summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2001-05-11 12:18:17 +0000
committerCarsten Driesner <cd@openoffice.org>2001-05-11 12:18:17 +0000
commitc32c16d119155112a7812024b566907e4a2003e6 (patch)
tree4c2bfef3844f4bc2ff6dc18151ef1dfedfa30d31 /framework
parent9c6f0c6f88c84ff4c9e8c84baa71e84939dbe62e (diff)
export bookmark menu for sfx
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/bmkmenu.hxx18
-rw-r--r--framework/inc/classes/menuconfiguration.hxx6
-rw-r--r--framework/prj/d.lst1
3 files changed, 11 insertions, 14 deletions
diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/classes/bmkmenu.hxx
index a2900e0fc3f5..6c9603a9bf16 100644
--- a/framework/inc/classes/bmkmenu.hxx
+++ b/framework/inc/classes/bmkmenu.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bmkmenu.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: cd $ $Date: 2001-05-03 08:03:11 $
+ * last change: $Author: cd $ $Date: 2001-05-11 13:17:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,7 +75,6 @@
#include <vcl/menu.hxx>
#include <vcl/image.hxx>
-#include <classes/menumanager.hxx>
class String;
class ImageList;
@@ -88,8 +87,12 @@ namespace framework
class BmkMenu_Impl;
class BmkMenu : public PopupMenu
{
-
public:
+ struct Attributes
+ {
+ ::rtl::OUString aTargetFrame;
+ };
+
enum BmkMenuType
{
BMK_NEWMENU,
@@ -107,18 +110,11 @@ class BmkMenu : public PopupMenu
USHORT CreateMenuId();
private:
- struct Attributes
- {
- ::rtl::OUString aTargetFrame;
- };
-
BmkMenu( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
BmkMenuType, BmkMenu* pRoot );
BmkMenu_Impl* _pImp;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xFrame;
-
- friend class MenuManager;
};
} // namespace framework
diff --git a/framework/inc/classes/menuconfiguration.hxx b/framework/inc/classes/menuconfiguration.hxx
index 1fcbd74375b0..d44b26671d51 100644
--- a/framework/inc/classes/menuconfiguration.hxx
+++ b/framework/inc/classes/menuconfiguration.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: menuconfiguration.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: pb $ $Date: 2001-05-11 10:09:46 $
+ * last change: $Author: cd $ $Date: 2001-05-11 13:17:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,7 +116,7 @@ class MenuConfiguration
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream )
throw ( ::com::sun::star::lang::WrappedTargetException );
- Menu* CreateBookmarkMenu(
+ PopupMenu* CreateBookmarkMenu(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const ::rtl::OUString& aURL )
throw ( ::com::sun::star::lang::WrappedTargetException );
diff --git a/framework/prj/d.lst b/framework/prj/d.lst
index 93718d9f00ff..e1a9aad893d1 100644
--- a/framework/prj/d.lst
+++ b/framework/prj/d.lst
@@ -9,6 +9,7 @@ mkdir: %_DEST%\inc%_EXT%\framework
..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib
..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx
..\inc\classes\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx
+..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx
..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx