summaryrefslogtreecommitdiff
path: root/include/oox/dump
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-04 08:06:50 +0200
committerNoel Grandin <noel@peralex.com>2015-08-04 08:55:57 +0200
commitf17f89aadc5e88880df0c852289e2fa5b04254ba (patch)
tree13e85b793019f5c4eab1e2282a94a20b896bd769 /include/oox/dump
parent50097a8bb2be903d8a985f6f03f364567bf4643d (diff)
include: inline some use-once typedefs
Change-Id: I064e95c72e5f67178cf2875f457adac241cee529
Diffstat (limited to 'include/oox/dump')
-rw-r--r--include/oox/dump/dumperbase.hxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index d0530553d074..f9d3a1b9b34d 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;