ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

5th step to remove tools/rtti.hxx

Browse Source 
tools/rtti.hxx removed
completed the interface of some Sdr.*  Items
and removed pseudo items

Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
This commit is contained in:
Oliver Specht
2015-11-11 10:49:30 +00:00
parent c21ddcdb30
commit fa91dd31f3
1164 changed files with 734 additions and 2500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4
View File
@@ -132,3 +132,7 @@ DerivedData
# gdb config
/.gdbinit
/.gdb_history
# eclipse
.project
.cproject
avmedia/source/framework/mediaitem.cxx
+1 -1
View File
@@ -44,7 +44,7 @@ namespace avmedia
{
// - MediaItem -
TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
SfxPoolItem* MediaItem::CreateDefault() { return new MediaItem; }
struct MediaItem::Impl
{
basctl/source/basicide/basdoc.cxx
-1
View File
@@ -32,7 +32,6 @@
namespace basctl
{
TYPEINIT1(DocShell, SfxObjectShell);
SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SfxObjectShellFlags::STD_NORMAL, "sbasic" )
basctl/source/basicide/basdoc.hxx
-1
View File
@@ -46,7 +46,6 @@ protected:
bool bTemplate = false ) const override;
public:
TYPEINFO_OVERRIDE();
SFX_DECL_OBJECTFACTORY();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
basctl/source/basicide/basidesh.cxx
-2
View File
@@ -126,8 +126,6 @@ public:
};
TYPEINIT1( Shell, SfxViewShell );
SFX_IMPL_NAMED_VIEWFACTORY( Shell, "Default" )
{
SFX_VIEW_REGISTRATION( DocShell );
basctl/source/basicide/bastypes.cxx
-2
View File
@@ -40,8 +40,6 @@ namespace basctl
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
TYPEINIT1( SbxItem, SfxPoolItem );
BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,m_aDocument( rDocument )
basctl/source/basicide/sbxitem.cxx
+1 -1
View File
@@ -21,7 +21,7 @@
namespace basctl
{
SfxPoolItem* SbxItem::CreateDefault() { DBG_ASSERT(false, "No SbxItem factory available"); return 0; }
SbxItem::SbxItem (
sal_uInt16 nWhichItem,
ScriptDocument const& rDocument,
basctl/source/dlged/dlgedmod.cxx
-2
View File
@@ -23,8 +23,6 @@
namespace basctl
{
TYPEINIT1(DlgEdModel,SdrModel);
DlgEdModel::DlgEdModel()
:SdrModel()
{
basctl/source/dlged/dlgedobj.cxx
-2
View File
@@ -52,7 +52,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::script;
TYPEINIT1(DlgEdObj, SdrUnoObj);
DlgEditor& DlgEdObj::GetDialogEditor ()
{
@@ -1217,7 +1216,6 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer)
}
}
TYPEINIT1(DlgEdForm, DlgEdObj);
DlgEdForm::DlgEdForm (DlgEditor& rDlgEditor_) :
rDlgEditor(rDlgEditor_)
basctl/source/dlged/dlgedpage.cxx
-1
View File
@@ -25,7 +25,6 @@
namespace basctl
{
TYPEINIT1( DlgEdPage, SdrPage );
DlgEdPage::DlgEdPage(DlgEdModel& rModel, bool bMasterPage)
: SdrPage(rModel, bMasterPage)
basctl/source/dlged/dlgedview.cxx
-1
View File
@@ -31,7 +31,6 @@
namespace basctl
{
TYPEINIT1( DlgEdView, SdrView );
DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor) :
SdrView(&rModel, &rOut),
basctl/source/inc/basidesh.hxx
-1
View File
@@ -145,7 +145,6 @@ private:
virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) override;
public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_VIEWSH )
SFX_DECL_VIEWFACTORY(Shell);
basctl/source/inc/dlgedmod.hxx
-1
View File
@@ -38,7 +38,6 @@ private:
void operator=(const DlgEdModel& rSrcModel) = delete;
public:
TYPEINFO_OVERRIDE();
DlgEdModel();
virtual ~DlgEdModel();
basctl/source/inc/dlgedobj.hxx
-2
View File
@@ -86,7 +86,6 @@ protected:
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut );
public:
TYPEINFO_OVERRIDE();
virtual ~DlgEdObj();
virtual void SetPage(SdrPage* pNewPage) override;
@@ -157,7 +156,6 @@ protected:
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
public:
TYPEINFO_OVERRIDE();
virtual ~DlgEdForm();
basctl/source/inc/dlgedpage.hxx
-1
View File
@@ -40,7 +40,6 @@ private:
DlgEdForm* pDlgEdForm;
public:
TYPEINFO_OVERRIDE();
explicit DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false );
virtual ~DlgEdPage();
basctl/source/inc/dlgedview.hxx
-1
View File
@@ -38,7 +38,6 @@ private:
DlgEditor& rDlgEditor;
public:
TYPEINFO_OVERRIDE();
DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor);
virtual ~DlgEdView();
basctl/source/inc/sbxitem.hxx
+1 -1
View File
@@ -44,7 +44,7 @@ class SbxItem : public SfxPoolItem
ItemType m_eType;
public:
TYPEINFO_OVERRIDE();
static SfxPoolItem* CreateDefault();
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType);
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
basic/inc/sbobjmod.hxx
-2
View File
@@ -37,7 +37,6 @@ protected:
virtual ~SbObjModule();
public:
TYPEINFO_OVERRIDE();
SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override;
@@ -61,7 +60,6 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule
//protected:
void InitObject();
public:
TYPEINFO_OVERRIDE();
SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat );
virtual ~SbUserFormModule();
virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override;
basic/inc/sbprop.hxx
-2
View File
@@ -37,7 +37,6 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty
virtual ~SbProperty();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICPROP,1);
TYPEINFO_OVERRIDE();
SbModule* GetModule() { return pMod; }
};
@@ -54,7 +53,6 @@ public:
: SbxProperty( r, t ) // , pMod( p )
, mbSet( false )
{}
TYPEINFO_OVERRIDE();
bool isSet()
{ return mbSet; }
basic/inc/sbstdobj.hxx
-3
View File
@@ -48,7 +48,6 @@ protected:
void PropHeight( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
public:
TYPEINFO_OVERRIDE();
SbStdPicture();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
@@ -79,7 +78,6 @@ protected:
void PropName( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
public:
TYPEINFO_OVERRIDE();
SbStdFont();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
@@ -114,7 +112,6 @@ protected:
static void MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool bWrite );
public:
TYPEINFO_OVERRIDE();
SbStdClipboard();
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
basic/source/basmgr/basmgr.cxx
-1
View File
@@ -95,7 +95,6 @@ static const char szManagerStream[] = "BasicManager2";
static const char szImbedded[] = "LIBIMBEDDED";
static const char szCryptingKey[] = "CryptedBasic";
TYPEINIT1( BasicManager, SfxBroadcaster );
const StreamMode eStreamReadMode = StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL;
const StreamMode eStorageReadMode = StreamMode::READ | StreamMode::SHARE_DENYWRITE;
basic/source/classes/sb.cxx
-3
View File
@@ -52,7 +52,6 @@
#include <svtools/miscopt.hxx>
using namespace ::com::sun::star::script;
TYPEINIT1(StarBASIC,SbxObject)
#define RTLNAME "@SBRTL"
// i#i68894#
@@ -628,7 +627,6 @@ SbxObject* createUserTypeImpl( const OUString& rClassName )
}
TYPEINIT1(SbClassModuleObject,SbModule)
SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
: SbModule( pClassModule->GetName() )
@@ -2047,7 +2045,6 @@ void StarBASIC::DetachAllDocBasicItems()
// #118116 Implementation Collection object
TYPEINIT1(BasicCollection,SbxObject)
static const char pCountStr[] = "Count";
static const char pAddStr[] = "Add";
basic/source/classes/sbunoobj.cxx
-10
View File
@@ -96,14 +96,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::bridge;
using namespace cppu;
TYPEINIT1(SbUnoMethod,SbxMethod)
TYPEINIT1(SbUnoProperty,SbxProperty)
TYPEINIT1(SbUnoObject,SbxObject)
TYPEINIT1(SbUnoStructRefObject,SbxObject)
TYPEINIT1(SbUnoClass,SbxObject)
TYPEINIT1(SbUnoService,SbxObject)
TYPEINIT1(SbUnoServiceCtor,SbxMethod)
TYPEINIT1(SbUnoSingleton,SbxObject)
// Identifiers for creating the strings for dbg_Properties
static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
@@ -355,7 +347,6 @@ Any convertAny( const Any& rVal, const Type& aDestType )
// #105565 Special Object to wrap a strongly typed Uno Any
TYPEINIT1(SbUnoAnyObject,SbxObject)
// TODO: source out later
@@ -2013,7 +2004,6 @@ OUString Impl_DumpMethods(SbUnoObject& rUnoObj)
return aRet.makeStringAndClear();
}
TYPEINIT1(AutomationNamedArgsSbxArray,SbxArray)
// Implementation SbUnoObject
void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
basic/source/classes/sbxmod.cxx
-9
View File
@@ -413,14 +413,6 @@ SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) throw (Runt
return pProperty;
}
TYPEINIT1(SbModule,SbxObject)
TYPEINIT1(SbMethod,SbxMethod)
TYPEINIT1(SbProperty,SbxProperty)
TYPEINIT1(SbProcedureProperty,SbxProperty)
TYPEINIT1(SbJScriptModule,SbModule)
TYPEINIT1(SbJScriptMethod,SbMethod)
TYPEINIT1(SbObjModule,SbModule)
TYPEINIT1(SbUserFormModule,SbObjModule)
uno::Reference< frame::XModel > getDocumentModel( StarBASIC* pb )
{
@@ -649,7 +641,6 @@ SbIfaceMapperMethod::~SbIfaceMapperMethod()
{
}
TYPEINIT1(SbIfaceMapperMethod,SbMethod)
// From the code generator: remove invalid entries
basic/source/inc/sbjsmeth.hxx
-1
View File
@@ -34,7 +34,6 @@ public:
virtual ~SbJScriptMethod();
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2);
TYPEINFO_OVERRIDE();
};
basic/source/inc/sbjsmod.hxx
-1
View File
@@ -32,7 +32,6 @@ class SbJScriptModule : public SbModule
virtual bool StoreData( SvStream& ) const override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1);
TYPEINFO_OVERRIDE();
SbJScriptModule( const OUString& ); // hand through
};
basic/source/inc/sbunoobj.hxx
-11
View File
@@ -81,7 +81,6 @@ class SbUnoStructRefObject: public SbxObject
OUString Impl_DumpProperties();
OUString getDbgObjectName();
public:
TYPEINFO_OVERRIDE();
StructRefInfo getStructMember( const OUString& rMember );
StructRefInfo getStructInfo() { return maMemberInfo; }
SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
@@ -119,7 +118,6 @@ class SbUnoObject: public SbxObject
public:
static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
TYPEINFO_OVERRIDE();
SbUnoObject( const OUString& aName_, const css::uno::Any& aUnoObj_ );
virtual ~SbUnoObject();
@@ -165,7 +163,6 @@ class SbUnoMethod : public SbxMethod
bool mbInvocation; // Method is based on invocation
public:
TYPEINFO_OVERRIDE();
SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > xUnoMethod_,
bool bInvocation );
@@ -196,7 +193,6 @@ class SbUnoProperty : public SbxProperty
SbUnoProperty& operator = ( const SbUnoProperty&) = delete;
public:
TYPEINFO_OVERRIDE();
SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType,
const css::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct );
@@ -220,7 +216,6 @@ class SbUnoClass : public SbxObject
const css::uno::Reference< css::reflection::XIdlClass > m_xClass;
public:
TYPEINFO_OVERRIDE();
SbUnoClass( const OUString& aName_ )
: SbxObject( aName_ )
{}
@@ -250,7 +245,6 @@ class SbUnoService : public SbxObject
bool m_bNeedsInit;
public:
TYPEINFO_OVERRIDE();
SbUnoService( const OUString& aName_,
const css::uno::Reference< css::reflection::XServiceTypeDescription2 >& xServiceTypeDesc )
: SbxObject( aName_ )
@@ -278,7 +272,6 @@ class SbUnoServiceCtor : public SbxMethod
SbUnoServiceCtor* pNext;
public:
TYPEINFO_OVERRIDE();
SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > xServiceCtorDesc );
virtual ~SbUnoServiceCtor();
@@ -295,7 +288,6 @@ class SbUnoSingleton : public SbxObject
const css::uno::Reference< css::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc;
public:
TYPEINFO_OVERRIDE();
SbUnoSingleton( const OUString& aName_,
const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
@@ -319,7 +311,6 @@ public:
const css::uno::Any& getValue()
{ return mVal; }
TYPEINFO_OVERRIDE();
};
@@ -330,7 +321,6 @@ class AutomationNamedArgsSbxArray : public SbxArray
{
css::uno::Sequence< OUString > maNameSeq;
public:
TYPEINFO_OVERRIDE();
AutomationNamedArgsSbxArray( sal_Int32 nSeqSize )
: maNameSeq( nSeqSize )
{}
@@ -377,7 +367,6 @@ class BasicCollection : public SbxObject
void CollRemove( SbxArray* pPar_ );
public:
TYPEINFO_OVERRIDE();
BasicCollection( const OUString& rClassname );
virtual SbxVariable* Find( const OUString&, SbxClassType ) override;
virtual void Clear() override;
basic/source/runtime/stdobj1.cxx
-3
View File
@@ -110,7 +110,6 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite )
}
TYPEINIT1( SbStdPicture, SbxObject );
SbStdPicture::SbStdPicture() :
SbxObject( OUString("Picture"))
@@ -224,7 +223,6 @@ void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite )
}
}
TYPEINIT1( SbStdFont, SbxObject );
SbStdFont::SbStdFont()
: SbxObject( OUString("Font") )
@@ -392,7 +390,6 @@ void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool )
}
TYPEINIT1( SbStdClipboard, SbxObject );
SbStdClipboard::SbStdClipboard() :
SbxObject( OUString("Clipboard") )
basic/source/sbx/sbxarray.cxx
-2
View File
@@ -34,8 +34,6 @@ struct SbxVarEntry
boost::optional<OUString> maAlias;
};
TYPEINIT1(SbxArray,SbxBase)
TYPEINIT1(SbxDimArray,SbxArray)
// SbxArray
basic/source/sbx/sbxbase.cxx
-1
View File
@@ -30,7 +30,6 @@
// AppData-Structure for SBX:
TYPEINIT0(SbxBase)
SbxAppData::SbxAppData()
: eSbxError(ERRCODE_SBX_OK)
basic/source/sbx/sbxcoll.cxx
-2
View File
@@ -22,8 +22,6 @@
#include <basic/sbx.hxx>
#include "sbxres.hxx"
TYPEINIT1(SbxCollection,SbxObject)
TYPEINIT1(SbxStdCollection,SbxCollection)
static OUString pCount;
static OUString pAdd;
basic/source/sbx/sbxobj.cxx
-3
View File
@@ -27,9 +27,6 @@
#include <svl/SfxBroadcaster.hxx>
#include "sbxres.hxx"
TYPEINIT1(SbxMethod,SbxVariable)
TYPEINIT1(SbxProperty,SbxVariable)
TYPEINIT2(SbxObject,SbxVariable,SfxListener)
static OUString pNameProp; // Name-Property
static OUString pParentProp; // Parent-Property
basic/source/sbx/sbxvalue.cxx
-1
View File
@@ -28,7 +28,6 @@
#include "sbxconv.hxx"
#include "runtime.hxx"
TYPEINIT1(SbxValue,SbxBase)
///////////////////////////// constructors
basic/source/sbx/sbxvar.cxx
-1
View File
@@ -36,7 +36,6 @@ using namespace com::sun::star::uno;
// SbxVariable
TYPEINIT1(SbxVariable,SbxValue)
// SbxVariableImpl
compilerplugins/clang/store/constantfunction.cxx
-2
View File
@@ -418,13 +418,11 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
return true;
}
// can't mess with the TYPEINIT macros in include/tools/rtti.hxx or the LINK macros in include/tools/link.hxx
std::string aImmediateMacro = "";
if (compat::isMacroBodyExpansion(compiler, pFunctionDecl->getLocStart()) ) {
StringRef name { Lexer::getImmediateMacroName(
pFunctionDecl->getLocStart(), compiler.getSourceManager(), compiler.getLangOpts()) };
aImmediateMacro = name;
if (name == "TYPEINIT_FACTORY" || name == "TYPEINFO" || name == "TYPEINFO_OVERRIDE"
|| name.startswith("IMPL_LINK_") )
{
return true;
connectivity/source/drivers/file/fcode.cxx
-23
View File
@@ -32,30 +32,7 @@ using namespace connectivity::file;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
TYPEINIT0(OCode);
TYPEINIT1(OOperand, OCode);
TYPEINIT1(OOperandRow, OOperand);
TYPEINIT1(OOperandAttr, OOperandRow);
TYPEINIT1(OOperandParam, OOperandRow);
TYPEINIT1(OOperandValue, OOperand);
TYPEINIT1(OOperandConst, OOperandValue);
TYPEINIT1(OOperandResult, OOperandValue);
TYPEINIT1(OStopOperand, OOperandValue);
TYPEINIT1(OOperator, OCode);
TYPEINIT1(OBoolOperator,OOperator);
TYPEINIT1(OOp_NOT, OBoolOperator);
TYPEINIT1(OOp_AND, OBoolOperator);
TYPEINIT1(OOp_OR, OBoolOperator);
TYPEINIT1(OOp_ISNULL, OBoolOperator);
TYPEINIT1(OOp_ISNOTNULL, OOp_ISNULL);
TYPEINIT1(OOp_LIKE, OBoolOperator);
TYPEINIT1(OOp_NOTLIKE, OOp_LIKE);
TYPEINIT1(OOp_COMPARE, OBoolOperator);
TYPEINIT1(ONumOperator, OOperator);
TYPEINIT1(ONthOperator, OOperator);
TYPEINIT1(OBinaryOperator, OOperator);
TYPEINIT1(OUnaryOperator, OOperator);
OCode::OCode()
{
connectivity/source/inc/file/fcode.hxx
-24
View File
@@ -23,7 +23,6 @@
#include <connectivity/sqliterator.hxx>
#include <com/sun/star/sdbc/DataType.hpp>
#include <connectivity/CommonTools.hxx>
#include <tools/rtti.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <connectivity/FValue.hxx>
@@ -57,7 +56,6 @@ namespace connectivity
inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
{ }
TYPEINFO();
};
@@ -77,7 +75,6 @@ namespace connectivity
sal_Int32 getDBType() const {return m_eDBType;}
inline bool isValid() const;
TYPEINFO_OVERRIDE();
};
class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand
@@ -92,7 +89,6 @@ namespace connectivity
virtual void setValue(const ORowSetValue& _rVal) override;
void bindValue(const OValueRefRow& _pRow); // Bind to the value that the operand represents
TYPEINFO_OVERRIDE();
};
// Attributes from a result row
@@ -105,7 +101,6 @@ namespace connectivity
OOperandAttr(sal_uInt16 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn);
TYPEINFO_OVERRIDE();
};
// Parameter for a predicate
@@ -113,7 +108,6 @@ namespace connectivity
{
public:
OOperandParam(connectivity::OSQLParseNode* pNode, sal_Int32 _nPos);
TYPEINFO_OVERRIDE();
};
// Value operands
@@ -134,7 +128,6 @@ namespace connectivity
virtual const ORowSetValue& getValue() const override;
virtual void setValue(const ORowSetValue& _rVal) override;
TYPEINFO_OVERRIDE();
};
@@ -144,7 +137,6 @@ namespace connectivity
public:
OOperandConst(const connectivity::OSQLParseNode& rColumnRef, const OUString& aStrValue);
TYPEINFO_OVERRIDE();
};
@@ -159,7 +151,6 @@ namespace connectivity
public:
OOperandResult(const ORowSetValue& _rVar)
:OOperandValue(_rVar, _rVar.getTypeKind()) {}
TYPEINFO_OVERRIDE();
};
@@ -190,7 +181,6 @@ namespace connectivity
{
public:
OStopOperand(){}
TYPEINFO_OVERRIDE();
};
// Operators
@@ -198,7 +188,6 @@ namespace connectivity
{
public:
virtual void Exec(OCodeStack&) = 0;
TYPEINFO_OVERRIDE();
};
@@ -206,7 +195,6 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OBoolOperator : public OOperator
{
public:
TYPEINFO_OVERRIDE();
virtual void Exec(OCodeStack&) override;
virtual bool operate(const OOperand*, const OOperand*) const;
};
@@ -214,7 +202,6 @@ namespace connectivity
class OOp_NOT : public OBoolOperator
{
public:
TYPEINFO_OVERRIDE();
protected:
virtual void Exec(OCodeStack&) override;
@@ -224,7 +211,6 @@ namespace connectivity
class OOp_AND : public OBoolOperator
{
public:
TYPEINFO_OVERRIDE();
protected:
virtual bool operate(const OOperand*, const OOperand*) const override;
@@ -233,7 +219,6 @@ namespace connectivity
class OOp_OR : public OBoolOperator
{
public:
TYPEINFO_OVERRIDE();
protected:
virtual bool operate(const OOperand*, const OOperand*) const override;
};
@@ -241,7 +226,6 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OOp_ISNULL : public OBoolOperator
{
public:
TYPEINFO_OVERRIDE();
public:
virtual void Exec(OCodeStack&) override;
virtual bool operate(const OOperand*, const OOperand* = nullptr) const override;
@@ -250,14 +234,12 @@ namespace connectivity
class OOO_DLLPUBLIC_FILE OOp_ISNOTNULL : public OOp_ISNULL
{
public:
TYPEINFO_OVERRIDE();
virtual bool operate(const OOperand*, const OOperand* = nullptr) const override;
};
class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator
{
public:
TYPEINFO_OVERRIDE();
protected:
const sal_Unicode cEscape;
@@ -270,7 +252,6 @@ namespace connectivity
class OOp_NOTLIKE : public OOp_LIKE
{
public:
TYPEINFO_OVERRIDE();
public:
OOp_NOTLIKE(const sal_Unicode cEsc = L'\0'):OOp_LIKE(cEsc){};
@@ -282,7 +263,6 @@ namespace connectivity
sal_Int32 aPredicateType;
public:
TYPEINFO_OVERRIDE();
OOp_COMPARE(sal_Int32 aPType)
:aPredicateType(aPType) {}
@@ -296,7 +276,6 @@ namespace connectivity
public:
virtual void Exec(OCodeStack&) override;
TYPEINFO_OVERRIDE();
protected:
virtual double operate(const double& fLeft,const double& fRight) const = 0;
@@ -337,7 +316,6 @@ namespace connectivity
public:
virtual void Exec(OCodeStack&) override;
TYPEINFO_OVERRIDE();
protected:
virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const = 0;
@@ -348,7 +326,6 @@ namespace connectivity
public:
virtual void Exec(OCodeStack&) override;
TYPEINFO_OVERRIDE();
protected:
virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const = 0;
@@ -360,7 +337,6 @@ namespace connectivity
virtual void Exec(OCodeStack&) override;
virtual ORowSetValue operate(const ORowSetValue& lhs) const = 0;
TYPEINFO_OVERRIDE();
};
}
cui/inc/pch/precompiled_cui.hxx
-1
View File
@@ -536,7 +536,6 @@
#include <svx/sxmbritm.hxx>
#include <svx/sxmfsitm.hxx>
#include <svx/sxmlhitm.hxx>
#include <svx/sxmsuitm.hxx>
#include <svx/sxmtfitm.hxx>
#include <svx/sxmtpitm.hxx>
#include <svx/sxmtritm.hxx>
cui/source/options/cfgchart.cxx
-1
View File
@@ -27,7 +27,6 @@
using namespace com::sun::star;
TYPEINIT1( SvxChartColorTableItem, SfxPoolItem );
SvxChartColorTable::SvxChartColorTable()
: nNextElementNumber(0)
cui/source/options/cfgchart.hxx
-2
View File
@@ -20,7 +20,6 @@
#ifndef INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
#define INCLUDED_CUI_SOURCE_OPTIONS_CFGCHART_HXX
#include <tools/rtti.hxx>
#include <unotools/configitem.hxx>
#include <svl/poolitem.hxx>
#include <svx/xtable.hxx>
@@ -90,7 +89,6 @@ public:
class SvxChartColorTableItem : public SfxPoolItem
{
public:
TYPEINFO_OVERRIDE();
SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& );
SvxChartColorTableItem( const SvxChartColorTableItem& );
cui/source/options/connpoolsettings.cxx
-1
View File
@@ -42,7 +42,6 @@ namespace offapp
{
}
TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem )
DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings )
:SfxPoolItem(_nId)
cui/source/options/connpoolsettings.hxx
-1
View File
@@ -73,7 +73,6 @@ namespace offapp
DriverPoolingSettings m_aSettings;
public:
TYPEINFO_OVERRIDE();
DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings );
cui/source/options/dbregistersettings.cxx
-1
View File
@@ -25,7 +25,6 @@
namespace svx
{
TYPEINIT1( DatabaseMapItem, SfxPoolItem )
DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations )
:SfxPoolItem( _nId )
cui/source/options/dbregistersettings.hxx
-1
View File
@@ -69,7 +69,6 @@ namespace svx
DatabaseRegistrations m_aRegistrations;
public:
TYPEINFO_OVERRIDE();
DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations );
cui/source/tabpages/measure.cxx
+2 -3
View File
@@ -39,7 +39,6 @@
#include <svx/sxmbritm.hxx>
#include <svx/sxmfsitm.hxx>
#include <svx/sxmlhitm.hxx>
#include <svx/sxmsuitm.hxx>
#include <svx/sxmtfitm.hxx>
#include <svx/sxmtpitm.hxx>
#include <svx/sxmtritm.hxx>
@@ -500,7 +499,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
eState = m_pTsbShowUnit->GetState();
if( m_pTsbShowUnit->IsValueChangedFromSaved() )
{
rAttrs->Put( makeSdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
rAttrs->Put( SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, TRISTATE_TRUE == eState ) );
bModified = true;
}
@@ -729,7 +728,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
{
TriState eState = m_pTsbShowUnit->GetState();
if( eState != TRISTATE_INDET )
aAttrSet.Put( makeSdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
aAttrSet.Put( SdrYesNoItem( SDRATTR_MEASURESHOWUNIT, TRISTATE_TRUE == eState ) );
}
if( p == m_pLbUnit )
dbaccess/source/filter/xml/xmlStyleImport.cxx
-2
View File
@@ -46,8 +46,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace xmloff::token;
TYPEINIT1( OTableStyleContext, XMLPropStyleContext );
TYPEINIT1( OTableStylesContext, SvXMLStylesContext );
OTableStyleContext::OTableStyleContext( ODBFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
dbaccess/source/filter/xml/xmlStyleImport.hxx
-2
View File
@@ -53,7 +53,6 @@ namespace dbaxml
public:
TYPEINFO_OVERRIDE();
OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -96,7 +95,6 @@ namespace dbaxml
public:
TYPEINFO_OVERRIDE();
OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx ,
const OUString& rLName ,
dbaccess/source/ui/dlg/DbAdminImpl.cxx
-1
View File
@@ -1095,7 +1095,6 @@ void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSo
}
// DbuTypeCollectionItem
TYPEINIT1(DbuTypeCollectionItem, SfxPoolItem);
DbuTypeCollectionItem::DbuTypeCollectionItem(sal_Int16 _nWhich, ::dbaccess::ODsnTypeCollection* _pCollection)
:SfxPoolItem(_nWhich)
,m_pCollection(_pCollection)
dbaccess/source/ui/dlg/dsnItem.hxx
-1
View File
@@ -36,7 +36,6 @@ namespace dbaui
::dbaccess::ODsnTypeCollection* m_pCollection;
public:
TYPEINFO_OVERRIDE();
DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = nullptr);
DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource);
dbaccess/source/ui/dlg/optionalboolitem.cxx
-1
View File
@@ -23,7 +23,6 @@ namespace dbaui
{
// OptionalBoolItem
TYPEINIT1( OptionalBoolItem, SfxPoolItem );
OptionalBoolItem::OptionalBoolItem( sal_Int16 _nWhich )
:SfxPoolItem( _nWhich )
,m_aValue()
dbaccess/source/ui/dlg/optionalboolitem.hxx
-1
View File
@@ -33,7 +33,6 @@ namespace dbaui
::boost::optional< bool > m_aValue;
public:
TYPEINFO_OVERRIDE();
explicit OptionalBoolItem( sal_Int16 nWhich );
OptionalBoolItem( const OptionalBoolItem& _rSource );
dbaccess/source/ui/inc/GeneralUndo.hxx
-1
View File
@@ -35,7 +35,6 @@ namespace dbaui
OUString m_strComment; // undo, redo comment
public:
TYPEINFO_OVERRIDE();
OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); }
virtual OUString GetComment() const override { return m_strComment; }
dbaccess/source/ui/inc/JoinTableView.hxx
-1
View File
@@ -24,7 +24,6 @@
#include <vcl/idle.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/vclptr.hxx>
#include <tools/rtti.hxx>
#include <svtools/transfer.hxx>
#include "callbacks.hxx"
dbaccess/source/ui/inc/TableConnection.hxx
-1
View File
@@ -22,7 +22,6 @@
#include <vector>
#include <tools/debug.hxx>
#include <vcl/window.hxx>
#include <tools/rtti.hxx>
#include <com/sun/star/uno/Reference.h>
#include "TableConnectionData.hxx"
dbaccess/source/ui/inc/TableConnectionData.hxx
-1
View File
@@ -22,7 +22,6 @@
#include "ConnectionLineData.hxx"
#include "TableWindowData.hxx"
#include <vector>
#include <tools/rtti.hxx>
#include <memory>
namespace dbaui
dbaccess/source/ui/inc/TableWindow.hxx
-1
View File
@@ -22,7 +22,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "TableWindowTitle.hxx"
#include <tools/rtti.hxx>
#include <rtl/ref.hxx>
#include "TableWindowData.hxx"
#include "TableWindowListBox.hxx"
dbaccess/source/ui/inc/propertysetitem.hxx
-1
View File
@@ -34,7 +34,6 @@ namespace dbaui
css::uno::Reference< css::beans::XPropertySet > m_xSet;
public:
TYPEINFO_OVERRIDE();
OPropertySetItem(sal_Int16 nWhich);
OPropertySetItem(sal_Int16 nWhich,
const css::uno::Reference< css::beans::XPropertySet >& _rxSet);
dbaccess/source/ui/inc/stringlistitem.hxx
-1
View File
@@ -36,7 +36,6 @@ class OStringListItem : public SfxPoolItem
css::uno::Sequence< OUString > m_aList;
public:
TYPEINFO_OVERRIDE();
OStringListItem(sal_Int16 nWhich, const css::uno::Sequence< OUString >& _rList);
OStringListItem(const OStringListItem& _rSource);
dbaccess/source/ui/misc/propertysetitem.cxx
-1
View File
@@ -26,7 +26,6 @@ namespace dbaui
using namespace ::com::sun::star::beans;
// OPropertySetItem
TYPEINIT1(OPropertySetItem, SfxPoolItem);
OPropertySetItem::OPropertySetItem(sal_Int16 _nWhich)
:SfxPoolItem(_nWhich)
{
dbaccess/source/ui/misc/stringlistitem.cxx
-1
View File
@@ -25,7 +25,6 @@ namespace dbaui
using namespace ::com::sun::star::uno;
// OStringListItem
TYPEINIT1(OStringListItem, SfxPoolItem);
OStringListItem::OStringListItem(sal_Int16 _nWhich, const Sequence< OUString >& _rList)
:SfxPoolItem(_nWhich)
,m_aList(_rList)
dbaccess/source/ui/querydesign/QTableConnectionData.hxx
-1
View File
@@ -22,7 +22,6 @@
#include "TableConnectionData.hxx"
#include "TableFieldDescription.hxx"
#include "QEnumTypes.hxx"
#include <tools/rtti.hxx>
namespace dbaui
{
dbaccess/source/ui/querydesign/QTableWindow.hxx
-1
View File
@@ -22,7 +22,6 @@
#include "TableWindow.hxx"
#include "QTableWindowData.hxx"
#include "TableFieldDescription.hxx"
#include <tools/rtti.hxx>
namespace dbaui
{
dbaccess/source/ui/tabledesign/TEditControl.cxx
-1
View File
@@ -61,7 +61,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdb;
// TYPEINIT1(OTableEditorCtrl, DBView);
#define HANDLE_ID 0
dbaccess/source/ui/tabledesign/TableUndo.cxx
-9
View File
@@ -30,15 +30,6 @@
using namespace dbaui;
using namespace ::svt;
TYPEINIT1( OCommentUndoAction, SfxUndoAction );
TYPEINIT1( OTableDesignUndoAct, OCommentUndoAction );
TYPEINIT1( OTableEditorUndoAct, OTableDesignUndoAct );
TYPEINIT1( OTableDesignCellUndoAct, OTableDesignUndoAct );
TYPEINIT1( OTableEditorTypeSelUndoAct, OTableEditorUndoAct );
TYPEINIT1( OTableEditorDelUndoAct, OTableEditorUndoAct );
TYPEINIT1( OTableEditorInsUndoAct, OTableEditorUndoAct );
TYPEINIT1( OTableEditorInsNewUndoAct, OTableEditorUndoAct );
TYPEINIT1( OPrimKeyUndoAct, OTableEditorUndoAct );
// class OTableDesignUndoAct
OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID)
dbaccess/source/ui/tabledesign/TableUndo.hxx
-8
View File
@@ -40,7 +40,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID);
virtual ~OTableDesignUndoAct();
};
@@ -52,7 +51,6 @@ namespace dbaui
VclPtr<OTableEditorCtrl> pTabEdCtrl;
public:
TYPEINFO_OVERRIDE();
OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID );
virtual ~OTableEditorUndoAct();
};
@@ -68,7 +66,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn );
virtual ~OTableDesignCellUndoAct();
};
@@ -84,7 +81,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType );
virtual ~OTableEditorTypeSelUndoAct();
};
@@ -97,7 +93,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
explicit OTableEditorDelUndoAct( OTableEditorCtrl* pOwner );
virtual ~OTableEditorDelUndoAct();
};
@@ -111,7 +106,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
long nInsertPosition,
const ::std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows);
@@ -127,7 +121,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows );
virtual ~OTableEditorInsNewUndoAct();
};
@@ -142,7 +135,6 @@ namespace dbaui
virtual void Undo() override;
virtual void Redo() override;
public:
TYPEINFO_OVERRIDE();
OPrimKeyUndoAct( OTableEditorCtrl* pOwner, const MultiSelection& aDeletedKeys, const MultiSelection& aInsertedKeys );
virtual ~OPrimKeyUndoAct();
};
editeng/inc/pch/precompiled_editeng.hxx
-1
View File
@@ -269,7 +269,6 @@
#include <tools/mapunit.hxx>
#include <tools/poly.hxx>
#include <tools/resid.hxx>
#include <tools/rtti.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/tenccvt.hxx>
editeng/source/items/bulitem.cxx
-1
View File
@@ -30,7 +30,6 @@
TYPEINIT1(SvxBulletItem,SfxPoolItem);
editeng/source/items/charhiddenitem.cxx
+2 -1
View File
@@ -21,7 +21,8 @@
#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(false, 0));
SfxPoolItem* SvxCharHiddenItem::CreateDefault() { return new SvxCharHiddenItem(false, 0);}
SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId ) :
SfxBoolItem( nId, bHidden )
editeng/source/items/flditem.cxx
+16 -17
View File
@@ -220,7 +220,6 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
return nullptr;
}
TYPEINIT1( SvxFieldItem, SfxPoolItem );
SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase );
@@ -247,7 +246,7 @@ SvxFieldData* SvxFieldData::Clone() const
bool SvxFieldData::operator==( const SvxFieldData& rFld ) const
{
DBG_ASSERT( Type() == rFld.Type(), "==: Different Types" );
DBG_ASSERT( typeid(*this) == typeid(rFld), "==: Different Types" );
(void)rFld;
return true; // Basic class is always the same.
}
@@ -362,7 +361,7 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
return true;
if( pField == nullptr || pOtherFld == nullptr )
return false;
return ( pField->Type() == pOtherFld->Type() )
return ( typeid(*pField) == typeid(*pOtherFld) )
&& ( *pField == *pOtherFld );
}
@@ -401,7 +400,7 @@ SvxFieldData* SvxDateField::Clone() const
bool SvxDateField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
if ( typeid(rOther) != typeid(*this) )
return false;
const SvxDateField& rOtherFld = static_cast<const SvxDateField&>(rOther);
@@ -539,7 +538,7 @@ SvxFieldData* SvxURLField::Clone() const
bool SvxURLField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
if ( typeid(rOther) != typeid(*this) )
return false;
const SvxURLField& rOtherFld = static_cast<const SvxURLField&>(rOther);
@@ -628,7 +627,7 @@ SvxFieldData* SvxPageTitleField::Clone() const
bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxPageTitleField) );
return ( dynamic_cast< const SvxPageTitleField *>(&rCmp) != nullptr );
}
void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ )
@@ -661,7 +660,7 @@ SvxFieldData* SvxPageField::Clone() const
bool SvxPageField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxPageField) );
return ( dynamic_cast< const SvxPageField *>(&rCmp) != nullptr );
}
void SvxPageField::Load( SvPersistStream & /*rStm*/ )
@@ -689,7 +688,7 @@ SvxFieldData* SvxPagesField::Clone() const
bool SvxPagesField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxPagesField) );
return ( dynamic_cast< const SvxPagesField *>(&rCmp) != nullptr);
}
void SvxPagesField::Load( SvPersistStream & /*rStm*/ )
@@ -711,7 +710,7 @@ SvxFieldData* SvxTimeField::Clone() const
bool SvxTimeField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxTimeField) );
return ( dynamic_cast< const SvxTimeField *>(&rCmp) != nullptr);
}
void SvxTimeField::Load( SvPersistStream & /*rStm*/ )
@@ -738,7 +737,7 @@ SvxFieldData* SvxFileField::Clone() const
bool SvxFileField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxFileField) );
return ( dynamic_cast< const SvxFileField *>(&rCmp) != nullptr );
}
void SvxFileField::Load( SvPersistStream & /*rStm*/ )
@@ -768,7 +767,7 @@ SvxFieldData* SvxTableField::Clone() const
bool SvxTableField::operator==( const SvxFieldData& rCmp ) const
{
if (rCmp.Type() != TYPE(SvxTableField))
if (dynamic_cast< const SvxTableField *>(&rCmp) != nullptr)
return false;
return mnTab == static_cast<const SvxTableField&>(rCmp).mnTab;
@@ -817,7 +816,7 @@ SvxFieldData* SvxExtTimeField::Clone() const
bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
if ( typeid(rOther) != typeid(*this) )
return false;
const SvxExtTimeField& rOtherFld = static_cast<const SvxExtTimeField&>(rOther);
@@ -961,7 +960,7 @@ SvxFieldData* SvxExtFileField::Clone() const
bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
if ( typeid(rOther) != typeid(*this) )
return false;
const SvxExtFileField& rOtherFld = static_cast<const SvxExtFileField&>(rOther);
@@ -1113,7 +1112,7 @@ SvxFieldData* SvxAuthorField::Clone() const
bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
if ( typeid(rOther) != typeid(*this) )
return false;
const SvxAuthorField& rOtherFld = static_cast<const SvxAuthorField&>(rOther);
@@ -1214,7 +1213,7 @@ SvxFieldData* SvxHeaderField::Clone() const
bool SvxHeaderField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxHeaderField) );
return ( dynamic_cast< const SvxHeaderField *>(&rCmp) != nullptr );
}
void SvxHeaderField::Load( SvPersistStream & /*rStm*/ )
@@ -1237,7 +1236,7 @@ SvxFieldData* SvxFooterField::Clone() const
bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxFooterField) );
return ( dynamic_cast< const SvxFooterField *>(&rCmp) != nullptr );
}
void SvxFooterField::Load( SvPersistStream & /*rStm*/ )
@@ -1259,7 +1258,7 @@ SvxFieldData* SvxDateTimeField::Clone() const
bool SvxDateTimeField::operator==( const SvxFieldData& rCmp ) const
{
return ( rCmp.Type() == TYPE(SvxDateTimeField) );
return ( dynamic_cast< const SvxDateTimeField *>(&rCmp) != nullptr );
}
void SvxDateTimeField::Load( SvPersistStream & /*rStm*/ )
editeng/source/items/frmitems.cxx
+17 -15
View File
@@ -138,21 +138,23 @@ namespace
}
}
TYPEINIT1_FACTORY(SvxPaperBinItem, SfxByteItem, new SvxPaperBinItem(0));
TYPEINIT1_FACTORY(SvxSizeItem, SfxPoolItem, new SvxSizeItem(0));
TYPEINIT1_FACTORY(SvxLRSpaceItem, SfxPoolItem, new SvxLRSpaceItem(0));
TYPEINIT1_FACTORY(SvxULSpaceItem, SfxPoolItem, new SvxULSpaceItem(0));
TYPEINIT1_FACTORY(SvxPrintItem, SfxBoolItem, new SvxPrintItem(0));
TYPEINIT1_FACTORY(SvxOpaqueItem, SfxBoolItem, new SvxOpaqueItem(0));
TYPEINIT1_FACTORY(SvxProtectItem, SfxPoolItem, new SvxProtectItem(0));
TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0));
TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0));
TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0));
TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
SfxPoolItem* SvxPaperBinItem::CreateDefault() { return new SvxPaperBinItem(0);}
SfxPoolItem* SvxSizeItem::CreateDefault() { return new SvxSizeItem(0);}
SfxPoolItem* SvxLRSpaceItem::CreateDefault() { return new SvxLRSpaceItem(0);}
SfxPoolItem* SvxULSpaceItem::CreateDefault() { return new SvxULSpaceItem(0);}
SfxPoolItem* SvxPrintItem::CreateDefault() { return new SvxPrintItem(0);}
SfxPoolItem* SvxOpaqueItem::CreateDefault() { return new SvxOpaqueItem(0);}
SfxPoolItem* SvxProtectItem::CreateDefault() { return new SvxProtectItem(0);}
SfxPoolItem* SvxBrushItem::CreateDefault() { return new SvxBrushItem(0);}
SfxPoolItem* SvxShadowItem::CreateDefault() { return new SvxShadowItem(0);}
SfxPoolItem* SvxBoxItem::CreateDefault() { return new SvxBoxItem(0);}
SfxPoolItem* SvxBoxInfoItem::CreateDefault() { return new SvxBoxInfoItem(0);}
SfxPoolItem* SvxFormatBreakItem::CreateDefault() { return new SvxFormatBreakItem(SVX_BREAK_NONE, 0);}
SfxPoolItem* SvxFormatKeepItem::CreateDefault() { return new SvxFormatKeepItem(false, 0);}
SfxPoolItem* SvxLineItem::CreateDefault() { return new SvxLineItem(0);}
SfxPoolItem* SvxFrameDirectionItem::CreateDefault() { return new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0);}
// class SvxPaperBinItem ------------------------------------------------
editeng/source/items/justifyitem.cxx
+3 -2
View File
@@ -31,8 +31,9 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
TYPEINIT1_FACTORY( SvxHorJustifyItem, SfxEnumItem, new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) );
TYPEINIT1_FACTORY( SvxVerJustifyItem, SfxEnumItem, new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) );
SfxPoolItem* SvxHorJustifyItem::CreateDefault() { return new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ;}
SfxPoolItem* SvxVerJustifyItem::CreateDefault() { return new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ;}
using namespace ::com::sun::star;
editeng/source/items/optitems.cxx
-2
View File
@@ -30,8 +30,6 @@ using namespace ::com::sun::star::linguistic2;
// STATIC DATA -----------------------------------------------------------
TYPEINIT1(SfxSpellCheckItem, SfxPoolItem);
TYPEINIT1(SfxHyphenRegionItem, SfxPoolItem);
// class SfxSpellCheckItem -----------------------------------------------
editeng/source/items/paraitem.cxx
+13 -14
View File
@@ -24,7 +24,6 @@
#include <comphelper/processfactory.hxx>
#include <unotools/syslocale.hxx>
#include <comphelper/types.hxx>
#include <tools/rtti.hxx>
#include <tools/mapunit.hxx>
#include <svl/itempool.hxx>
#include <svl/memberid.hrc>
@@ -53,20 +52,20 @@
using namespace ::com::sun::star;
TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0));
TYPEINIT1_FACTORY(SvxAdjustItem, SfxPoolItem, new SvxAdjustItem(SVX_ADJUST_LEFT, 0));
TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(false, 0));
TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0));
TYPEINIT1_FACTORY(SvxParaGridItem, SfxBoolItem, new SvxParaGridItem(true, 0));
SfxPoolItem* SvxLineSpacingItem::CreateDefault() { return new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0);}
SfxPoolItem* SvxAdjustItem::CreateDefault() { return new SvxAdjustItem(SVX_ADJUST_LEFT, 0);}
SfxPoolItem* SvxWidowsItem::CreateDefault() { return new SvxWidowsItem(0, 0);}
SfxPoolItem* SvxOrphansItem::CreateDefault() { return new SvxOrphansItem(0, 0);}
SfxPoolItem* SvxHyphenZoneItem::CreateDefault() { return new SvxHyphenZoneItem(false, 0);}
SfxPoolItem* SvxTabStopItem::CreateDefault() { return new SvxTabStopItem(0);}
SfxPoolItem* SvxFormatSplitItem::CreateDefault() { return new SvxFormatSplitItem(false, 0);}
SfxPoolItem* SvxPageModelItem::CreateDefault() { return new SvxPageModelItem(0);}
SfxPoolItem* SvxScriptSpaceItem::CreateDefault() { return new SvxScriptSpaceItem(false, 0);}
SfxPoolItem* SvxHangingPunctuationItem::CreateDefault() { return new SvxHangingPunctuationItem(false, 0);}
SfxPoolItem* SvxForbiddenRuleItem::CreateDefault() { return new SvxForbiddenRuleItem(false, 0);}
SfxPoolItem* SvxParaVertAlignItem::CreateDefault() { return new SvxParaVertAlignItem(0, 0);}
SfxPoolItem* SvxParaGridItem::CreateDefault() { return new SvxParaGridItem(true, 0);}
SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId )
editeng/source/items/textitem.cxx
+32 -37
View File
@@ -105,43 +105,38 @@ bool SvxFontItem::bEnableStoreUnicodeNames = false;
// STATIC DATA -----------------------------------------------------------
TYPEINIT1(SvxFontListItem, SfxPoolItem);
TYPEINIT1_FACTORY(SvxFontItem, SfxPoolItem, new SvxFontItem(0));
TYPEINIT1_FACTORY(SvxPostureItem, SfxEnumItem, new SvxPostureItem(ITALIC_NONE, 0));
TYPEINIT1_FACTORY(SvxWeightItem, SfxEnumItem, new SvxWeightItem(WEIGHT_NORMAL, 0));
TYPEINIT1_FACTORY(SvxFontHeightItem, SfxPoolItem, new SvxFontHeightItem(240, 100, 0));
TYPEINIT1_FACTORY(SvxFontWidthItem, SfxPoolItem, new SvxFontWidthItem(0, 100, 0));
TYPEINIT1_FACTORY(SvxTextLineItem, SfxEnumItem, new SvxTextLineItem(UNDERLINE_NONE, 0));
TYPEINIT1_FACTORY(SvxUnderlineItem, SfxEnumItem, new SvxUnderlineItem(UNDERLINE_NONE, 0));
TYPEINIT1_FACTORY(SvxOverlineItem, SfxEnumItem, new SvxOverlineItem(UNDERLINE_NONE, 0));
TYPEINIT1_FACTORY(SvxCrossedOutItem, SfxEnumItem, new SvxCrossedOutItem(STRIKEOUT_NONE, 0));
TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(false, 0));
TYPEINIT1_FACTORY(SvxAutoKernItem, SfxBoolItem, new SvxAutoKernItem(false, 0));
TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(false, 0));
TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0));
TYPEINIT1_FACTORY(SvxPropSizeItem, SfxUInt16Item, new SvxPropSizeItem(100, 0));
TYPEINIT1_FACTORY(SvxColorItem, SfxPoolItem, new SvxColorItem(0));
// XXX: Should 2nd argument of next line SfxColorItem or SfxPoolItem?
TYPEINIT1_FACTORY(SvxBackgroundColorItem, SvxColorItem, new SvxBackgroundColorItem(0));
TYPEINIT1_FACTORY(SvxCharSetColorItem, SvxColorItem, new SvxCharSetColorItem(0));
TYPEINIT1_FACTORY(SvxKerningItem, SfxInt16Item, new SvxKerningItem(0, 0));
TYPEINIT1_FACTORY(SvxCaseMapItem, SfxEnumItem, new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0));
TYPEINIT1_FACTORY(SvxEscapementItem, SfxPoolItem, new SvxEscapementItem(0));
TYPEINIT1_FACTORY(SvxLanguageItem, SfxEnumItem, new SvxLanguageItem(LANGUAGE_GERMAN, 0));
TYPEINIT1_FACTORY(SvxNoLinebreakItem, SfxBoolItem, new SvxNoLinebreakItem(true, 0));
TYPEINIT1_FACTORY(SvxNoHyphenItem, SfxBoolItem, new SvxNoHyphenItem(true, 0));
TYPEINIT1_FACTORY(SvxLineColorItem, SvxColorItem, new SvxLineColorItem(0));
TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0));
TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0));
TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(true, 0, 0, 0));
TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0));
TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0));
TYPEINIT1_FACTORY(SvxCharReliefItem, SfxEnumItem, new SvxCharReliefItem(RELIEF_NONE, 0));
TYPEINIT1_FACTORY(SvxRsidItem, SfxUInt32Item, new SvxRsidItem(0, 0));
TYPEINIT1(SvxScriptSetItem, SfxSetItem );
SfxPoolItem* SvxFontItem::CreateDefault() {return new SvxFontItem(0);}
SfxPoolItem* SvxPostureItem::CreateDefault() { return new SvxPostureItem(ITALIC_NONE, 0);}
SfxPoolItem* SvxWeightItem::CreateDefault() {return new SvxWeightItem(WEIGHT_NORMAL, 0);}
SfxPoolItem* SvxFontHeightItem::CreateDefault() {return new SvxFontHeightItem(240, 100, 0);}
SfxPoolItem* SvxFontWidthItem::CreateDefault() {return new SvxFontWidthItem(0, 100, 0);}
SfxPoolItem* SvxTextLineItem::CreateDefault() {return new SvxTextLineItem(UNDERLINE_NONE, 0);}
SfxPoolItem* SvxUnderlineItem::CreateDefault() {return new SvxUnderlineItem(UNDERLINE_NONE, 0);}
SfxPoolItem* SvxOverlineItem::CreateDefault() {return new SvxOverlineItem(UNDERLINE_NONE, 0);}
SfxPoolItem* SvxCrossedOutItem::CreateDefault() {return new SvxCrossedOutItem(STRIKEOUT_NONE, 0);}
SfxPoolItem* SvxShadowedItem::CreateDefault() {return new SvxShadowedItem(false, 0);}
SfxPoolItem* SvxAutoKernItem::CreateDefault() {return new SvxAutoKernItem(false, 0);}
SfxPoolItem* SvxWordLineModeItem::CreateDefault() {return new SvxWordLineModeItem(false, 0);}
SfxPoolItem* SvxContourItem::CreateDefault() {return new SvxContourItem(false, 0);}
SfxPoolItem* SvxPropSizeItem::CreateDefault() {return new SvxPropSizeItem(100, 0);}
SfxPoolItem* SvxColorItem::CreateDefault() {return new SvxColorItem(0);}
SfxPoolItem* SvxBackgroundColorItem::CreateDefault() {return new SvxBackgroundColorItem(0);}
SfxPoolItem* SvxCharSetColorItem::CreateDefault() {return new SvxCharSetColorItem(0);}
SfxPoolItem* SvxKerningItem::CreateDefault() {return new SvxKerningItem(0, 0);}
SfxPoolItem* SvxCaseMapItem::CreateDefault() {return new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, 0);}
SfxPoolItem* SvxEscapementItem::CreateDefault() {return new SvxEscapementItem(0);}
SfxPoolItem* SvxLanguageItem::CreateDefault() {return new SvxLanguageItem(LANGUAGE_GERMAN, 0);}
SfxPoolItem* SvxNoLinebreakItem::CreateDefault() {return new SvxNoLinebreakItem(true, 0);}
SfxPoolItem* SvxNoHyphenItem::CreateDefault() {return new SvxNoHyphenItem(true, 0);}
SfxPoolItem* SvxLineColorItem::CreateDefault() {return new SvxLineColorItem(0);}
SfxPoolItem* SvxBlinkItem::CreateDefault() {return new SvxBlinkItem(false, 0);}
SfxPoolItem* SvxEmphasisMarkItem::CreateDefault() {return new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0);}
SfxPoolItem* SvxTwoLinesItem::CreateDefault() {return new SvxTwoLinesItem(true, 0, 0, 0);}
SfxPoolItem* SvxScriptTypeItem::CreateDefault() {return new SvxScriptTypeItem();}
SfxPoolItem* SvxCharRotateItem::CreateDefault() {return new SvxCharRotateItem(0, false, 0);}
SfxPoolItem* SvxCharScaleWidthItem::CreateDefault() {return new SvxCharScaleWidthItem(100, 0);}
SfxPoolItem* SvxCharReliefItem::CreateDefault() {return new SvxCharReliefItem(RELIEF_NONE, 0);}
SfxPoolItem* SvxRsidItem::CreateDefault() {return new SvxRsidItem(0, 0);}
// class SvxFontListItem -------------------------------------------------
editeng/source/items/writingmodeitem.cxx
+2 -1
View File
@@ -25,7 +25,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0));
SfxPoolItem* SvxWritingModeItem::CreateDefault() { return new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0);}
SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich )
: SfxUInt16Item( _nWhich, (sal_uInt16)eValue )
editeng/source/items/xmlcnitm.cxx
-1
View File
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::xml;
TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem);
SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich )
idl/inc/basobj.hxx
-3
View File
@@ -100,7 +100,6 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
public:
TYPEINFO_OVERRIDE();
SvMetaObject();
static void WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
@@ -147,7 +146,6 @@ class SvMetaReference : public SvMetaObject
protected:
tools::SvRef<SvMetaReference> aRef;
public:
TYPEINFO_OVERRIDE();
SvMetaReference();
const SvString & GetName() const override
@@ -199,7 +197,6 @@ class SvMetaExtern : public SvMetaReference
bool bReadUUId;
bool bReadVersion;
public:
TYPEINFO_OVERRIDE();
SvMetaExtern();
SvMetaModule * GetModule() const;
idl/inc/module.hxx
-1
View File
@@ -52,7 +52,6 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
public:
TYPEINFO_OVERRIDE();
virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ) override;
idl/inc/object.hxx
-2
View File
@@ -46,7 +46,6 @@ class SvClassElement : public SvRttiBase
OString aPrefix;
SvMetaClassRef xClass;
public:
TYPEINFO_OVERRIDE();
SvClassElement();
void SetPrefix( const OString& rPrefix )
@@ -98,7 +97,6 @@ protected:
virtual void ReadContextSvIdl( SvIdlDataBase &,
SvTokenStream & rInStm ) override;
public:
TYPEINFO_OVERRIDE();
SvMetaClass();
void FillClasses( SvMetaClassList & rList );
idl/inc/slot.hxx
-1
View File
@@ -146,7 +146,6 @@ protected:
}
public:
TYPEINFO_OVERRIDE();
SvMetaObject * MakeClone() const;
SvMetaSlot *Clone() const { return static_cast<SvMetaSlot *>(MakeClone()); }
idl/inc/types.hxx
-6
View File
@@ -48,7 +48,6 @@ protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) override;
public:
TYPEINFO_OVERRIDE();
SvMetaAttribute();
SvMetaAttribute( SvMetaType * );
@@ -113,7 +112,6 @@ protected:
bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
public:
TYPEINFO_OVERRIDE();
SvMetaType();
SvMetaType( const OString& rTypeName, char cParserChar,
const OString& rCName );
@@ -176,7 +174,6 @@ class SvMetaTypeMemberList : public SvRefMemberList<SvMetaType *> {};
class SvMetaTypeString : public SvMetaType
{
public:
TYPEINFO_OVERRIDE();
SvMetaTypeString();
};
@@ -185,7 +182,6 @@ class SvMetaTypeStringMemberList : public SvRefMemberList<SvMetaTypeString *> {}
class SvMetaEnumValue : public SvMetaObject
{
public:
TYPEINFO_OVERRIDE();
SvMetaEnumValue();
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
@@ -200,7 +196,6 @@ class SvMetaTypeEnum : public SvMetaType
protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
public:
TYPEINFO_OVERRIDE();
SvMetaTypeEnum();
sal_uLong Count() const { return aEnumValueList.size(); }
@@ -216,7 +211,6 @@ class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
class SvMetaTypevoid : public SvMetaType
{
public:
TYPEINFO_OVERRIDE();
SvMetaTypevoid();
};
class SvMetaTypevoidMemberList : public SvRefMemberList<SvMetaTypevoid *> {};
idl/source/objects/basobj.cxx
-3
View File
@@ -62,7 +62,6 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
rOutStm.Seek( nPos );
}
TYPEINIT1( SvMetaObject, SvRttiBase );
SvMetaObject::SvMetaObject()
{
}
@@ -158,13 +157,11 @@ bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
return bOk;
}
TYPEINIT1( SvMetaReference, SvMetaObject );
SvMetaReference::SvMetaReference()
{
}
TYPEINIT1( SvMetaExtern, SvMetaReference );
SvMetaExtern::SvMetaExtern()
: pModule( nullptr )
idl/source/objects/module.cxx
-1
View File
@@ -27,7 +27,6 @@
#include <tools/debug.hxx>
#include <osl/file.hxx>
TYPEINIT1( SvMetaModule, SvMetaExtern );
SvMetaModule::SvMetaModule( bool bImp )
: bImported( bImp ), bIsModified( false )
idl/source/objects/object.cxx
-2
View File
@@ -28,13 +28,11 @@
#include <globals.hxx>
#include <database.hxx>
TYPEINIT1( SvClassElement, SvPersistBase );
SvClassElement::SvClassElement()
{
};
TYPEINIT1( SvMetaClass, SvMetaType );
SvMetaClass::SvMetaClass()
: aAutomation( true, false )
{
idl/source/objects/slot.cxx
-1
View File
@@ -27,7 +27,6 @@
#include <globals.hxx>
#include <database.hxx>
TYPEINIT1( SvMetaSlot, SvMetaAttribute );
SvMetaObject *SvMetaSlot::MakeClone() const
{
idl/source/objects/types.cxx
+4 -8
View File
@@ -27,7 +27,6 @@
#include <globals.hxx>
#include <database.hxx>
TYPEINIT1( SvMetaAttribute, SvMetaReference );
SvMetaAttribute::SvMetaAttribute()
: aAutomation( true, false )
, aExport( true, false )
@@ -220,7 +219,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&
{
}
TYPEINIT1( SvMetaType, SvMetaExtern );
#define CTOR \
: aCall0( CALL_VALUE, false ) \
, aCall1( CALL_VALUE, false ) \
@@ -592,8 +590,10 @@ void SvMetaType::WriteSfxItem(
rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() )
.WriteCharPtr( " = " ) << endl;
rOutStm.WriteChar( '{' ) << endl;
rOutStm.WriteCharPtr( "\tTYPE(" ).WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " )
.WriteCharPtr( aAttrCount.getStr() );
rOutStm.WriteCharPtr( "\tcreateSfxPoolItem<" ).WriteCharPtr( rItemName.getStr() )
.WriteCharPtr(">, &typeid(").WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " );
rOutStm.WriteCharPtr( aAttrCount.getStr() );
if( nAttrCount )
{
rOutStm.WriteCharPtr( ", { " );
@@ -658,13 +658,11 @@ OString SvMetaType::GetParserString() const
return aPStr;
}
TYPEINIT1( SvMetaTypeString, SvMetaType );
SvMetaTypeString::SvMetaTypeString()
: SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" )
{
}
TYPEINIT1( SvMetaEnumValue, SvMetaObject );
SvMetaEnumValue::SvMetaEnumValue()
{
}
@@ -677,7 +675,6 @@ bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
return true;
}
TYPEINIT1( SvMetaTypeEnum, SvMetaType );
SvMetaTypeEnum::SvMetaTypeEnum()
{
SetBasicName("Integer");
@@ -737,7 +734,6 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
return false;
}
TYPEINIT1( SvMetaTypevoid, SvMetaType );
SvMetaTypevoid::SvMetaTypevoid()
: SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" )
{
include/avmedia/mediaitem.hxx
+1 -2
View File
@@ -20,7 +20,6 @@
#ifndef INCLUDED_AVMEDIA_MEDIAITEM_HXX
#define INCLUDED_AVMEDIA_MEDIAITEM_HXX
#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/media/ZoomLevel.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -64,7 +63,7 @@ enum class MediaState
class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
{
public:
TYPEINFO_OVERRIDE();
static SfxPoolItem* CreateDefault();
explicit MediaItem( sal_uInt16 i_nWhich = 0,
AVMediaSetMask nMaskSet = AVMediaSetMask::NONE );
include/basic/basmgr.hxx
-1
View File
@@ -134,7 +134,6 @@ protected:
virtual ~BasicManager();
public:
TYPEINFO_OVERRIDE();
BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString* pLibPath = nullptr, bool bDocMgr = false );
BasicManager( StarBASIC* pStdLib, OUString* pLibPath = nullptr, bool bDocMgr = false );
include/basic/sbmeth.hxx
-2
View File
@@ -52,7 +52,6 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
TYPEINFO_OVERRIDE();
virtual SbxInfo* GetInfo() override;
SbxArray* GetStatics();
void ClearStatics();
@@ -75,7 +74,6 @@ class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod
SbMethodRef mxImplMeth;
public:
TYPEINFO_OVERRIDE();
SbIfaceMapperMethod( const OUString& rName, SbMethod* pImplMeth )
: SbMethod( rName, pImplMeth->GetType(), nullptr )
, mxImplMeth( pImplMeth )
include/basic/sbmod.hxx
-2
View File
@@ -95,7 +95,6 @@ protected:
virtual ~SbModule();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2);
TYPEINFO_OVERRIDE();
SbModule( const OUString&, bool bCompat = false );
virtual void SetParent( SbxObject* ) override;
virtual void Clear() override;
@@ -145,7 +144,6 @@ class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule
bool mbInitializeEventDone;
public:
TYPEINFO_OVERRIDE();
SbClassModuleObject( SbModule* pClassModule );
virtual ~SbClassModuleObject();
include/basic/sbstar.hxx
-1
View File
@@ -86,7 +86,6 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1);
TYPEINFO_OVERRIDE();
StarBASIC( StarBASIC* pParent = nullptr, bool bIsDocBasic = false );
include/basic/sbx.hxx
-4
View File
@@ -137,7 +137,6 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1);
TYPEINFO_OVERRIDE();
SbxArray( SbxDataType=SbxVARIANT );
SbxArray( const SbxArray& );
SbxArray& operator=( const SbxArray& );
@@ -186,7 +185,6 @@ protected:
virtual ~SbxDimArray();
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1);
TYPEINFO_OVERRIDE();
SbxDimArray( SbxDataType=SbxVARIANT );
SbxDimArray( const SbxDimArray& );
SbxDimArray& operator=( const SbxDimArray& );
@@ -229,7 +227,6 @@ protected:
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_COLLECTION,1);
TYPEINFO_OVERRIDE();
SbxCollection( const OUString& rClassname );
SbxCollection( const SbxCollection& );
SbxCollection& operator=( const SbxCollection& );
@@ -250,7 +247,6 @@ protected:
virtual void CollRemove( SbxArray* pPar ) override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
TYPEINFO_OVERRIDE();
SbxStdCollection( const OUString& rClassname, const OUString& rElemClass, bool=true );
SbxStdCollection( const SbxStdCollection& );
SbxStdCollection& operator=( const SbxStdCollection& );
include/basic/sbxcore.hxx
-2
View File
@@ -24,7 +24,6 @@
#include <basic/sbxdef.hxx>
#include <rtl/ustring.hxx>
#include <tools/ref.hxx>
#include <tools/rtti.hxx>
class SvStream;
@@ -62,7 +61,6 @@ protected:
virtual sal_uInt16 GetSbxId() const { return 0; }
public:
TYPEINFO();
inline void SetFlags( SbxFlagBits n );
inline SbxFlagBits GetFlags() const;
inline void SetFlag( SbxFlagBits n );
include/basic/sbxmeth.hxx
-1
View File
@@ -29,7 +29,6 @@ class BASIC_DLLPUBLIC SbxMethod : public SbxVariable
SbxDataType mbRuntimeFunctionReturnType;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
TYPEINFO_OVERRIDE();
SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false );
SbxMethod( const SbxMethod& r );
virtual ~SbxMethod();
include/basic/sbxobj.hxx
-1
View File
@@ -43,7 +43,6 @@ protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_OBJECT,1);
TYPEINFO_OVERRIDE();
SbxObject( const OUString& rClassname );
SbxObject( const SbxObject& );
SbxObject& operator=( const SbxObject& );
include/basic/sbxprop.hxx
-1
View File
@@ -27,7 +27,6 @@ class BASIC_DLLPUBLIC SbxProperty : public SbxVariable
{
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1);
TYPEINFO_OVERRIDE();
SbxProperty( const OUString& r, SbxDataType t );
SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {}
virtual ~SbxProperty();
include/basic/sbxvar.hxx
-2
View File
@@ -103,7 +103,6 @@ protected:
virtual bool StoreData( SvStream& ) const override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1);
TYPEINFO_OVERRIDE();
SbxValue();
SbxValue( SbxDataType, void* = nullptr );
SbxValue( const SbxValue& );
@@ -292,7 +291,6 @@ protected:
virtual bool StoreData( SvStream& ) const override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2);
TYPEINFO_OVERRIDE();
SbxVariable();
SbxVariable( SbxDataType, void* = nullptr );
SbxVariable( const SbxVariable& );
include/editeng/adjustitem.hxx
+1 -1
View File
@@ -47,7 +47,7 @@ class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface
bool bLastBlock : 1;
public:
TYPEINFO_OVERRIDE();
static SfxPoolItem* CreateDefault();
SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/,
const sal_uInt16 nId );
include/editeng/autokernitem.hxx
+1 -1
View File
@@ -34,7 +34,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
static SfxPoolItem* CreateDefault();
SvxAutoKernItem( const bool bAutoKern /*= false*/,
const sal_uInt16 nId );
include/editeng/blinkitem.hxx
+1 -1
View File
@@ -35,7 +35,7 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
static SfxPoolItem* CreateDefault();
SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId );

Some files were not shown because too many files have changed in this diff Show More