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

filter,desktop,dbaccess: inline some use-once typedefs

Browse Source 
Change-Id: I35f256a11b211c3cb977ae76b5b561efbfd13b9d
This commit is contained in:
Noel Grandin
2015-08-03 15:12:45 +02:00
parent 2886f830a9
commit 8e08edb1d9
12 changed files with 24 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbaccess/source/core/dataaccess/ComponentDefinition.cxx
View File

@@ -52,9 +52,9 @@ namespace dbaccess
{ {
/// helper class for column property change events which holds the OComponentDefinition weak /// helper class for column property change events which holds the OComponentDefinition weak
typedef ::cppu::WeakImplHelper< XPropertyChangeListener > TColumnPropertyListener_BASE;
class OColumnPropertyListener: class OColumnPropertyListener:
public TColumnPropertyListener_BASE, private boost::noncopyable public ::cppu::WeakImplHelper< XPropertyChangeListener >,
private boost::noncopyable
{ {
OComponentDefinition* m_pComponent; OComponentDefinition* m_pComponent;
protected: protected:

7
dbaccess/source/core/dataaccess/datasource.cxx
View File

@@ -95,8 +95,6 @@ using namespace ::comphelper;
namespace dbaccess namespace dbaccess
{ {
// FlushNotificationAdapter
typedef ::cppu::WeakImplHelper< XFlushListener > FlushNotificationAdapter_Base;
/** helper class which implements a XFlushListener, and forwards all /** helper class which implements a XFlushListener, and forwards all
notification events to another XFlushListener notification events to another XFlushListener
@@ -107,7 +105,7 @@ typedef ::cppu::WeakImplHelper< XFlushListener > FlushNotificationAdapter_Base;
their listeners with a hard reference, if you simply do not *want* their listeners with a hard reference, if you simply do not *want*
to be held hard-ref-wise. to be held hard-ref-wise.
*/ */
class FlushNotificationAdapter : public FlushNotificationAdapter_Base class FlushNotificationAdapter : public ::cppu::WeakImplHelper< XFlushListener >
{ {
private: private:
WeakReference< XFlushable > m_aBroadcaster; WeakReference< XFlushable > m_aBroadcaster;
@@ -260,7 +258,6 @@ void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentic
/** The class OSharedConnectionManager implements a structure to share connections. /** The class OSharedConnectionManager implements a structure to share connections.
It owns the master connections which will be disposed when the last connection proxy is gone. It owns the master connections which will be disposed when the last connection proxy is gone.
*/ */
typedef ::cppu::WeakImplHelper< XEventListener > OConnectionHelper_BASE;
// need to hold the digest // need to hold the digest
struct TDigestHolder struct TDigestHolder
{ {
@@ -272,7 +269,7 @@ struct TDigestHolder
}; };
class OSharedConnectionManager : public OConnectionHelper_BASE class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener >
{ {
// contains the currently used master connections // contains the currently used master connections

3
dbaccess/source/ui/browser/genericcontroller.cxx
View File

@@ -84,7 +84,6 @@ using namespace ::comphelper;
#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) #define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() )
typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap; typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
typedef ::std::list< DispatchInformation > DispatchInfoList;
namespace dbaui namespace dbaui
{ {
@@ -1487,7 +1486,7 @@ namespace
Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException, std::exception) Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (RuntimeException, std::exception)
{ {
DispatchInfoList aInformationList; ::std::list< DispatchInformation > aInformationList;
DispatchInformation aDispatchInfo; DispatchInformation aDispatchInfo;
for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin(); for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin();
aIter != m_aSupportedFeatures.end(); aIter != m_aSupportedFeatures.end();

4
desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
View File

@@ -37,9 +37,7 @@ namespace backend
namespace sfwk namespace sfwk
{ {
typedef ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > t_DocHandlerImpl; class ParcelDescDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
class ParcelDescDocHandler : public t_DocHandlerImpl
{ {
private: private:
bool m_bIsParsed; bool m_bIsParsed;

3
dtrans/source/win32/dtobj/FmtFilter.cxx
View File

@@ -454,7 +454,6 @@ std::wstring getShellLinkTarget(const std::wstring& aLnkFile)
} }
typedef std::vector<std::wstring> FileList_t; typedef std::vector<std::wstring> FileList_t;
typedef FileList_t::value_type FileList_ValueType_t;
typedef Sequence<sal_Int8> ByteSequence_t; typedef Sequence<sal_Int8> ByteSequence_t;
/* Calculate the size required for turning a string list into /* Calculate the size required for turning a string list into
@@ -470,7 +469,7 @@ size_t CalcSizeForStringListBuffer(const FileList_t& fileList)
{ {
size += iter->length() + 1; // length including terminating '\0' size += iter->length() + 1; // length including terminating '\0'
} }
return (size * sizeof(FileList_ValueType_t::value_type)); return (size * sizeof(FileList_t::value_type::value_type));
} }
ByteSequence_t FileListToByteSequence(const FileList_t& fileList) ByteSequence_t FileListToByteSequence(const FileList_t& fileList)

20
filter/source/flash/swfexporter.hxx
View File

@@ -97,9 +97,6 @@ public:
mnBlueScreenColor( 0 ) {} mnBlueScreenColor( 0 ) {}
}; };
typedef ::std::vector<ShapeInfo*> ShapeInfoVector;
struct ShapeAnimationInfo struct ShapeAnimationInfo
{ {
@@ -114,8 +111,8 @@ struct ShapeAnimationInfo
struct PageInfo struct PageInfo
{ {
::com::sun::star::presentation::FadeEffect meFadeEffect; css::presentation::FadeEffect meFadeEffect;
::com::sun::star::presentation::AnimationSpeed meFadeSpeed; css::presentation::AnimationSpeed meFadeSpeed;
sal_Int32 mnDuration; sal_Int32 mnDuration;
sal_Int32 mnChange; sal_Int32 mnChange;
@@ -124,10 +121,11 @@ struct PageInfo
sal_uInt16 mnObjectsID; sal_uInt16 mnObjectsID;
sal_uInt16 mnForegroundID; sal_uInt16 mnForegroundID;
bool mbBackgroundVisible; bool mbBackgroundVisible;
bool mbBackgroundObjectsVisible; bool mbBackgroundObjectsVisible;
ShapeInfoVector maShapesVector; ::std::vector<ShapeInfo*>
maShapesVector;
PageInfo(); PageInfo();
~PageInfo(); ~PageInfo();
@@ -136,10 +134,6 @@ struct PageInfo
typedef ::std::map<sal_uInt32, PageInfo> PageInfoMap;
class FlashExporter class FlashExporter
{ {
public: public:
@@ -176,7 +170,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XGraphicExportFilter > mxGraphicExporter;
PageInfoMap maPagesMap; ::std::map<sal_uInt32, PageInfo> maPagesMap;
sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage); sal_uInt16 exportDrawPageBackground(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage);
sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage); sal_uInt16 exportMasterPageObjects(sal_uInt16 nPage, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xMasterPage);

4
filter/source/flash/swffilter.cxx
View File

@@ -63,9 +63,7 @@ using ::com::sun::star::frame::XModel;
namespace swf { namespace swf {
typedef ::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream> OslOutputStreamWrapper_Base; class OslOutputStreamWrapper : public ::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream>
// needed for some compilers
class OslOutputStreamWrapper : public OslOutputStreamWrapper_Base
{ {
osl::File mrFile; osl::File mrFile;

7
filter/source/graphicfilter/icgm/bundles.hxx
View File

@@ -162,15 +162,12 @@ public:
~FontEntry(); ~FontEntry();
}; };
typedef ::std::vector< FontEntry* > FontEntryList;
class CGMFList class CGMFList
{ {
sal_uInt32 nFontNameCount; sal_uInt32 nFontNameCount;
sal_uInt32 nCharSetCount; sal_uInt32 nCharSetCount;
FontEntryList aFontEntryList; ::std::vector< FontEntry* >
aFontEntryList;
void ImplDeleteList(); void ImplDeleteList();
public: public:

4
filter/source/graphicfilter/icgm/elements.hxx
View File

@@ -27,7 +27,6 @@
#define nBackGroundColor aColorTable[ 0 ] #define nBackGroundColor aColorTable[ 0 ]
typedef ::std::vector< Bundle* > BundleList; typedef ::std::vector< Bundle* > BundleList;
typedef ::std::map<sal_uInt32, HatchEntry> HatchMap;
class CGMElements class CGMElements
{ {
@@ -117,7 +116,8 @@ class CGMElements
FillBundle aFillBundle; FillBundle aFillBundle;
BundleList aFillList; BundleList aFillList;
FloatPoint aFillRefPoint; FloatPoint aFillRefPoint;
HatchMap maHatchMap; ::std::map<sal_uInt32, HatchEntry>
maHatchMap;
Transparency eTransparency; Transparency eTransparency;

2
filter/source/graphicfilter/idxf/dxf2mtf.cxx
View File

@@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf
tools::PolyPolygon aPolyPoly; tools::PolyPolygon aPolyPoly;
for ( j = 0; j < rE.nBoundaryPathCount; j++ ) for ( j = 0; j < rE.nBoundaryPathCount; j++ )
{ {
DXFPointArray aPtAry; std::deque< Point > aPtAry;
const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ]; const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ];
if ( rPathData.bIsPolyLine ) if ( rPathData.bIsPolyLine )
{ {

9
filter/source/graphicfilter/idxf/dxfentrd.hxx
View File

@@ -25,8 +25,6 @@
#include <deque> #include <deque>
typedef std::deque< Point > DXFPointArray;
enum DXFEntityType { enum DXFEntityType {
DXF_LINE, DXF_LINE,
DXF_POINT, DXF_POINT,
@@ -400,8 +398,6 @@ struct DXFEdgeTypeSpline : public DXFEdgeType
virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
}; };
typedef std::deque< DXFEdgeType* > DXFEdgeTypeArray;
struct DXFBoundaryPathData struct DXFBoundaryPathData
{ {
sal_Int32 nFlags; // 92 sal_Int32 nFlags; // 92
@@ -412,11 +408,12 @@ struct DXFBoundaryPathData
sal_Int32 nSourceBoundaryObjects; // 97 sal_Int32 nSourceBoundaryObjects; // 97
sal_Int32 nEdgeCount; // 93 sal_Int32 nEdgeCount; // 93
bool bIsPolyLine; bool bIsPolyLine;
sal_Int32 nPointIndex; sal_Int32 nPointIndex;
DXFVector* pP; DXFVector* pP;
DXFEdgeTypeArray aEdges; std::deque< DXFEdgeType* >
aEdges;
DXFBoundaryPathData(); DXFBoundaryPathData();
~DXFBoundaryPathData(); ~DXFBoundaryPathData();

3
filter/source/pdf/pdfdialog.hxx
View File

@@ -31,9 +31,8 @@
namespace vcl { class Window; } namespace vcl { class Window; }
typedef ::svt::OGenericUnoDialog PDFDialog_DialogBase;
typedef ::cppu::ImplInheritanceHelper2 < typedef ::cppu::ImplInheritanceHelper2 <
PDFDialog_DialogBase, ::svt::OGenericUnoDialog,
XPropertyAccess, XPropertyAccess,
XExporter XExporter
> PDFDialog_Base; > PDFDialog_Base;