summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx1
-rw-r--r--sfx2/inc/sorgitm.hxx2
-rw-r--r--sfx2/source/appl/appmain.cxx1
-rw-r--r--sfx2/source/appl/linksrc.cxx1
-rw-r--r--sfx2/source/appl/lnkbase2.cxx1
-rw-r--r--sfx2/source/appl/module.cxx1
-rw-r--r--sfx2/source/bastyp/dummytypes.cxx1
-rw-r--r--sfx2/source/config/evntconf.cxx1
-rw-r--r--sfx2/source/control/minfitem.cxx2
-rw-r--r--sfx2/source/control/msg.cxx2
-rw-r--r--sfx2/source/control/msgpool.cxx2
-rw-r--r--sfx2/source/control/shell.cxx1
-rw-r--r--sfx2/source/control/sorgitm.cxx6
-rw-r--r--sfx2/source/control/statcach.cxx2
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx5
-rw-r--r--sfx2/source/dialog/tabdlg.cxx1
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/dialog/tplpitem.cxx2
-rw-r--r--sfx2/source/doc/frmdescr.cxx1
-rw-r--r--sfx2/source/doc/objitem.cxx6
-rw-r--r--sfx2/source/doc/objxtor.cxx2
-rw-r--r--sfx2/source/doc/zoomitem.cxx3
-rw-r--r--sfx2/source/inc/templdgi.hxx3
-rw-r--r--sfx2/source/menu/mnuitem.cxx8
-rw-r--r--sfx2/source/statbar/stbitem.cxx6
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx10
-rw-r--r--sfx2/source/view/frame.cxx8
-rw-r--r--sfx2/source/view/viewfrm.cxx2
-rw-r--r--sfx2/source/view/viewsh.cxx1
30 files changed, 36 insertions, 50 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index a1876f804919..30f8c8db141f 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -691,7 +691,6 @@
#include <tools/rc.hxx>
#include <tools/rcid.h>
#include <tools/resary.hxx>
-#include <tools/rtti.hxx>
#include <tools/stream.hxx>
#include <tools/svborder.hxx>
#include <tools/tenccvt.hxx>
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 5adcbc8d3a25..69c833ea9ab6 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -29,7 +29,7 @@ private:
OUString aLanguage;
public:
- TYPEINFO_OVERRIDE();
+ static SfxPoolItem* CreateDefault();
SfxScriptOrganizerItem();
SfxScriptOrganizerItem( const SfxScriptOrganizerItem& );
virtual ~SfxScriptOrganizerItem();
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index e2dab3835bec..ed854b65d672 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -42,7 +42,6 @@
#include <sfx2/docfile.hxx>
#include "workwin.hxx"
-TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
SfxFilterMatcher& SfxApplication::GetFilterMatcher()
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 66f1290a5afd..e5466533f3ac 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::uno;
namespace sfx2
{
-TYPEINIT0( SvLinkSource )
class SvLinkSourceTimer : public Timer
{
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 63b3a73291f5..c6e37810637e 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno;
namespace sfx2
{
-TYPEINIT0( SvBaseLink )
class ImplDdeItem;
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index e226227ef448..99e702370662 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -132,7 +132,6 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig )
return rpList; }
-TYPEINIT1(SfxModule, SfxShell);
SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell)
diff --git a/sfx2/source/bastyp/dummytypes.cxx b/sfx2/source/bastyp/dummytypes.cxx
index e1ae0ad996cc..2955172ecaf1 100644
--- a/sfx2/source/bastyp/dummytypes.cxx
+++ b/sfx2/source/bastyp/dummytypes.cxx
@@ -8,7 +8,6 @@
#include <config_features.h>
-#include <tools/rtti.hxx>
#include <avmedia/mediaitem.hxx>
#if !HAVE_FEATURE_AVMEDIA
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 247ee3c17841..19b3829b98e2 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/uno/Reference.hxx>
-TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
using namespace com::sun::star;
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index 8fd65376b8da..a0d2458ecb1e 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -21,7 +21,7 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1(SfxMacroInfoItem, SfxPoolItem);
+SfxPoolItem* SfxMacroInfoItem::CreateDefault() { DBG_ASSERT(false, "No SfxMacroInfItem factory available"); return 0; }
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 590b3bb1c4cb..574182c3cc98 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -29,7 +29,7 @@ SfxSlotKind SfxSlot::GetKind() const
return (SfxSlotKind) SFX_KIND_STANDARD;
if ( nMasterSlotId && fnExec==nullptr && fnState==nullptr )
{
- if ( pType->Type() == TYPE(SfxBoolItem) )
+ if ( *pType->pType == typeid(SfxBoolItem) )
return (SfxSlotKind) SFX_KIND_ENUM;
else
{
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 41524a8ad6d3..eafca7394d5e 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -95,7 +95,7 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface )
-TypeId SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
+const std::type_info* SfxSlotPool::GetSlotType( sal_uInt16 nId ) const
{
const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId );
return pSlot ? pSlot->GetType()->Type() : nullptr;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 0e091441358a..17550aeeca7a 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -51,7 +51,6 @@
// Maps the Which() field to a pointer to a SfxPoolItem
typedef boost::ptr_map<sal_uInt16, SfxPoolItem> SfxItemPtrMap;
-TYPEINIT0(SfxShell);
using namespace com::sun::star;
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 16e7bdccd463..8a202314decc 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -21,11 +21,11 @@
#include <sfx2/sfxsids.hrc>
#include "sorgitm.hxx"
#include <osl/diagnose.h>
-
+#include <typeinfo>
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1_AUTOFACTORY(SfxScriptOrganizerItem, SfxStringItem);
+SfxPoolItem* SfxScriptOrganizerItem::CreateDefault() { return new SfxScriptOrganizerItem; }
SfxScriptOrganizerItem::SfxScriptOrganizerItem() :
@@ -63,7 +63,7 @@ SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const
bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const
{
- return rItem.Type() == Type() &&
+ return typeid(rItem) == typeid(*this) &&
SfxStringItem::operator==(rItem) &&
aLanguage == static_cast<const SfxScriptOrganizerItem &>(rItem).aLanguage;
}
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index e41992aa5b8e..7a47fb645a83 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -412,7 +412,7 @@ void SfxStateCache::SetState_Impl
!IsInvalidItem(pState) && !IsInvalidItem(pLastItem);
DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" );
if ( bBothAvailable )
- bNotify = pState->Type() != pLastItem->Type() ||
+ bNotify = typeid(*pState) != typeid(*pLastItem) ||
*pState != *pLastItem;
else
bNotify = ( pState != pLastItem ) || ( eState != eLastState );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index ec301c7b1d3e..cb3050a93faf 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -968,7 +968,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
{
if (pLastState && !IsInvalidItem(pLastState))
{
- bNotify = pState->Type() != pLastState->Type() || *pState != *pLastState;
+ bNotify = typeid(*pState) != typeid(*pLastState) || *pState != *pLastState;
delete pLastState;
}
pLastState = !IsInvalidItem(pState) ? pState->Clone() : pState;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 8209bd458607..fb9fddcfe300 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -104,7 +104,8 @@ bool operator==(const util::DateTime &i_rLeft, const util::DateTime &i_rRight)
}
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
+
+SfxPoolItem* SfxDocumentInfoItem::CreateDefault() { return new SfxDocumentInfoItem; }
const sal_uInt16 HI_NAME = 1;
const sal_uInt16 HI_TYPE = 2;
@@ -327,7 +328,7 @@ SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
{
- if (!(rItem.Type() == Type() && SfxStringItem::operator==(rItem)))
+ if (!(typeid(rItem) == typeid(*this) && SfxStringItem::operator==(rItem)))
return false;
const SfxDocumentInfoItem& rInfoItem(static_cast<const SfxDocumentInfoItem&>(rItem));
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b2575dae91be..10464439f4fa 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -44,7 +44,6 @@ using namespace ::com::sun::star::uno;
#define USERITEM_NAME "UserItem"
-TYPEINIT1(SfxTabDialogItem,SfxSetItem);
struct TabPageImpl
{
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index edf73b61c9ee..fea4f79652ea 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -181,8 +181,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
#define MAX_FILTER_ENTRIES 14
-TYPEINIT0(SfxCommonTemplateDialog_Impl);
-TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
{
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index c53998c197a6..b8ca54f7c5f6 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -23,8 +23,8 @@
// STATIC DATA -----------------------------------------------------------
-TYPEINIT1_AUTOFACTORY(SfxTemplateItem, SfxFlagItem);
+SfxPoolItem* SfxTemplateItem::CreateDefault() { return new SfxTemplateItem; }
SfxTemplateItem::SfxTemplateItem() :
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index a8d7dbc14331..f6ad2b4ca076 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -174,7 +174,6 @@ bool SfxFrameProperties::operator ==( const SfxFrameProperties& rProp ) const
bResizable == rProp.bResizable && bSetResizable == rProp.bSetResizable;
}
-TYPEINIT1(SfxFrameDescriptorItem, SfxPoolItem);
SfxFrameDescriptorItem::~SfxFrameDescriptorItem()
{}
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index 66154237224c..1e5a4f5459d8 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -22,8 +22,10 @@
#include <sfx2/objitem.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-TYPEINIT1_AUTOFACTORY(SfxObjectShellItem,SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SfxObjectItem,SfxPoolItem)
+
+SfxPoolItem* SfxObjectShellItem::CreateDefault() { return new SfxObjectShellItem; }
+
+SfxPoolItem* SfxObjectItem::CreateDefault() { return new SfxObjectItem; }
bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const
{
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 4db56613247c..55322b1eab06 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -39,7 +39,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <svl/eitem.hxx>
-#include <tools/rtti.hxx>
#include <svl/lstner.hxx>
#include <sfx2/sfxhelp.hxx>
#include <basic/sbstar.hxx>
@@ -202,7 +201,6 @@ void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _r
mpDoc->DoClose();
}
-TYPEINIT1(SfxObjectShell, SfxShell);
SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index 9b1e95068deb..0217acdb51b4 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -27,7 +27,8 @@
#include <sfx2/sfx.hrc>
-TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem);
+
+SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; }
#define ZOOM_PARAM_VALUE "Value"
#define ZOOM_PARAM_VALUESET "ValueSet"
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index eb16a8e2fe46..54190385efae 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -33,7 +33,6 @@ class SfxTemplateControllerItem;
#include <svl/eitem.hxx>
#include <rsc/rscsfx.hxx>
-#include <tools/rtti.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/templdlg.hxx>
@@ -291,7 +290,6 @@ protected:
SfxObjectShell* SaveSelection();
public:
- TYPEINFO_OVERRIDE();
SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool );
virtual ~SfxCommonTemplateDialog_Impl();
@@ -385,7 +383,6 @@ protected:
public:
friend class SfxTemplateDialog;
- TYPEINFO_OVERRIDE();
SfxTemplateDialog_Impl( SfxBindings*, SfxTemplatePanelControl* pDlgWindow );
virtual ~SfxTemplateDialog_Impl();
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 40c6b6e726c4..cf76a3a20ca7 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -247,7 +247,7 @@ SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/,
void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
{
RegisterMenuControl( pMod, new SfxMenuCtrlFactory(
- SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
+ SfxMenuControl::CreateImpl, typeid(SfxStringItem), nSlotId ) );
}
@@ -258,7 +258,7 @@ void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pF
SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings )
{
- TypeId aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
+ const std::type_info* aSlotType = SFX_SLOTPOOL().GetSlotType(nId);
if ( aSlotType )
{
SfxApplication *pApp = SfxGetpApp();
@@ -271,7 +271,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
{
SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nId) ) )
return rFactories[nFactory].pCtor( nId, rMenu, rBindings );
@@ -281,7 +281,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl();
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nId) ) )
return rFactories[nFactory].pCtor( nId, rMenu, rBindings );
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 3417c09fa27c..4c0d962a3383 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -604,7 +604,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
else
pSlotPool = &SfxSlotPool::GetSlotPool();
- TypeId aSlotType = pSlotPool->GetSlotType(nSlotID);
+ const std::type_info* aSlotType = pSlotPool->GetSlotType(nSlotID);
if ( aSlotType )
{
if ( pMod )
@@ -614,7 +614,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
{
SfxStbCtrlFactArr_Impl &rFactories = *pFactories;
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nSlotID) ) )
return rFactories[nFactory].pCtor( nSlotID, nStbId, *pBar );
@@ -623,7 +623,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
SfxStbCtrlFactArr_Impl &rFactories = pApp->GetStbCtrlFactories_Impl();
for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory )
- if ( rFactories[nFactory].nTypeId == aSlotType &&
+ if ( rFactories[nFactory].nTypeId == *aSlotType &&
( ( rFactories[nFactory].nSlotId == 0 ) ||
( rFactories[nFactory].nSlotId == nSlotID) ) )
return rFactories[nFactory].pCtor( nSlotID, nStbId, *pBar );
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 3ce36caf70be..7cbe75dde6a6 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -288,7 +288,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
pSlotPool = pMod->GetSlotPool();
else
pSlotPool = &SfxSlotPool::GetSlotPool();
- TypeId aSlotType = pSlotPool->GetSlotType( nSlotId );
+ const std::type_info* aSlotType = pSlotPool->GetSlotType( nSlotId );
if ( aSlotType )
{
SfxToolBoxControl *pCtrl;
@@ -303,7 +303,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
// search for a factory with the given slot id
for( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
break;
if( nFactory == nCount )
@@ -311,7 +311,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
// if no factory exists for the given slot id, see if we
// have a generic factory with the correct slot type and slot id == 0
for ( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == 0) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == 0) )
break;
}
@@ -329,7 +329,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
const sal_uInt16 nCount = rFactories.size();
for( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == nSlotId) )
break;
if( nFactory == nCount )
@@ -337,7 +337,7 @@ SfxToolBoxControl* SfxToolBoxControl::CreateControl( sal_uInt16 nSlotId, sal_uIn
// if no factory exists for the given slot id, see if we
// have a generic factory with the correct slot type and slot id == 0
for( nFactory = 0; nFactory < nCount; ++nFactory )
- if( (rFactories[nFactory].nTypeId == aSlotType) && (rFactories[nFactory].nSlotId == 0) )
+ if( (rFactories[nFactory].nTypeId == *aSlotType) && (rFactories[nFactory].nSlotId == 0) )
break;
}
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index d354921a3319..8709e06c2061 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -75,10 +75,12 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::container;
-TYPEINIT1_AUTOFACTORY(SfxFrameItem, SfxPoolItem);
-TYPEINIT1(SfxUsrAnyItem, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SfxUnoFrameItem, SfxPoolItem);
+SfxPoolItem* SfxUsrAnyItem::CreateDefault() { DBG_ASSERT(false, "No SfxUsrAnyItem factory available"); return 0; }
+SfxPoolItem* SfxUnoFrameItem::CreateDefault()
+{
+ return new SfxUnoFrameItem();
+}
void SfxFrame::Construct_Impl()
{
pImp = new SfxFrame_Impl( this );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 05e2ca165d09..1534261dd592 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -154,8 +154,6 @@ void SfxViewFrame::InitInterface_Impl()
#endif
}
-TYPEINIT2(SfxViewFrame,SfxShell,SfxListener);
-TYPEINIT1(SfxViewFrameItem, SfxPoolItem);
namespace
{
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index a0a3b3afae1f..e9af2f4201a6 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -330,7 +330,6 @@ void SfxViewShell::InitInterface_Impl()
{
}
-TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
/** search for a filter name dependent on type and module
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 16:37:10 +0000