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

include: inline some use-once typedefs

Browse Source 
Change-Id: I064e95c72e5f67178cf2875f457adac241cee529
This commit is contained in:
Noel Grandin
2015-08-04 08:06:50 +02:00
parent 50097a8bb2
commit f17f89aadc
29 changed files with 63 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dtrans/source/win32/dtobj/DOTransferable.cxx
View File

@@ -161,7 +161,7 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla
void SAL_CALL CDOTransferable::initFlavorList( ) void SAL_CALL CDOTransferable::initFlavorList( )
{ {
IEnumFORMATETCPtr pEnumFormatEtc; sal::systools::COMReference<IEnumFORMATETC> pEnumFormatEtc;
HRESULT hr = m_rDataObject->EnumFormatEtc( DATADIR_GET, &pEnumFormatEtc ); HRESULT hr = m_rDataObject->EnumFormatEtc( DATADIR_GET, &pEnumFormatEtc );
if ( SUCCEEDED( hr ) ) if ( SUCCEEDED( hr ) )
{ {

13
include/editeng/svxrtf.hxx
View File

@@ -76,7 +76,6 @@ public:
}; };
typedef std::deque< Color* > SvxRTFColorTbl;
typedef std::map<short, std::unique_ptr<vcl::Font>> SvxRTFFontTbl; typedef std::map<short, std::unique_ptr<vcl::Font>> SvxRTFFontTbl;
typedef std::map<sal_uInt16, std::unique_ptr<SvxRTFStyleType>> SvxRTFStyleTbl; typedef std::map<sal_uInt16, std::unique_ptr<SvxRTFStyleType>> SvxRTFStyleTbl;
@@ -170,12 +169,12 @@ struct RTFPardAttrMapIds
class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
{ {
SvStream &rStrm; SvStream & rStrm;
SvxRTFColorTbl aColorTbl; std::deque< Color* > aColorTbl;
SvxRTFFontTbl m_FontTable; SvxRTFFontTbl m_FontTable;
SvxRTFStyleTbl m_StyleTable; SvxRTFStyleTbl m_StyleTable;
SvxRTFItemStack aAttrStack; SvxRTFItemStack aAttrStack;
SvxRTFItemStackList m_AttrSetList; SvxRTFItemStackList m_AttrSetList;
RTFPlainAttrMapIds aPlainMap; RTFPlainAttrMapIds aPlainMap;
RTFPardAttrMapIds aPardMap; RTFPardAttrMapIds aPardMap;

6
include/filter/msfilter/escherex.hxx
View File

@@ -726,13 +726,11 @@ public:
}; };
struct EscherShapeListEntry; struct EscherShapeListEntry;
typedef ::std::vector< EscherShapeListEntry* > EscherShapeList_impl;
typedef ::std::vector< EscherConnectorListEntry* > EscherConnectorList_impl;
class MSFILTER_DLLPUBLIC EscherSolverContainer class MSFILTER_DLLPUBLIC EscherSolverContainer
{ {
EscherShapeList_impl maShapeList; ::std::vector< EscherShapeListEntry* > maShapeList;
EscherConnectorList_impl maConnectorList; ::std::vector< EscherConnectorListEntry* > maConnectorList;
public: public:

4
include/filter/msfilter/msdffimp.hxx
View File

@@ -180,11 +180,9 @@ struct SvxMSDffConnectorRule
friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom );
}; };
typedef ::std::vector< SvxMSDffConnectorRule* > SvxMSDffConnectorRuleList;
struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer
{ {
SvxMSDffConnectorRuleList aCList; ::std::vector< SvxMSDffConnectorRule* > aCList;
SvxMSDffSolverContainer(); SvxMSDffSolverContainer();
~SvxMSDffSolverContainer(); ~SvxMSDffSolverContainer();

13
include/filter/msfilter/svdfppt.hxx
View File

@@ -418,7 +418,6 @@ struct SdPageCapsule {
SdrPage * page; SdrPage * page;
}; };
typedef ::std::vector< PPTOleEntry* > PPTOleEntryList;
class PPTExtParaProv; class PPTExtParaProv;
class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
{ {
@@ -432,7 +431,7 @@ protected:
PptDocumentAtom aDocAtom; PptDocumentAtom aDocAtom;
DffRecordManager aDocRecManager; // contains all first level container and atoms of the document container DffRecordManager aDocRecManager; // contains all first level container and atoms of the document container
PPTOleEntryList aOleObjectList; // contains PPTOleEntrys ::std::vector< PPTOleEntry* > aOleObjectList;
PptFontCollection* m_pFonts; PptFontCollection* m_pFonts;
@@ -526,7 +525,6 @@ struct ProcessData
typedef ::std::vector< SdHyperlinkEntry* > SdHyperlinkEntryList;
class SdrTextObj; class SdrTextObj;
class SfxObjectShell; class SfxObjectShell;
@@ -542,7 +540,7 @@ protected:
bool bOk; bool bOk;
PptUserEditAtom aUserEditAtom; PptUserEditAtom aUserEditAtom;
PptColorSchemeAtom aPageColors; PptColorSchemeAtom aPageColors;
SdHyperlinkEntryList aHyperList; ::std::vector< SdHyperlinkEntry* > aHyperList;
sal_uInt32* pPersistPtr; sal_uInt32* pPersistPtr;
sal_uLong nPersistPtrAnz; sal_uLong nPersistPtrAnz;
@@ -669,11 +667,10 @@ struct PPTTextSpecInfo
~PPTTextSpecInfo(); ~PPTTextSpecInfo();
}; };
typedef ::std::vector< PPTTextSpecInfo* > PPTTextSpecInfoList;
struct PPTTextSpecInfoAtomInterpreter struct PPTTextSpecInfoAtomInterpreter
{ {
bool bValid; bool bValid;
PPTTextSpecInfoList aList; ::std::vector< PPTTextSpecInfo* > aList;
PPTTextSpecInfoAtomInterpreter(); PPTTextSpecInfoAtomInterpreter();
~PPTTextSpecInfoAtomInterpreter(); ~PPTTextSpecInfoAtomInterpreter();
@@ -717,11 +714,9 @@ struct PPTBuGraEntry
PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInstance ); PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInstance );
}; };
typedef ::std::vector< PPTBuGraEntry* > PPTBuGraEntryList;
class PPTExtParaProv class PPTExtParaProv
{ {
PPTBuGraEntryList aBuGraList; ::std::vector< PPTBuGraEntry* > aBuGraList;
public: public:
bool bStyles; bool bStyles;

8
include/oox/core/fasttokenhandler.hxx
View File

@@ -33,13 +33,13 @@ namespace core {
typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::xml::sax::XFastTokenHandler > FastTokenHandler_BASE;
/** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface
that provides access to the tokens generated from the internal token name list. that provides access to the tokens generated from the internal token name list.
*/ */
class OOX_DLLPUBLIC FastTokenHandler : public FastTokenHandler_BASE, class OOX_DLLPUBLIC FastTokenHandler :
public sax_fastparser::FastTokenHandlerBase public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,
::com::sun::star::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
{ {
public: public:
explicit FastTokenHandler(); explicit FastTokenHandler();

10
include/oox/dump/dumperbase.hxx
View File

@@ -92,10 +92,9 @@ const sal_Unicode OOX_DUMP_CMDPROMPT = '?';
const sal_Unicode OOX_DUMP_PLACEHOLDER = '\x01'; const sal_Unicode OOX_DUMP_PLACEHOLDER = '\x01';
typedef ::std::pair< OUString, OUString > OUStringPair; typedef ::std::pair< OUString, OUString > OUStringPair;
typedef ::std::pair< sal_Int64, sal_Int64 > Int64Pair;
typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< OUString > OUStringVector;
typedef ::std::vector< sal_Int64 > Int64Vector; typedef ::std::vector< sal_Int64 > Int64Vector;
@@ -447,7 +446,6 @@ static const String EMPTY_STRING;
class Base; class Base;
typedef std::shared_ptr< Base > BaseRef;
/** Base class for all dumper classes. /** Base class for all dumper classes.
@@ -504,7 +502,7 @@ public:
virtual ~Base(); virtual ~Base();
bool isValid() const { return implIsValid(); } bool isValid() const { return implIsValid(); }
static bool isValid( const BaseRef& rxBase ) { return rxBase.get() && rxBase->isValid(); } static bool isValid( const std::shared_ptr< Base >& rxBase ) { return rxBase.get() && rxBase->isValid(); }
protected: protected:
Base() {} Base() {}
@@ -744,7 +742,7 @@ private:
struct ExtItemFormatKey struct ExtItemFormatKey
{ {
sal_Int64 mnKey; sal_Int64 mnKey;
Int64Pair maFilter; ::std::pair< sal_Int64, sal_Int64 > maFilter;
explicit ExtItemFormatKey( sal_Int64 nKey ) : mnKey( nKey ), maFilter( 0, 0 ) {} explicit ExtItemFormatKey( sal_Int64 nKey ) : mnKey( nKey ), maFilter( 0, 0 ) {}
bool operator<( const ExtItemFormatKey& rRight ) const; bool operator<( const ExtItemFormatKey& rRight ) const;

10
include/oox/ole/axbinarywriter.hxx
View File

@@ -73,11 +73,6 @@ private:
/** A pair of integer values as a property. */ /** A pair of integer values as a property. */
typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
/** An array of string values as a property. */
typedef ::std::vector< OUString > AxStringArray;
/** Export helper to write simple and complex ActiveX form control properties /** Export helper to write simple and complex ActiveX form control properties
to a binary input stream. */ to a binary input stream. */
class AxBinaryPropertyWriter class AxBinaryPropertyWriter
@@ -158,8 +153,9 @@ private:
ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties. ComplexPropVector maStreamProps; ///< Stores info for all used stream data properties.
AxPairData maDummyPairData; ///< Dummy pair for unsupported properties. AxPairData maDummyPairData; ///< Dummy pair for unsupported properties.
StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties. StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported properties.
OUString maDummyString; ///< Dummy string for unsupported properties. OUString maDummyString; ///< Dummy string for unsupported properties.
AxStringArray maDummyStringArray; ///< Dummy string array for unsupported properties. ::std::vector< OUString >
maDummyStringArray; ///< Dummy string array for unsupported properties.
sal_Int16 mnBlockSize; sal_Int16 mnBlockSize;
sal_Int64 mnPropFlagsStart; ///< pos of Prop flags sal_Int64 mnPropFlagsStart; ///< pos of Prop flags
sal_Int64 mnPropFlags; ///< Flags specifying existing properties. sal_Int64 mnPropFlags; ///< Flags specifying existing properties.

4
include/oox/vml/vmlinputstream.hxx
View File

@@ -34,8 +34,6 @@ namespace vml {
typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream > InputStream_BASE;
/** An input stream class for VML streams, implementing the UNO interface /** An input stream class for VML streams, implementing the UNO interface
com.sun.star.io.XInputStream needed by the Expat XML parsers. com.sun.star.io.XInputStream needed by the Expat XML parsers.
@@ -53,7 +51,7 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream > InputStrea
3) Line breaks represented by a single <br> element (without matching 3) Line breaks represented by a single <br> element (without matching
</br> element) are replaced by a literal LF character. </br> element) are replaced by a literal LF character.
*/ */
class InputStream : public InputStream_BASE class InputStream : public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream >
{ {
public: public:
explicit InputStream( explicit InputStream(

4
include/sfx2/evntconf.hxx
View File

@@ -47,12 +47,10 @@ struct SFX2_DLLPUBLIC SfxEventName
, maUIName( rUIName ) {} , maUIName( rUIName ) {}
}; };
typedef ::std::vector< SfxEventName* > _SfxEventNamesList;
class SFX2_DLLPUBLIC SfxEventNamesList class SFX2_DLLPUBLIC SfxEventNamesList
{ {
private: private:
_SfxEventNamesList aEventNamesList; ::std::vector< SfxEventName* > aEventNamesList;
void DelDtor(); void DelDtor();
public: public:

2
include/sfx2/hintpost.hxx
View File

@@ -53,8 +53,6 @@ public:
void SetEventHdl(const Link<SfxRequest*,void>& rLink); void SetEventHdl(const Link<SfxRequest*,void>& rLink);
}; };
typedef tools::SvRef<SfxHintPoster> SfxHintPosterRef;
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
include/sfx2/itemwrapper.hxx
View File

@@ -73,11 +73,9 @@ public:
+- ValueItemWrapper< ItemT, ValueT > [1] +- ValueItemWrapper< ItemT, ValueT > [1]
| | | |
| +- BoolItemWrapper [1] | +- BoolItemWrapper [1]
| +- Int16ItemWrapper [1]
| +- UInt16ItemWrapper [1] | +- UInt16ItemWrapper [1]
| +- Int32ItemWrapper [1] | +- Int32ItemWrapper [1]
| +- UInt32ItemWrapper [1] | +- UInt32ItemWrapper [1]
| +- StringItemWrapper [1]
| |
+- IdentItemWrapper< ItemT > [1] +- IdentItemWrapper< ItemT > [1]
@@ -150,11 +148,9 @@ public:
typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper;
typedef ValueItemWrapper< SfxInt16Item, sal_Int16 > Int16ItemWrapper;
typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper; typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper;
typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper;
typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper; typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper;
typedef ValueItemWrapper< SfxStringItem, const OUString& > StringItemWrapper;

4
include/sfx2/styfitem.hxx
View File

@@ -59,11 +59,9 @@ public:
void SetImage( const Image& _rImg ) { aImage = _rImg; } void SetImage( const Image& _rImg ) { aImage = _rImg; }
}; };
typedef ::std::vector< SfxStyleFamilyItem* > SfxStyleFamilyList;
class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource
{ {
SfxStyleFamilyList aEntryList; ::std::vector< SfxStyleFamilyItem* > aEntryList;
public: public:
SfxStyleFamilies( const ResId &); SfxStyleFamilies( const ResId &);

6
include/sot/exchange.hxx
View File

@@ -41,12 +41,10 @@ struct DataFlavorEx : public ::com::sun::star::datatransfer::DataFlavor
SotClipboardFormatId mnSotId; SotClipboardFormatId mnSotId;
}; };
typedef ::std::vector< DataFlavorEx > _DataFlavorExVector;
// JP 23.03.2001 - this struct is only for "hide" the STD of the vetor, // JP 23.03.2001 - this struct is only for "hide" the STD of the vetor,
// because our makefile filter all this symbols and so nowbody can use // because our makefile filter all this symbols and so nobody can use
// these struct in any interfacses. // these struct in any interfacses.
struct DataFlavorExVector : public _DataFlavorExVector struct DataFlavorExVector : public ::std::vector< DataFlavorEx >
{ {
}; };

4
include/sot/filelist.hxx
View File

@@ -25,11 +25,9 @@
#include <vector> #include <vector>
typedef ::std::vector< OUString > FileStringList;
class SOT_DLLPUBLIC FileList : public SvDataCopyStream class SOT_DLLPUBLIC FileList : public SvDataCopyStream
{ {
FileStringList aStrList; ::std::vector< OUString > aStrList;
protected: protected:

8
include/svl/adrparse.hxx
View File

@@ -42,16 +42,14 @@ struct SvAddressEntry_Impl
}; };
typedef ::std::vector< SvAddressEntry_Impl* > SvAddressList_Impl;
class SVL_DLLPUBLIC SvAddressParser class SVL_DLLPUBLIC SvAddressParser
{ {
friend class SvAddressParser_Impl; friend class SvAddressParser_Impl;
SvAddressEntry_Impl m_aFirst; SvAddressEntry_Impl m_aFirst;
SvAddressList_Impl m_aRest; ::std::vector< SvAddressEntry_Impl* >
bool m_bHasFirst; m_aRest;
bool m_bHasFirst;
public: public:
SvAddressParser(const OUString& rInput); SvAddressParser(const OUString& rInput);

5
include/svl/ownlist.hxx
View File

@@ -51,9 +51,6 @@ public:
const OUString & GetArgument() const { return aArgument; } const OUString & GetArgument() const { return aArgument; }
}; };
typedef ::std::vector< SvCommand > SvCommandList_impl;
class SVL_DLLPUBLIC SvCommandList class SVL_DLLPUBLIC SvCommandList
/* /*
The list contains objects of type SvCommand. The list contains objects of type SvCommand.
@@ -62,7 +59,7 @@ class SVL_DLLPUBLIC SvCommandList
*/ */
{ {
private: private:
SvCommandList_impl aCommandList; ::std::vector< SvCommand > aCommandList;
public: public:
SvCommand& Append( const OUString & rCommand, const OUString & rArg ); SvCommand& Append( const OUString & rCommand, const OUString & rArg );

6
include/svtools/imap.hxx
View File

@@ -31,14 +31,12 @@ class Size;
class Fraction; class Fraction;
class IMapObject; class IMapObject;
typedef ::std::vector< IMapObject* > IMapObjectList_impl;
class SVT_DLLPUBLIC ImageMap class SVT_DLLPUBLIC ImageMap
{ {
private: private:
IMapObjectList_impl maList; ::std::vector< IMapObject* > maList;
OUString aName; OUString aName;
protected: protected:

12
include/svtools/parrtf.hxx
View File

@@ -34,15 +34,13 @@ struct RtfParserState_Impl
{} {}
}; };
typedef std::stack< RtfParserState_Impl > RtfParserStates_Impl;
class SVT_DLLPUBLIC SvRTFParser : public SvParser class SVT_DLLPUBLIC SvRTFParser : public SvParser
{ {
RtfParserStates_Impl aParserStates; std::stack< RtfParserState_Impl > aParserStates;
int nOpenBrakets;
int nOpenBrakets; rtl_TextEncoding eCodeSet,
rtl_TextEncoding eCodeSet, eUNICodeSet; eUNICodeSet;
sal_uInt8 nUCharOverread; sal_uInt8 nUCharOverread;
private: private:
static short _inSkipGroup; static short _inSkipGroup;

5
include/svtools/svparser.hxx
View File

@@ -168,11 +168,6 @@ public:
}; };
#ifndef GOODIES_DECL_SVPARSER_DEFINED
#define GOODIES_DECL_SVPARSER_DEFINED
typedef tools::SvRef<SvParser> SvParserRef;
#endif
inline sal_uLong SvParser::SetLineNr( sal_uLong nlNum ) inline sal_uLong SvParser::SetLineNr( sal_uLong nlNum )
{ sal_uLong nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; } { sal_uLong nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; }

4
include/svx/gridctrl.hxx
View File

@@ -47,7 +47,6 @@ namespace svxform
{ {
class DataColumn; class DataColumn;
} }
typedef ::std::vector< ::svxform::DataColumn* > DbDataColumns;
enum GridRowStatus enum GridRowStatus
{ {
@@ -64,7 +63,8 @@ enum GridRowStatus
class DbGridRow : public SvRefBase class DbGridRow : public SvRefBase
{ {
::com::sun::star::uno::Any m_aBookmark; // Bookmark of the row, can be set ::com::sun::star::uno::Any m_aBookmark; // Bookmark of the row, can be set
DbDataColumns m_aVariants; ::std::vector< ::svxform::DataColumn* >
m_aVariants;
GridRowStatus m_eStatus; GridRowStatus m_eStatus;
bool m_bIsNew; bool m_bIsNew;
// row is no longer valid // row is no longer valid

1
include/systools/win32/comtools.hxx
View File

@@ -183,7 +183,6 @@ namespace systools
/* Typedefs for some popular COM interfaces */ /* Typedefs for some popular COM interfaces */
typedef sal::systools::COMReference<IDataObject> IDataObjectPtr; typedef sal::systools::COMReference<IDataObject> IDataObjectPtr;
typedef sal::systools::COMReference<IStream> IStreamPtr; typedef sal::systools::COMReference<IStream> IStreamPtr;
typedef sal::systools::COMReference<IEnumFORMATETC> IEnumFORMATETCPtr;
#endif // INCLUDED_SYSTOOLS_WIN32_COMTOOLS_HXX #endif // INCLUDED_SYSTOOLS_WIN32_COMTOOLS_HXX

10
include/tools/inetmsg.hxx
View File

@@ -80,8 +80,6 @@ public:
} }
}; };
typedef ::std::vector< INetMessageHeader* > HeaderList_impl;
/** /**
RFC822 fields RFC822 fields
*/ */
@@ -129,11 +127,11 @@ enum INetMessageContainerType
}; };
class INetMIMEMessage; class INetMIMEMessage;
typedef ::std::vector< INetMIMEMessage* > INetMIMEMessgeList_impl;
class TOOLS_DLLPUBLIC INetMIMEMessage class TOOLS_DLLPUBLIC INetMIMEMessage
{ {
HeaderList_impl m_aHeaderList; ::std::vector< INetMessageHeader* >
m_aHeaderList;
sal_uIntPtr m_nDocSize; sal_uIntPtr m_nDocSize;
OUString m_aDocName; OUString m_aDocName;
@@ -145,8 +143,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessage
::std::map<InetMessageField, sal_uIntPtr> m_nRFC822Index; ::std::map<InetMessageField, sal_uIntPtr> m_nRFC822Index;
::std::map<InetMessageMime, sal_uIntPtr> m_nMIMEIndex; ::std::map<InetMessageMime, sal_uIntPtr> m_nMIMEIndex;
INetMIMEMessage* pParent; INetMIMEMessage* pParent;
INetMIMEMessgeList_impl aChildren; ::std::vector< INetMIMEMessage* > aChildren;
OString m_aBoundary; OString m_aBoundary;
bool bHeaderParsed; bool bHeaderParsed;

4
include/tools/pstm.hxx
View File

@@ -95,7 +95,6 @@ public:
SvPersistBase *& rpObj ); SvPersistBase *& rpObj );
}; };
typedef UniqueIndex<SvPersistBase> SvPersistUIdx;
typedef std::map<SvPersistBase*, sal_uIntPtr> PersistBaseMap; typedef std::map<SvPersistBase*, sal_uIntPtr> PersistBaseMap;
class SvStream; class SvStream;
@@ -138,7 +137,8 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
SvClassManager & rClassMgr; SvClassManager & rClassMgr;
SvStream * pStm; SvStream * pStm;
PersistBaseMap aPTable; // reversed pointer and key PersistBaseMap aPTable; // reversed pointer and key
SvPersistUIdx aPUIdx; UniqueIndex<SvPersistBase>
aPUIdx;
sal_uIntPtr nStartIdx; sal_uIntPtr nStartIdx;
const SvPersistStream * pRefStm; const SvPersistStream * pRefStm;

12
include/vcl/region.hxx
View File

@@ -33,9 +33,6 @@ namespace vcl { class Window; }
class OutputDevice; class OutputDevice;
class Bitmap; class Bitmap;
typedef std::shared_ptr< RegionBand > RegionBandPtr;
typedef std::shared_ptr< tools::PolyPolygon > PolyPolygonPtr;
typedef std::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr;
typedef std::vector< Rectangle > RectangleVector; typedef std::vector< Rectangle > RectangleVector;
namespace vcl { namespace vcl {
@@ -48,9 +45,12 @@ private:
friend class ::Bitmap; friend class ::Bitmap;
// possible contents // possible contents
B2DPolyPolygonPtr mpB2DPolyPolygon; std::shared_ptr< basegfx::B2DPolyPolygon >
PolyPolygonPtr mpPolyPolygon; mpB2DPolyPolygon;
RegionBandPtr mpRegionBand; std::shared_ptr< tools::PolyPolygon >
mpPolyPolygon;
std::shared_ptr< RegionBand >
mpRegionBand;
/// bitfield /// bitfield
bool mbIsNull : 1; bool mbIsNull : 1;

5
include/xmloff/shapeimport.hxx
View File

@@ -199,15 +199,14 @@ public:
typedef ::std::vector< SdXML3DLightContext* > Imp3DLightList;
class SdXML3DSceneAttributesHelper class SdXML3DSceneAttributesHelper
{ {
protected: protected:
SvXMLImport& mrImport; SvXMLImport& mrImport;
// list for local light contexts // list for local light contexts
Imp3DLightList maList; ::std::vector< SdXML3DLightContext* >
maList;
// local parameters which need to be read // local parameters which need to be read
com::sun::star::drawing::HomogenMatrix mxHomMat; com::sun::star::drawing::HomogenMatrix mxHomMat;

5
include/xmloff/table/XMLTableExport.hxx
View File

@@ -55,8 +55,6 @@ struct XMLTableInfo
std::vector< OUString > maDefaultRowCellStyles; std::vector< OUString > maDefaultRowCellStyles;
}; };
typedef std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, std::shared_ptr< XMLTableInfo > > TableInfoMap;
class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject
{ {
public: public:
@@ -82,7 +80,8 @@ private:
rtl::Reference< SvXMLExportPropertyMapper > mxCellExportPropertySetMapper; rtl::Reference< SvXMLExportPropertyMapper > mxCellExportPropertySetMapper;
rtl::Reference< SvXMLExportPropertyMapper > mxRowExportPropertySetMapper; rtl::Reference< SvXMLExportPropertyMapper > mxRowExportPropertySetMapper;
rtl::Reference< SvXMLExportPropertyMapper > mxColumnExportPropertySetMapper; rtl::Reference< SvXMLExportPropertyMapper > mxColumnExportPropertySetMapper;
TableInfoMap maTableInfoMap; std::map< const css::uno::Reference< css::table::XColumnRowRange >, std::shared_ptr< XMLTableInfo > >
maTableInfoMap;
bool mbExportTables; bool mbExportTables;
protected: protected:

3
sfx2/source/control/dispatch.cxx
View File

@@ -115,7 +115,8 @@ struct SfxDispatcher_Impl
std::deque<SfxToDo_Impl> aToDoStack; // not processed Push/Pop std::deque<SfxToDo_Impl> aToDoStack; // not processed Push/Pop
SfxViewFrame* pFrame; // NULL or associated Frame SfxViewFrame* pFrame; // NULL or associated Frame
SfxDispatcher* pParent; // AppDispatcher, NULL if possible SfxDispatcher* pParent; // AppDispatcher, NULL if possible
SfxHintPosterRef xPoster; // Execute asynchronous tools::SvRef<SfxHintPoster>
xPoster; // Execute asynchronous
bool bFlushing; // sal_True during Flush //? bool bFlushing; // sal_True during Flush //?
bool bUpdated; // Update_Impl has run bool bUpdated; // Update_Impl has run
bool bLocked; // No Execute bool bLocked; // No Execute

2
sw/source/filter/html/swhtml.cxx
View File

@@ -211,7 +211,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam,
// damit keiner das Doc klaut! // damit keiner das Doc klaut!
rDoc.acquire(); rDoc.acquire();
sal_uLong nRet = 0; sal_uLong nRet = 0;
SvParserRef xParser = new SwHTMLParser( &rDoc, rPam, *pStrm, tools::SvRef<SvParser> xParser = new SwHTMLParser( &rDoc, rPam, *pStrm,
rName, rBaseURL, !bInsertMode, pMedium, rName, rBaseURL, !bInsertMode, pMedium,
IsReadUTF8(), IsReadUTF8(),
bIgnoreHTMLComments ); bIgnoreHTMLComments );