[Libreoffice-commits] core.git: toolkit/source ucbhelper/source ucb/source vbahelper/source vcl/source vcl/unx writerfilter/source xmloff/inc xmloff/source xmlscript/source xmlsecurity/source
Noel Grandin
noel at peralex.com
Mon Aug 3 05:16:54 PDT 2015
toolkit/source/controls/dialogcontrol.cxx | 4 +---
ucb/source/core/FileAccess.cxx | 9 +++------
ucbhelper/source/provider/propertyvalueset.cxx | 9 +--------
vbahelper/source/msforms/vbacontrol.cxx | 3 +--
vbahelper/source/msforms/vbacontrols.cxx | 4 +---
vbahelper/source/msforms/vbamultipage.cxx | 3 +--
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 3 +--
vbahelper/source/vbahelper/vbacommandbars.cxx | 4 +---
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 8 +++-----
vcl/source/control/morebtn.cxx | 8 +++-----
vcl/source/gdi/animate.cxx | 4 +---
vcl/unx/gtk/a11y/atklistener.hxx | 5 ++---
writerfilter/source/dmapper/DomainMapper.cxx | 6 +++---
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 +--
writerfilter/source/dmapper/LatentStyleHandler.hxx | 1 -
writerfilter/source/dmapper/PageBordersHandler.hxx | 1 -
writerfilter/source/dmapper/SectionColumnHandler.hxx | 2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx | 6 +++---
writerfilter/source/dmapper/StyleSheetTable.hxx | 2 +-
writerfilter/source/dmapper/TDefTableHandler.hxx | 1 -
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 2 +-
writerfilter/source/dmapper/TablePropertiesHandler.hxx | 1 -
writerfilter/source/dmapper/TextEffectsHandler.hxx | 2 --
xmloff/inc/XMLEventImportHelper.hxx | 3 +--
xmloff/inc/xexptran.hxx | 11 ++++-------
xmloff/source/draw/sdxmlimp_impl.hxx | 15 +++++++--------
xmloff/source/draw/shapeimport.cxx | 5 ++---
xmloff/source/draw/ximpstyl.hxx | 9 ++++-----
xmloff/source/style/xmlnumfi.cxx | 8 +++-----
xmlscript/source/xml_helper/xml_impctx.cxx | 4 +---
xmlsecurity/source/helper/xsecctl.hxx | 4 +---
xmlsecurity/source/xmlsec/mscrypt/oid.hxx | 6 ++----
32 files changed, 54 insertions(+), 102 deletions(-)
New commits:
commit a4fd6c4f9e5b010f00ba7cc84a4b2d5d8950813a
Author: Noel Grandin <noel at peralex.com>
Date: Mon Aug 3 12:34:22 2015 +0200
inline some use-once typedefs
Change-Id: I02cbbba56a2ad83e0ac3d806265a7e0d6a29594d
Reviewed-on: https://gerrit.libreoffice.org/17495
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index a19b255..018b239 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -73,10 +73,8 @@ using namespace ::com::sun::star::util;
// we probably will need both a hash of control models and hash of controls
// => use some template magic
-typedef ::cppu::WeakImplHelper1< container::XNameContainer > SimpleNameContainer_BASE;
-
template< typename T >
-class SimpleNamedThingContainer : public SimpleNameContainer_BASE
+class SimpleNamedThingContainer : public ::cppu::WeakImplHelper1< container::XNameContainer >
{
typedef std::unordered_map< OUString, Reference< T >, OUStringHash,
std::equal_to< OUString > > NamedThingsHash;
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 4e36b76..47e86f2 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -131,9 +131,8 @@ public:
};
// Implementation XActiveDataSink
-typedef cppu::WeakImplHelper1< XActiveDataSink > ActiveDataSinkHelper;
-class OActiveDataSink : public ActiveDataSinkHelper
+class OActiveDataSink : public cppu::WeakImplHelper1< XActiveDataSink >
{
Reference< XInputStream > mxStream;
@@ -147,9 +146,8 @@ public:
};
// Implementation XActiveDataStreamer
-typedef cppu::WeakImplHelper1< XActiveDataStreamer > ActiveDataStreamerHelper;
-class OActiveDataStreamer : public ActiveDataStreamerHelper
+class OActiveDataStreamer : public cppu::WeakImplHelper1< XActiveDataStreamer >
{
Reference< XStream > mxStream;
@@ -163,9 +161,8 @@ public:
};
// Implementation XCommandEnvironment
-typedef cppu::WeakImplHelper1< XCommandEnvironment > CommandEnvironmentHelper;
-class OCommandEnvironment : public CommandEnvironmentHelper
+class OCommandEnvironment : public cppu::WeakImplHelper1< XCommandEnvironment >
{
Reference< XInteractionHandler > mxInteraction;
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 1732e70..df5edeb 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -121,15 +121,8 @@ using namespace ucbhelper_impl;
namespace ucbhelper
{
-
-
// class PropertyValues.
-
-
-
-typedef std::vector< ucbhelper_impl::PropertyValue > PropertyValuesVector;
-
-class PropertyValues : public PropertyValuesVector {};
+class PropertyValues : public std::vector< ucbhelper_impl::PropertyValue > {};
} // namespace ucbhelper
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 017c594..84f9852 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -767,8 +767,7 @@ void ScVbaControl::setLocked( bool bLocked ) throw (uno::RuntimeException)
m_xProps->setPropertyValue( "ReadOnly" , uno::makeAny( bLocked ) );
}
-typedef cppu::WeakImplHelper1< XControlProvider > ControlProvider_BASE;
-class ControlProviderImpl : public ControlProvider_BASE
+class ControlProviderImpl : public cppu::WeakImplHelper1< XControlProvider >
{
uno::Reference< uno::XComponentContext > m_xCtx;
public:
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index ce70d05..5c75aa4 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -38,13 +38,11 @@ using namespace com::sun::star;
using namespace ooo::vba;
-typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
-
typedef std::unordered_map< OUString, sal_Int32, OUStringHash,
std::equal_to< OUString > > ControlIndexMap;
typedef std::vector< uno::Reference< awt::XControl > > ControlVec;
-class ControlArrayWrapper : public ArrayWrapImpl
+class ControlArrayWrapper : public ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess >
{
uno::Reference< awt::XControlContainer > mxDialog;
uno::Sequence< OUString > msNames;
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 3422032..057464f 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -26,8 +26,7 @@ using namespace ooo::vba;
const OUString SVALUE( "MultiPageValue" );
-typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
-class PagesImpl : public PagesImpl_Base
+class PagesImpl : public cppu::WeakImplHelper1< container::XIndexAccess >
{
sal_Int32 mnPages;
public:
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index a47b33c..331c989 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -22,8 +22,7 @@
using namespace com::sun::star;
using namespace ooo::vba;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
-class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
+class CommandBarControlEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
{
//uno::Reference< uno::XComponentContext > m_xContext;
CommandBarControls_BASE* m_pCommandBarControls;
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx
index 9993979..ad32100 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -32,9 +32,7 @@ using namespace com::sun::star;
using namespace ooo::vba;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
-
-class CommandBarEnumeration : public CommandBarEnumeration_BASE
+class CommandBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
{
uno::Reference< XHelperInterface > m_xParent;
uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 9540e70..7f830d6 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -59,17 +59,15 @@ static const char aSpreadsheetDocument[] = "com.sun.star.sheet.SpreadsheetDocume
static const char aTextDocument[] = "com.sun.star.text.TextDocument";
typedef std::unordered_map< OUString,
-sal_Int32, OUStringHash,
-::std::equal_to< OUString > > NameIndexHash;
+ sal_Int32, OUStringHash,
+ ::std::equal_to< OUString > > NameIndexHash;
typedef std::vector < uno::Reference< frame::XModel > > Documents;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > DocumentsEnumImpl_BASE;
-
// #FIXME clearly this is a candidate for some sort of helper base class as
// this is a copy of SelectedSheetsEnum ( vbawindow.cxx )
-class DocumentsEnumImpl : public DocumentsEnumImpl_BASE
+class DocumentsEnumImpl : public ::cppu::WeakImplHelper1< container::XEnumeration >
{
uno::Reference< uno::XComponentContext > m_xContext;
Documents m_documents;
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index ec91329..5e7e104 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -22,13 +22,11 @@
#include <tools/rc.h>
#include <vector>
-typedef ::std::vector< VclPtr<vcl::Window> > ImplMoreWindowList;
-
struct ImplMoreButtonData
{
- ImplMoreWindowList *mpItemList;
- OUString maMoreText;
- OUString maLessText;
+ std::vector< VclPtr<vcl::Window> >* mpItemList;
+ OUString maMoreText;
+ OUString maLessText;
};
void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 5578cf6..bd03f54 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -351,12 +351,10 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout )
maTimer.Start();
}
-typedef ::std::vector< AInfo* > AInfoList_impl;
-
IMPL_LINK_NOARG_TYPED(Animation, ImplTimeoutHdl, Timer *, void)
{
const size_t nAnimCount = maList.size();
- AInfoList_impl aAInfoList;
+ std::vector< AInfo* > aAInfoList;
if( nAnimCount )
{
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index a1380c4..804769f 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -27,8 +27,6 @@
#include "atkwrapper.hxx"
-typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleVector;
-
class AtkListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
{
public:
@@ -43,7 +41,8 @@ public:
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
AtkObjectWrapper *mpWrapper;
- AccessibleVector m_aChildList;
+ std::vector< css::uno::Reference< css::accessibility::XAccessible > >
+ m_aChildList;
private:
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 4493b68..267dc54 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1907,7 +1907,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
if( pProperties.get())
{
- SectionColumnHandlerPtr pSectHdl( new SectionColumnHandler );
+ std::shared_ptr< SectionColumnHandler > pSectHdl( new SectionColumnHandler );
pProperties->resolve(*pSectHdl);
if(pSectionContext && !m_pImpl->isInIndexContext())
{
@@ -1968,7 +1968,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if( pProperties.get( ) && pSectionContext )
{
- PageBordersHandlerPtr pHandler( new PageBordersHandler );
+ std::shared_ptr< PageBordersHandler > pHandler( new PageBordersHandler );
pProperties->resolve( *pHandler );
// Set the borders to the context and apply them to the styles
@@ -2462,7 +2462,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
case NS_ooxml::LN_stylisticSets_stylisticSets:
case NS_ooxml::LN_cntxtAlts_cntxtAlts:
{
- TextEffectsHandlerPtr pTextEffectsHandlerPtr( new TextEffectsHandler(nSprmId) );
+ std::shared_ptr<TextEffectsHandler> pTextEffectsHandlerPtr( new TextEffectsHandler(nSprmId) );
boost::optional<PropertyIds> aPropertyId = pTextEffectsHandlerPtr->getGrabBagPropertyId();
if(aPropertyId)
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 519f8e5..8dc1856 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -266,7 +266,6 @@ struct AnnotationPosition
css::uno::Reference<css::text::XTextRange> m_xStart;
css::uno::Reference<css::text::XTextRange> m_xEnd;
};
-typedef std::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t;
struct LineNumberSettings
{
@@ -434,7 +433,7 @@ private:
//annotation import
css::uno::Reference< css::beans::XPropertySet > m_xAnnotationField;
sal_Int32 m_nAnnotationId;
- AnnotationPositions_t m_aAnnotationPositions;
+ std::unordered_map< sal_Int32, AnnotationPosition > m_aAnnotationPositions;
void GetCurrentLocale(css::lang::Locale& rLocale);
void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false);
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index fd7bf6a..5759785 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -36,7 +36,6 @@ public:
std::vector<css::beans::PropertyValue> getAttributes() const;
};
-typedef std::shared_ptr<LatentStyleHandler> LatentStyleHandlerPtr;
} // namespace dmapper
} // namespace writerfilter
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index 7c2d3ad..ce3660c 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -68,7 +68,6 @@ public:
};
void SetBorders( SectionPropertyMap* pSectContext );
};
-typedef std::shared_ptr< PageBordersHandler > PageBordersHandlerPtr;
} }
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index bd63179..c8ab4f1 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -59,7 +59,7 @@ public:
const std::vector<_Column>& GetColumns() const { return m_aCols;}
};
-typedef std::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr;
+
}}
#endif
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index cdc0e59..c062917 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -444,7 +444,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
if ( nType == STYLE_TYPE_TABLE )
{
StyleSheetEntryPtr pEntry = m_pImpl->m_pCurrentEntry;
- TableStyleSheetEntryPtr pTableEntry( new TableStyleSheetEntry( *pEntry.get( ), this ) );
+ std::shared_ptr<TableStyleSheetEntry> pTableEntry( new TableStyleSheetEntry( *pEntry.get( ), this ) );
m_pImpl->m_pCurrentEntry = pTableEntry;
}
else
@@ -732,7 +732,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if (pProperties.get())
{
- LatentStyleHandlerPtr pLatentStyleHandler(new LatentStyleHandler());
+ std::shared_ptr<LatentStyleHandler> pLatentStyleHandler(new LatentStyleHandler());
pProperties->resolve(*pLatentStyleHandler);
beans::PropertyValue aValue;
aValue.Name = "lsdException";
@@ -750,7 +750,7 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
if (!m_pImpl->m_pCurrentEntry)
break;
- TablePropertiesHandlerPtr pTblHandler(new TablePropertiesHandler());
+ std::shared_ptr<TablePropertiesHandler> pTblHandler(new TablePropertiesHandler());
pTblHandler->SetProperties( m_pImpl->m_pCurrentEntry->pProperties );
if ( !pTblHandler->sprm( rSprm ) )
{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index ba05630..7296ca3 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -152,7 +152,7 @@ public:
protected:
PropertyMapPtr GetLocalPropertiesFromMask( sal_Int32 nMask );
};
-typedef std::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr;
+
}}
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 18fd424..0765f66 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -79,7 +79,6 @@ public:
static OUString getBorderTypeString(sal_Int32 nType);
static OUString getThemeColorTypeString(sal_Int32 nType);
};
-typedef std::shared_ptr< TDefTableHandler > TDefTableHandlerPtr;
}}
#endif
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 4db5a8c..5d42d00 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -243,7 +243,7 @@ namespace dmapper {
if( pProperties.get())
{
//in OOXML there's one set of borders at each cell (if there is any)
- TDefTableHandlerPtr pTDefTableHandler( new TDefTableHandler());
+ std::shared_ptr< TDefTableHandler > pTDefTableHandler( new TDefTableHandler());
if (m_pCurrentInteropGrabBag)
pTDefTableHandler->enableInteropGrabBag("tcBorders");
pProperties->resolve( *pTDefTableHandler );
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index cc1d72c..1532f7f 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -86,7 +86,6 @@ private:
m_pCurrentProperties->InsertProps(pProps);
};
};
-typedef std::shared_ptr<TablePropertiesHandler> TablePropertiesHandlerPtr;
} }
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index cce0872..a0cddf3 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -69,8 +69,6 @@ public:
};
-typedef std::shared_ptr<TextEffectsHandler> TextEffectsHandlerPtr;
-
}}
#endif // INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TEXTEFFECTSHANDLER_HXX
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 4dca709..27c7f9a 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -36,7 +36,6 @@ struct XMLEventNameTranslation;
typedef ::std::map< OUString, XMLEventContextFactory* > FactoryMap;
typedef ::std::map< XMLEventName, OUString > NameMap;
-typedef ::std::list< NameMap* > NameMapList;
/**
@@ -61,7 +60,7 @@ class XMLEventImportHelper
NameMap* pEventNameMap;
/// stack of previous aEventNameMap
- NameMapList aEventNameMapList;
+ std::list< NameMap* > aEventNameMapList;
public:
XMLEventImportHelper();
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 3f9d42d..178fa58 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -43,13 +43,10 @@ namespace basegfx
class B3DHomMatrix;
}
-typedef ::std::vector< ImpSdXMLExpTransObj2DBase* > ImpSdXMLExpTransObj2DBaseList;
-typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseList;
-
class SdXMLImExTransform2D
{
- ImpSdXMLExpTransObj2DBaseList maList;
- OUString msString;
+ std::vector< ImpSdXMLExpTransObj2DBase* > maList;
+ OUString msString;
void EmptyList();
@@ -69,8 +66,8 @@ public:
class SdXMLImExTransform3D
{
- ImpSdXMLExpTransObj3DBaseList maList;
- OUString msString;
+ std::vector< ImpSdXMLExpTransObj3DBase* > maList;
+ OUString msString;
void EmptyList();
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 1f21426..8088a5f 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -151,8 +151,6 @@ struct SdXMLltXDrawPageId
}
};
-typedef std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId > DrawPageIdMap;
-
class SvXMLUnitConverter;
class SvXMLTokenMap;
class SdXMLMasterStylesContext;
@@ -194,14 +192,15 @@ class SdXMLImport: public SvXMLImport
sal_Int32 mnNewPageCount;
sal_Int32 mnNewMasterPageCount;
- bool mbIsDraw;
- bool mbLoadDoc;
- bool mbPreview;
+ bool mbIsDraw;
+ bool mbLoadDoc;
+ bool mbPreview;
- DrawPageIdMap maDrawPageIds;
+ std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId >
+ maDrawPageIds;
- OUString msPageLayouts;
- OUString msPreview;
+ OUString msPageLayouts;
+ OUString msPreview;
HeaderFooterDeclMap maHeaderDeclsMap;
HeaderFooterDeclMap maFooterDeclsMap;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 1e3e893..52fb082 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -55,8 +55,6 @@ struct ltint32
}
};
-typedef std::map<sal_Int32,com::sun::star::uno::Reference< com::sun::star::drawing::XShape >,ltint32> IdShapeMap;
-
struct ConnectionHint
{
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxConnector;
@@ -97,7 +95,8 @@ struct XMLShapeImportHelperImpl
// context for sorting shapes
ShapeSortContext* mpSortContext;
- IdShapeMap maShapeIds;
+ std::map<sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XShape >, ltint32>
+ maShapeIds;
std::vector<ConnectionHint> maConnections;
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 593ff18..cb05a6a 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -120,7 +120,6 @@ public:
const OUString& GetDisplayName() const { return msDisplayName; }
};
-typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList;
// presentation:placeholder context
@@ -146,15 +145,15 @@ public:
const OUString& GetName() const { return msName; }
sal_Int32 GetX() const { return mnX; }
};
-typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList;
// style:presentation-page-layout context
class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext
{
OUString msName;
- ImpPlaceholderList maList;
- sal_uInt16 mnTypeId;
+ std::vector< SdXMLPresentationPlaceholderContext* >
+ maList;
+ sal_uInt16 mnTypeId;
const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
@@ -235,7 +234,7 @@ public:
class SdXMLMasterStylesContext : public SvXMLImportContext
{
- ImpMasterPageList maMasterPageList;
+ std::vector< SdXMLMasterPageContext* > maMasterPageList;
const SdXMLImport& GetSdImport() const { return static_cast<const SdXMLImport&>(GetImport()); }
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 700cbae..6a80964 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -60,12 +60,10 @@ struct SvXMLNumFmtEntry
aName(rN), nKey(nK), bRemoveAfterUse(bR) {}
};
-typedef ::boost::ptr_vector<SvXMLNumFmtEntry> SvXMLNumFmtEntryArr;
-
struct SvXMLEmbeddedElement
{
- sal_Int32 nFormatPos;
- OUString aText;
+ sal_Int32 nFormatPos;
+ OUString aText;
SvXMLEmbeddedElement( sal_Int32 nFP, const OUString& rT ) :
nFormatPos(nFP), aText(rT) {}
@@ -83,7 +81,7 @@ class SvXMLNumImpData
SvXMLTokenMap* pStyleAttrTokenMap;
SvXMLTokenMap* pStyleElemAttrTokenMap;
LocaleDataWrapper* pLocaleData;
- SvXMLNumFmtEntryArr aNameEntries;
+ boost::ptr_vector<SvXMLNumFmtEntry> aNameEntries;
uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index d97ab1f..38658be 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -79,8 +79,6 @@ struct ElementEntry
{ m_prefixes.reserve( 2 ); }
};
-typedef ::std::vector< ElementEntry * > t_ElementVector;
-
class ExtendedAttributes;
struct MGuard
@@ -116,7 +114,7 @@ class DocumentHandlerImpl :
sal_Int32 m_nLastPrefix_lookup;
OUString m_aLastPrefix_lookup;
- t_ElementVector m_elements;
+ std::vector< ElementEntry * > m_elements;
sal_Int32 m_nSkipElements;
Mutex * m_pMutex;
diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx
index 7b63ca0..d6aae02 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -138,8 +138,6 @@ public:
}
};
-typedef ::std::vector< InternalSignatureInformation > InternalSignatureInformations;
-
class XSecController : public cppu::WeakImplHelper4
<
com::sun::star::xml::crypto::sax::XSecurityController,
@@ -207,7 +205,7 @@ private:
/*
* Signature information
*/
- InternalSignatureInformations m_vInternalSignatureInformations;
+ std::vector< InternalSignatureInformation > m_vInternalSignatureInformations;
/*
* the previous node on the SAX chain.
diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index 654edf1..4521cc3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -20,12 +20,10 @@
#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX
#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_OID_HXX
-typedef struct OIDItemStr OIDItem;
-
-struct OIDItemStr {
+typedef struct {
char *oid;
char *desc;
-};
+} OIDItem;
OIDItem OIDs[] = {
{"1.2.840.113549", "RSA Data Security Inc."},
More information about the Libreoffice-commits
mailing list