summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-03 15:12:09 +0200
committerNoel Grandin <noel@peralex.com>2015-08-04 08:55:56 +0200
commitc5b995bb09487e2b7626a5920506b07dff390203 (patch)
treedf41f558f729b513cdef5292ae69d7d395f5921f /rsc
parent368a3e45a3f126d34f794a9118fcef0e3270cd78 (diff)
sal,rsc,oox: inline some use-once typedefs
Change-Id: I91bebe06c5c5f3ebe5fbeec83dcf3f5bdf563201
Diffstat (limited to 'rsc')
-rw-r--r--rsc/inc/rscdb.hxx11
-rw-r--r--rsc/inc/rscdef.hxx3
2 files changed, 5 insertions, 9 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index bbaa74dbb014..7fadead2e5f2 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 f6d378d14db6..ce0126570d2a 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);