convert form data navigator menu to .ui

which has the advantage of also fixing it

Change-Id: Ida23826c9ce334d517c9d70096d5fb478d53b891

2 files changed, 2 insertions, 37 deletions

diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
deleted file mode 100644
index f51cec3bc48a..000000000000
--- a/svx/source/inc/datanavi.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HRC
-#define INCLUDED_SVX_SOURCE_INC_DATANAVI_HRC
-
-// class XFormsInstancePage
-
-// Menu items
-#define MID_INSERT_CONTROL      100
-
-// ToolBox items
-#define TBI_ITEM_ADD            10
-#define TBI_ITEM_ADD_ELEMENT    11
-#define TBI_ITEM_ADD_ATTRIBUTE  12
-#define TBI_ITEM_EDIT           13
-#define TBI_ITEM_REMOVE         14
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 123c986cbb44..b40eb78daeee 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -103,6 +103,8 @@ namespace svxform
     class DataTreeListBox : public SvTreeListBox
     {
     private:
+        std::unique_ptr<VclBuilder> m_xBuilder;
+        VclPtr<PopupMenu>       m_xMenu;
         VclPtr<XFormsPage>      m_pXFormsPage;
         DataGroupType           m_eGroup;
         sal_uInt16              m_nAddId;