summaryrefslogtreecommitdiff
path: root/sfx2/source/inc/workwin.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-04-15 09:57:55 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-16 19:24:20 +0000
commit74af27fef6505d4e47b53ea765b9cc4a96629fa4 (patch)
tree110a01987048b7dca19cbab0b5ba2db50b9a4fb7 /sfx2/source/inc/workwin.hxx
parent431b265af7a66c15a35e8a388d2aa8c9ddb106e1 (diff)
Convert SfxChildWindows_Impl from SfxPtrArr to std::vector
- also remove dead struct SfxSplitWin_Impl Change-Id: I408bd994b206963b5ac115f4d47fc79c6687e051 Reviewed-on: https://gerrit.libreoffice.org/3390 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sfx2/source/inc/workwin.hxx')
-rw-r--r--sfx2/source/inc/workwin.hxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index f86c79f5f1c6..60efbe52c122 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -149,7 +149,7 @@ enum SfxDockingConfig
};
typedef std::vector<SfxChild_Impl*> SfxChildList_Impl;
-DECL_PTRARRAY( SfxChildWindows_Impl, SfxChildWin_Impl*, 2, 2 )
+typedef std::vector<SfxChildWin_Impl*> SfxChildWindows_Impl;
struct SfxObjectBarList_Impl
@@ -163,12 +163,6 @@ struct SfxObjectBarList_Impl
{ return aArr[nAct]; }
};
-struct SfxSplitWin_Impl
-{
- SfxSplitWindow* pSplitWin;
- SfxChildWindows_Impl* pChildWins;
-};
-
#define SFX_SPLITWINDOWS_LEFT 0
#define SFX_SPLITWINDOWS_TOP 2
#define SFX_SPLITWINDOWS_RIGHT 1
@@ -227,7 +221,7 @@ protected:
SfxWorkWindow* pParent;
SfxSplitWindow* pSplit[SFX_SPLITWINDOWS_MAX];
SfxChildList_Impl aChildren;
- SfxChildWindows_Impl* pChildWins;
+ SfxChildWindows_Impl aChildWins;
SfxBindings* pBindings;
Window* pWorkWin;
SfxShell* pConfigShell;