diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-11-07 14:43:19 +0100 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2015-11-11 10:49:30 +0000 |
commit | fa91dd31f39a24329d288d4e1cda28db3a16af0d (patch) | |
tree | 603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /cui | |
parent | c21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (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 'cui')
-rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 1 | ||||
-rw-r--r-- | cui/source/options/cfgchart.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/cfgchart.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/connpoolsettings.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/connpoolsettings.hxx | 1 | ||||
-rw-r--r-- | cui/source/options/dbregistersettings.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/dbregistersettings.hxx | 1 | ||||
-rw-r--r-- | cui/source/tabpages/measure.cxx | 5 |
8 files changed, 2 insertions, 11 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 98943bbafcff..4f81b67f887c 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -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> diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 1e37184959b4..727e88bdf32b 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star; -TYPEINIT1( SvxChartColorTableItem, SfxPoolItem ); SvxChartColorTable::SvxChartColorTable() : nNextElementNumber(0) diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 8ef95e307e20..401485f57c6c 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -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& ); diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index cb42a3a36bdd..17e8a27386cc 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -42,7 +42,6 @@ namespace offapp { } - TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem ) DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ) :SfxPoolItem(_nId) diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index 3aafcae54a9a..8353f45585d0 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -73,7 +73,6 @@ namespace offapp DriverPoolingSettings m_aSettings; public: - TYPEINFO_OVERRIDE(); DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 75f71d57e10d..18a8680518b1 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -25,7 +25,6 @@ namespace svx { - TYPEINIT1( DatabaseMapItem, SfxPoolItem ) DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ) :SfxPoolItem( _nId ) diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 12172c01a2d2..9c85d9be7edb 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -69,7 +69,6 @@ namespace svx DatabaseRegistrations m_aRegistrations; public: - TYPEINFO_OVERRIDE(); DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index dfd5abca4620..3c8d08dc2a62 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -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 ) |