summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-11-07 14:43:19 +0100
committerOliver Specht <oliver.specht@cib.de>2015-11-11 10:49:30 +0000
commitfa91dd31f39a24329d288d4e1cda28db3a16af0d (patch)
tree603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /svx/source/items
parentc21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (diff)
5th step to remove tools/rtti.hxx
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>
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/SmartTagItem.cxx3
-rw-r--r--svx/source/items/algitem.cxx5
-rw-r--r--svx/source/items/chrtitem.cxx10
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/customshapeitem.cxx1
-rw-r--r--svx/source/items/drawitem.cxx13
-rw-r--r--svx/source/items/e3ditem.cxx2
-rw-r--r--svx/source/items/galleryitem.cxx3
-rw-r--r--svx/source/items/hlnkitem.cxx3
-rw-r--r--svx/source/items/numinf.cxx1
-rw-r--r--svx/source/items/pageitem.cxx3
-rw-r--r--svx/source/items/postattr.cxx7
-rw-r--r--svx/source/items/rotmodit.cxx2
-rw-r--r--svx/source/items/viewlayoutitem.cxx3
-rw-r--r--svx/source/items/zoomslideritem.cxx3
15 files changed, 30 insertions, 31 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 5ba83719d0cb..fd64d96c6aa9 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -25,7 +25,8 @@
using namespace ::com::sun::star;
-TYPEINIT1(SvxSmartTagItem, SfxPoolItem);
+
+SfxPoolItem* SvxSmartTagItem::CreateDefault() { DBG_ASSERT(false, "No SvxSmartTagItem factory available"); return 0; }
SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 0a1577d1fbe7..54720b99e83e 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -40,8 +40,9 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( SvxOrientationItem, SfxEnumItem, new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) );
-TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
+
+SfxPoolItem* SvxOrientationItem::CreateDefault() { return new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) ;}
+SfxPoolItem* SvxMarginItem::CreateDefault() { return new SvxMarginItem(0) ;}
SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
const sal_uInt16 nId):
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 39f1a5563635..0815388e96a4 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -31,14 +31,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0));
-TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem);
-TYPEINIT1(SvxChartTextOrderItem, SfxEnumItem);
-TYPEINIT1(SvxChartTextOrientItem, SfxEnumItem);
-TYPEINIT1(SvxChartIndicateItem, SfxEnumItem);
-TYPEINIT1(SvxChartKindErrorItem, SfxEnumItem);
-TYPEINIT1(SvxChartRegressItem, SfxEnumItem);
-TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0));
+
+SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);}
SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
SfxEnumItem(nId, (sal_uInt16)eStyle)
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 9835dfae0215..63a2a1b94090 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -33,7 +33,7 @@ struct SvxClipboardFormatItem_Impl
SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
};
-TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new SvxClipboardFormatItem(0));
+SfxPoolItem* SvxClipboardFormatItem::CreateDefault() { return new SvxClipboardFormatItem(0); };
SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
const SvxClipboardFormatItem_Impl& rCpy )
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 952438888a3b..ae492779761b 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -23,7 +23,6 @@
using namespace ::std;
using namespace com::sun::star;
-TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem);
SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem()
: SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index 423cab1e6fb8..213189d8028a 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -23,12 +23,13 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( SvxColorListItem, SfxPoolItem , new SvxColorListItem );
-TYPEINIT1_FACTORY( SvxGradientListItem, SfxPoolItem , new SvxGradientListItem );
-TYPEINIT1_FACTORY( SvxHatchListItem, SfxPoolItem , new SvxHatchListItem );
-TYPEINIT1_FACTORY( SvxBitmapListItem, SfxPoolItem , new SvxBitmapListItem );
-TYPEINIT1_FACTORY( SvxDashListItem, SfxPoolItem , new SvxDashListItem );
-TYPEINIT1_FACTORY( SvxLineEndListItem, SfxPoolItem , new SvxLineEndListItem );
+
+SfxPoolItem* SvxColorListItem::CreateDefault() { return new SvxColorListItem ;}
+SfxPoolItem* SvxGradientListItem::CreateDefault() { return new SvxGradientListItem ;}
+SfxPoolItem* SvxHatchListItem::CreateDefault() { return new SvxHatchListItem ;}
+SfxPoolItem* SvxBitmapListItem::CreateDefault() { return new SvxBitmapListItem ;}
+SfxPoolItem* SvxDashListItem::CreateDefault() { return new SvxDashListItem ;}
+SfxPoolItem* SvxLineEndListItem::CreateDefault() { return new SvxLineEndListItem ;}
SvxColorListItem::SvxColorListItem()
{
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 80ecad61aab2..d41b77818a31 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -24,8 +24,6 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem);
-
SvxB3DVectorItem::SvxB3DVectorItem()
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index 095a4c80663e..51d0cf7f1ba8 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -23,7 +23,8 @@
#include <com/sun/star/uno/Sequence.hxx>
-TYPEINIT1_AUTOFACTORY( SvxGalleryItem, SfxPoolItem );
+
+SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; }
SvxGalleryItem::SvxGalleryItem()
: m_nType( css::gallery::GalleryItemType::EMPTY )
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index f14d683b0224..8b8f1852f35f 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -26,7 +26,8 @@
-TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0));
+
+SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(0);}
#define HYPERLINKFF_MARKER 0x599401FE
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index a6348bc99234..630218127468 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -21,7 +21,6 @@
-TYPEINIT1(SvxNumberInfoItem, SfxPoolItem);
#define INIT(pNum,eVal,nDouble,rStr) \
SfxPoolItem ( nId ), \
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 6468acac3189..6153f0e75776 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -31,7 +31,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0));
+
+SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(0);}
SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 8139f0fce2ae..97cc424b3f70 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -24,9 +24,10 @@
-TYPEINIT1_FACTORY(SvxPostItAuthorItem, SfxStringItem, new SvxPostItAuthorItem(0));
-TYPEINIT1_FACTORY(SvxPostItDateItem, SfxStringItem, new SvxPostItDateItem(0));
-TYPEINIT1_FACTORY(SvxPostItTextItem, SfxStringItem, new SvxPostItTextItem(0));
+
+SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); }
+SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); }
+SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); }
SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich )
{
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index f35601038b0f..b5d622eb1aa7 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -36,8 +36,8 @@
using namespace ::com::sun::star;
-TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0));
+SfxPoolItem* SvxRotateModeItem::CreateDefault() { return new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0);}
// SvxRotateModeItem - orientation with turned text
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 7c6cde664c92..ea349097cd44 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -26,7 +26,8 @@
#include <osl/diagnose.h>
-TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
+
+SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; }
#define VIEWLAYOUT_PARAM_COLUMNS "Columns"
#define VIEWLAYOUT_PARAM_BOOKMODE "BookMode"
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 5d776322fdf9..6b8cb85617a7 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -26,7 +26,8 @@
-TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
+
+SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; }
#define ZOOMSLIDER_PARAM_CURRENTZOOM "Columns"
#define ZOOMSLIDER_PARAM_SNAPPINGPOINTS "SnappingPoints"