mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some unused typedefs, and inline some use-once

Browse Source 
Change-Id: I5ada1cff98c0a3e065d126444f8052f444323743
Reviewed-on: https://gerrit.libreoffice.org/23234
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2016-03-14 08:41:57 +02:00 committed by Noel Grandin
parent 03637a75c1
commit f7965b0bcd
9 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/source/model/main/Axis.cxx
View File

@ -309,10 +309,9 @@ struct StaticAxisInfo : public rtl::StaticAggregate< uno::Reference< beans::XPro
}; };
typedef uno::Reference< beans::XPropertySet > lcl_tSubGridType; typedef uno::Reference< beans::XPropertySet > lcl_tSubGridType;
typedef uno::Sequence< lcl_tSubGridType > lcl_tSubGridSeq;
void lcl_CloneSubGrids( void lcl_CloneSubGrids(
const lcl_tSubGridSeq & rSource, lcl_tSubGridSeq & rDestination ) const uno::Sequence< lcl_tSubGridType > & rSource, uno::Sequence< lcl_tSubGridType > & rDestination )
{ {
const lcl_tSubGridType * pBegin = rSource.getConstArray(); const lcl_tSubGridType * pBegin = rSource.getConstArray();
const lcl_tSubGridType * pEnd = pBegin + rSource.getLength(); const lcl_tSubGridType * pEnd = pBegin + rSource.getLength();

2
include/vcl/devicecoordinate.hxx
View File

@ -15,13 +15,11 @@
#if VCL_FLOAT_DEVICE_PIXEL #if VCL_FLOAT_DEVICE_PIXEL
#include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2dpoint.hxx>
typedef double DeviceCoordinate; typedef double DeviceCoordinate;
typedef basegfx::B2DPoint DevicePoint;
#else /* !VCL_FLOAT_DEVICE_PIXEL */ #else /* !VCL_FLOAT_DEVICE_PIXEL */
#include <basegfx/point/b2ipoint.hxx> #include <basegfx/point/b2ipoint.hxx>
typedef long DeviceCoordinate; typedef long DeviceCoordinate;
typedef basegfx::B2IPoint DevicePoint;
#endif /* ! Carpet Cushion */ #endif /* ! Carpet Cushion */

3
include/vcl/metric.hxx
View File

@ -33,7 +33,6 @@ class CmapResult;
typedef sal_uInt32 sal_UCS4; typedef sal_uInt32 sal_UCS4;
typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr; typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr;
typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr; typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr;
typedef boost::intrusive_ptr< ImplFontMetric > ImplFontMetricPtr;
class VCL_DLLPUBLIC FontMetric : public vcl::Font class VCL_DLLPUBLIC FontMetric : public vcl::Font
{ {
@ -73,7 +72,7 @@ public:
bool operator!=( const FontMetric& rMetric ) const bool operator!=( const FontMetric& rMetric ) const
{ return !operator==( rMetric ); } { return !operator==( rMetric ); }
protected: protected:
ImplFontMetricPtr mpImplMetric; // Implementation boost::intrusive_ptr<ImplFontMetric> mpImplMetric; // Implementation
}; };
template< typename charT, typename traits > template< typename charT, typename traits >

4
sc/source/ui/vba/vbaformatconditions.cxx
View File

@ -33,8 +33,6 @@
using namespace ::ooo::vba; using namespace ::ooo::vba;
using namespace ::com::sun::star; using namespace ::com::sun::star;
typedef std::vector< beans::PropertyValue > VecPropValues;
static const char OPERATOR[] = "Operator"; static const char OPERATOR[] = "Operator";
static const char FORMULA1[] = "Formula1"; static const char FORMULA1[] = "Formula1";
static const char FORMULA2[] = "Formula2"; static const char FORMULA2[] = "Formula2";
@ -168,7 +166,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons
sStyleName = xStyle->getName(); sStyleName = xStyle->getName();
} }
VecPropValues aPropertyValueVector; std::vector< beans::PropertyValue > aPropertyValueVector;
sheet::ConditionOperator aType = ScVbaFormatCondition::retrieveAPIType(_nType, uno::Reference< sheet::XSheetCondition >() ); sheet::ConditionOperator aType = ScVbaFormatCondition::retrieveAPIType(_nType, uno::Reference< sheet::XSheetCondition >() );
uno::Any aValue; uno::Any aValue;

10
sfx2/source/control/shell.cxx
View File

@ -48,18 +48,16 @@
#include <vector> #include <vector>
#include <map> #include <map>
// Maps the Which() field to a pointer to a SfxPoolItem
typedef std::map<sal_uInt16, std::unique_ptr<SfxPoolItem>> SfxItemPtrMap;
using namespace com::sun::star; using namespace com::sun::star;
struct SfxShell_Impl: public SfxBroadcaster struct SfxShell_Impl: public SfxBroadcaster
{ {
OUString aObjectName; // Name of Sbx-Objects OUString aObjectName; // Name of Sbx-Objects
SfxItemPtrMap m_Items; // Data exchange on Item level // Maps the Which() field to a pointer to a SfxPoolItem
std::map<sal_uInt16, std::unique_ptr<SfxPoolItem>>
m_Items; // Data exchange on Item level
SfxViewShell* pViewSh; // SfxViewShell if Shell is SfxViewShell* pViewSh; // SfxViewShell if Shell is
// ViewFrame/ViewShell/SubShell list // ViewFrame/ViewShell/SubShell list
SfxViewFrame* pFrame; // Frame, if <UI-active> SfxViewFrame* pFrame; // Frame, if <UI-active>
SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent; SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent;
bool bActive; bool bActive;

1
writerfilter/source/dmapper/GraphicHelpers.hxx
View File

@ -64,7 +64,6 @@ public:
virtual void lcl_attribute( Id aName, Value& rVal ) override; virtual void lcl_attribute( Id aName, Value& rVal ) override;
virtual void lcl_sprm( Sprm& rSprm ) override; virtual void lcl_sprm( Sprm& rSprm ) override;
}; };
typedef std::shared_ptr<WrapHandler> WrapHandlerPtr;
} } } }

2
writerfilter/source/dmapper/OLEHandler.cxx
View File

@ -153,7 +153,7 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if ( pProperties.get( ) ) if ( pProperties.get( ) )
{ {
WrapHandlerPtr pHandler( new WrapHandler ); std::shared_ptr<WrapHandler> pHandler( new WrapHandler );
pProperties->resolve( *pHandler ); pProperties->resolve( *pHandler );
m_nWrapMode = pHandler->getWrapMode( ); m_nWrapMode = pHandler->getWrapMode( );

2
writerfilter/source/dmapper/StyleSheetTable.hxx
View File

@ -78,8 +78,6 @@ public:
}; };
typedef std::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr; typedef std::shared_ptr<StyleSheetEntry> StyleSheetEntryPtr;
typedef std::deque<StyleSheetEntryPtr> StyleSheetEntryDeque;
typedef std::shared_ptr<StyleSheetEntryDeque> StyleSheetEntryDequePtr;
class DomainMapper; class DomainMapper;
class StyleSheetTable : class StyleSheetTable :

4
xmloff/source/style/prstylei.cxx
View File

@ -248,8 +248,6 @@ Reference < XStyle > XMLPropStyleContext::Create()
return xNewStyle; return xNewStyle;
} }
typedef ::std::set < OUString > PropertyNameSet;
void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
{ {
SvXMLStylesContext* pSvXMLStylesContext = static_cast< SvXMLStylesContext* >(&mxStyles); SvXMLStylesContext* pSvXMLStylesContext = static_cast< SvXMLStylesContext* >(&mxStyles);
@ -391,7 +389,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
} }
else else
{ {
PropertyNameSet aNameSet; std::set < OUString > aNameSet;
sal_Int32 nCount = xPrMap->GetEntryCount(); sal_Int32 nCount = xPrMap->GetEntryCount();
sal_Int32 i; sal_Int32 i;
for( i = 0; i < nCount; i++ ) for( i = 0; i < nCount; i++ )