From fe480d8136b204c8dc6c68916cce7e816f8b9c48 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 27 Jan 2015 07:32:01 +0200 Subject: remove unused typedefs found with some minor modifications to find/find-unused-defines.sh Change-Id: I18cc479adedc7a0dada68a4aeef08300e62631dd Reviewed-on: https://gerrit.libreoffice.org/14194 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/filter/msfilter/mstoolbar.hxx | 1 - include/filter/msfilter/svxmsbas.hxx | 2 -- include/framework/addonsoptions.hxx | 1 - include/oox/drawingml/drawingmltypes.hxx | 1 - include/oox/dump/dumperbase.hxx | 3 --- include/oox/helper/binaryoutputstream.hxx | 1 - include/oox/helper/progressbar.hxx | 1 - include/oox/ole/axcontrol.hxx | 1 - include/oox/ole/olehelper.hxx | 1 - include/sfx2/controlwrapper.hxx | 7 ------- include/sfx2/fcontnr.hxx | 2 -- include/sfx2/itemconnect.hxx | 8 -------- include/sot/exchange.hxx | 3 --- include/svx/svdmodel.hxx | 1 - include/tools/pstm.hxx | 1 - include/tools/rc.h | 1 - include/tools/stream.hxx | 2 -- include/touch/touch.h | 1 - 18 files changed, 38 deletions(-) (limited to 'include') diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index e71e873831e6..b6bb4c14da06 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -339,7 +339,6 @@ public: #endif }; -typedef cppu::WeakImplHelper1< css::container::XIndexContainer > PropertyValueIndexContainer_BASE; class MSFILTER_DLLPUBLIC TBVisualData : public TBBase { diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 10ea1207ed16..24db778a98aa 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -44,9 +44,7 @@ class SfxObjectShell; * probably what the user expects to see when viewing the code */ -typedef std::unordered_map< sal_Int32, OUString > ObjIdToName; -typedef std::map< OUString, ObjIdToName > ControlAttributeInfo; class MSFILTER_DLLPUBLIC SvxImportMSVBasic { diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 7cd834626ec0..7edf6baf3da1 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -49,7 +49,6 @@ namespace framework { -typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > MergeMenuDefinition; struct FWE_DLLPUBLIC MergeMenuInstruction { diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 433e2b906044..6c6dee122fea 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -61,7 +61,6 @@ struct TextCharacterProperties; typedef ::boost::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr; struct TextBodyProperties; -typedef ::boost::shared_ptr< TextBodyProperties > TextBodyPropertiesPtr; struct EffectProperties; typedef ::boost::shared_ptr< EffectProperties > EffectPropertiesPtr; diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 926d6e46356d..7abfbb39c71e 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -1291,7 +1291,6 @@ private: PreferredItemVector maPreferred; }; -typedef ::boost::shared_ptr< StorageObjectBase > StorageObjectRef; @@ -1354,7 +1353,6 @@ protected: OUString maSysFileName; }; -typedef ::boost::shared_ptr< OutputObjectBase > OutputObjectRef; @@ -1550,7 +1548,6 @@ protected: BinaryInputStreamRef mxStrm; }; -typedef ::boost::shared_ptr< InputObjectBase > InputObjectRef; diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index a1b562133c61..172958667097 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -109,7 +109,6 @@ void BinaryOutputStream::writeArray( const Type* opnArray, sal_Int32 nElemCount writeArray(pArray.get(), nElemCount); } -typedef ::boost::shared_ptr< BinaryOutputStream > BinaryOutputStreamRef; diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index e671d42deb6d..d529974ce0d9 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -56,7 +56,6 @@ public: virtual void setPosition( double fPosition ) = 0; }; -typedef ::boost::shared_ptr< IProgressBar > IProgressBarRef; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index e3a7199fe355..6e267d667a43 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -857,7 +857,6 @@ public: // direct access needed for legacy VML drawing controls bool mbFontSupport; ///< True = control supports the font property. }; -typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 937ae019d86d..86f3321863b8 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -50,7 +50,6 @@ namespace oox { namespace oox { -typedef ::boost::shared_ptr< oox::BinaryXInputStream > BinaryXInputStreamRef; namespace ole { diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 91b79b04f396..d37ffc5a0458 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -289,9 +289,7 @@ public: -typedef NumericFieldWrapper< sal_Int16 > Int16NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper; -typedef NumericFieldWrapper< sal_Int32 > Int32NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper; typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper; @@ -326,7 +324,6 @@ private: typedef MetricFieldWrapper< sal_Int16 > Int16MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper; -typedef MetricFieldWrapper< sal_Int32 > Int32MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper; typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper; @@ -368,9 +365,7 @@ public: -typedef ListBoxWrapper< sal_Int16 > Int16ListBoxWrapper; typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper; -typedef ListBoxWrapper< sal_Int32 > Int32ListBoxWrapper; typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper; typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper; @@ -412,9 +407,7 @@ public: -typedef ValueSetWrapper< sal_Int16 > Int16ValueSetWrapper; typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper; -typedef ValueSetWrapper< sal_Int32 > Int32ValueSetWrapper; typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper; typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper; diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 450e83857c80..758a73e80b4d 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -42,8 +42,6 @@ class SfxMedium; class SfxFilterContainer_Impl; class SfxFrame; -//#define SFX_FILTER_CONTAINER_FACTORY 1 -typedef sal_uInt16 SfxFilterContainerFlags; class SfxRefItem : public SfxPoolItem { diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 79fce0c4c5dd..81a869edb3eb 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -323,9 +323,7 @@ public: -typedef NumericConnection< Int16ItemWrapper > Int16NumericConnection; typedef NumericConnection< UInt16ItemWrapper > UInt16NumericConnection; -typedef NumericConnection< Int32ItemWrapper > Int32NumericConnection; typedef NumericConnection< UInt32ItemWrapper > UInt32NumericConnection; @@ -354,9 +352,7 @@ public: -typedef MetricConnection< Int16ItemWrapper > Int16MetricConnection; typedef MetricConnection< UInt16ItemWrapper > UInt16MetricConnection; -typedef MetricConnection< Int32ItemWrapper > Int32MetricConnection; typedef MetricConnection< UInt32ItemWrapper > UInt32MetricConnection; @@ -387,9 +383,7 @@ public: -typedef ListBoxConnection< Int16ItemWrapper > Int16ListBoxConnection; typedef ListBoxConnection< UInt16ItemWrapper > UInt16ListBoxConnection; -typedef ListBoxConnection< Int32ItemWrapper > Int32ListBoxConnection; typedef ListBoxConnection< UInt32ItemWrapper > UInt32ListBoxConnection; @@ -420,9 +414,7 @@ public: -typedef ValueSetConnection< Int16ItemWrapper > Int16ValueSetConnection; typedef ValueSetConnection< UInt16ItemWrapper > UInt16ValueSetConnection; -typedef ValueSetConnection< Int32ItemWrapper > Int32ValueSetConnection; typedef ValueSetConnection< UInt32ItemWrapper > UInt32ValueSetConnection; diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx index d509fdb8ba6e..2f72b61365cd 100644 --- a/include/sot/exchange.hxx +++ b/include/sot/exchange.hxx @@ -41,7 +41,6 @@ struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor SotFormatStringId mnSotId; }; -typedef ::std::vector< ::com::sun::star::datatransfer::DataFlavor > DataFlavorVector; typedef ::std::vector< DataFlavorEx > _DataFlavorExVector; // JP 23.03.2001 - this struct is only for "hide" the STD of the vetor, @@ -51,8 +50,6 @@ struct DataFlavorExVector : public _DataFlavorExVector { }; -typedef ::std::list< ::com::sun::star::datatransfer::DataFlavor > DataFlavorList; -typedef ::std::list< DataFlavorEx > DataFlavorExList; SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uLong nId ); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index d50124a32ae3..d71434d4d3aa 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -667,7 +667,6 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -typedef tools::WeakReference< SdrModel > SdrModelWeakRef; diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 6f6fd7d0f8b1..8fc54703c86b 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -51,7 +51,6 @@ class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase public: TYPEINFO(); }; -typedef tools::SvRef SvRttiBaseRef; #define SV_DECL_PERSIST( Class, CLASS_ID ) \ TYPEINFO_OVERRIDE(); \ diff --git a/include/tools/rc.h b/include/tools/rc.h index 210211307398..49f6ebdd58d9 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -26,7 +26,6 @@ // (Here are all window styles that are not in WinBits) #define RSC_EXTRAMAPUNIT 0xFFFF // do not change that value! -typedef short RSWND_STYLE; #define RSWND_DISABLED 0x01 #define RSWND_CLIENTSIZE 0x02 diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index dcb2b713d9b6..72679f282463 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -167,7 +167,6 @@ public: virtual void Terminate() = 0; }; -typedef tools::SvRef SvOpenLockBytesRef; // SvAsyncLockBytes @@ -197,7 +196,6 @@ public: virtual void Terminate() SAL_OVERRIDE { m_bTerminated = true; } }; -typedef tools::SvRef SvAsyncLockBytesRef; // SvStream diff --git a/include/touch/touch.h b/include/touch/touch.h index e141bf7d725d..25e84850d5bd 100644 --- a/include/touch/touch.h +++ b/include/touch/touch.h @@ -218,7 +218,6 @@ void touch_ui_selection_none(); // thread. typedef enum { DOWN, MOVE, UP} MLOMouseButtonState; -typedef enum { NONE, SHIFT, META } MLOModifiers; typedef int MLOModifierMask; void touch_lo_keyboard_did_hide(); -- cgit v1.2.3