summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/datanavi.hxx8
-rw-r--r--svx/source/inc/frmselimpl.hxx3
2 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 84249101ebb8..9135583a0cbc 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -96,7 +96,6 @@ namespace svxform
typedef css::uno::Reference< css::xforms::XSubmission > XSubmission_ref;
typedef css::uno::Sequence< css::beans::PropertyValue > PropertyValue_seq;
typedef std::vector< XContainer_ref > ContainerList;
- typedef std::vector< XEventTarget_ref > EventTargetList;
class DataTreeListBox : public SvTreeListBox
@@ -321,7 +320,8 @@ namespace svxform
bool m_bIsNotifyDisabled;
PageList m_aPageList;
ContainerList m_aContainerList;
- EventTargetList m_aEventTargetList;
+ std::vector< XEventTarget_ref >
+ m_aEventTargetList;
Timer m_aUpdateTimer;
DataListener_ref m_xDataListener;
@@ -493,8 +493,6 @@ namespace svxform
class NamespaceItemDialog : public ModalDialog
{
private:
- typedef std::vector< OUString > PrefixList;
-
VclPtr<SvSimpleTable> m_pNamespacesList;
VclPtr<PushButton> m_pAddNamespaceBtn;
VclPtr<PushButton> m_pEditNamespaceBtn;
@@ -502,7 +500,7 @@ namespace svxform
VclPtr<OKButton> m_pOKBtn;
VclPtr<AddConditionDialog> m_pConditionDlg;
- PrefixList m_aRemovedList;
+ std::vector< OUString > m_aRemovedList;
XNameContainer_ref& m_rNamespaces;
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 62a0d7f3a9d7..21c35ddd758d 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -239,7 +239,6 @@ class FrameBorderIterBase
public:
typedef Cont container_type;
typedef Iter iterator_type;
- typedef Pred predicate_type;
typedef typename Cont::value_type value_type;
typedef FrameBorderIterBase<Cont, Iter, Pred> this_type;
@@ -251,7 +250,7 @@ public:
private:
iterator_type maIt;
iterator_type maEnd;
- predicate_type maPred;
+ Pred maPred;
};
/** Iterator for constant svx::FrameBorder containers, iterates over all borders. */