diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-09-30 16:10:07 +0200 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2015-10-06 07:29:37 +0000 |
commit | 89d39bc100aabf5dccbe77c0b5c0c85736e85b39 (patch) | |
tree | 871a91210913ecee91530c95392534bf18f80f3f /include/editeng | |
parent | 32b9901dae7403453d773f5904de15551a323595 (diff) |
tdf#94559: 4th step to remove rtti.hxx
replaced use of PTR_CAST, IS_TYPE, ISA in
idl, editeng, sc, sd, sw, sfx2, sot, starmath
Change-Id: I4a5bba4fdc4829099618c09b690c83f876a3d653
Reviewed-on: https://gerrit.libreoffice.org/19132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'include/editeng')
-rw-r--r-- | include/editeng/editeng.hxx | 7 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index d9aee4bd5af6..a35a3424309d 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -39,6 +39,7 @@ #include <editeng/eedata.hxx> #include <o3tl/typed_flags_set.hxx> #include <svl/languageoptions.hxx> +#include <functional> namespace com { namespace sun { namespace star { namespace linguistic2 { @@ -136,6 +137,10 @@ namespace o3tl { template<> struct typed_flags<GetAttribsFlags> : is_typed_flags<GetAttribsFlags, 0x07> {}; } +template<class T> bool checkSvxFieldData(const SvxFieldData* pData) +{ + return dynamic_cast<const T*>(pData) != nullptr; +} class SdrObject; class EDITENG_DLLPUBLIC EditEngine @@ -452,7 +457,7 @@ public: bool UpdateFields(); bool UpdateFieldsOnly(); - void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); + void RemoveFields( bool bKeepFieldText, std::function<bool ( const SvxFieldData* )> isFieldData = [] (const SvxFieldData* ){return true;} ); sal_uInt16 GetFieldCount( sal_Int32 nPara ) const; EFieldInfo GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 77ae2e0dd41d..69ccb523fbe0 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -908,7 +908,7 @@ public: void QuickFormatDoc( bool bFull = false ); bool UpdateFields(); - void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); + void RemoveFields( bool bKeepFieldText, std::function<bool ( const SvxFieldData* )> isFieldData = [] (const SvxFieldData* ){return true;} ); void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); |