accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 4
basctl/source/basicide/basidesh.cxx | 4
basctl/source/basicide/moduldl2.cxx | 7 -
basctl/source/inc/dlgedclip.hxx | 8 -
basic/source/basmgr/basmgr.cxx | 6 -
basic/source/classes/errobject.cxx | 5 -
basic/source/classes/sbunoobj.cxx | 8 -
basic/source/inc/propacc.hxx | 4
basic/source/inc/symtbl.hxx | 11 +-
chart2/source/view/main/OpenGLRender.hxx | 4
comphelper/source/property/genericpropertyset.cxx | 8 -
connectivity/source/commontools/TTableHelper.cxx | 5 -
connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx | 5 -
cui/source/inc/autocdlg.hxx | 6 -
cui/source/inc/cuigaldlg.hxx | 5 -
cui/source/inc/cuitabline.hxx | 12 +-
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 4
dbaccess/source/core/dataaccess/datasource.cxx | 7 -
dbaccess/source/ui/browser/genericcontroller.cxx | 3
desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx | 4
dtrans/source/win32/dtobj/DOTransferable.cxx | 2
dtrans/source/win32/dtobj/FmtFilter.cxx | 3
filter/source/flash/swfexporter.hxx | 20 +---
filter/source/flash/swffilter.cxx | 4
filter/source/graphicfilter/icgm/bundles.hxx | 7 -
filter/source/graphicfilter/icgm/elements.hxx | 4
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 2
filter/source/graphicfilter/idxf/dxfentrd.hxx | 9 -
filter/source/pdf/pdfdialog.hxx | 3
forms/source/component/GroupManager.hxx | 9 -
forms/source/xforms/submission/serialization.hxx | 4
fpicker/source/win32/folderpicker/MtaFop.cxx | 7 -
framework/inc/classes/filtercachedata.hxx | 23 +---
framework/inc/recording/dispatchrecorder.hxx | 4
i18nlangtag/source/languagetag/simple-langtag.cxx | 3
idl/inc/basobj.hxx | 4
idl/inc/module.hxx | 1
idl/inc/object.hxx | 2
idl/inc/types.hxx | 2
idl/source/objects/module.cxx | 2
idl/source/objects/object.cxx | 2
idl/source/objects/types.cxx | 2
idl/source/prj/database.cxx | 2
include/editeng/svxrtf.hxx | 13 +-
include/filter/msfilter/escherex.hxx | 6 -
include/filter/msfilter/msdffimp.hxx | 4
include/filter/msfilter/svdfppt.hxx | 13 --
include/oox/core/fasttokenhandler.hxx | 8 -
include/oox/dump/dumperbase.hxx | 10 --
include/oox/ole/axbinarywriter.hxx | 10 --
include/oox/vml/vmlinputstream.hxx | 4
include/sfx2/evntconf.hxx | 4
include/sfx2/hintpost.hxx | 2
include/sfx2/itemwrapper.hxx | 4
include/sfx2/styfitem.hxx | 4
include/sot/exchange.hxx | 6 -
include/sot/filelist.hxx | 4
include/svl/adrparse.hxx | 8 -
include/svl/ownlist.hxx | 5 -
include/svtools/imap.hxx | 6 -
include/svtools/parrtf.hxx | 12 +-
include/svtools/svparser.hxx | 5 -
include/svx/gridctrl.hxx | 4
include/systools/win32/comtools.hxx | 1
include/tools/inetmsg.hxx | 10 --
include/tools/pstm.hxx | 4
include/vcl/region.hxx | 12 +-
include/xmloff/shapeimport.hxx | 5 -
include/xmloff/table/XMLTableExport.hxx | 5 -
oox/inc/drawingml/textfield.hxx | 2
oox/source/drawingml/diagram/constraintlistcontext.cxx | 2
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 2
oox/source/drawingml/textbodycontext.cxx | 2
oox/source/helper/propertymap.cxx | 4
oox/source/ole/olestorage.cxx | 4
rsc/inc/rscdb.hxx | 11 --
rsc/inc/rscdef.hxx | 3
sal/qa/osl/process/osl_process.cxx | 8 -
sc/inc/sortparam.hxx | 7 -
sc/source/core/data/documentimport.cxx | 5 -
sc/source/core/data/table3.cxx | 7 -
sc/source/filter/excel/excimp8.cxx | 4
sc/source/filter/html/htmlpars.cxx | 2
sc/source/filter/inc/autofilterbuffer.hxx | 4
sc/source/filter/inc/htmlpars.hxx | 23 ++--
sc/source/filter/inc/sheetdatabuffer.hxx | 3
sc/source/filter/inc/stylesbuffer.hxx | 10 --
sc/source/filter/inc/worksheethelper.hxx | 2
sc/source/filter/oox/excelvbaproject.cxx | 9 -
sc/source/filter/xml/XMLStylesImportHelper.hxx | 16 +--
sc/source/filter/xml/xmlimprt.hxx | 5 -
sc/source/ui/inc/acredlin.hxx | 5 -
sc/source/ui/unoobj/shapeuno.cxx | 3
sc/source/ui/vba/vbaaxes.cxx | 4
sc/source/ui/vba/vbaeventshelper.cxx | 7 -
sc/source/ui/vba/vbaformatconditions.hxx | 4
sc/source/ui/vba/vbamenubars.cxx | 4
sc/source/ui/vba/vbapagebreaks.cxx | 3
sc/source/ui/vba/vbapane.hxx | 4
sc/source/ui/vba/vbarange.cxx | 4
sc/source/ui/vba/vbawindow.cxx | 4
sc/source/ui/vba/vbaworksheets.cxx | 8 -
scripting/source/vbaevents/eventhelper.cxx | 4
sd/source/filter/html/buttonset.cxx | 3
sd/source/ui/slideshow/slideshowviewimpl.hxx | 17 +--
sfx2/source/control/dispatch.cxx | 3
sfx2/source/control/shell.cxx | 14 +-
sfx2/source/dialog/itemconnect.cxx | 8 -
sfx2/source/dialog/versdlg.cxx | 4
sfx2/source/doc/doctemplates.cxx | 11 +-
sfx2/source/inc/workwin.hxx | 17 +--
sfx2/source/sidebar/EnumContext.cxx | 11 +-
shell/inc/internal/types.hxx | 10 --
shell/source/tools/lngconvex/lngconvex.cxx | 4
starmath/inc/error.hxx | 4
starmath/inc/node.hxx | 1
starmath/inc/parse.hxx | 4
starmath/source/parse.cxx | 4
stoc/test/testintrosp.cxx | 8 -
svl/source/inc/poolio.hxx | 5 -
svx/source/accessibility/AccessibleFrameSelector.cxx | 48
+++-------
svx/source/engine3d/scene3d.cxx | 7 -
svx/source/form/fmundo.cxx | 3
svx/source/inc/fmshimp.hxx | 6 -
svx/source/table/celltypes.hxx | 2
svx/source/table/tablemodel.hxx | 4
svx/source/table/tablertfimporter.cxx | 5 -
sw/source/filter/html/swhtml.cxx | 2
128 files changed, 288 insertions(+), 516 deletions(-)
New commits:
commit f17f89aadc5e88880df0c852289e2fa5b04254ba
Author: Noel Grandin <n...@peralex.com>
Date: Tue Aug 4 08:06:50 2015 +0200
include: inline some use-once typedefs
Change-Id: I064e95c72e5f67178cf2875f457adac241cee529
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index d8e22cb..0f29173 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -161,7 +161,7 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported(
const DataFlavor& aFla
void SAL_CALL CDOTransferable::initFlavorList( )
{
- IEnumFORMATETCPtr pEnumFormatEtc;
+ sal::systools::COMReference<IEnumFORMATETC> pEnumFormatEtc;
HRESULT hr = m_rDataObject->EnumFormatEtc( DATADIR_GET, &pEnumFormatEtc );
if ( SUCCEEDED( hr ) )
{
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 8e8276f..1b795e2 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -76,7 +76,6 @@ public:
};
-typedef std::deque< Color* > SvxRTFColorTbl;
typedef std::map<short, std::unique_ptr<vcl::Font>> SvxRTFFontTbl;
typedef std::map<sal_uInt16, std::unique_ptr<SvxRTFStyleType>> SvxRTFStyleTbl;
@@ -170,12 +169,12 @@ struct RTFPardAttrMapIds
class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
{
- SvStream &rStrm;
- SvxRTFColorTbl aColorTbl;
- SvxRTFFontTbl m_FontTable;
- SvxRTFStyleTbl m_StyleTable;
- SvxRTFItemStack aAttrStack;
- SvxRTFItemStackList m_AttrSetList;
+ SvStream & rStrm;
+ std::deque< Color* > aColorTbl;
+ SvxRTFFontTbl m_FontTable;
+ SvxRTFStyleTbl m_StyleTable;
+ SvxRTFItemStack aAttrStack;
+ SvxRTFItemStackList m_AttrSetList;
RTFPlainAttrMapIds aPlainMap;
RTFPardAttrMapIds aPardMap;
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index 8e0e6d3..5acd233 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -726,13 +726,11 @@ public:
};
struct EscherShapeListEntry;
-typedef ::std::vector< EscherShapeListEntry* > EscherShapeList_impl;
-typedef ::std::vector< EscherConnectorListEntry* > EscherConnectorList_impl;
class MSFILTER_DLLPUBLIC EscherSolverContainer
{
- EscherShapeList_impl maShapeList;
- EscherConnectorList_impl maConnectorList;
+ ::std::vector< EscherShapeListEntry* > maShapeList;
+ ::std::vector< EscherConnectorListEntry* > maConnectorList;
public:
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index f3ce6b5..6108ab2 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -180,11 +180,9 @@ struct SvxMSDffConnectorRule
friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn,
SvxMSDffConnectorRule& rAtom );
};
-typedef ::std::vector< SvxMSDffConnectorRule* > SvxMSDffConnectorRuleList;
-
struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer
{
- SvxMSDffConnectorRuleList aCList;
+ ::std::vector< SvxMSDffConnectorRule* > aCList;
SvxMSDffSolverContainer();
~SvxMSDffSolverContainer();
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 6dc7d3d..4f9b8d8 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -418,7 +418,6 @@ struct SdPageCapsule {
SdrPage * page;
};
-typedef ::std::vector< PPTOleEntry* > PPTOleEntryList;
class PPTExtParaProv;
class MSFILTER_DLLPUBLIC SdrEscherImport : public SvxMSDffManager
{
@@ -432,7 +431,7 @@ protected:
PptDocumentAtom aDocAtom;
DffRecordManager aDocRecManager; // contains all first
level container and atoms of the document container
- PPTOleEntryList aOleObjectList; // contains PPTOleEntrys
+ ::std::vector< PPTOleEntry* > aOleObjectList;
PptFontCollection* m_pFonts;
@@ -526,7 +525,6 @@ struct ProcessData
-typedef ::std::vector< SdHyperlinkEntry* > SdHyperlinkEntryList;
class SdrTextObj;
class SfxObjectShell;
@@ -542,7 +540,7 @@ protected:
bool bOk;
PptUserEditAtom aUserEditAtom;
PptColorSchemeAtom aPageColors;
- SdHyperlinkEntryList aHyperList;
+ ::std::vector< SdHyperlinkEntry* > aHyperList;
sal_uInt32* pPersistPtr;
sal_uLong nPersistPtrAnz;
@@ -669,11 +667,10 @@ struct PPTTextSpecInfo
~PPTTextSpecInfo();
};
-typedef ::std::vector< PPTTextSpecInfo* > PPTTextSpecInfoList;
struct PPTTextSpecInfoAtomInterpreter
{
bool bValid;
- PPTTextSpecInfoList aList;
+ ::std::vector< PPTTextSpecInfo* > aList;
PPTTextSpecInfoAtomInterpreter();
~PPTTextSpecInfoAtomInterpreter();
@@ -717,11 +714,9 @@ struct PPTBuGraEntry
PPTBuGraEntry( Graphic& rGraphic, sal_uInt32 nInstance );
};
-typedef ::std::vector< PPTBuGraEntry* > PPTBuGraEntryList;
-
class PPTExtParaProv
{
- PPTBuGraEntryList aBuGraList;
+ ::std::vector< PPTBuGraEntry* > aBuGraList;
public:
bool bStyles;
diff --git a/include/oox/core/fasttokenhandler.hxx
b/include/oox/core/fasttokenhandler.hxx
index baf0472..cdb9682 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -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
that provides access to the tokens generated from the internal token name
list.
*/
-class OOX_DLLPUBLIC FastTokenHandler : public FastTokenHandler_BASE,
- public sax_fastparser::FastTokenHandlerBase
+class OOX_DLLPUBLIC FastTokenHandler :
+ public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,
+
::com::sun::star::xml::sax::XFastTokenHandler >,
+ public sax_fastparser::FastTokenHandlerBase
{
public:
explicit FastTokenHandler();
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index d053055..f9d3a1b 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -92,10 +92,9 @@ const sal_Unicode OOX_DUMP_CMDPROMPT = '?';
const sal_Unicode OOX_DUMP_PLACEHOLDER = '\x01';
typedef ::std::pair< OUString, OUString > OUStringPair;
-typedef ::std::pair< sal_Int64, sal_Int64 > Int64Pair;
-typedef ::std::vector< OUString > OUStringVector;
-typedef ::std::vector< sal_Int64 > Int64Vector;
+typedef ::std::vector< OUString > OUStringVector;
+typedef ::std::vector< sal_Int64 > Int64Vector;
@@ -447,7 +446,6 @@ static const String EMPTY_STRING;
class Base;
-typedef std::shared_ptr< Base > BaseRef;
/** Base class for all dumper classes.
@@ -504,7 +502,7 @@ public:
virtual ~Base();
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:
Base() {}
@@ -744,7 +742,7 @@ private:
struct ExtItemFormatKey
{
sal_Int64 mnKey;
- Int64Pair maFilter;
+ ::std::pair< sal_Int64, sal_Int64 > maFilter;
explicit ExtItemFormatKey( sal_Int64 nKey ) : mnKey( nKey
), maFilter( 0, 0 ) {}
bool operator<( const ExtItemFormatKey& rRight ) const;
diff --git a/include/oox/ole/axbinarywriter.hxx
b/include/oox/ole/axbinarywriter.hxx
index d380ab7..4eb133a 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -73,11 +73,6 @@ private:
/** A pair of integer values as a property. */
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
to a binary input stream. */
class AxBinaryPropertyWriter
@@ -158,8 +153,9 @@ private:
ComplexPropVector maStreamProps; ///< Stores info for all used
stream data properties.
AxPairData maDummyPairData; ///< Dummy pair for unsupported
properties.
StreamDataSequence maDummyPicData; ///< Dummy picture for unsupported
properties.
- OUString maDummyString; ///< Dummy string for unsupported
properties.
- AxStringArray maDummyStringArray; ///< Dummy string array for
unsupported properties.
+ OUString maDummyString; ///< Dummy string for unsupported
properties.
+ ::std::vector< OUString >
+ maDummyStringArray; ///< Dummy string array for
unsupported properties.
sal_Int16 mnBlockSize;
sal_Int64 mnPropFlagsStart; ///< pos of Prop flags
sal_Int64 mnPropFlags; ///< Flags specifying existing
properties.
diff --git a/include/oox/vml/vmlinputstream.hxx
b/include/oox/vml/vmlinputstream.hxx
index d92c099..3f7efe0 100644
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -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
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
</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:
explicit InputStream(
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 67eb07a..b1ee5ca 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -47,12 +47,10 @@ struct SFX2_DLLPUBLIC SfxEventName
, maUIName( rUIName ) {}
};
-typedef ::std::vector< SfxEventName* > _SfxEventNamesList;
-
class SFX2_DLLPUBLIC SfxEventNamesList
{
private:
- _SfxEventNamesList aEventNamesList;
+ ::std::vector< SfxEventName* > aEventNamesList;
void DelDtor();
public:
diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx
index c94ecbf..fbcc477 100644
--- a/include/sfx2/hintpost.hxx
+++ b/include/sfx2/hintpost.hxx
@@ -53,8 +53,6 @@ public:
void SetEventHdl(const Link<SfxRequest*,void>& rLink);
};
-typedef tools::SvRef<SfxHintPoster> SfxHintPosterRef;
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 21424ac..594bcd4 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -73,11 +73,9 @@ public:
+- ValueItemWrapper< ItemT, ValueT > [1]
| |
| +- BoolItemWrapper [1]
- | +- Int16ItemWrapper [1]
| +- UInt16ItemWrapper [1]
| +- Int32ItemWrapper [1]
| +- UInt32ItemWrapper [1]
- | +- StringItemWrapper [1]
|
+- IdentItemWrapper< ItemT > [1]
@@ -150,11 +148,9 @@ public:
typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper;
-typedef ValueItemWrapper< SfxInt16Item, sal_Int16 > Int16ItemWrapper;
typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper;
typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper;
typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper;
-typedef ValueItemWrapper< SfxStringItem, const OUString& > StringItemWrapper;
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index ecb247d..8dcd02a 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -59,11 +59,9 @@ public:
void SetImage( const Image& _rImg ) { aImage = _rImg; }
};
-typedef ::std::vector< SfxStyleFamilyItem* > SfxStyleFamilyList;
-
class SFX2_DLLPUBLIC SfxStyleFamilies: public Resource
{
- SfxStyleFamilyList aEntryList;
+ ::std::vector< SfxStyleFamilyItem* > aEntryList;
public:
SfxStyleFamilies( const ResId &);
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index be53ba1..a42e836 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -41,12 +41,10 @@ struct DataFlavorEx : public
::com::sun::star::datatransfer::DataFlavor
SotClipboardFormatId mnSotId;
};
-typedef ::std::vector< DataFlavorEx >
_DataFlavorExVector;
-
// 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.
-struct DataFlavorExVector : public _DataFlavorExVector
+struct DataFlavorExVector : public ::std::vector< DataFlavorEx >
{
};
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index c1ccabe..a91f9db 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -25,11 +25,9 @@
#include <vector>
-typedef ::std::vector< OUString > FileStringList;
-
class SOT_DLLPUBLIC FileList : public SvDataCopyStream
{
- FileStringList aStrList;
+ ::std::vector< OUString > aStrList;
protected:
diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx
index b4e4f1b..2213e26 100644
--- a/include/svl/adrparse.hxx
+++ b/include/svl/adrparse.hxx
@@ -42,16 +42,14 @@ struct SvAddressEntry_Impl
};
-typedef ::std::vector< SvAddressEntry_Impl* > SvAddressList_Impl;
-
-
class SVL_DLLPUBLIC SvAddressParser
{
friend class SvAddressParser_Impl;
SvAddressEntry_Impl m_aFirst;
- SvAddressList_Impl m_aRest;
- bool m_bHasFirst;
+ ::std::vector< SvAddressEntry_Impl* >
+ m_aRest;
+ bool m_bHasFirst;
public:
SvAddressParser(const OUString& rInput);
diff --git a/include/svl/ownlist.hxx b/include/svl/ownlist.hxx
index fbd0123..eb0298c 100644
--- a/include/svl/ownlist.hxx
+++ b/include/svl/ownlist.hxx
@@ -51,9 +51,6 @@ public:
const OUString & GetArgument() const { return aArgument; }
};
-typedef ::std::vector< SvCommand > SvCommandList_impl;
-
-
class SVL_DLLPUBLIC SvCommandList
/*
The list contains objects of type SvCommand.
@@ -62,7 +59,7 @@ class SVL_DLLPUBLIC SvCommandList
*/
{
private:
- SvCommandList_impl aCommandList;
+ ::std::vector< SvCommand > aCommandList;
public:
SvCommand& Append( const OUString & rCommand, const OUString & rArg );
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 4c8f231..4ac636a 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -31,14 +31,12 @@ class Size;
class Fraction;
class IMapObject;
-typedef ::std::vector< IMapObject* > IMapObjectList_impl;
-
class SVT_DLLPUBLIC ImageMap
{
private:
- IMapObjectList_impl maList;
- OUString aName;
+ ::std::vector< IMapObject* > maList;
+ OUString aName;
protected:
diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index 6eb58d9..7351522 100644
--- a/include/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
@@ -34,15 +34,13 @@ struct RtfParserState_Impl
{}
};
-typedef std::stack< RtfParserState_Impl > RtfParserStates_Impl;
-
class SVT_DLLPUBLIC SvRTFParser : public SvParser
{
- RtfParserStates_Impl aParserStates;
-
- int nOpenBrakets;
- rtl_TextEncoding eCodeSet, eUNICodeSet;
- sal_uInt8 nUCharOverread;
+ std::stack< RtfParserState_Impl > aParserStates;
+ int nOpenBrakets;
+ rtl_TextEncoding eCodeSet,
+ eUNICodeSet;
+ sal_uInt8 nUCharOverread;
private:
static short _inSkipGroup;
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b15580e..f4c04f5 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -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 )
{ sal_uLong nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; }
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index a30dd0c..1600c45 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -47,7 +47,6 @@ namespace svxform
{
class DataColumn;
}
-typedef ::std::vector< ::svxform::DataColumn* > DbDataColumns;
enum GridRowStatus
{
@@ -64,7 +63,8 @@ enum GridRowStatus
class DbGridRow : public SvRefBase
{
::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;
bool m_bIsNew;
// row is no longer valid
diff --git a/include/systools/win32/comtools.hxx
b/include/systools/win32/comtools.hxx
index 0cbe54f..fffa544 100644
--- a/include/systools/win32/comtools.hxx
+++ b/include/systools/win32/comtools.hxx
@@ -183,7 +183,6 @@ namespace systools
/* Typedefs for some popular COM interfaces */
typedef sal::systools::COMReference<IDataObject> IDataObjectPtr;
typedef sal::systools::COMReference<IStream> IStreamPtr;
-typedef sal::systools::COMReference<IEnumFORMATETC> IEnumFORMATETCPtr;
#endif // INCLUDED_SYSTOOLS_WIN32_COMTOOLS_HXX
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index c064a0d..49d470b 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -80,8 +80,6 @@ public:
}
};
-typedef ::std::vector< INetMessageHeader* > HeaderList_impl;
-
/**
RFC822 fields
*/
@@ -129,11 +127,11 @@ enum INetMessageContainerType
};
class INetMIMEMessage;
-typedef ::std::vector< INetMIMEMessage* > INetMIMEMessgeList_impl;
class TOOLS_DLLPUBLIC INetMIMEMessage
{
- HeaderList_impl m_aHeaderList;
+ ::std::vector< INetMessageHeader* >
+ m_aHeaderList;
sal_uIntPtr m_nDocSize;
OUString m_aDocName;
@@ -145,8 +143,8 @@ class TOOLS_DLLPUBLIC INetMIMEMessage
::std::map<InetMessageField, sal_uIntPtr> m_nRFC822Index;
::std::map<InetMessageMime, sal_uIntPtr> m_nMIMEIndex;
- INetMIMEMessage* pParent;
- INetMIMEMessgeList_impl aChildren;
+ INetMIMEMessage* pParent;
+ ::std::vector< INetMIMEMessage* > aChildren;
OString m_aBoundary;
bool bHeaderParsed;
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index b0dc8a9..4bf6dbd 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -95,7 +95,6 @@ public:
SvPersistBase *& rpObj );
};
-typedef UniqueIndex<SvPersistBase> SvPersistUIdx;
typedef std::map<SvPersistBase*, sal_uIntPtr> PersistBaseMap;
class SvStream;
@@ -138,7 +137,8 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
SvClassManager & rClassMgr;
SvStream * pStm;
PersistBaseMap aPTable; // reversed pointer and key
- SvPersistUIdx aPUIdx;
+ UniqueIndex<SvPersistBase>
+ aPUIdx;
sal_uIntPtr nStartIdx;
const SvPersistStream * pRefStm;
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index f32bbe1..4cbca18 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -33,9 +33,6 @@ namespace vcl { class Window; }
class OutputDevice;
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;
namespace vcl {
@@ -48,9 +45,12 @@ private:
friend class ::Bitmap;
// possible contents
- B2DPolyPolygonPtr mpB2DPolyPolygon;
- PolyPolygonPtr mpPolyPolygon;
- RegionBandPtr mpRegionBand;
+ std::shared_ptr< basegfx::B2DPolyPolygon >
+ mpB2DPolyPolygon;
+ std::shared_ptr< tools::PolyPolygon >
+ mpPolyPolygon;
+ std::shared_ptr< RegionBand >
+ mpRegionBand;
/// bitfield
bool mbIsNull : 1;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index b1869ad..3e72562 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -199,15 +199,14 @@ public:
-typedef ::std::vector< SdXML3DLightContext* > Imp3DLightList;
-
class SdXML3DSceneAttributesHelper
{
protected:
SvXMLImport& mrImport;
// list for local light contexts
- Imp3DLightList maList;
+ ::std::vector< SdXML3DLightContext* >
+ maList;
// local parameters which need to be read
com::sun::star::drawing::HomogenMatrix mxHomMat;
diff --git a/include/xmloff/table/XMLTableExport.hxx
b/include/xmloff/table/XMLTableExport.hxx
index 447bf88..2b354b2 100644
--- a/include/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
@@ -55,8 +55,6 @@ struct XMLTableInfo
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
{
public:
@@ -82,7 +80,8 @@ private:
rtl::Reference< SvXMLExportPropertyMapper >
mxCellExportPropertySetMapper;
rtl::Reference< SvXMLExportPropertyMapper >
mxRowExportPropertySetMapper;
rtl::Reference< SvXMLExportPropertyMapper >
mxColumnExportPropertySetMapper;
- TableInfoMap maTableInfoMap;
+ std::map< const css::uno::Reference< css::table::XColumnRowRange >,
std::shared_ptr< XMLTableInfo > >
+ maTableInfoMap;
bool mbExportTables;
protected:
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 8d14270..e968568 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -115,7 +115,8 @@ struct SfxDispatcher_Impl
std::deque<SfxToDo_Impl> aToDoStack; // not processed Push/Pop
SfxViewFrame* pFrame; // NULL or associated Frame
SfxDispatcher* pParent; // AppDispatcher, NULL if possible
- SfxHintPosterRef xPoster; // Execute asynchronous
+ tools::SvRef<SfxHintPoster>
+ xPoster; // Execute asynchronous
bool bFlushing; // sal_True during Flush //?
bool bUpdated; // Update_Impl has run
bool bLocked; // No Execute
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 9d338a7..f8f0fb7 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -211,7 +211,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPam,
// damit keiner das Doc klaut!
rDoc.acquire();
sal_uLong nRet = 0;
- SvParserRef xParser = new SwHTMLParser( &rDoc, rPam, *pStrm,
+ tools::SvRef<SvParser> xParser = new SwHTMLParser( &rDoc, rPam, *pStrm,
rName, rBaseURL, !bInsertMode,
pMedium,
IsReadUTF8(),
bIgnoreHTMLComments );
commit 50097a8bb2be903d8a985f6f03f364567bf4643d
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 15:13:20 2015 +0200
basic,basctl: inline some use-once typedefs
Change-Id: I60619a5bfe9507fb5ed24123f62f6b5c2f2c8712
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
index 8aef5c7..80a9e27 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -159,9 +159,9 @@ private:
<p>The instance holds its XAccessibleContext with a hard reference, while
the context holds this instance weak.</p>
*/
-typedef ::cppu::WeakImplHelper< css::accessibility::XAccessible >
AccessibleGridControlAccess_Base;
-class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base
+class AccessibleGridControlAccess :
+ public ::cppu::WeakImplHelper< css::accessibility::XAccessible >
,public ::svt::table::IAccessibleTableControl
{
private:
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index 79e352e..834979a 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -62,9 +62,7 @@ namespace basctl
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper< container::XContainerListener >
ContainerListenerBASE;
-
-class ContainerListenerImpl : public ContainerListenerBASE
+class ContainerListenerImpl : public ::cppu::WeakImplHelper<
container::XContainerListener >
{
Shell* mpShell;
public:
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index af0e8d3..ae4d83d 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -66,12 +66,10 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
-typedef ::cppu::WeakImplHelper< task::XInteractionHandler > HandlerImpl_BASE;
-
namespace
{
-class DummyInteractionHandler : public HandlerImpl_BASE
+class DummyInteractionHandler : public ::cppu::WeakImplHelper<
task::XInteractionHandler >
{
Reference< task::XInteractionHandler2 > m_xHandler;
public:
@@ -1167,9 +1165,8 @@ void LibPage::implExportLib( const OUString& aLibName,
const OUString& aTargetUR
}
// Implementation XCommandEnvironment
-typedef cppu::WeakImplHelper< XCommandEnvironment >
LibCommandEnvironmentHelper;
-class OLibCommandEnvironment : public LibCommandEnvironmentHelper
+class OLibCommandEnvironment : public cppu::WeakImplHelper<
XCommandEnvironment >
{
Reference< task::XInteractionHandler > mxInteraction;
diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx
index 2178423..5a42822 100644
--- a/basctl/source/inc/dlgedclip.hxx
+++ b/basctl/source/inc/dlgedclip.hxx
@@ -27,12 +27,8 @@ namespace basctl
{
-// DlgEdTransferableImpl
-
-
-typedef ::cppu::WeakImplHelper< css::datatransfer::XTransferable,
css::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper;
-
-class DlgEdTransferableImpl : public DlgEdTransferableHelper
+class DlgEdTransferableImpl : public ::cppu::WeakImplHelper<
css::datatransfer::XTransferable,
+
css::datatransfer::clipboard::XClipboardOwner >
{
private:
css::uno::Sequence< css::datatransfer::DataFlavor > m_SeqFlavors;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index d9e8a5c..8aa4ae46 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -75,8 +75,6 @@ using namespace cppu;
typedef WeakImplHelper< container::XNameContainer > NameContainerHelper;
typedef WeakImplHelper< script::XStarBasicModuleInfo > ModuleInfoHelper;
-typedef WeakImplHelper< script::XStarBasicDialogInfo > DialogInfoHelper;
-typedef WeakImplHelper< script::XStarBasicLibraryInfo > LibraryInfoHelper;
typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper;
// Version 1
@@ -1721,7 +1719,7 @@ public:
-class DialogInfo_Impl : public DialogInfoHelper
+class DialogInfo_Impl : public WeakImplHelper< script::XStarBasicDialogInfo >
{
OUString maName;
uno::Sequence< sal_Int8 > mData;
@@ -1740,7 +1738,7 @@ public:
-class LibraryInfo_Impl : public LibraryInfoHelper
+class LibraryInfo_Impl : public WeakImplHelper< script::XStarBasicLibraryInfo >
{
OUString maName;
uno::Reference< container::XNameContainer > mxModuleContainer;
diff --git a/basic/source/classes/errobject.cxx
b/basic/source/classes/errobject.cxx
index b1b2bf1..7abf256 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -27,9 +27,8 @@
using namespace ::com::sun::star;
using namespace ::ooo;
-typedef ::cppu::WeakImplHelper< vba::XErrObject, script::XDefaultProperty >
ErrObjectImpl_BASE;
-
-class ErrObject : public ErrObjectImpl_BASE
+class ErrObject : public ::cppu::WeakImplHelper< vba::XErrObject,
+ script::XDefaultProperty >
{
OUString m_sHelpFile;
OUString m_sSource;
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 92d5952..f87eeac 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -105,8 +105,6 @@ TYPEINIT1(SbUnoService,SbxObject)
TYPEINIT1(SbUnoServiceCtor,SbxMethod)
TYPEINIT1(SbUnoSingleton,SbxObject)
-typedef WeakImplHelper< XAllListener > BasicAllListenerHelper;
-
// Identifiers for creating the strings for dbg_Properties
static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
static char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
@@ -3882,7 +3880,7 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const
SfxHint& rHint )
// Implementation of an EventAttacher-drawn AllListener, which
// solely transmits several events to an general AllListener
-class BasicAllListener_Impl : public BasicAllListenerHelper
+class BasicAllListener_Impl : public WeakImplHelper< XAllListener >
{
void firing_impl(const AllEventObject& Event, Any* pRet);
@@ -4322,10 +4320,8 @@ protected:
};
} // namespace
-typedef WeakImplHelper< XInvocation, XComponent > ModuleInvocationProxyHelper;
-
class ModuleInvocationProxy : public OMutexBasis,
- public ModuleInvocationProxyHelper
+ public WeakImplHelper< XInvocation, XComponent >
{
OUString m_aPrefix;
SbxObjectRef m_xScopeObj;
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index a74d2b2..d10cf79 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -86,8 +86,6 @@ public:
-typedef ::cppu::WeakImplHelper< css::beans::XPropertySetInfo >
SbPropertySetInfoHelper;
-
// AB 20.3.2000 Help Class for XPropertySetInfo implementation
class PropertySetInfoImpl
{
@@ -109,7 +107,7 @@ public:
throw ( css::uno::RuntimeException );
};
-class SbPropertySetInfo: public SbPropertySetInfoHelper
+class SbPropertySetInfo: public ::cppu::WeakImplHelper<
css::beans::XPropertySetInfo >
{
PropertySetInfoImpl aImpl;
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index bb8d1b7..2682eee 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -49,17 +49,16 @@ public:
};
-typedef boost::ptr_vector<SbiSymDef> SbiSymbols;
-
class SbiSymPool {
friend class SbiSymDef;
friend class SbiProcDef;
protected:
SbiStringPool& rStrings;
- SbiSymbols aData;
- SbiSymPool* pParent;
- SbiParser* pParser;
- SbiSymScope eScope;
+ boost::ptr_vector<SbiSymDef>
+ aData;
+ SbiSymPool* pParent;
+ SbiParser* pParser;
+ SbiSymScope eScope;
sal_uInt16 nProcId; // for STATIC-variable
sal_uInt16 nCur; // iterator
public:
commit 3ff2e30ff671aa43891968d21aa2e17774e47baf
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 15:13:07 2015 +0200
cui,connectivity: inline some use-once typedefs
Change-Id: I1b043031014a3e823cd614966984a2ac2be1ac71
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 910c862..dae190a 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -42,8 +42,6 @@ struct Bubble2DPointList
float yScale;
};
-typedef std::vector<GLfloat> Bubble2DCircle;
-
struct RectanglePointList
{
float points[12];
@@ -159,7 +157,7 @@ private:
glm::vec4 m_2DColor;
- Bubble2DCircle m_Bubble2DCircle;
+ std::vector<GLfloat> m_Bubble2DCircle;
std::list <Bubble2DPointList> m_Bubble2DShapePointList;
GLint m_CommonProID;
diff --git a/comphelper/source/property/genericpropertyset.cxx
b/comphelper/source/property/genericpropertyset.cxx
index 4d9f7a6..754b08d 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -40,14 +40,12 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-typedef std::map<OUString, Any> GenericAnyMapImpl;
-
namespace comphelper
{
struct IMPL_GenericPropertySet_MutexContainer
{
- Mutex maMutex ;
- } ;
+ Mutex maMutex;
+ };
class GenericPropertySet : public OWeakAggObject,
public XServiceInfo,
@@ -56,7 +54,7 @@ namespace comphelper
private IMPL_GenericPropertySet_MutexContainer
{
private:
- GenericAnyMapImpl maAnyMap;
+ std::map<OUString, Any> maAnyMap;
cppu::OMultiTypeInterfaceContainerHelperVar<OUString> m_aListener;
protected:
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index fbd00ec..b77b2de 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -50,12 +50,13 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
+
namespace
{
/// helper class for column property change events which holds the
OComponentDefinition weak
-typedef ::cppu::WeakImplHelper< XContainerListener >
OTableContainerListener_BASE;
class OTableContainerListener:
- public OTableContainerListener_BASE, private boost::noncopyable
+ public ::cppu::WeakImplHelper< XContainerListener >,
+ private boost::noncopyable
{
OTableHelper* m_pComponent;
::std::map< OUString,bool> m_aRefNames;
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
index 5b47a28..5d10a68 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx
@@ -61,9 +61,6 @@ struct ColDesc
class ResultSet;
-typedef std::vector< ColDesc > ColDescVector;
-
-
class ResultSetMetaData :
public ::cppu::WeakImplHelper<
com::sun::star::sdbc::XResultSetMetaData >
{
@@ -73,7 +70,7 @@ class ResultSetMetaData :
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
m_table;
OUString m_tableName;
OUString m_schemaName;
- ColDescVector m_colDesc;
+ std::vector< ColDesc > m_colDesc;
ResultSet *m_pResultSet;
bool m_checkedForTable;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index c9b9b6c..50bd18d 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -211,7 +211,6 @@ struct DoubleString
};
typedef std::vector<DoubleString> DoubleStringArray;
-typedef std::map<LanguageType, DoubleStringArray> DoubleStringTable;
struct StringChangeList
{
@@ -240,8 +239,9 @@ private:
OUString sModify;
OUString sNew;
- std::set<OUString> aFormatText;
- DoubleStringTable aDoubleStringTable;
+ std::set<OUString> aFormatText;
+ std::map<LanguageType, DoubleStringArray>
+ aDoubleStringTable;
CollatorWrapper* pCompareClass;
CharClass* pCharClass;
LanguageType eLang;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 1ca1174..f7a2e3f 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -236,8 +236,6 @@ public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet*
rSet );
};
-typedef ::std::vector< FilterEntry* > FilterEntryList_impl;
-
class TPGalleryThemeProperties : public SfxTabPage
{
friend class SearchThread;
@@ -254,7 +252,8 @@ class TPGalleryThemeProperties : public SfxTabPage
ExchangeData* pData;
StringList aFoundList;
- FilterEntryList_impl aFilterEntryList;
+ ::std::vector< FilterEntry* >
+ aFilterEntryList;
Timer aPreviewTimer;
OUString aLastFilterName;
OUString aPreviewString;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index e66b4b5..3f09f31 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -82,7 +82,6 @@ public:
/*************************************************************************/
struct SvxBmpItemInfo;
-typedef ::std::vector< SvxBmpItemInfo* > SvxBmpItemInfoList;
class SvxLineTabPage : public SvxTabPage
{
@@ -136,17 +135,18 @@ private:
VclPtr<MetricField> m_pSymbolWidthMF;
VclPtr<MetricField> m_pSymbolHeightMF;
VclPtr<CheckBox> m_pSymbolRatioCB;
- std::vector<OUString> aGrfNames;
- SvxBmpItemInfoList aGrfBrushItems;
- bool bLastWidthModified;
+ std::vector<OUString> aGrfNames;
+ ::std::vector< SvxBmpItemInfo* >
+ aGrfBrushItems;
+ bool bLastWidthModified;
Size aSymbolLastSize;
Graphic aSymbolGraphic;
Size aSymbolSize;
- bool bSymbols;
+ bool bSymbols;
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- bool bObjSelected;
+ bool bObjSelected;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
commit 8e08edb1d9b774b51c81b13a5f374b99c75e54fe
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 15:12:45 2015 +0200
filter,desktop,dbaccess: inline some use-once typedefs
Change-Id: I35f256a11b211c3cb977ae76b5b561efbfd13b9d
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index ae89078..88770df 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -52,9 +52,9 @@ namespace dbaccess
{
/// helper class for column property change events which holds the
OComponentDefinition weak
-typedef ::cppu::WeakImplHelper< XPropertyChangeListener >
TColumnPropertyListener_BASE;
class OColumnPropertyListener:
- public TColumnPropertyListener_BASE, private boost::noncopyable
+ public ::cppu::WeakImplHelper< XPropertyChangeListener >,
+ private boost::noncopyable
{
OComponentDefinition* m_pComponent;
protected:
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 0412431..4f09edf 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -95,8 +95,6 @@ using namespace ::comphelper;
namespace dbaccess
{
-// FlushNotificationAdapter
-typedef ::cppu::WeakImplHelper< XFlushListener > FlushNotificationAdapter_Base;
/** helper class which implements a XFlushListener, and forwards all
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*
to be held hard-ref-wise.
*/
-class FlushNotificationAdapter : public FlushNotificationAdapter_Base
+class FlushNotificationAdapter : public ::cppu::WeakImplHelper< XFlushListener
>
{
private:
WeakReference< XFlushable > m_aBroadcaster;
@@ -260,7 +258,6 @@ void SAL_CALL
OAuthenticationContinuation::setRememberAccount( RememberAuthentic
/** 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.
*/
-typedef ::cppu::WeakImplHelper< XEventListener > OConnectionHelper_BASE;
// need to hold the digest
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
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 0c57d68..a22e8fd 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -84,7 +84,6 @@ using namespace ::comphelper;
#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16
>::max() )
typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
-typedef ::std::list< DispatchInformation > DispatchInfoList;
namespace dbaui
{
@@ -1487,7 +1486,7 @@ namespace
Sequence< DispatchInformation > SAL_CALL
OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16
CommandGroup ) throw (RuntimeException, std::exception)
{
- DispatchInfoList aInformationList;
+ ::std::list< DispatchInformation > aInformationList;
DispatchInformation aDispatchInfo;
for ( SupportedFeatures::const_iterator aIter =
m_aSupportedFeatures.begin();
aIter != m_aSupportedFeatures.end();
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 5c6c034..11051e6f 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -37,9 +37,7 @@ namespace backend
namespace sfwk
{
-typedef ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
t_DocHandlerImpl;
-
-class ParcelDescDocHandler : public t_DocHandlerImpl
+class ParcelDescDocHandler : public ::cppu::WeakImplHelper<
css::xml::sax::XDocumentHandler >
{
private:
bool m_bIsParsed;
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx
b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 4063762..e92d455 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -454,7 +454,6 @@ std::wstring getShellLinkTarget(const std::wstring&
aLnkFile)
}
typedef std::vector<std::wstring> FileList_t;
-typedef FileList_t::value_type FileList_ValueType_t;
typedef Sequence<sal_Int8> ByteSequence_t;
/* 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'
}
- return (size * sizeof(FileList_ValueType_t::value_type));
+ return (size * sizeof(FileList_t::value_type::value_type));
}
ByteSequence_t FileListToByteSequence(const FileList_t& fileList)
diff --git a/filter/source/flash/swfexporter.hxx
b/filter/source/flash/swfexporter.hxx
index 5c05b62..b1c5024 100644
--- a/filter/source/flash/swfexporter.hxx
+++ b/filter/source/flash/swfexporter.hxx
@@ -97,9 +97,6 @@ public:
mnBlueScreenColor( 0 ) {}
};
-typedef ::std::vector<ShapeInfo*> ShapeInfoVector;
-
-
struct ShapeAnimationInfo
{
@@ -114,8 +111,8 @@ struct ShapeAnimationInfo
struct PageInfo
{
- ::com::sun::star::presentation::FadeEffect meFadeEffect;
- ::com::sun::star::presentation::AnimationSpeed meFadeSpeed;
+ css::presentation::FadeEffect meFadeEffect;
+ css::presentation::AnimationSpeed meFadeSpeed;
sal_Int32 mnDuration;
sal_Int32 mnChange;
@@ -124,10 +121,11 @@ struct PageInfo
sal_uInt16 mnObjectsID;
sal_uInt16 mnForegroundID;
- bool mbBackgroundVisible;
- bool mbBackgroundObjectsVisible;
+ bool mbBackgroundVisible;
+ bool mbBackgroundObjectsVisible;
- ShapeInfoVector maShapesVector;
+ ::std::vector<ShapeInfo*>
+ maShapesVector;
PageInfo();
~PageInfo();
@@ -136,10 +134,6 @@ struct PageInfo
-typedef ::std::map<sal_uInt32, PageInfo> PageInfoMap;
-
-
-
class FlashExporter
{
public:
@@ -176,7 +170,7 @@ private:
::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 exportMasterPageObjects(sal_uInt16 nPage,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >&
xMasterPage);
diff --git a/filter/source/flash/swffilter.cxx
b/filter/source/flash/swffilter.cxx
index aefdf56..f443cd6 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -63,9 +63,7 @@ using ::com::sun::star::frame::XModel;
namespace swf {
-typedef ::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream>
OslOutputStreamWrapper_Base;
- // needed for some compilers
-class OslOutputStreamWrapper : public OslOutputStreamWrapper_Base
+class OslOutputStreamWrapper : public
::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream>
{
osl::File mrFile;
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx
b/filter/source/graphicfilter/icgm/bundles.hxx
index d04cb36..22c71a0 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -162,15 +162,12 @@ public:
~FontEntry();
};
-
-
-typedef ::std::vector< FontEntry* > FontEntryList;
-
class CGMFList
{
sal_uInt32 nFontNameCount;
sal_uInt32 nCharSetCount;
- FontEntryList aFontEntryList;
+ ::std::vector< FontEntry* >
+ aFontEntryList;
void ImplDeleteList();
public:
diff --git a/filter/source/graphicfilter/icgm/elements.hxx
b/filter/source/graphicfilter/icgm/elements.hxx
index c7c52f3..6c66bd5 100644
--- a/filter/source/graphicfilter/icgm/elements.hxx
+++ b/filter/source/graphicfilter/icgm/elements.hxx
@@ -27,7 +27,6 @@
#define nBackGroundColor aColorTable[ 0 ]
typedef ::std::vector< Bundle* > BundleList;
-typedef ::std::map<sal_uInt32, HatchEntry> HatchMap;
class CGMElements
{
@@ -117,7 +116,8 @@ class CGMElements
FillBundle aFillBundle;
BundleList aFillList;
FloatPoint aFillRefPoint;
- HatchMap maHatchMap;
+ ::std::map<sal_uInt32, HatchEntry>
+ maHatchMap;
Transparency eTransparency;
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 3dd97e2..29a67f3 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity
& rE, const DXFTransf
tools::PolyPolygon aPolyPoly;
for ( j = 0; j < rE.nBoundaryPathCount; j++ )
{
- DXFPointArray aPtAry;
+ std::deque< Point > aPtAry;
const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ];
if ( rPathData.bIsPolyLine )
{
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx
b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index dd02dac..eeeee6e 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -25,8 +25,6 @@
#include <deque>
-typedef std::deque< Point > DXFPointArray;
-
enum DXFEntityType {
DXF_LINE,
DXF_POINT,
@@ -400,8 +398,6 @@ struct DXFEdgeTypeSpline : public DXFEdgeType
virtual bool EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE;
};
-typedef std::deque< DXFEdgeType* > DXFEdgeTypeArray;
-
struct DXFBoundaryPathData
{
sal_Int32 nFlags; // 92
@@ -412,11 +408,12 @@ struct DXFBoundaryPathData
sal_Int32 nSourceBoundaryObjects; // 97
sal_Int32 nEdgeCount; // 93
- bool bIsPolyLine;
+ bool bIsPolyLine;
sal_Int32 nPointIndex;
DXFVector* pP;
- DXFEdgeTypeArray aEdges;
+ std::deque< DXFEdgeType* >
+ aEdges;
DXFBoundaryPathData();
~DXFBoundaryPathData();
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index e343902..a450b4f 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -31,9 +31,8 @@
namespace vcl { class Window; }
-typedef ::svt::OGenericUnoDialog PDFDialog_DialogBase;
typedef ::cppu::ImplInheritanceHelper2 <
- PDFDialog_DialogBase,
+ ::svt::OGenericUnoDialog,
XPropertyAccess,
XExporter
> PDFDialog_Base;
commit 2886f830a9c7871974f9afbc1fdc46bbae468811
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 15:12:26 2015 +0200
idl,framework,forms: inline some use-once typedefs
Change-Id: Icb4908c274ec0778af7ed9fe2d935bf6723fedfb
diff --git a/forms/source/component/GroupManager.hxx
b/forms/source/component/GroupManager.hxx
index 4a07fae..c2c17c2 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -131,15 +131,12 @@ public:
const OGroupComp& GetGroupComponent() const { return m_aGroupComp; }
};
-typedef std::vector<OGroupCompAcc> OGroupCompAccArr;
-
-
class OGroup
{
- OGroupCompArr m_aCompArray;
- OGroupCompAccArr m_aCompAccArray;
+ OGroupCompArr m_aCompArray;
+ std::vector<OGroupCompAcc> m_aCompAccArray;
- OUString m_aGroupName;
+ OUString m_aGroupName;
sal_uInt16 m_nInsertPos; // The insertion position of the GroupComps is
determind by the Group
friend class OGroupLess;
diff --git a/forms/source/xforms/submission/serialization.hxx
b/forms/source/xforms/submission/serialization.hxx
index da61af1..9339d47 100644
--- a/forms/source/xforms/submission/serialization.hxx
+++ b/forms/source/xforms/submission/serialization.hxx
@@ -35,13 +35,11 @@
Serialize an XObject
*/
-typedef std::map<OUString, OUString> PropMap;
-
class CSerialization
{
protected:
css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
- PropMap m_properties;
+ std::map<OUString, OUString> m_properties;
public:
virtual ~CSerialization() {}
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx
b/fpicker/source/win32/folderpicker/MtaFop.cxx
index d832ddf..4be8a3e 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -39,9 +39,6 @@ const sal_Bool MANUAL_RESET = sal_True;
const sal_Bool AUTO_RESET = sal_False;
const sal_Bool INIT_NONSIGNALED = sal_False;
-typedef sal::systools::COMReference<IMalloc> IMallocPtr;
-typedef sal::systools::COMReference<IShellFolder> IShellFolderPtr;
-
namespace
{
const char* FOLDERPICKER_SRV_DLL_NAME = "fps.dll";
@@ -416,7 +413,7 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
{
- IMallocPtr pIMalloc;
+ sal::systools::COMReference<IMalloc> pIMalloc;
SHGetMalloc(&pIMalloc);
if (pIMalloc.is())
{
@@ -437,7 +434,7 @@ LPITEMIDLIST SAL_CALL
CMtaFolderPicker::getItemIdListFromPath( const OUString& a
LPITEMIDLIST lpItemIdList(NULL);
- IShellFolderPtr pIShellFolder;
+ sal::systools::COMReference<IShellFolder> pIShellFolder;
SHGetDesktopFolder(&pIShellFolder);
if (pIShellFolder.is())
diff --git a/framework/inc/classes/filtercachedata.hxx
b/framework/inc/classes/filtercachedata.hxx
index b01fbbc..8139407 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -355,17 +355,6 @@ class PerformanceHash : public std::unordered_map<
OUString,
{
};
-// Define easy usable types
-
-typedef SetNodeHash< FileType >
FileTypeHash;
-typedef SetNodeHash< Filter > FilterHash;
-typedef SetNodeHash< Detector >
DetectorHash;
-typedef SetNodeHash< Loader > LoaderHash;
-typedef SetNodeHash< ContentHandler >
ContentHandlerHash;
-typedef OUStringHashMap
PreferredHash;
-typedef OUStringList OrderList;
-
-
// Use private static data container to hold all values of configuration!
@@ -398,16 +387,16 @@ class DataContainer
DataContainer();
- FileTypeHash m_aTypeCache; /// hold all
information about registered file types
- FilterHash m_aFilterCache; /// hold all
information about registered filters
- DetectorHash m_aDetectorCache; /// hold all
information about registered detect services
- LoaderHash m_aLoaderCache; /// hold all
information about registered loader services
- ContentHandlerHash m_aContentHandlerCache; /// hold all
information about registered content handler services
+ SetNodeHash< FileType > m_aTypeCache; /// hold all
information about registered file types
+ SetNodeHash< Filter > m_aFilterCache; /// hold all
information about registered filters
+ SetNodeHash< Detector > m_aDetectorCache; /// hold all
information about registered detect services
+ SetNodeHash< Loader > m_aLoaderCache; /// hold all
information about registered loader services
+ SetNodeHash< ContentHandler > m_aContentHandlerCache; /// hold all
information about registered content handler services
PerformanceHash m_aFastFilterCache; /// hold all
registered filter for a special file type
PerformanceHash m_aFastDetectorCache; /// hold all
registered detect services for a special file type
PerformanceHash m_aFastLoaderCache; /// hold all
registered loader services for a special file type
PerformanceHash m_aFastContentHandlerCache; /// hold all
registered content handler services for a special file type
- PreferredHash m_aPreferredTypesCache; /// assignment of
extensions to preferred types for it
+ OUStringHashMap m_aPreferredTypesCache; /// assignment of
extensions to preferred types for it
Loader m_aGenericLoader; /// information
about our default frame loader
OUString m_sLocale; /// current set
locale of configuration to handle right UIName from set of all UINames!
bool m_bTypesModified;
diff --git a/framework/inc/recording/dispatchrecorder.hxx
b/framework/inc/recording/dispatchrecorder.hxx
index 80128e7..abe2c91 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -45,8 +45,6 @@
namespace framework{
-typedef ::std::vector < com::sun::star::frame::DispatchStatement >
DispatchStatementList;
-
class DispatchRecorder
: public ::cppu::WeakImplHelper3<
css::lang::XServiceInfo
@@ -55,7 +53,7 @@ class DispatchRecorder
{
// private member
private:
- DispatchStatementList m_aStatements;
+ ::std::vector < css::frame::DispatchStatement > m_aStatements;
sal_Int32 m_nRecordingID;
css::uno::Reference< css::script::XTypeConverter > m_xConverter;
diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx
b/i18nlangtag/source/languagetag/simple-langtag.cxx
index a7aa1ae..0cad44e 100644
--- a/i18nlangtag/source/languagetag/simple-langtag.cxx
+++ b/i18nlangtag/source/languagetag/simple-langtag.cxx
@@ -22,7 +22,6 @@
namespace {
-typedef int lt_bool_t;
typedef void* lt_pointer_t;
struct lt_error_t {
@@ -326,7 +325,7 @@ static void lt_tag_unref(lt_tag_t *tag)
any i-* irregular and x-* privateuse. Subtags are not checked for validity
(alpha, digit, registered, ...).
*/
-static lt_bool_t lt_tag_parse(lt_tag_t *tag,
+static int lt_tag_parse(lt_tag_t *tag,
const char *tag_string,
lt_error_t **error)
{
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 8119418..89ca0a6 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -100,12 +100,10 @@ public:
class SvMetaNameMemberList : public SvRefMemberList<SvMetaName *> {};
-class SvMetaReference;
-typedef tools::SvRef<SvMetaReference> SvMetaReferenceRef;
class SvMetaReference : public SvMetaName
{
protected:
- SvMetaReferenceRef aRef;
+ tools::SvRef<SvMetaReference> aRef;
public:
TYPEINFO_OVERRIDE();
SvMetaReference();
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 4cb3798..46cacb8 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -65,7 +65,6 @@ public:
void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
};
-typedef tools::SvRef<SvMetaModule> SvMetaModuleRef;
class SvMetaModuleMemberList : public SvRefMemberList<SvMetaModule *> {};
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 37788d3..7d3e07b 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -62,8 +62,6 @@ public:
{ return xClass; }
};
-typedef tools::SvRef<SvClassElement> SvClassElementRef;
-
class SvClassElementMemberList : public SvRefMemberList<SvClassElement *> {};
class SvMetaClassMemberList : public SvRefMemberList<SvMetaClass *> {};
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 79b976d..a9d5c75 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -190,7 +190,6 @@ public:
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
SAL_OVERRIDE;
};
-typedef tools::SvRef<SvMetaEnumValue> SvMetaEnumValueRef;
class SvMetaEnumValueMemberList : public SvRefMemberList<SvMetaEnumValue *> {};
@@ -211,7 +210,6 @@ public:
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
SAL_OVERRIDE;
};
-typedef tools::SvRef<SvMetaTypeEnum> SvMetaTypeEnumRef;
class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 573fc6d..c6e2944 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -97,7 +97,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else if( rInStm.GetToken().Is( SvHash_enum() ) )
{
- SvMetaTypeEnumRef aEnum = new SvMetaTypeEnum();
+ tools::SvRef<SvMetaTypeEnum> aEnum = new SvMetaTypeEnum();
if( aEnum->ReadSvIdl( rBase, rInStm ) )
{
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index fe9117d..1ce4378 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -58,7 +58,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
SvMetaClass * pClass = rBase.ReadKnownClass( rInStm );
if( pClass )
{
- SvClassElementRef xEle = new SvClassElement();
+ tools::SvRef<SvClassElement> xEle = new SvClassElement();
xEle->SetClass( pClass );
aClassList.push_back( xEle );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 95a04f0..e87ea42 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -704,7 +704,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase &
rBase,
{
sal_uInt32 nTokPos = rInStm.Tell();
- SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue();
+ tools::SvRef<SvMetaEnumValue> aEnumVal = new SvMetaEnumValue();
bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm );
if( bOk )
{
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 6030afd..51f906c 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -587,7 +587,7 @@ bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm,
bool bImported, const
// only one import at the very beginning
if( pTok->Is( SvHash_module() ) )
{
- SvMetaModuleRef aModule = new SvMetaModule( bImported );
+ tools::SvRef<SvMetaModule> aModule = new SvMetaModule( bImported );
if( aModule->ReadSvIdl( *this, rInStm ) )
GetModuleList().push_back( aModule );
else
commit c5b995bb09487e2b7626a5920506b07dff390203
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 15:12:09 2015 +0200
sal,rsc,oox: inline some use-once typedefs
Change-Id: I91bebe06c5c5f3ebe5fbeec83dcf3f5bdf563201
diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx
index 9fd0d64..b6a7790 100644
--- a/oox/inc/drawingml/textfield.hxx
+++ b/oox/inc/drawingml/textfield.hxx
@@ -53,8 +53,6 @@ private:
OUString msUuid;
};
-typedef std::shared_ptr< TextField > TextFieldPtr;
-
} }
#endif
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx
b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index 99d5614..177a6aa 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx
@@ -49,7 +49,7 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement,
{
case DGM_TOKEN( constr ):
{
- ConstraintAtomPtr pNode( new ConstraintAtom() );
+ boost::shared_ptr< ConstraintAtom > pNode( new ConstraintAtom() );
mpNode->addChild( pNode );
pNode->setFor( rAttribs.getToken( XML_for, XML_none ) );
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 873d634..5d20256 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -147,8 +147,6 @@ private:
sal_Int32 mnOperator;
};
-typedef boost::shared_ptr< ConstraintAtom > ConstraintAtomPtr;
-
class AlgAtom
: public LayoutAtom
{
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index baf6b0e..2fca12d 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -73,7 +73,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext(
sal_Int32 aElementToken
}
case A_TOKEN( fld ): // "CT_TextField" Text Field.
{
- TextFieldPtr pField( new TextField );
+ std::shared_ptr< TextField > pField( new TextField );
mrParagraph.addRun( pField );
return new TextFieldContext( *this, rAttribs, *pField );
}
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index efa47df..22e8e6f 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -92,14 +92,12 @@ using ::com::sun::star::drawing::TextVerticalAdjust;
namespace {
-typedef ::cppu::WeakImplHelper2< XPropertySet, XPropertySetInfo >
GenericPropertySetBase;
-
/** This class implements a generic XPropertySet.
Properties of all names and types can be set and later retrieved.
TODO: move this to comphelper or better find an existing implementation
*/
-class GenericPropertySet : public GenericPropertySetBase
+class GenericPropertySet : public ::cppu::WeakImplHelper2< XPropertySet,
XPropertySetInfo >
{
public:
explicit GenericPropertySet( const PropertyMap& rPropMap );
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 296898c..2a961cb 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -48,12 +48,10 @@ using namespace ::com::sun::star::uno;
namespace {
-typedef ::cppu::WeakImplHelper2< XSeekable, XOutputStream >
OleOutputStreamBase;
-
/** Implementation of an OLE storage output stream that inserts itself into the
storage when it is closed.
*/
-class OleOutputStream : public OleOutputStreamBase
+class OleOutputStream : public ::cppu::WeakImplHelper2< XSeekable,
XOutputStream >
{
public:
explicit OleOutputStream(
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index bbaa74d..7fadead 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -53,9 +53,6 @@ struct WriteRcContext
RscCmdLine* pCmdLine;
};
-// Liste die alle Basistypen enthaelt
-typedef ::std::vector< RscTop* > RscBaseList;
-
// Tabelle fuer Systemabhaengige Resourcen
struct RscSysEntry
{
@@ -66,8 +63,6 @@ struct RscSysEntry
sal_uInt32 nRefId;
};
-typedef ::std::vector< RscSysEntry* > RscSysList;
-
class RscTypCont
{
rtl_TextEncoding nSourceCharSet;
@@ -84,8 +79,10 @@ class RscTypCont
RscTop * pRoot; // Zeiger auf die Wurzel vom
Typenbaum
RSCINST aVersion; // Versionskontrollinstanz
- RscBaseList aBaseLst; // Liste der einfachen
Resourceklasse
- RscSysList aSysLst; // Liste der Systemresourcen
+ ::std::vector< RscTop* >
+ aBaseLst; // Liste der einfachen
Resourceklasse
+ ::std::vector< RscSysEntry* >
+ aSysLst; // Liste der Systemresourcen
Atom nWinBitVarId; // Name der Winbitvariablen
Atom nBorderId;
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index f6d378d..ce012657 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -222,7 +222,6 @@ public:
bool IsIncFile(){ return bIncFile; };
};
-typedef UniqueIndex<RscFile> RscSubFileTab;
#define NOFILE_INDEX UNIQUEINDEX_ENTRY_NOTFOUND
class RscDefTree
@@ -238,7 +237,7 @@ public:
void Remove( RscDefine * pDef );
};
-class RscFileTab : public RscSubFileTab
+class RscFileTab : public UniqueIndex<RscFile>
{
RscDefTree aDefTree;
sal_uLong Find(const OString& rName);
diff --git a/sal/qa/osl/process/osl_process.cxx
b/sal/qa/osl/process/osl_process.cxx
index 39e254c..ea430f9 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -94,8 +94,6 @@ inline ::rtl::OUString getExecutablePath()
//rtl::OUString CWD = getExecutablePath();
typedef std::vector<OString> string_container_t;
-typedef string_container_t::const_iterator string_container_const_iter_t;
-typedef string_container_t::iterator string_container_iter_t;
class exclude : public std::unary_function<OString, bool>
{
@@ -103,8 +101,8 @@ public:
exclude(const string_container_t& exclude_list)
{
- string_container_const_iter_t iter = exclude_list.begin();
- string_container_const_iter_t iter_end = exclude_list.end();
+ string_container_t::const_iterator iter = exclude_list.begin();
+ string_container_t::const_iterator iter_end = exclude_list.end();
for (/**/; iter != iter_end; ++iter)
exclude_list_.push_back(env_var_name(*iter));
}
@@ -307,7 +305,7 @@ public:
//are different to the parent environment (they come first)
//and the variables that should be equal between parent
//and child environment
- string_container_iter_t iter_logical_end =
+ string_container_t::iterator iter_logical_end =
std::stable_partition(child_env.begin(), child_env.end(),
exclude(different_env_vars));
string_container_t different_child_env_vars(child_env.begin(),
iter_logical_end);
commit 368a3e45a3f126d34f794a9118fcef0e3270cd78
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 15:11:45 2015 +0200
sc: inline some use-once typedefs
Change-Id: I332e160dda3f167e61f99da1eb0aa6bd72a48b06
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index ed79c37..08af119 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -38,8 +38,6 @@ struct ScSortKeyState
bool bAscending;
};
-typedef ::std::vector<ScSortKeyState> ScSortKeyStateVec;
-
struct SC_DLLPUBLIC ScSortParam
{
SCCOL nCol1;
@@ -57,9 +55,10 @@ struct SC_DLLPUBLIC ScSortParam
SCTAB nDestTab;
SCCOL nDestCol;
SCROW nDestRow;
- ScSortKeyStateVec maKeyState;
+ ::std::vector<ScSortKeyState>
+ maKeyState;
::com::sun::star::lang::Locale aCollatorLocale;
- OUString aCollatorAlgorithm;
+ OUString aCollatorAlgorithm;
sal_uInt16 nCompatHeader;
ScSortParam();
diff --git a/sc/source/core/data/documentimport.cxx
b/sc/source/core/data/documentimport.cxx
index 18346fa..419c366 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -42,8 +42,6 @@ struct TabAttr
std::vector<ColAttr> maCols;
};
-typedef std::vector<TabAttr> TabAttrsType;
-
}
struct ScDocumentImportImpl
@@ -52,8 +50,7 @@ struct ScDocumentImportImpl
sc::StartListeningContext maListenCxt;
sc::ColumnBlockPositionSet maBlockPosSet;
SvtScriptType mnDefaultScriptNumeric;
-
- TabAttrsType maTabAttrs;
+ std::vector<TabAttr> maTabAttrs;
ScDocumentImportImpl(ScDocument& rDoc) :
mrDoc(rDoc),
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 896b59b..372e8da 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -670,9 +670,6 @@ public:
}
};
-typedef ReorderNotifier<sc::RefColReorderHint, sc::ColRowReorderMapType,
SCCOL> ColReorderNotifier;
-typedef ReorderNotifier<sc::RefRowReorderHint, sc::ColRowReorderMapType,
SCROW> RowReorderNotifier;
-
class StartListeningNotifier : std::unary_function<SvtListener*, void>
{
sc::RefStartListeningHint maHint;
@@ -992,7 +989,7 @@ void ScTable::SortReorderByColumn(
// once.
std::sort(aListeners.begin(), aListeners.end());
aListeners.erase(std::unique(aListeners.begin(), aListeners.end()),
aListeners.end());
- ColReorderNotifier aFunc(aColMap, nTab, nRow1, nRow2);
+ ReorderNotifier<sc::RefColReorderHint, sc::ColRowReorderMapType,
SCCOL> aFunc(aColMap, nTab, nRow1, nRow2);
std::for_each(aListeners.begin(), aListeners.end(), aFunc);
// Re-start area listeners on the reordered columns.
@@ -1421,7 +1418,7 @@ void ScTable::SortReorderByRowRefUpdate(
}
// Notify the listeners to update their references.
- RowReorderNotifier aFunc(aRowMap, nTab, nCol1, nCol2);
+ ReorderNotifier<sc::RefRowReorderHint, sc::ColRowReorderMapType, SCROW>
aFunc(aRowMap, nTab, nCol1, nCol2);
std::for_each(aListeners.begin(), aListeners.end(), aFunc);
// Re-group formulas in affected columns.
diff --git a/sc/source/filter/excel/excimp8.cxx
b/sc/source/filter/excel/excimp8.cxx
index ce349fe..03ea1f3 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -109,9 +109,7 @@ using namespace ::comphelper;
//OleNameOverrideContainer
-typedef ::cppu::WeakImplHelper1< container::XNameContainer >
OleNameOverrideContainer_BASE;
-
-class OleNameOverrideContainer : public OleNameOverrideContainer_BASE
+class OleNameOverrideContainer : public ::cppu::WeakImplHelper1<
container::XNameContainer >
{
private:
typedef std::unordered_map< OUString, uno::Reference<
container::XIndexContainer >, OUStringHash,
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 32d5a1d..178796b 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -491,7 +491,7 @@ void ScHTMLLayoutParser::Adjust()
{
xLockedList->RemoveAll();
- ScHTMLAdjustStack aStack;
+ ::std::stack< ScHTMLAdjustStackEntry* > aStack;
ScHTMLAdjustStackEntry* pS = NULL;
sal_uInt16 nTab = 0;
SCCOL nLastCol = SCCOL_MAX;
diff --git a/sc/source/filter/inc/autofilterbuffer.hxx
b/sc/source/filter/inc/autofilterbuffer.hxx
index 65ae36b..1a3450f 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -64,7 +64,6 @@ public:
virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
};
-typedef ::boost::shared_ptr< FilterSettingsBase > FilterSettingsRef;
/** Settings for a discrete filter, specifying a list of values to be shown in
the filtered range.
@@ -177,7 +176,8 @@ public:
ApiFilterSettings finalizeImport( sal_Int32 nMaxCount );
private:
- FilterSettingsRef mxSettings;
+ ::boost::shared_ptr< FilterSettingsBase >
+ mxSettings;
sal_Int32 mnColId;
bool mbHiddenButton;
bool mbShowButton;
diff --git a/sc/source/filter/inc/htmlpars.hxx
b/sc/source/filter/inc/htmlpars.hxx
index c7f526b..2b5c2c4 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -130,7 +130,6 @@ struct ScHTMLTableStackEntry
{}
~ScHTMLTableStackEntry() {}
};
-typedef ::std::stack< ScHTMLTableStackEntry* > ScHTMLTableStack;
struct ScHTMLAdjustStackEntry
{
@@ -143,7 +142,6 @@ struct ScHTMLAdjustStackEntry
nCurRow( nCRow )
{}
};
-typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack;
class EditEngine;
class ScDocument;
@@ -157,23 +155,24 @@ class ScHTMLLayoutParser : public ScHTMLParser
{
private:
Size aPageSize;
- OUString aBaseURL;
- ScHTMLTableStack aTableStack;
- OUString aString;
+ OUString aBaseURL;
+ ::std::stack< ScHTMLTableStackEntry* >
+ aTableStack;
+ OUString aString;
ScRangeListRef xLockedList; // je Table
OuterMap* pTables;
ScHTMLColOffset* pColOffset;
ScHTMLColOffset* pLocalColOffset; // je Table
- sal_uLong nFirstTableCell; // je Table
+ sal_uLong nFirstTableCell; // je Table
short nTableLevel;
- sal_uInt16 nTable;
- sal_uInt16 nMaxTable;
+ sal_uInt16 nTable;
+ sal_uInt16 nMaxTable;
SCCOL nColCntStart; // erste Col je Table
SCCOL nMaxCol; // je Table
- sal_uInt16 nTableWidth; // je Table
- sal_uInt16 nColOffset; // aktuell, Pixel
- sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel
- sal_uInt16 nOffsetTolerance; // for use with SeekOffset and
related
+ sal_uInt16 nTableWidth; // je Table
+ sal_uInt16 nColOffset; // aktuell, Pixel
+ sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel
+ sal_uInt16 nOffsetTolerance; // for use with SeekOffset and
related
bool bTabInTabCell:1;
bool bFirstRow:1; // je Table, ob in erster Zeile
bool bInCell:1;
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 9612e84..35832b2 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -229,7 +229,8 @@ private:
CellBlockBuffer maCellBlocks; /// Manages all open cell
blocks.
ArrayFormulaList maArrayFormulas; /// All array formulas in the
sheet.
TableOperationList maTableOperations; /// All table operations in
the sheet.
- SharedFormulaMap maSharedFormulas; /// Maps shared formula base
address to defined name token index.
+ ::std::map< BinAddress, ApiTokenSequence >
+ maSharedFormulas; /// Maps shared formula base
address to defined name token index.
::com::sun::star::table::CellAddress
maSharedFmlaAddr; /// Address of a cell
containing a pending shared formula.
css::table::CellAddress maSharedBaseAddr; /// Base address of the
pending shared formula.
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index de9aded..a71cecd 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -350,8 +350,6 @@ private:
ApiAlignmentData maApiData; /// Alignment data converted to
API constants.
};
-typedef std::shared_ptr< Alignment > AlignmentRef;
-
/** Contains all XML cell protection attributes, e.g. from a protection
element. */
struct ProtectionModel
{
@@ -398,8 +396,6 @@ private:
ApiProtectionData maApiData; /// Protection data converted to
API constants.
};
-typedef std::shared_ptr< Protection > ProtectionRef;
-
/** Contains XML attributes of a single border line. */
struct BorderLineModel
{
@@ -715,8 +711,10 @@ public:
private:
FontRef mxFont; /// Font data.
NumberFormatRef mxNumFmt; /// Number format data.
- AlignmentRef mxAlignment; /// Alignment data.
- ProtectionRef mxProtection; /// Protection data.
+ std::shared_ptr< Alignment >
+ mxAlignment; /// Alignment data.
+ std::shared_ptr< Protection >
+ mxProtection; /// Protection data.
BorderRef mxBorder; /// Border data.
FillRef mxFill; /// Fill data.
};
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index 663baad..e11d6aa 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -61,8 +61,6 @@ class WorksheetSettings;
typedef ::std::map< OUString, ScDataBarFormatData* > ExtLst;
-typedef ::std::map< BinAddress, ApiTokenSequence > SharedFormulaMap;
-
/** An enumeration for all types of sheets in a workbook. */
enum WorksheetType
{
diff --git a/sc/source/filter/oox/excelvbaproject.cxx
b/sc/source/filter/oox/excelvbaproject.cxx
index c6ffb14..1dfd8ee 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -62,9 +62,6 @@ struct SheetCodeNameInfo
maSheetProps( rSheetProps ), maPrefix( rPrefix ) {}
};
-typedef ::std::set< OUString > CodeNameSet;
-typedef ::std::list< SheetCodeNameInfo > SheetCodeNameInfoList;
-
} // namespace
void ExcelVbaProject::prepareImport()
@@ -74,10 +71,10 @@ void ExcelVbaProject::prepareImport()
if( mxDocument.is() ) try
{
// collect existing codenames (do not use them when creating new
codenames)
- CodeNameSet aUsedCodeNames;
+ ::std::set< OUString > aUsedCodeNames;
// collect sheets without codenames
- SheetCodeNameInfoList aCodeNameInfos;
+ ::std::list< SheetCodeNameInfo > aCodeNameInfos;
// iterate over all imported sheets
Reference< XEnumerationAccess > xSheetsEA( mxDocument->getSheets(),
UNO_QUERY_THROW );
@@ -103,7 +100,7 @@ void ExcelVbaProject::prepareImport()
}
// create new codenames if sheets do not have one
- for( SheetCodeNameInfoList::iterator aIt = aCodeNameInfos.begin(),
aEnd = aCodeNameInfos.end(); aIt != aEnd; ++aIt )
+ for( ::std::list< SheetCodeNameInfo >::iterator aIt =
aCodeNameInfos.begin(), aEnd = aCodeNameInfos.end(); aIt != aEnd; ++aIt )
{
// search for an unused codename
sal_Int32 nCounter = 1;
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx
b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index bb1b11e..b4f5e74 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -105,12 +105,11 @@ public:
void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument*
pDoc);
void SetStylesToRanges(const OUString* pStyleName, ScXMLImport& rImport);
};
-typedef tools::SvRef<ScMyStyleRanges> ScMyStyleRangesRef;
struct ScMyStyle
{
- OUString sStyleName;
- ScMyStyleRangesRef xRanges;
+ OUString sStyleName;
+ tools::SvRef<ScMyStyleRanges> xRanges;
ScMyStyle() : xRanges(new ScMyStyleRanges()) {}
~ScMyStyle() {}
@@ -125,18 +124,17 @@ struct LessStyle
};
typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet;
-typedef std::vector<ScMyStylesSet::iterator> ScMyStyles;
class ScMyStylesImportHelper
{
ScMyStylesSet aCellStyles;
- ScMyStyles aColDefaultStyles;
+ std::vector<ScMyStylesSet::iterator> aColDefaultStyles;
ScMyStylesSet::iterator aRowDefaultStyle;
ScXMLImport& rImport;
- OUString* pStyleName;
- OUString* pPrevStyleName;
- OUString* pCurrency;
- OUString* pPrevCurrency;
+ OUString* pStyleName;
+ OUString* pPrevStyleName;
+ OUString* pCurrency;
+ OUString* pPrevCurrency;
ScRange aPrevRange;
sal_Int16 nCellType;
sal_Int16 nPrevCellType;
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 6efb408..413b783 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -817,7 +817,6 @@ struct ScMyImportValidation
};
typedef std::vector<ScMyImportValidation> ScMyImportValidations;
-typedef std::list<SvXMLImportContext*> ScMyViewContextList;
class ScMyStylesImportHelper;
class ScXMLEditAttributeMap;
@@ -836,8 +835,8 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
mutable boost::scoped_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScMyViewContextList aViewContextList;
- ScMyStylesImportHelper* pStylesImportHelper;
+ std::list<SvXMLImportContext*> aViewContextList;
+ ScMyStylesImportHelper* pStylesImportHelper;
OUString sNumberFormat;
OUString sLocale;
OUString sCellStyle;
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 2738f10..860c402 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -52,11 +52,6 @@ public:
bool bIsAcceptable;
};
-typedef long LExpNum;
-
-//@ Expand entrys are ambiguous and therefore removed
-//DECLARE_TABLE( ScChgTrackExps, LExpNum)
-
class ScAcceptChgDlg : public SfxModelessDialog
{
private:
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 57dfd48..177cfc7 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -1361,8 +1361,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw()
#define SC_EVENTACC_SCRIPT "Script"
#define SC_EVENTACC_EVENTTYPE "EventType"
-typedef ::cppu::WeakImplHelper1< container::XNameReplace >
ShapeUnoEventAcess_BASE;
-class ShapeUnoEventAccessImpl : public ShapeUnoEventAcess_BASE
+class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper1<
container::XNameReplace >
{
private:
ScShapeObj* mpShape;
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index cf855f1..47020c1 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -37,8 +37,6 @@ using namespace ::ooo::vba::excel::XlAxisGroup;
typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group
combination
typedef ::std::vector< AxesCoordinate > vecAxesIndices;
-typedef ::cppu::WeakImplHelper1< container::XIndexAccess >
AxisIndexWrapper_BASE;
-
namespace {
class EnumWrapper : public EnumerationHelper_BASE
@@ -84,7 +82,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >&
xChart, const uno:
namespace {
-class AxisIndexWrapper : public AxisIndexWrapper_BASE
+class AxisIndexWrapper : public ::cppu::WeakImplHelper1<
container::XIndexAccess >
{
// if necessary for better performance we could change this into a map and
cache the
// indices -> Axis, currently we create a new Axis object
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx
b/sc/source/ui/vba/vbaeventshelper.cxx
index 6fc4e47..94fa0d5 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -107,10 +107,11 @@ uno::Reference< awt::XWindow > lclGetWindowForController(
const uno::Reference<
} // namespace
-typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener,
awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener >
ScVbaEventListener_BASE;
-
// This class is to process Workbook window related event
-class ScVbaEventListener : public ScVbaEventListener_BASE
+class ScVbaEventListener : public ::cppu::WeakImplHelper4<
awt::XTopWindowListener,
+
awt::XWindowListener,
+
frame::XBorderResizeListener,
+
util::XChangesListener >
{
public:
ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference<
frame::XModel >& rxModel, ScDocShell* pDocShell );
diff --git a/sc/source/ui/vba/vbaformatconditions.hxx
b/sc/source/ui/vba/vbaformatconditions.hxx
index d8dfef4..45d0001 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -28,8 +28,6 @@
#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <vbahelper/vbacollectionimpl.hxx>
-typedef CollTestImplHelper< ov::excel::XFormatConditions >
ScVbaFormatConditions_BASE;
-
// This class is used only as a target for casting, it seems,
// and no objects of this type are created as such, I think.
// So avoid MSVC warnings:
@@ -42,7 +40,7 @@ typedef CollTestImplHelper< ov::excel::XFormatConditions >
ScVbaFormatConditions
#pragma warning(disable: 4610)
#endif
-class ScVbaFormatConditions: public ScVbaFormatConditions_BASE
+class ScVbaFormatConditions: public CollTestImplHelper<
ov::excel::XFormatConditions >
{
css::table::CellAddress maCellAddress;
css::uno::Reference< css::sheet::XSheetConditionalEntries >
mxSheetConditionalEntries;
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index 265f9a1..aa289f2 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
using namespace ooo::vba;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration >
MenuBarEnumeration_BASE;
-
-class MenuBarEnumeration : public MenuBarEnumeration_BASE
+class MenuBarEnumeration : public ::cppu::WeakImplHelper1<
container::XEnumeration >
{
uno::Reference< XHelperInterface > m_xParent;
uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx
b/sc/source/ui/vba/vbapagebreaks.cxx
index 8e9744c..dcab022 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -22,8 +22,7 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangePageBreaks_Base;
-class RangePageBreaks : public RangePageBreaks_Base
+class RangePageBreaks : public ::cppu::WeakImplHelper1<container::XIndexAccess
>
{
private:
uno::Reference< XHelperInterface > mxParent;
diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx
index dd94655..8553966 100644
--- a/sc/source/ui/vba/vbapane.hxx
+++ b/sc/source/ui/vba/vbapane.hxx
@@ -24,9 +24,7 @@
#include <vbahelper/vbahelperinterface.hxx>
#include "excelvbahelper.hxx"
-typedef cppu::WeakImplHelper1< ov::excel::XPane > ScVbaPane_BASE;
-
-class ScVbaPane : public ScVbaPane_BASE
+class ScVbaPane : public cppu::WeakImplHelper1< ov::excel::XPane >
{
public:
ScVbaPane(
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 6ecc6f8..a65dbc8 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -309,9 +309,9 @@ public:
// very simple class to pass to ScVbaCollectionBaseImpl containing
// just one item
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess,
container::XEnumerationAccess > SingleRange_BASE;
-class SingleRangeIndexAccess : public SingleRange_BASE
+class SingleRangeIndexAccess : public ::cppu::WeakImplHelper2<
container::XIndexAccess,
+
container::XEnumerationAccess >
{
private:
uno::Reference< XHelperInterface > mxParent;
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 6ed0c84..7f27017 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -54,14 +54,12 @@ SCTAB, OUStringHash,
typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > Enumeration_BASE;
-
typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess
, com::sun::star::container::XIndexAccess
, com::sun::star::container::XNameAccess
> SelectedSheets_BASE;
-class SelectedSheetsEnum : public Enumeration_BASE
+class SelectedSheetsEnum : public ::cppu::WeakImplHelper1<
container::XEnumeration >
{
public:
uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/sc/source/ui/vba/vbaworksheets.cxx
b/sc/source/ui/vba/vbaworksheets.cxx
index c07fbd9..18b8515 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -52,8 +52,6 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration >
SheetEnumeration_BASE;
-typedef ::cppu::WeakImplHelper3< container::XNameAccess,
container::XIndexAccess, container::XEnumerationAccess >
SheetCollectionHelper_BASE;
// a map ( or hashmap ) wont do as we need also to preserve the order
// (as added ) of the items
typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap;
@@ -61,7 +59,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > >
SheetMap;
// #FIXME #TODO the implementation of the Sheets collections sucks,
// e.g. there is no support for tracking sheets added/removed from the
collection
-class WorkSheetsEnumeration : public SheetEnumeration_BASE
+class WorkSheetsEnumeration : public ::cppu::WeakImplHelper1<
container::XEnumeration >
{
SheetMap mSheetMap;
SheetMap::iterator mIt;
@@ -80,7 +78,9 @@ public:
}
};
-class SheetCollectionHelper : public SheetCollectionHelper_BASE
+class SheetCollectionHelper : public ::cppu::WeakImplHelper3<
container::XNameAccess,
+
container::XIndexAccess,
+
container::XEnumerationAccess >
{
SheetMap mSheetMap;
SheetMap::iterator cachePos;
diff --git a/scripting/source/vbaevents/eventhelper.cxx
b/scripting/source/vbaevents/eventhelper.cxx
index 976f153..403d7b3 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -545,9 +545,7 @@ ReadOnlyEventsNameContainer::hasByName( const OUString&
aName ) throw (RuntimeEx
return sal_True;
}
-typedef ::cppu::WeakImplHelper< XScriptEventsSupplier > EventsSupplier_BASE;
-
-class ReadOnlyEventsSupplier : public EventsSupplier_BASE
+class ReadOnlyEventsSupplier : public ::cppu::WeakImplHelper<
XScriptEventsSupplier >
{
public:
ReadOnlyEventsSupplier( const Sequence< OUString >& eventMethods, const
OUString& sCodeName )
commit 0fd9b79687a9f58a407da8e46e54637f353e122b
Author: Noel Grandin <n...@peralex.com>
Date: Mon Aug 3 14:17:20 2015 +0200
shell,sfx2,sd: inline some use-once typedefs
Change-Id: Ifde52b0d92163f99d399b4a9544a196defad1ba4
diff --git a/sd/source/filter/html/buttonset.cxx
b/sd/source/filter/html/buttonset.cxx
index ab7590f..8ab49ff 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -133,7 +133,6 @@ bool ButtonsImpl::copyGraphic( const OUString& rName, const
OUString& rPath )
return false;
}
-typedef std::vector< boost::shared_ptr< ButtonsImpl > > ButtonVector;
class ButtonSetImpl
{
public:
@@ -148,7 +147,7 @@ public:
Reference< XGraphicProvider > getGraphicProvider();
- ButtonVector maButtons;
+ std::vector< boost::shared_ptr< ButtonsImpl > > maButtons;
Reference< XGraphicProvider > mxGraphicProvider;
};
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx
b/sd/source/ui/slideshow/slideshowviewimpl.hxx
index 01d3fe7..0967f31 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx
@@ -114,8 +114,6 @@ protected:
::osl::Mutex& mrMutex;
};
-typedef ::std::unique_ptr< SlideShowViewListeners >
SlideShowViewListenersPtr;
-
// SlideShowViewPaintListeners
typedef ::comphelper::OListenerContainerBase<
::com::sun::star::awt::XPaintListener,
::com::sun::star::awt::PaintEvent > SlideShowViewPaintListeners_Base;
@@ -128,7 +126,6 @@ public:
protected:
virtual bool implTypedNotify( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XPaintListener >& rListener, const
::com::sun::star::awt::PaintEvent& rEvent ) throw(
::com::sun::star::uno::Exception ) SAL_OVERRIDE;
};
-typedef ::std::unique_ptr< SlideShowViewPaintListeners >
SlideShowViewPaintListenersPtr;
// SlideShowViewMouseListeners
typedef ::comphelper::OListenerContainerBase<
::com::sun::star::awt::XMouseListener, WrappedMouseEvent >
SlideShowViewMouseListeners_Base;
@@ -143,7 +140,6 @@ protected:
const WrappedMouseEvent& rEvent
) throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
};
-typedef ::std::unique_ptr< SlideShowViewMouseListeners >
SlideShowViewMouseListenersPtr;
// SlideShowViewMouseMotionListeners
typedef ::comphelper::OListenerContainerBase<
::com::sun::star::awt::XMouseMotionListener,
@@ -158,7 +154,6 @@ protected:
virtual bool implTypedNotify( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseMotionListener >& rListener,
const WrappedMouseMotionEvent&
rEvent ) throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
};
-typedef ::std::unique_ptr< SlideShowViewMouseMotionListeners >
SlideShowViewMouseMotionListenersPtr;
// SlideShowView
class ShowWindow;
@@ -237,10 +232,14 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >
mxPointer;
SlideshowImpl* mpSlideShow;
ShowWindow& mrOutputWindow;
- SlideShowViewListenersPtr mpViewListeners;
- SlideShowViewPaintListenersPtr mpPaintListeners;
- SlideShowViewMouseListenersPtr mpMouseListeners;
- SlideShowViewMouseMotionListenersPtr mpMouseMotionListeners;
+ ::std::unique_ptr< SlideShowViewListeners >
+ mpViewListeners;
+ ::std::unique_ptr< SlideShowViewPaintListeners >
+ mpPaintListeners;
+ ::std::unique_ptr< SlideShowViewMouseListeners >
+ mpMouseListeners;
+ ::std::unique_ptr< SlideShowViewMouseMotionListeners >
+ mpMouseMotionListeners;
SdDrawDocument* mpDoc;
bool mbIsMouseMotionListener;
Rectangle maPresentationArea;
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 8306dfe..1fc4e52 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -53,24 +53,22 @@ typedef boost::ptr_map<sal_uInt16, SfxPoolItem>
SfxItemPtrMap;
TYPEINIT0(SfxShell);
-typedef boost::ptr_vector<SfxSlot> SfxVerbSlotArr_Impl;
-
using namespace com::sun::star;
struct SfxShell_Impl: public SfxBroadcaster
{
- OUString aObjectName; // Name of Sbx-Objects
- SfxItemPtrMap aItems; // Data exchange on Item level
- SfxViewShell* pViewSh; // SfxViewShell if Shell is
+ OUString aObjectName; // Name of Sbx-Objects
+ SfxItemPtrMap aItems; // Data exchange on Item level
+ SfxViewShell* pViewSh; // SfxViewShell if Shell is
// ViewFrame/ViewShell/SubShell
list
- SfxViewFrame* pFrame; // Frame, if <UI-active>
- SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent;
+ SfxViewFrame* pFrame; // Frame, if <UI-active>
+ SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent;
bool bActive;
sal_uIntPtr nDisableFlags;
sal_uIntPtr nHelpId;
svtools::AsynchronLink* pExecuter;
svtools::AsynchronLink* pUpdater;
- SfxVerbSlotArr_Impl aSlotArr;
+ boost::ptr_vector<SfxSlot> aSlotArr;
com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >
aVerbList;
::sfx2::sidebar::ContextChangeBroadcaster maContextChangeBroadcaster;
diff --git a/sfx2/source/dialog/itemconnect.cxx
b/sfx2/source/dialog/itemconnect.cxx
index 595e1b4..c073542 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -167,8 +167,6 @@ void ColorListBoxWrapper::SetControlValue( Color aColor )
typedef std::vector< ControlWrapperBase* > ControlWrpVec;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
