[Libreoffice-commits] .: config_host.mk.in configure.ac framework/Library_lomenubar.mk framework/Module_framework.mk framework/source framework/util postprocess/packcomponents scp2/InstallModule_ooo.mk scp2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 14 07:31:20 PST 2012
config_host.mk.in | 1
configure.ac | 14
framework/Library_lomenubar.mk | 62 -
framework/Module_framework.mk | 6
framework/source/lomenubar/AwtKeyToDbusmenuString.cxx | 148 ---
framework/source/lomenubar/AwtKeyToDbusmenuString.hxx | 36
framework/source/lomenubar/DesktopJob.cxx | 164 ---
framework/source/lomenubar/DesktopJob.hxx | 92 -
framework/source/lomenubar/FrameHelper.cxx | 867 ------------------
framework/source/lomenubar/FrameHelper.hxx | 157 ---
framework/source/lomenubar/FrameJob.cxx | 400 --------
framework/source/lomenubar/FrameJob.hxx | 103 --
framework/source/lomenubar/HACKING | 99 --
framework/source/lomenubar/Jobs.xcu | 34
framework/source/lomenubar/MenuItemInfo.cxx | 106 --
framework/source/lomenubar/MenuItemInfo.hxx | 57 -
framework/source/lomenubar/MenuItemStatusListener.cxx | 85 -
framework/source/lomenubar/MenuItemStatusListener.hxx | 38
framework/source/lomenubar/README | 15
framework/source/lomenubar/exports.cxx | 76 -
framework/util/lomenubar.component | 38
postprocess/packcomponents/makefile.mk | 4
scp2/InstallModule_ooo.mk | 1
scp2/source/ooo/file_library_ooo.scp | 4
scp2/source/ooo/module_hidden_ooo.scp | 3
25 files changed, 2610 deletions(-)
New commits:
commit 4e7f9650e2a32b648cbd50ab113955920f960354
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Nov 14 16:30:16 2012 +0100
remove ancient lo-menubar implementation now that we have the shiny new one
Change-Id: Ie5ea41e7376838ac7f2ebfbe0d703e6a28d8a8a9
diff --git a/config_host.mk.in b/config_host.mk.in
index 8e4c7df..d473422 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,7 +157,6 @@ export ENABLE_KDE4=@ENABLE_KDE4@
export ENABLE_KDE=@ENABLE_KDE@
export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
-export ENABLE_LOMENUBAR=@ENABLE_LOMENUBAR@
export ENABLE_LTO=@ENABLE_LTO@
export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
export ENABLE_MINIMIZER=@ENABLE_MINIMIZER@
diff --git a/configure.ac b/configure.ac
index 4e5ddd1..96ee115 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11291,20 +11291,6 @@ AC_SUBST(ENABLE_OXYGENOFFICE)
AC_SUBST(OXYGENOFFICE_PACK)
dnl ===================================================================
-dnl Test whether to build global menu support
-dnl ===================================================================
-AC_MSG_CHECKING([whether to build global menu support])
-if test "$enable_lomenubar" = "" -o "$enable_lomenubar" = "no"; then
- AC_MSG_RESULT([no])
- ENABLE_LOMENUBAR="FALSE"
-else
- AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES(DBUSMENUGTK, dbusmenu-gtk-0.4,, AC_MSG_ERROR([requirements to build lo-menubar not met. Use --disable-lomenubar or install the missing packages]))
- ENABLE_LOMENUBAR="TRUE"
-fi
-AC_SUBST(ENABLE_LOMENUBAR)
-
-dnl ===================================================================
dnl Test whether to enable online update service
dnl ===================================================================
AC_MSG_CHECKING([whether to enable online update])
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
deleted file mode 100644
index dbf2110..0000000
--- a/framework/Library_lomenubar.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,lomenubar))
-
-$(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
-
-
-$(eval $(call gb_Library_use_sdk_api,lomenubar))
-
-$(eval $(call gb_Library_use_externals,lomenubar,\
- gtk \
- dbusmenugtk \
-))
-
-$(eval $(call gb_Library_use_libraries,lomenubar,\
- sal \
- cppu \
- cppuhelper \
- comphelper \
-))
-
-$(eval $(call gb_Library_add_libs,lomenubar,\
- -lX11 \
-))
-
-$(eval $(call gb_Library_add_exception_objects,lomenubar,\
- framework/source/lomenubar/MenuItemInfo \
- framework/source/lomenubar/AwtKeyToDbusmenuString \
- framework/source/lomenubar/DesktopJob \
- framework/source/lomenubar/FrameJob \
- framework/source/lomenubar/FrameHelper \
- framework/source/lomenubar/MenuItemStatusListener \
- framework/source/lomenubar/exports \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 1e885da..76fd1b1 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -40,12 +40,6 @@ $(eval $(call gb_Module_add_targets,framework,\
Package_uiconfig \
))
-ifeq ($(ENABLE_LOMENUBAR),TRUE)
-$(eval $(call gb_Module_add_targets,framework,\
- Library_lomenubar \
-))
-endif
-
$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
JunitTest_framework_complex \
JunitTest_framework_unoapi \
diff --git a/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx b/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx
deleted file mode 100644
index 3845d79..0000000
--- a/framework/source/lomenubar/AwtKeyToDbusmenuString.cxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#define XK_MISCELLANY
-#define XK_LATIN1
-#define XK_PUBLISHING
-
-#include <X11/Xlib.h>
-#include <X11/keysymdef.h>
-
-#include <glib.h>
-
-#include <com/sun/star/awt/Key.hpp>
-
-using namespace ::com::sun::star;
-
-KeySym MapAwtToXKey (guint16 aKeyCode);
-
-gchar*
-AwtKeyToDbusmenuString (guint16 aKeyCode)
-{
- KeySym code = (KeySym)0;
-
- if (!aKeyCode)
- return NULL;
-
- //We try the consecutive ranges first, if the code is not there
- //we use MapAwtToXKey(), se below
- if (aKeyCode >= awt::Key::A && aKeyCode <= awt::Key::Z)
- code = (KeySym)aKeyCode - (KeySym)awt::Key::A + XK_A;
- else if (aKeyCode >= awt::Key::F1 && aKeyCode <= awt::Key::F26)
- code = (KeySym)aKeyCode - (KeySym)awt::Key::F1 + XK_F1;
- else if (aKeyCode >= awt::Key::NUM0 && aKeyCode <= awt::Key::NUM9)
- code = (KeySym)aKeyCode - (KeySym)awt::Key::NUM0 + XK_0;
- else
- code = MapAwtToXKey (aKeyCode);
-
- if (code == 0)
- return NULL;
-
- return XKeysymToString (code);
-}
-
-
-//This is a 1-1 mapper between com::sun::star::awt:Key values and X11 KeySyms
-//note that some symbols are missing
-KeySym
-MapAwtToXKey (guint16 aKeyCode)
-{
- switch (aKeyCode)
- {
- case awt::Key::UP:
- return XK_Up;
- case awt::Key::DOWN:
- return XK_Down;
- case awt::Key::LEFT:
- return XK_Left;
- case awt::Key::RIGHT:
- return XK_Right;
- case awt::Key::HOME:
- return XK_Home;
- case awt::Key::END:
- return XK_End;
- case awt::Key::PAGEUP:
- return XK_Page_Up;
- case awt::Key::PAGEDOWN:
- return XK_Page_Down;
- case awt::Key::RETURN:
- return XK_Return;
- case awt::Key::ESCAPE:
- return XK_Escape;
- case awt::Key::TAB:
- return XK_Tab;
- case awt::Key::BACKSPACE:
- return XK_BackSpace;
- case awt::Key::SPACE:
- return XK_space;
- case awt::Key::INSERT:
- return XK_Insert;
- case awt::Key::DELETE:
- return XK_Delete;
- case awt::Key::ADD:
- return XK_plus;
- case awt::Key::SUBTRACT:
- return XK_minus;
- case awt::Key::MULTIPLY:
- return XK_asterisk;
- case awt::Key::DIVIDE:
- return XK_slash;
- case awt::Key::POINT:
- return XK_period;
- case awt::Key::COMMA:
- return XK_comma;
- case awt::Key::LESS:
- return XK_less;
- case awt::Key::GREATER:
- return XK_greater;
- case awt::Key::EQUAL:
- return XK_equal;
- case awt::Key::UNDO:
- return XK_Undo;
- case awt::Key::REPEAT:
- return XK_Redo;
- case awt::Key::FIND:
- return XK_Find;
- case awt::Key::DECIMAL:
- return XK_decimalpoint;
- case awt::Key::TILDE:
- return XK_asciitilde;
- case awt::Key::QUOTELEFT:
- return XK_leftsinglequotemark;
- //Sun keys and other unsupported symbols
- case awt::Key::OPEN:
- case awt::Key::CUT:
- case awt::Key::COPY:
- case awt::Key::PASTE:
- case awt::Key::PROPERTIES:
- case awt::Key::FRONT:
- case awt::Key::CONTEXTMENU:
- case awt::Key::HELP:
- case awt::Key::MENU:
- default:
- return 0;
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx b/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx
deleted file mode 100644
index 80f2f7f..0000000
--- a/framework/source/lomenubar/AwtKeyToDbusmenuString.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef __AWT_KEY_TO_DBUSMENU_STRING_HXX__
-#define __AWT_KEY_TO_DBUSMENU_STRING_HXX__
-#include <X11/X.h>
-#include <glib.h>
-
-gchar*
-AwtKeyToDbusmenuString (guint16 aKeyCode);
-
-
-#endif //__AWT_KEY_TO_DBUSMENU_STRING_HXX__
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/DesktopJob.cxx b/framework/source/lomenubar/DesktopJob.cxx
deleted file mode 100644
index 1bfc4a9..0000000
--- a/framework/source/lomenubar/DesktopJob.cxx
+++ /dev/null
@@ -1,164 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#include "DesktopJob.hxx"
-#include "FrameJob.hxx"
-
-#include <gio/gio.h>
-//#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#include <libdbusmenu-glib/server.h>
-#pragma GCC diagnostic error "-Wignored-qualifiers"
-//#pragma GCC diagnostic pop
-
-#include <rtl/process.h>
-#include <osl/diagnose.h>
-#include <cppuhelper/implbase1.hxx>
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/document/EventObject.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
-
-using rtl::OUString;
-using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::NamedValue;
-using com::sun::star::document::XEventListener;
-using com::sun::star::document::XEventBroadcaster;
-using com::sun::star::frame::XFrame;
-using com::sun::star::frame::XFramesSupplier;
-using com::sun::star::frame::XFrameActionListener;
-using com::sun::star::frame::XModel;
-using com::sun::star::frame::XLayoutManager;
-using com::sun::star::frame::FrameActionEvent;
-using com::sun::star::frame::XFrameActionListener;
-using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::XMultiServiceFactory;
-using com::sun::star::lang::EventObject;
-using com::sun::star::uno::Any;
-using com::sun::star::uno::Exception;
-using com::sun::star::uno::Reference;
-using com::sun::star::uno::RuntimeException;
-using com::sun::star::uno::Sequence;
-using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::UNO_QUERY_THROW;
-using com::sun::star::uno::XInterface;
-
-//-------------------------- D-Bus Callbacks ----------------------------------
-static void
-on_bus (GDBusConnection * /*connection*/,
- const gchar * /*name*/,
- gpointer /*user_data*/)
-{
- //TODO: Should we actually do something here?
- return;
-}
-
-static void
-name_lost (GDBusConnection * /*connection*/, const gchar * name, gpointer /*user_data*/)
-{
- g_error ("Unable to get name '%s' on DBus", name);
- return;
-}
-
-// --------------------------- DesktopJob ----------------------------------
-Any SAL_CALL DesktopJob::execute( const Sequence< NamedValue >& /*aArguments*/ )
- throw ( IllegalArgumentException, Exception, RuntimeException )
-{
- g_type_init ();
-
- g_bus_own_name(G_BUS_TYPE_SESSION,
- LIBREOFFICE_BUSNAME,
- G_BUS_NAME_OWNER_FLAGS_NONE,
- on_bus,
- NULL,
- name_lost,
- NULL,
- NULL);
-
- return Any ();
-}
-
-OUString
-DesktopJob_getImplementationName ()
- throw (RuntimeException)
-{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( DESKTOPJOB_IMPLEMENTATION_NAME ) );
-}
-
-sal_Bool SAL_CALL
-DesktopJob_supportsService( const OUString& ServiceName )
- throw (RuntimeException)
-{
- return ServiceName == DESKTOPJOB_SERVICE_NAME;
-}
-
-Sequence< OUString > SAL_CALL
-DesktopJob_getSupportedServiceNames( )
- throw (RuntimeException)
-{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( DESKTOPJOB_SERVICE_NAME ) );
- return aRet;
-}
-
-Reference< XInterface > SAL_CALL
-DesktopJob_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
- throw( Exception )
-{
- return (cppu::OWeakObject*) new DesktopJob(rSMgr);
-}
-
-// XServiceInfo
-OUString SAL_CALL
-DesktopJob::getImplementationName()
- throw (RuntimeException)
-{
- return DesktopJob_getImplementationName();
-}
-
-sal_Bool SAL_CALL
-DesktopJob::supportsService( const OUString& rServiceName )
- throw (RuntimeException)
-{
- return DesktopJob_supportsService( rServiceName );
-}
-
-Sequence< OUString > SAL_CALL
-DesktopJob::getSupportedServiceNames()
- throw (RuntimeException)
-{
- return DesktopJob_getSupportedServiceNames();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/DesktopJob.hxx b/framework/source/lomenubar/DesktopJob.hxx
deleted file mode 100644
index 3df7819..0000000
--- a/framework/source/lomenubar/DesktopJob.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef __DESKTOP_JOB_HXX__
-#define __DESKTOP_JOB_HXX__
-
-#include <glib.h>
-#include <libdbusmenu-glib/menuitem.h>
-
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
-
-#define LIBREOFFICE_BUSNAME "org.libreoffice.dbusmenu"
-#define DESKTOPJOB_IMPLEMENTATION_NAME "org.libreoffice.comp.framework.lomenubar.DesktopJob"
-#define DESKTOPJOB_SERVICE_NAME "com.sun.star.task.Job"
-
-namespace css = ::com::sun::star;
-using css::uno::Reference;
-using css::uno::Sequence;
-using css::uno::Any;
-using css::uno::Exception;
-using css::uno::RuntimeException;
-using css::lang::IllegalArgumentException;
-
-class DesktopJob : public cppu::WeakImplHelper2 < css::task::XJob, css::lang::XServiceInfo >
-{
- private:
- Reference< css::lang::XMultiServiceFactory > mxMSF;
-
- public:
- DesktopJob( const Reference< css::lang::XMultiServiceFactory > &rxMSF)
- : mxMSF( rxMSF ) {}
-
- virtual ~DesktopJob() {}
-
- // XJob
- virtual Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& Arguments)
- throw (IllegalArgumentException, Exception, RuntimeException);
-
- // XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw (RuntimeException);
-
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
- throw (RuntimeException);
-
- virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw (RuntimeException);
-};
-
-
-::rtl::OUString
-DesktopJob_getImplementationName()
- throw ( RuntimeException );
-
-sal_Bool SAL_CALL
-DesktopJob_supportsService( const ::rtl::OUString& ServiceName )
- throw ( RuntimeException );
-
-Sequence< ::rtl::OUString > SAL_CALL
-DesktopJob_getSupportedServiceNames()
- throw ( RuntimeException );
-
-Reference< css::uno::XInterface >
-SAL_CALL DesktopJob_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
- throw ( Exception );
-
-#endif //__DESKTOP_JOB_HXX__
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx
deleted file mode 100644
index bc90eba..0000000
--- a/framework/source/lomenubar/FrameHelper.cxx
+++ /dev/null
@@ -1,867 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#include "FrameHelper.hxx"
-#include "AwtKeyToDbusmenuString.hxx"
-#include "MenuItemInfo.hxx"
-#include "MenuItemStatusListener.hxx"
-
-#include <boost/foreach.hpp>
-
-#include <com/sun/star/awt/KeyEvent.hpp>
-#include <com/sun/star/awt/SystemDependentXWindow.hpp>
-#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/awt/XWindow2.hpp>
-#include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyModifier.hpp>
-#include <com/sun/star/awt/MenuEvent.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/awt/XPopupMenu.hpp>
-#include <com/sun/star/awt/XMenuExtended.hpp>
-#include <com/sun/star/awt/XMenuListener.hpp>
-#include <com/sun/star/awt/XPopupMenuExtended.hpp>
-#include <com/sun/star/frame/DispatchHelper.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/frame/XPopupMenuController.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
-#include <com/sun/star/frame/FrameActionEvent.hpp>
-#include <com/sun/star/lang/SystemDependent.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/frame/UICommandDescription.hpp>
-#include <com/sun/star/ui/XUIElement.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
-#include <rtl/process.h>
-#include <comphelper/processfactory.hxx>
-
-#include <gio/gio.h>
-//#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#include <libdbusmenu-glib/client.h>
-#pragma GCC diagnostic error "-Wignored-qualifiers"
-//#pragma GCC diagnostic pop
-#include <libdbusmenu-gtk/menuitem.h>
-
-using rtl::OUString;
-using rtl::OString;
-using rtl::OUStringToOString;
-
-using namespace ::com::sun::star;
-
-using com::sun::star::awt::KeyEvent;
-using com::sun::star::awt::MenuEvent;
-using com::sun::star::awt::SystemDependentXWindow;
-using com::sun::star::awt::XMenuListener;
-using com::sun::star::awt::XMenuExtended;
-using com::sun::star::awt::XMenuListener;
-using com::sun::star::awt::MenuEvent;
-using com::sun::star::awt::XPopupMenu;
-using com::sun::star::awt::XPopupMenuExtended;
-using com::sun::star::awt::XSystemDependentWindowPeer;
-using com::sun::star::awt::XWindow2;
-using com::sun::star::beans::XPropertySet;
-using com::sun::star::beans::PropertyValue;
-using com::sun::star::container::XNameAccess;
-using com::sun::star::container::NoSuchElementException;
-using com::sun::star::frame::DispatchHelper;
-using com::sun::star::frame::XController;
-using com::sun::star::frame::XComponentLoader;
-using com::sun::star::frame::XDispatch;
-using com::sun::star::frame::XDispatchProvider;
-using com::sun::star::frame::XDispatchHelper;
-using com::sun::star::frame::XModel;
-using com::sun::star::frame::XModuleManager;
-using com::sun::star::frame::XLayoutManager;
-using com::sun::star::frame::XPopupMenuController;
-using com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW;
-using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::UNO_QUERY_THROW;
-using com::sun::star::uno::Sequence;
-using com::sun::star::uno::XComponentContext;
-using com::sun::star::uno::XInterface;
-using com::sun::star::ui::XUIElement;
-using com::sun::star::frame::UICommandDescription;
-using com::sun::star::ui::XUIConfigurationManager;
-using com::sun::star::ui::XUIConfigurationManagerSupplier;
-using com::sun::star::ui::XAcceleratorConfiguration;
-using com::sun::star::ui::XModuleUIConfigurationManagerSupplier;
-using com::sun::star::ui::ModuleUIConfigurationManagerSupplier;
-using com::sun::star::util::URL;
-using com::sun::star::util::XURLTransformer;
-
-
-namespace
-{
- static Sequence<Any> lcl_initArgs(const OUString& sModuleName, const Reference<XFrame> xFrame)
- {
- // These are the arguments needed for the XPopupMenuController
- Sequence<Any> aResult(2);
- PropertyValue item;
-
- item.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("ModuleName"));
- item.Value <<= sModuleName;
- aResult[0] <<= item;
-
- item.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Frame"));
- item.Value <<= xFrame;
- aResult[1] <<= item;
- return aResult;
- };
-
- struct DispatchConnection
- {
- Reference<XDispatch> m_xDispatch;
- URL m_aUrl;
- DispatchConnection(Reference<XDispatch> xDispatch, URL aUrl)
- : m_xDispatch(xDispatch), m_aUrl(aUrl)
- {}
- };
-}
-
-namespace framework { namespace lomenubar
-{
- class DispatchRegistry
- {
- private:
- ::std::vector<DispatchConnection> m_vDispatchConnections;
- const Reference<XStatusListener> m_xStatusListener;
- public:
- DispatchRegistry(const Reference<XStatusListener> xStatusListener)
- : m_xStatusListener(xStatusListener)
- {}
- ~DispatchRegistry()
- {
- BOOST_FOREACH(const DispatchConnection& rConnection, m_vDispatchConnections)
- {
- rConnection.m_xDispatch->removeStatusListener(m_xStatusListener, rConnection.m_aUrl);
- }
- }
- void Connect(Reference<XDispatch> xDispatch, URL aURL)
- {
- const DispatchConnection connection(xDispatch, aURL);
- m_vDispatchConnections.push_back(connection);
- xDispatch->addStatusListener(m_xStatusListener, aURL);
- }
- };
-}}
-
-// ------------------------ Item callbacks ---------------------------
-// Item activated. It distpatches the command associated to a given menu item.
-void
-item_activated (DbusmenuMenuitem *item, guint /*timestamp*/, gpointer user_data)
-{
- FrameHelper *helper = (FrameHelper*)user_data;
- OUString command = OUString::createFromAscii(dbusmenu_menuitem_property_get (item, "CommandURL"));
- helper->dispatchCommand (command);
-}
-
-// Rebuilds the submenu
-gboolean
-item_about_to_show (DbusmenuMenuitem *item, gpointer user_data)
-{
- //Get the XMenu interface for the MenuBar UIElement
- FrameHelper *helper = (FrameHelper*)user_data;
- Reference < XFrame > xFrame = helper->getFrame ();
- Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
- Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
- UNO_QUERY);
- Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
- UNO_QUERY);
- Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
-
- if (!menuPropSet.is ())
- {
- return FALSE;
- }
-
- Reference < XMenu > xMenu(menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
- UNO_QUERY);
- if (!xMenu.is())
- {
- return FALSE;
- }
-
- //Find xMenu for the first level item
- Reference < XMenu > xSubMenu;
- Reference < XMenuExtended > xMenuEx (xMenu, UNO_QUERY);
- guint16 root_count = xMenu->getItemCount();
- for (guint16 i = 0; i<root_count ;i++)
- {
-
- guint16 id = xMenu->getItemId (i);
- if (id == 0)
- continue;
-
- OUString command = xMenuEx->getCommand (id);
-
- //We must find the element with the same command URL
- if (! OUString::createFromAscii (dbusmenu_menuitem_property_get (item, "CommandURL")).equals (command))
- continue;
-
- Reference <XPopupMenu> subPopup (xMenu->getPopupMenu (id), UNO_QUERY);
- xSubMenu = Reference <XMenu> (subPopup, UNO_QUERY);
- break;
- }
-
- //We only do this for toplevel items
- if (xSubMenu.is ())
- {
- helper->rebuildMenu (xSubMenu, item);
- return FALSE;
- }
-
- //If it is not a toplevel item we stop trying to rebuild
- return TRUE;
-}
-
-void
-destroy_menuitem (gpointer data)
-{
- g_object_unref (G_OBJECT (data));
-}
-
-void
-destroy_menu_item_info (gpointer data)
-{
- delete (MenuItemInfo*)data;
-}
-
-// ------------------------ FrameHelper Class -------------------------------
-FrameHelper::FrameHelper(const Reference< XMultiServiceFactory >& rServiceManager,
- const Reference< XFrame >& xFrame,
- DbusmenuServer* server)
- : m_xStatusListener(new MenuItemStatusListener(this))
- , m_pDispatchRegistry(new framework::lomenubar::DispatchRegistry(m_xStatusListener))
- , m_xMSF(rServiceManager)
- , m_xTrans(util::URLTransformer::create(comphelper::getComponentContext(m_xMSF)))
- , m_xMM(frame::ModuleManager(comphelper::getComponentContext(m_xMSF)),UNO_QUERY)
- , m_xPCF(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.PopupMenuControllerFactory"))), UNO_QUERY)
- , m_xFrame(xFrame)
- , m_xdp(xFrame, UNO_QUERY)
- , m_args(lcl_initArgs(m_xMM->identify(xFrame), xFrame))
- , m_server(server)
- , m_root(NULL)
- , m_watcher_set(FALSE)
- , m_blockDetach(FALSE)
-{
-
- //Get xUICommands database (to retrieve labels, see FrameJob::getLabelFromCommandURL ())
- Reference < XNameAccess > xNameAccess (UICommandDescription::create(comphelper::getComponentContext(m_xMSF)));
- xNameAccess->getByName(m_xMM->identify(xFrame)) >>= m_xUICommands;
-
-
- // This initializes the shortcut database
- getAcceleratorConfigurations (xFrame->getController()->getModel (), m_xMM);
-
- // This is a hash table that maps Command URLs to MenuItemInfo classes
- // to cache command information
- m_commandsInfo = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- destroy_menu_item_info);
-
-}
-
-void SAL_CALL
-FrameHelper::disposing (const EventObject& /*aEvent*/ ) throw (RuntimeException)
-{}
-
-FrameHelper::~FrameHelper()
-{
- ::boost::scoped_ptr< ::framework::lomenubar::DispatchRegistry>().swap(m_pDispatchRegistry);
- if (m_server)
- g_object_unref (m_server);
-
- if (m_watcher_set)
- g_bus_unwatch_name (m_watcher);
-
- g_hash_table_destroy (m_commandsInfo);
-}
-
-void
-FrameHelper::setRootItem (DbusmenuMenuitem *root)
-{
- this->m_root = root;
-}
-
-void
-FrameHelper::setRegistrarWatcher (guint watcher)
-{
- m_watcher_set = TRUE;
- this->m_watcher = watcher;
-}
-
-void
-FrameHelper::setServer (DbusmenuServer *server)
-{
- this->m_server = server;
-}
-
-//Getters
-Reference < XFrame >
-FrameHelper::getFrame ()
-{
- return m_xFrame;
-}
-
-GHashTable*
-FrameHelper::getCommandsInfo ()
-{
- return m_commandsInfo;
-}
-
-unsigned long
-FrameHelper::getXID ()
-{
- Reference< XSystemDependentWindowPeer > xWin( m_xFrame->getContainerWindow(), UNO_QUERY );
-
- if (!xWin.is())
- return 0;
-
- sal_Int8 processID[16];
- rtl_getGlobalProcessId( (sal_uInt8*)processID );
- Sequence <signed char> pidSeq (processID, 16);
-
- SystemDependentXWindow xWindow;
- xWin->getWindowHandle (pidSeq, SYSTEM_XWINDOW) >>= xWindow;
-
- return xWindow.WindowHandle;
-}
-
-void SAL_CALL
-FrameHelper::frameAction(const FrameActionEvent& action) throw (RuntimeException)
-{
- //If theh component is detached from the frame, remove this action listener,
- //it is then disposed and destroyed by the frame. We deregister the window
- //from the AppMenu Registrar
-
- //This is a special case, .uno:printPreview detaches the component but we are
- //not actually switching to another document.
- if (m_blockDetach)
- {
- m_blockDetach = TRUE;
- return;
- }
-
- if (action.Action == frame::FrameAction_COMPONENT_DETACHING)
- {
- GError *error = NULL;
-
-
- m_xFrame->removeFrameActionListener (this);
- Reference< XPropertySet > frameProps (m_xFrame, UNO_QUERY);
- Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
- UNO_QUERY);
- xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
-
- unsigned long xid = getXID();
-
- GDBusProxy *proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
- "com.canonical.AppMenu.Registrar",
- "/com/canonical/AppMenu/Registrar",
- "com.canonical.AppMenu.Registrar",
- NULL,
- &error);
- if (error)
- {
- g_warning ("Couldn't get /com/canonical/AppMenu/Registrar proxy");
- g_error_free (error);
- return;
- }
-
- //TODO: Check if window is registered already
- g_dbus_proxy_call_sync (proxy,
- "UnregisterWindow",
- g_variant_new ("(u)", (guint32)xid),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
-
- if (error)
- {
- g_warning ("Couldn't call /com/canonical/AppMenu/Registrar.UnregisterWindow");
- g_error_free (error);
- }
-
- if (m_server)
- {
- g_object_unref (m_server);
- m_server = NULL;
- m_root = NULL;
- }
-
- if (m_watcher_set)
- {
- g_bus_unwatch_name (m_watcher);
- m_watcher_set = FALSE;
- }
-
- return;
- }
-}
-
-//This function rebuilds (or builds from scratch) a DbusmenuMenuitem structure
-//from a given pair of XMenu/Dbusmenuitem.
-void
-FrameHelper::rebuildMenu (Reference < XMenu > xMenu,
- DbusmenuMenuitem *parent)
-{
- g_return_if_fail (parent != NULL);
- GList *items = dbusmenu_menuitem_get_children (parent);
- guint nitems = g_list_length (items); //number of available Dbusmenuitems
- guint16 count = xMenu->getItemCount (); //number of real menu items
-
- // One item does not represent always the same command.
- // We do this for performance reasons, as it's really hard to match a command with
- // a single dbusmenuitem given the lack of information provided by the status listener
- if (count > nitems)
- {
- // Add enough Dbusmenuitems to replicate all
- for (guint16 i = 0; i < (count - nitems); i++)
- {
- DbusmenuMenuitem *item = dbusmenu_menuitem_new ();
- dbusmenu_menuitem_child_append (parent, item);
- g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(item_activated), this);
- }
- items = dbusmenu_menuitem_get_children (parent);
- }
- if (count < nitems)
- {
- // If there is an excess of Dbusmenuitems we make them invisible
- for (guint16 i = nitems - 1; i >= count; i--)
- {
- DbusmenuMenuitem *item = DBUSMENU_MENUITEM (g_list_nth_data(items, i));
- dbusmenu_menuitem_property_set_bool (item, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
- }
- }
-
- for (guint16 i = 0; i<count; i++)
- {
- Reference < XMenuExtended > xMenuEx (xMenu, UNO_QUERY);
- guint16 id = xMenu->getItemId (i);
- OUString oUCommand = xMenuEx->getCommand (id);
- OString command = OUStringToOString (oUCommand, RTL_TEXTENCODING_ASCII_US);
-
- DbusmenuMenuitem *item = DBUSMENU_MENUITEM(g_list_nth_data(items, i));
-
- if (!item)
- continue;
-
- if (!DBUSMENU_IS_MENUITEM (item))
- continue;
-
- // We drop the WindowList, doesn't work properly and it's useless anyhow
- if ( oUCommand == ".uno:WindowList" )
- continue;
-
- //We set the default properties (in case it was not visible or a separator)
- dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_DEFAULT);
- dbusmenu_menuitem_property_set_bool (item, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-
- if (id == 0)
- {
- dbusmenu_menuitem_property_set (item, "CommandURL", "slot:0");
- dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
- //Getting rid of any possible children
- g_list_free_full (dbusmenu_menuitem_take_children (item), destroy_menuitem);
- continue;
- }
-
- //Setting the command
- dbusmenu_menuitem_property_set (item, "CommandURL", command.getStr());
-
- //Getting a shortcut
- KeyEvent kev = findShortcutForCommand (oUCommand);
-
- if (kev.KeyCode != 0) //KeyCode must have a value
- {
- GVariantBuilder builder;
- const gchar* keystring = AwtKeyToDbusmenuString(kev.KeyCode);
-
- g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
-
- //We map KeyEvent.Modifiers with Dbusmenu modifiers strings
- if (awt::KeyModifier::SHIFT & kev.Modifiers)
- g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_SHIFT);
- if (awt::KeyModifier::MOD2 & kev.Modifiers)
- g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_ALT);
- if (awt::KeyModifier::MOD1 & kev.Modifiers || awt::KeyModifier::MOD3 & kev.Modifiers)
- g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_CONTROL);
-
- g_variant_builder_add(&builder, "s", keystring);
-
- GVariant * inside = g_variant_builder_end(&builder);
- g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
- g_variant_builder_add_value(&builder, inside);
-
- GVariant * outsidevariant = g_variant_builder_end(&builder);
- dbusmenu_menuitem_property_set_variant(item, DBUSMENU_MENUITEM_PROP_SHORTCUT, outsidevariant);
- }
-
- // Lookup for a MenuItemInfo object for this menuitem, create one if it doesn't exist
- // this object caches the values that change on status updates.
- MenuItemInfo* commInfo = (MenuItemInfo*)g_hash_table_lookup (m_commandsInfo, (gconstpointer)command.getStr());
- if (!commInfo)
- {
- commInfo = new MenuItemInfo ();
- g_hash_table_insert (m_commandsInfo, g_strdup (command.getStr()), commInfo);
-
- OUString oULabel = getLabelFromCommandURL(oUCommand);
- if (oULabel.getLength() == 0)
- {
- oULabel = xMenu->getItemText (id);
- }
-
- //Replace tilde with underscore for Dbusmenu Alt accelerators
- oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
- // GLib behaves better than OUStringToOString wrt encoding transformation
- gchar* label = g_utf16_to_utf8 (oULabel.getStr(),
- oULabel.getLength(),
- NULL, NULL, NULL);
- commInfo->setLabel (label);
- g_free (label);
- }
-
- //Update the check state directly from the data, this is more reliable
- Reference < XPopupMenu > popUp (xMenu, UNO_QUERY);
- if (popUp.is() && popUp->isItemChecked (id))
- {
- commInfo->setCheckState (DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED);
- }
-
- dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_LABEL, commInfo->getLabel ());
- dbusmenu_menuitem_property_set_bool (item, DBUSMENU_MENUITEM_PROP_ENABLED, commInfo->getEnabled ());
-
- //TODO: Find a selection of which commands are radio toggle type
- if (commInfo->getCheckState () != DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN)
- {
- dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, commInfo->getCheckType ());
- dbusmenu_menuitem_property_set_int (item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, commInfo->getCheckState ());
- }
-
- // Adding status listener
- URL commandURL;
- commandURL.Complete = oUCommand;
- m_xTrans->parseStrict (commandURL);
-
- Reference < XDispatch > xDispatch = m_xdp->queryDispatch (commandURL, OUString(), 0);
- if(xDispatch.is())
- m_pDispatchRegistry->Connect(xDispatch, commandURL);
-
- Reference < XPopupMenu > subPopMenu (xMenu->getPopupMenu (id), UNO_QUERY);
-
- //Some menus do not provide the information available through the normal XMenu interface,
- //we need to access that info through a special XPopupMenuController
- if (isSpecialSubmenu (oUCommand))
- {
- Reference <XComponentContext> xContext(
- comphelper::getComponentContext(m_xMSF));
-
- Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(oUCommand,
- m_args,
- xContext),
- UNO_QUERY);
-
- Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXPopupMenu"))),
- UNO_QUERY);
-
- if (xRFC.is () && xPO.is ())
- {
- xRFC->setPopupMenu (xPO);
- xRFC->updatePopupMenu ();
- Reference < XMenu > subMenu (xPO, UNO_QUERY);
- rebuildMenu (subMenu, item);
- }
- else if (subPopMenu.is ())
- {
- Reference <XMenu> subMenu (subPopMenu, UNO_QUERY);
- rebuildMenu (subMenu, item);
- }
- }
-
- // Introspect submenus
- else if (subPopMenu.is ())
- {
- Reference <XMenu> subMenu (subPopMenu, UNO_QUERY);
- g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ABOUT_TO_SHOW, G_CALLBACK(item_about_to_show), this);
- rebuildMenu (subMenu, item);
- }
- else
- {
- //Getting rid of any possible children
- g_list_free_full (dbusmenu_menuitem_take_children (item), destroy_menuitem);
- }
- }
-
- return;
-}
-
-//Gets the menu item Label given a CommandURL
-//This is a work around for bug: https://bugs.freedesktop.org/show_bug.cgi?id=34127
-OUString
-FrameHelper::getLabelFromCommandURL (OUString commandURL)
-{
- OUString label;
-
- Sequence < PropertyValue > commandProps;
-
- if (commandURL.getLength () < 1)
- return label;
-
- if (!m_xUICommands.is())
- return label;
-
- try
- {
- m_xUICommands->getByName (commandURL) >>= commandProps;
- }
- catch (const com::sun::star::container::NoSuchElementException&)
- {
- return label;
- }
-
- for (sal_Int32 i = 0; i < commandProps.getLength(); i++)
- {
- if ( commandProps[i].Name == "Label" )
- {
- commandProps[i].Value >>= label;
- label = label.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
- //break;
- }
- }
-
- return label;
-}
-
-//This method is a facility to bootstrap the Dbusmenuitem strcuture from the menubar
-void
-FrameHelper::rebuildMenuFromRoot ()
-{
- Reference < XFrame > xFrame = getFrame ();
- Reference < XPropertySet > frameProps (xFrame, UNO_QUERY);
- Reference < XLayoutManager > xLayoutManager (frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
- UNO_QUERY);
- Reference < XUIElement > menuBar (xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
- UNO_QUERY);
- Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
-
- if (!menuPropSet.is ())
- return;
-
- Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
- UNO_QUERY);
- if (!xMenu.is ())
- return;
-
- rebuildMenu (xMenu, m_root);
-}
-
-//Some menus are special, this is the list of them
-gboolean
-FrameHelper::isSpecialSubmenu (OUString command)
-{
- const gchar * specialSubmenus[11] = {".uno:CharFontName",
- ".uno:FontHeight",
- ".uno:ObjectMenue",
- ".uno:InsertPageHeader",
- ".uno:InsertPageFooter",
- ".uno:ChangeControlType",
- ".uno:AvailableToolbars",
- ".uno:ScriptOrganizer",
- ".uno:RecentFileList",
- ".uno:AddDirect",
- ".uno:AutoPilotMenu"};
-
- for (gint i = 0; i < 11; i++)
- {
- if (command.equals (OUString::createFromAscii (specialSubmenus[i])))
- return TRUE;
- }
- return FALSE;
-}
-
-void
-FrameHelper::dispatchCommand (OUString command)
-{
- OUString target = OUString(RTL_CONSTASCII_USTRINGPARAM(""));
- Reference < XDispatchHelper > xdh( DispatchHelper::create(comphelper::getComponentContext(m_xMSF)) );
-
- // This is a special case, we don't want the helper to be disconnected from the frame
- // when PrintPreview dettaches. See the frameAction method.
- if ( command == ".uno:PrintPreview" )
- {
- m_blockDetach = TRUE;
- }
-
- // This is a special case for the recentfilelist
- if (command.matchAsciiL ("vnd.sun.star.popup:RecentFileList", 33, 0))
- {
- target = OUString(RTL_CONSTASCII_USTRINGPARAM("_default"));
-
- Reference <XComponentContext> xContext(
- comphelper::getComponentContext(m_xMSF));
- Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:RecentFileList")),
- m_args,
- xContext),
- UNO_QUERY);
- Reference < XMenuListener > xML (xRFC, UNO_QUERY);
-
- Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("stardiv.Toolkit.VCLXPopupMenu"))),
- UNO_QUERY);
-
- if (xRFC.is () && xPO.is ())
- {
- xRFC->setPopupMenu (xPO);
- xRFC->updatePopupMenu ();
- Reference < XMenu > subMenu (xPO, UNO_QUERY);
- Reference < XMenuExtended > subMenuEx (xPO, UNO_QUERY);
-
- //We need to find the item idd
- for (int i = 0; i < subMenu->getItemCount (); i++)
- {
- int id = subMenu->getItemId (i);
-
- if (subMenuEx->getCommand (id).equals (command))
- {
- MenuEvent mev;
- mev.MenuId = id;
-
- xML->select (mev);
- }
- }
- }
-
- return;
- }
-
- if (command.matchAsciiL ("private:factory/", 16, 0))
- target = OUString(RTL_CONSTASCII_USTRINGPARAM("_blank"));
-
- xdh->executeDispatch (Reference < XDispatchProvider > (m_xFrame, UNO_QUERY),
- command,
- target,
- 0,
- Sequence < PropertyValue > ());
-}
-
-//Set all the accelerator configuration sources
-void
-FrameHelper::getAcceleratorConfigurations (Reference < XModel > xModel,
- Reference < XModuleManager> xModuleManager)
-{
- //Get document shortcut database
- Reference< XUIConfigurationManagerSupplier > docUISupplier(xModel, UNO_QUERY);
- Reference< XUIConfigurationManager > docUIManager = docUISupplier->getUIConfigurationManager();
- Reference< XAcceleratorConfiguration > docAccelConf(docUIManager->getShortCutManager(), UNO_QUERY);
- this->m_docAccelConf = docAccelConf;
-
- //Get module shurtcut database
- Reference< XModuleUIConfigurationManagerSupplier > modUISupplier( ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(m_xMSF)) );
- Reference< XUIConfigurationManager > modUIManager = modUISupplier->getUIConfigurationManager(xModuleManager->identify(m_xFrame));
- Reference< XAcceleratorConfiguration > modAccelConf(modUIManager->getShortCutManager(), UNO_QUERY);
- this->m_modAccelConf = modAccelConf;
-
- //Get global shortcut database
- Reference< XAcceleratorConfiguration > globAccelConf(m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.GlobalAcceleratorConfiguration"))),
- UNO_QUERY);
- this->m_globAccelConf = globAccelConf;
-}
-
-
-//This function finds a KeyEvent with the shortcut information for each command
-KeyEvent
-FrameHelper::findShortcutForCommand (OUString command)
-
-{
- KeyEvent kev;
-
- Sequence < OUString > commands (1);
- commands[0] = command;
-
- try
- {
- Sequence < Any > evs = m_docAccelConf->getPreferredKeyEventsForCommandList (commands);
-
- for (int j = 0; j < evs.getLength (); j++)
- {
- KeyEvent ev;
- if (evs[j] >>= ev)
- return ev;
- }
- }
- catch (...)
- {}
- try
- {
- Sequence < Any > evs = m_modAccelConf->getPreferredKeyEventsForCommandList (commands);
-
- for (int j = 0; j < evs.getLength (); j++)
- {
- KeyEvent ev;
- if (evs[j] >>= ev)
- return ev;
- }
- }
- catch (...)
- {}
- try
- {
- Sequence < Any > evs = m_globAccelConf->getPreferredKeyEventsForCommandList (commands);
-
- for (int j = 0; j < evs.getLength (); j++)
- {
- KeyEvent ev;
- if (evs[j] >>= ev)
- return ev;
- }
- }
- catch (...)
- {}
-
- //NOTE: For some reason this item does not return its shortcut. Setting manually:
- if ( command == ".uno:HelpIndex" )
- {
- kev.KeyCode = awt::Key::F1;
- }
-
- return kev;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx
deleted file mode 100644
index 056dc1e..0000000
--- a/framework/source/lomenubar/FrameHelper.hxx
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef __FRAME_HELPER_HXX__
-#define __FRAME_HELPER_HXX__
-
-#include <vector>
-
-#include <boost/scoped_ptr.hpp>
-
-#include <com/sun/star/awt/KeyEvent.hpp>
-#include <com/sun/star/awt/XMenu.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-//#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#include <libdbusmenu-glib/server.h>
-#pragma GCC diagnostic error "-Wignored-qualifiers"
-//#pragma GCC diagnostic pop
-#include <libdbusmenu-glib/menuitem.h>
-
-using com::sun::star::awt::KeyEvent;
-using com::sun::star::awt::XMenu;
-using com::sun::star::beans::PropertyValue;
-using com::sun::star::container::XNameAccess;
-using com::sun::star::frame::FrameActionEvent;
-using com::sun::star::frame::XFrame;
-using com::sun::star::frame::XFramesSupplier;
-using com::sun::star::frame::XFrameActionListener;
-using com::sun::star::frame::XStatusListener;
-using com::sun::star::frame::XDispatchProvider;
-using com::sun::star::frame::XModuleManager;
-using com::sun::star::frame::XModel;
-using com::sun::star::lang::EventObject;
-using com::sun::star::lang::XMultiServiceFactory;
-using com::sun::star::lang::XMultiComponentFactory;
-using com::sun::star::uno::Any;
-using com::sun::star::uno::Reference;
-using com::sun::star::uno::Sequence;
-using com::sun::star::uno::RuntimeException;
-using com::sun::star::util::XURLTransformer;
-using com::sun::star::ui::XAcceleratorConfiguration;
-using rtl::OUString;
-
-
-namespace framework { namespace lomenubar
-{
- class DispatchRegistry;
-}}
-
-/* This class is a helper in charge of closing the dbusmenu server when a frame is closed,
- * and also allows the menuitem callbacks to dispatch commands.
- */
-
-class FrameHelper : public cppu::WeakImplHelper1 < XFrameActionListener >
-{
- private:
- const Reference < XStatusListener > m_xStatusListener;
- ::boost::scoped_ptr< ::framework::lomenubar::DispatchRegistry> m_pDispatchRegistry;
- const Reference < XMultiServiceFactory > m_xMSF;
- const Reference < XURLTransformer > m_xTrans;
- const Reference < XModuleManager> m_xMM;
- const Reference < XMultiComponentFactory > m_xPCF;
- const Reference < XFrame > m_xFrame;
- const Reference < XDispatchProvider > m_xdp;
- const Sequence < Any > m_args;
- Reference < XNameAccess > m_xUICommands;
- DbusmenuServer *m_server;
- DbusmenuMenuitem *m_root;
- gboolean m_watcher_set;
- guint m_watcher;
- GHashTable *m_commandsInfo;
- //This variable prevents the helper from being disconnected from the frame
- //for special cases of component dettaching like print preview
- gboolean m_blockDetach;
-
-
- gboolean isSpecialSubmenu (OUString command);
-
- //This is to build the shortcut database
- Reference< XAcceleratorConfiguration > m_docAccelConf;
- Reference< XAcceleratorConfiguration > m_modAccelConf;
- Reference< XAcceleratorConfiguration > m_globAccelConf;
-
- void getAcceleratorConfigurations (Reference < XModel >,
- Reference < XModuleManager>);
-
- KeyEvent findShortcutForCommand (OUString);
-
- public:
- FrameHelper(const Reference< XMultiServiceFactory >&,
- const Reference< XFrame >&,
- DbusmenuServer*);
-
- virtual ~FrameHelper();
- virtual void SAL_CALL frameAction(const FrameActionEvent& action)
- throw (RuntimeException);
-
- virtual void SAL_CALL disposing(const EventObject& aEvent)
- throw (RuntimeException);
-
- //Setters
- void setRootItem (DbusmenuMenuitem *);
- void setRegistrarWatcher (guint watcher);
- void setServer (DbusmenuServer *);
-
- //Getters
- Reference < XFrame > getFrame ();
- unsigned long getXID ();
- GHashTable* getCommandsInfo ();
- ::rtl::OUString getLabelFromCommandURL (::rtl::OUString);
-
- //Menu Related actions
- void dispatchCommand (OUString);
- void rebuildMenu (Reference < XMenu >, DbusmenuMenuitem*);
- void rebuildMenuFromRoot ();
- void populateWindowList (DbusmenuMenuitem *);
-};
-#endif // __FRAME_HELPER_HXX__
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
deleted file mode 100644
index d96d8fc..0000000
--- a/framework/source/lomenubar/FrameJob.cxx
+++ /dev/null
@@ -1,400 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#include "FrameJob.hxx"
-#include "DesktopJob.hxx"
-#include "FrameHelper.hxx"
-
-#define OBJ_PATH_PREFIX "/com/canonical/menu/"
-
-#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/awt/SystemDependentXWindow.hpp>
-#include <com/sun/star/awt/XMenu.hpp>
-#include <com/sun/star/awt/XMenuExtended.hpp>
-#include <com/sun/star/awt/XMenuBar.hpp>
-#include <com/sun/star/awt/XPopupMenu.hpp>
-#include <com/sun/star/awt/XPopupMenuExtended.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchHelper.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/SystemDependent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIElementSettings.hpp>
-#include <com/sun/star/ui/XUIElement.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-
-#include <iostream>
-#include <fstream>
-
-#include <gio/gio.h>
-//#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/client.h>
-#pragma GCC diagnostic error "-Wignored-qualifiers"
-//#pragma GCC diagnostic pop
-
-#include <rtl/process.h>
-#include <osl/diagnose.h>
-
-using rtl::OUString;
-using rtl::OString;
-using rtl::OUStringToOString;
-
-using com::sun::star::awt::KeyEvent;
-using com::sun::star::awt::SystemDependentXWindow;
-using com::sun::star::awt::XMenu;
-using com::sun::star::awt::XMenuExtended;
-using com::sun::star::awt::XPopupMenu;
-using com::sun::star::awt::XPopupMenuExtended;
-using com::sun::star::awt::XMenuBar;
-using com::sun::star::awt::XSystemDependentWindowPeer;
-using com::sun::star::uno::Sequence;
-using com::sun::star::uno::Reference;
-using com::sun::star::uno::WeakReference;
-using com::sun::star::uno::Any;
-using com::sun::star::uno::UNO_QUERY;
-using com::sun::star::uno::XInterface;
-using com::sun::star::uno::Exception;
-using com::sun::star::uno::RuntimeException;
-using com::sun::star::uno::XInterface;
-using com::sun::star::lang::IllegalArgumentException;
-using com::sun::star::lang::XMultiServiceFactory;
-using com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW;
-using com::sun::star::lang::EventObject;
-using com::sun::star::beans::NamedValue;
-using com::sun::star::beans::PropertyValue;
-using com::sun::star::beans::XPropertySet;
-using com::sun::star::document::XEventBroadcaster;
-using com::sun::star::frame::XFrame;
-using com::sun::star::frame::XFrameActionListener;
-using com::sun::star::frame::FrameActionEvent;
-using com::sun::star::frame::XController;
-using com::sun::star::frame::XLayoutManager;
-using com::sun::star::frame::XModel;
-using com::sun::star::frame::XModuleManager;
-using com::sun::star::frame::XDispatch;
-using com::sun::star::frame::XDispatchProvider;
-using com::sun::star::frame::XDispatchHelper;
-using com::sun::star::frame::XStatusListener;
-using com::sun::star::frame::FeatureStateEvent;
-using com::sun::star::ui::XUIElement;
-using com::sun::star::ui::XUIElementSettings;
-using com::sun::star::ui::XUIConfigurationManagerSupplier;
-using com::sun::star::ui::XUIConfigurationManager;
-using com::sun::star::ui::XModuleUIConfigurationManagerSupplier;
-using com::sun::star::ui::XAcceleratorConfiguration;
-using com::sun::star::util::URL;
-using com::sun::star::util::XURLTransformer;
-using com::sun::star::container::XIndexContainer;
-using com::sun::star::container::XIndexAccess;
-using com::sun::star::container::XNameAccess;
-using com::sun::star::container::NoSuchElementException;
-
-
-// This is a helper utility to transform an xid to a /com/canonical/menu/<XID>
-// DBUS object path
-OString
-xid_to_object_path (unsigned long xid)
-{
-
- GString *xid_str = g_string_new ("");
- g_string_printf (xid_str, "%d", (guint32)xid);
- OString object_path = OUStringToOString (OUString::createFromAscii (OBJ_PATH_PREFIX).concat (OUString::createFromAscii(xid_str->str)),
- RTL_TEXTENCODING_ASCII_US);
- g_string_free (xid_str, TRUE);
- return object_path;
-}
-
-//-------------------------- GObject callbacks -------------------------------//
-//This is called when a registrar becomes available. It registers the hides the menubar.
-static void
-on_registrar_available (GDBusConnection * /*connection*/,
- const gchar * /*name*/,
- const gchar * /*name_owner*/,
- gpointer user_data)
-{
- GError *error = NULL;
- GDBusProxy *proxy;
-
- FrameHelper *helper = static_cast<FrameHelper*>(user_data);
- unsigned long xid = helper->getXID();
-
- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
- "com.canonical.AppMenu.Registrar",
- "/com/canonical/AppMenu/Registrar",
- "com.canonical.AppMenu.Registrar",
- NULL,
- &error);
- if (error)
- {
- g_warning ("Couldn't get /com/canonical/AppMenu/Registrar proxy");
- return;
- }
-
-
- //TODO: Check if window is registered already
- g_dbus_proxy_call_sync (proxy,
- "RegisterWindow",
- g_variant_new ("(uo)",
- (guint32)xid,
- xid_to_object_path (xid).getStr()),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
-
- if (error)
- {
- g_warning ("Couldn't call /com/canonical/AppMenu/Registrar.RegisterWindow");
- return;
- }
-
- //Hide menubar
- Reference < XFrame > xFrame = helper->getFrame ();
- Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
- Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
- UNO_QUERY);
- xLayoutManager->hideElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
-
- return;
-}
-
-//This is called when the registrar becomes unavailable. It shows the menubar.
-static void
-on_registrar_unavailable (GDBusConnection * /*connection*/,
- const gchar * /*name*/,
- gpointer user_data)
-{
- //TODO: Unregister window?
-
- // Show menubar
- FrameHelper *helper = static_cast<FrameHelper*>(user_data);
- Reference < XFrame > xFrame = helper->getFrame ();
- Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
- Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
- UNO_QUERY);
- xLayoutManager->showElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")));
- return;
-}
-// ------------------------------- FrameJob --------------------------------------------
-Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
- throw ( IllegalArgumentException, Exception, RuntimeException )
-{
- Sequence< NamedValue > lEnv;
- Reference< XModel > xModel;
- sal_Int32 len = aArguments.getLength();
-
- for (int i = 0; i<len; i++)
- {
- if ( aArguments[i].Name == "Environment" )
- {
- aArguments[i].Value >>= lEnv;
- break;
- }
- }
-
- len = lEnv.getLength ();
- for (int i = 0; i<len; i++)
- {
- if ( lEnv[i].Name == "Model" )
- {
- lEnv[i].Value >>= xModel;
- }
- }
-
- //If we didn't get the model we have to quit
- if (!xModel.is())
- return Any();
-
-
- Reference< XController > xController( xModel->getCurrentController(), UNO_QUERY);
- if (!xController.is())
- return Any();
-
- m_xFrame = Reference< XFrame > ( xController->getFrame(), UNO_QUERY);
- if (!m_xFrame.is ())
- return Any();
-
- exportMenus (m_xFrame);
- return Any();
-}
-
-// This function crates a DbusmenuServer and starts the watcher for the AppMenu Registrar bus name
-void
-FrameJob::exportMenus (Reference < XFrame > xFrame)
-{
- //Set the xFrame for this object
-
- this->m_xFrame = xFrame;
-
- //Create dbusmenu server object path string
- DbusmenuServer *server = dbusmenu_server_new (xid_to_object_path(getXID (xFrame)).getStr());
-
-
- Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
- Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
- UNO_QUERY);
- if (!xLayoutManager.is())
- {
- g_object_unref (server);
- return;
- }
-
- Reference < XUIElement > menuBar(xLayoutManager->getElement (OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar"))),
- UNO_QUERY);
- Reference < XPropertySet > menuPropSet (menuBar, UNO_QUERY);
-
- if (!menuPropSet.is())
- {
- g_object_unref (server);
- return;
- }
-
- Reference < XMenu > xMenu (menuPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("XMenuBar"))),
- UNO_QUERY);
-
- if (!xMenu.is ())
- {
- g_object_unref (server);
- return;
- }
-
- //Create a new frame helper to close the server when needed
- FrameHelper *helper = new FrameHelper (m_xMSF, xFrame, server);
- xFrame->addFrameActionListener (Reference < XFrameActionListener > (helper));
-
- //Populate dbusmenu items and start the server
- DbusmenuMenuitem *root = getRootMenuitem (xMenu, (gpointer)helper);
- dbusmenu_server_set_root (server, root);
-
- //Listen to the availability of the registrar
- guint watcher = g_bus_watch_name (G_BUS_TYPE_SESSION,
- "com.canonical.AppMenu.Registrar",
- G_BUS_NAME_WATCHER_FLAGS_NONE,
- on_registrar_available,
- on_registrar_unavailable,
- helper,
- NULL);
- helper->setRegistrarWatcher (watcher);
-}
-
-
-//Gets the XID for a given XFrame
-unsigned long
-FrameJob::getXID (css::uno::Reference < css::frame::XFrame > xFrame)
-{
- Reference< XSystemDependentWindowPeer > xWin( xFrame->getContainerWindow(), UNO_QUERY);
-
- if (!xWin.is())
- return 0;
-
- sal_Int8 processID[16];
- rtl_getGlobalProcessId( (sal_uInt8*)processID );
- Sequence <signed char> pidSeq (processID, 16);
-
- SystemDependentXWindow xWindow;
- xWin->getWindowHandle (pidSeq, SYSTEM_XWINDOW) >>= xWindow;
-
- return xWindow.WindowHandle;
-}
-
-// Builds a Dbusmenuitem structure from an XMenu object
-DbusmenuMenuitem*
-FrameJob::getRootMenuitem (Reference < XMenu > xMenu, gpointer helper)
-{
-
- DbusmenuMenuitem *root = dbusmenu_menuitem_new_with_id (0);
- FrameHelper* fHelper = static_cast<FrameHelper*>(helper);
- fHelper->setRootItem(root);
- fHelper->rebuildMenu (xMenu, root);
-
- return root;
-}
-
-// XJob
-OUString FrameJob_getImplementationName ()
- throw (RuntimeException)
-{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( FRAMEJOB_IMPLEMENTATION_NAME ) );
-}
-
-sal_Bool SAL_CALL FrameJob_supportsService( const OUString& ServiceName )
- throw (RuntimeException)
-{
- return ServiceName == FRAMEJOB_SERVICE_NAME;
-}
-
-Sequence< OUString > SAL_CALL FrameJob_getSupportedServiceNames( )
- throw (RuntimeException)
-{
- Sequence < OUString > aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( FRAMEJOB_SERVICE_NAME ) );
- return aRet;
-}
-
-Reference< XInterface > SAL_CALL FrameJob_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
- throw( Exception )
-{
- return (cppu::OWeakObject*) new FrameJob(rSMgr);
-}
-
-// XServiceInfo
-OUString SAL_CALL FrameJob::getImplementationName()
- throw (RuntimeException)
-{
- return FrameJob_getImplementationName();
-}
-
-sal_Bool SAL_CALL FrameJob::supportsService( const OUString& rServiceName )
- throw (RuntimeException)
-{
- return FrameJob_supportsService( rServiceName );
-}
-
-Sequence< OUString > SAL_CALL FrameJob::getSupportedServiceNames()
- throw (RuntimeException)
-{
- return FrameJob_getSupportedServiceNames();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/FrameJob.hxx b/framework/source/lomenubar/FrameJob.hxx
deleted file mode 100644
index 06bbc06..0000000
--- a/framework/source/lomenubar/FrameJob.hxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef __FRAME_JOB_HXX__
-#define __MRAME_JOB_HXX__
-
-#include <com/sun/star/task/XJob.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XModuleManager.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#include <com/sun/star/awt/XMenu.hpp>
-#include <com/sun/star/awt/KeyEvent.hpp>
-
-#include <glib.h>
-#include <libdbusmenu-glib/menuitem.h>
-
-#define FRAMEJOB_IMPLEMENTATION_NAME "org.libreoffice.comp.framework.lomenubar.FrameJob"
-#define FRAMEJOB_SERVICE_NAME "com.sun.star.task.Job"
-
-namespace css = ::com::sun::star;
-using css::uno::Reference;
-
-class FrameJob : public cppu::WeakImplHelper2 < css::task::XJob, css::lang::XServiceInfo >
-{
- private:
- Reference < css::lang::XMultiServiceFactory > m_xMSF;
- Reference < css::container::XNameAccess > m_xUICommands;
- Reference < css::frame::XFrame > m_xFrame;
-
- unsigned long xid;
-
- //Private methods
- unsigned long getXID (Reference < css::frame::XFrame >);
- DbusmenuMenuitem* getRootMenuitem (Reference < css::awt::XMenu >,
- gpointer);
-
- public:
- FrameJob( const css::uno::Reference< css::lang::XMultiServiceFactory > &rxMSF)
- : m_xMSF( rxMSF ) {};
-
- void exportMenus (Reference < css::frame::XFrame > xFrame);
-
- virtual ~FrameJob() {}
-
- // XJob
- virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& Arguments)
- throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException);
-
- // XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
-
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
- throw (css::uno::RuntimeException);
-
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException);
-};
-
-
-::rtl::OUString FrameJob_getImplementationName()
- throw ( css::uno::RuntimeException );
-
-sal_Bool SAL_CALL FrameJob_supportsService( const ::rtl::OUString& ServiceName )
- throw ( css::uno::RuntimeException );
-
-css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameJob_getSupportedServiceNames()
- throw ( css::uno::RuntimeException );
-
-css::uno::Reference< css::uno::XInterface >
-SAL_CALL FrameJob_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr)
- throw ( css::uno::Exception );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/HACKING b/framework/source/lomenubar/HACKING
deleted file mode 100644
index 49d016f..0000000
--- a/framework/source/lomenubar/HACKING
+++ /dev/null
@@ -1,99 +0,0 @@
-LibreOffice DbusMenu Integration Source Code
-============================================
-There are three main classes, DesktopJob, FrameJob and FrameHelper implemented
-in their respective .cxx/.h files:
-
-- src/DesktopJob.cxx
-- src/DesktopJob.h
-
-- src/FrameJob.cxx
-- src/FrameJob.h
-
-- src/FrameHelper.cxx
-- src/FrameHelper.h
-
-The first two classes are Jobs executed synchronously on two events, the events
-that trigger these jobs are defined in data/Jobs.xcu. Further explanation on
-each class can be found below.
-
-The FrameHelper class performs most of the tasks regarding communication between
-
-The src/export.cxx code is the entry point for the resulting shared object
-that conforms this extension. It exports the information needed to register and
-access all the interfaces implemented by the two jobs exported.
-
-GLib Integration
-----------------
-This extension assumes the presence of the GLib mainloop in the application,
-it is not recommended its installation on LibreOffice deployments that do not
-provide integration with the glib mainloop.
-
-g_type_init() is called in DesktopJob for safety.
-
-DesktopJob
-----------
-This class is a XJob that is instantiated and executed on LibreOffice startup
-just once during the lifetime of the process.
-
-This class does nothing but trying to acquire the "org.libreoffice.dbusmenu"
-busname. Once the executed method returns the object instance is destroyed.
-
-FrameJob & FrameHelper
-----------------------
-This class is a XJob that is instantiated and executed every time a document is
-created or loaded. It watches for the presence of the
-com.canonical.AppMenu.Registrar well-known D-Bus name.
-
-Afterwards it creates an instance of the FrameHelper class. FrameHelper is an
-XFrameActionListener that subscribes to the XFrame that represents the current
-Window. The lifetime of this FrameHelper is bound to the life of the current
-document being viewed/edited.
-
-FrameHelper creates the initial structure of Dbusmenu menuitems, and the
-dbusmenu server. If FrameHelper is destroyed, the frame is unregistered and
-the server shutdown. It also stops watching com.canonical.AppMenu.Registrar
-presence.
-
-Listening for menu changes - MenuItemInfo & MenuItemStatusListener
-------------------------------------------------------------------
-FrameHelper subscribes creates a cache in the commandsInfo GHashTable property.
-This cache maps each command URL with a MenuItemInfo object that stores the
-current information for a given menu item.
-
-To listen for menu changes and update the cache, FrameHelper creates an instance
-of MenuItemStatusListener per each command url. This listeners update the data
-for the respective MenuItemInfo associated to the command URL it is listening
-for. The source code for these two classes can be found in the following
-respective files:
-
-- src/MenuItemInfo.h
-- src/MenuItemInfo.cxx
-
-- src/MenuItemStatusListener.h
-- src/MenuItemStatusListener.cxx
-
-Special Popup Menus
--------------------
-This is the set of special popup menus:
-- .uno:CharFontName
-- .uno:FontHeight
-- .uno:ObjectMenue
-- .uno:InsertPageHeader
-- .uno:InsertPageFooter
-- .uno:ChangeControlType
-- .uno:AvailableToolbars
-- .uno:ScriptOrganizer
-- .uno:RecentFileList
-- .uno:AddDirect
-- .uno:AutoPilotMenu
-
-These menus cannot be introspected as they are created dinamically when the user
-clicks on the menu. Therefor they are treated differently, see the usage of
-isSpecialSubmenu in the rebuildMenu method from the FrameHelper class.
-
-In the case of the recent file list, the command URLs provided by this
-workaround are not enough to open the document. A workaround for this is present
-in the FrameHelper::dispatchCommand method.
-
-For further reference on this type of submenus follow this link:
-http://wiki.services.openoffice.org/wiki/Framework/Tutorial/Popup_Menu_Controller
diff --git a/framework/source/lomenubar/Jobs.xcu b/framework/source/lomenubar/Jobs.xcu
deleted file mode 100644
index de2bb60..0000000
--- a/framework/source/lomenubar/Jobs.xcu
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="Jobs">
- <node oor:name="AppMenuDesktopJob" oor:op="replace">
- <prop oor:name="Service">
- <value>org.libreoffice.comp.framework.lomenubar.DesktopJob</value>
- </prop>
- </node>
- <node oor:name="AppMenuFrameJob" oor:op="replace">
- <prop oor:name="Service">
- <value>org.libreoffice.comp.framework.lomenubar.FrameJob</value>
- </prop>
- </node>
- </node>
- <node oor:name="Events">
- <node oor:name="OnStartApp" oor:op="replace">
- <node oor:name="JobList">
- <node oor:name="AppMenuDesktopJob" oor:op="replace"/>
- </node>
- </node>
- <node oor:name="onDocumentOpened" oor:op="replace">
- <node oor:name="JobList">
- <node oor:name="AppMenuFrameJob" oor:op="replace"/>
- </node>
- </node>
- <!--node oor:name="OnNew" oor:op="replace">
- <node oor:name="JobList">
- <node oor:name="AppMenuFrameJob" oor:op="replace"/>
- </node>
- </node-->
-
- </node>
-</oor:component-data>
diff --git a/framework/source/lomenubar/MenuItemInfo.cxx b/framework/source/lomenubar/MenuItemInfo.cxx
deleted file mode 100644
index 904f82a..0000000
--- a/framework/source/lomenubar/MenuItemInfo.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#include "MenuItemInfo.hxx"
-#include <libdbusmenu-gtk/menuitem.h>
-
-MenuItemInfo::MenuItemInfo ()
-{
- m_label = NULL;
- m_check_state = DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN;
- m_check_type = (gchar*)DBUSMENU_MENUITEM_TOGGLE_CHECK;
-
- m_is_visible = TRUE;
- m_is_enabled = TRUE;
-}
-
-MenuItemInfo::~MenuItemInfo ()
-{
- if (m_label)
- g_free(m_label);
-}
-
-//Setters
-void
-MenuItemInfo::setLabel (gchar* label)
-{
- this->m_label = g_strdup (label);
-}
-
-void
-MenuItemInfo::setEnabled (gboolean is_enabled)
-{
- this->m_is_enabled = is_enabled;
-}
-
-void
-MenuItemInfo::setCheckState (gint check_state)
-{
- this->m_check_state = check_state;
-}
-
-void
-MenuItemInfo::setCheckType (const gchar* check_type)
-{
- this->m_check_type = (gchar*)check_type;
-}
-
-void
-MenuItemInfo::setVisible (gboolean is_visible)
-{
- this->m_is_visible = is_visible;
-}
-
-//Getters
-gchar*
-MenuItemInfo::getLabel () const
-{
- return m_label;
-}
-
-gboolean
-MenuItemInfo::getEnabled () const
-{
- return m_is_enabled;
-}
-
-gint
-MenuItemInfo::getCheckState () const
-{
- return m_check_state;
-}
-
-const gchar*
-MenuItemInfo::getCheckType () const
-{
- return m_check_type;
-}
-
-gboolean
-MenuItemInfo::getVisible () const
-{
- return m_is_visible;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemInfo.hxx b/framework/source/lomenubar/MenuItemInfo.hxx
deleted file mode 100644
index 0171795..0000000
--- a/framework/source/lomenubar/MenuItemInfo.hxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#ifndef __MENU_ITEM_INFO_HXX__
-#define __MENU_ITEM_INFO_HXX__
-#include <glib.h>
-
-// This is used in a hash table with commandurls as keys
-class MenuItemInfo {
- gchar* m_label; //Label text in UTF-8 with tildes subst by underscores
- gint m_check_state;
- gchar* m_check_type;
- gboolean m_is_enabled;
- gboolean m_is_visible;
-
- public:
- MenuItemInfo ();
- ~MenuItemInfo ();
-
- //Setters
- void setLabel (gchar* label);
- void setEnabled (gboolean is_enabled);
- void setCheckState (gint check_state);
- void setCheckType (const gchar* check_type);
- void setVisible (gboolean is_visible);
-
- //Getters
- gchar* getLabel () const;
- gboolean getEnabled () const;
- gint getCheckState () const;
- const gchar* getCheckType () const;
- gboolean getVisible () const;
-};
-#endif // __MENU_ITEM_INFO_HXX__
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemStatusListener.cxx b/framework/source/lomenubar/MenuItemStatusListener.cxx
deleted file mode 100644
index 16a40de..0000000
--- a/framework/source/lomenubar/MenuItemStatusListener.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#include "MenuItemStatusListener.hxx"
-#include "MenuItemInfo.hxx"
-
-#include <com/sun/star/frame/status/Visibility.hpp>
-
-using com::sun::star::frame::status::Visibility;
-
-MenuItemStatusListener::MenuItemStatusListener (FrameHelper *helper)
- : m_helper(helper)
-{
- OSL_ENSURE(m_helper, "FrameHelper cannot be NULL");
-}
-
-void SAL_CALL
-MenuItemStatusListener::statusChanged(const FeatureStateEvent& Event)
- throw (RuntimeException)
-{
- sal_Bool isChecked;
- Visibility visible;
- OUString url = Event.FeatureURL.Complete;
- OUString oULabel;
-
- gchar* c_url = g_utf16_to_utf8 (url.getStr(),
- url.getLength(),
- NULL, NULL, NULL);
-
- GHashTable *commandsInfo = m_helper->getCommandsInfo ();
- MenuItemInfo *info = (MenuItemInfo*)g_hash_table_lookup (commandsInfo, (gpointer)c_url);
- if (!info)
- {
- info = new MenuItemInfo ();
- g_hash_table_insert (commandsInfo, c_url, info);
-
- //Set the default label
- oULabel = m_helper->getLabelFromCommandURL(url);
- // Replace tilde with underscore for Dbusmenu Alt accelerators
- oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
-
- // GLib behaves better than OUStringToOString wrt encoding transformation
- gchar* label = g_utf16_to_utf8 (oULabel.getStr(),
- oULabel.getLength(),
- NULL, NULL, NULL);
- info->setLabel (label);
- g_free (label);
- }
- else
- {
- //Since we're not introducing it in the hash table, we get rid of this string
- g_free (c_url);
- }
-
- //We set the enabled/disabled state
- info->setEnabled ((gboolean)Event.IsEnabled);
-
- //We find out what the new state is by casting
-
- //For some reason, URLs can slip through as labels, we make sure
- //this doesn't happen.
- if ((Event.State >>= oULabel) &&
- !oULabel.match ("private:", 0) &&
- !oULabel.match (".uno:", 0) &&
- !oULabel.match ("slot:", 0) &&
- !oULabel.match ("service:", 0) &&
- !oULabel.match (".cmd:", 0) &&
- !oULabel.match ("macro:///", 0))
- {
- oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
- gchar* label = g_utf16_to_utf8 (oULabel.getStr(),
- oULabel.getLength(),
- NULL, NULL, NULL);
- info->setLabel (label);
- g_free (label);
- }
- else if (Event.State >>= isChecked)
- {
- info->setCheckState (isChecked);
- }
- else if (Event.State >>= visible)
- {
- info->setVisible (visible.bVisible);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/MenuItemStatusListener.hxx b/framework/source/lomenubar/MenuItemStatusListener.hxx
deleted file mode 100644
index 89419c4..0000000
--- a/framework/source/lomenubar/MenuItemStatusListener.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef __MENU_ITEM_STATUS_LISTENER_HXX__
-#define __MENU_ITEM_STATUS_LISTENER_HXX__
-
-#include "FrameHelper.hxx"
-
-#include <glib.h>
-
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-#include <rtl/process.h>
-
-using com::sun::star::frame::FeatureStateEvent;
-using com::sun::star::frame::XStatusListener;
-using com::sun::star::lang::EventObject;
-
-// This class listens for changes in each menuitem and notifies FrameHelper about it
-class MenuItemStatusListener : public cppu::WeakImplHelper1 < XStatusListener >
-{
- private:
- guint16 m_id;
- FrameHelper* const m_helper;
-
- public:
- MenuItemStatusListener (FrameHelper *helper);
- ~MenuItemStatusListener () {}
-
- virtual void SAL_CALL
- statusChanged(const FeatureStateEvent& Event)
- throw (RuntimeException);
-
- virtual void SAL_CALL disposing(const EventObject& /*aEvent*/)
- throw (RuntimeException) {}
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/lomenubar/README b/framework/source/lomenubar/README
deleted file mode 100644
index 4517634..0000000
--- a/framework/source/lomenubar/README
+++ /dev/null
@@ -1,15 +0,0 @@
-LibreOffice Global Menubar Extension for DBusMenu
-=================================================
-
-This library is an extension for LibreOffice that exports the Menubar structure,
-actions and shortcuts through the DBusMenu D-Bus interface. If there is a
-present DbusMenu client (The Unity panel or the Appmenu applet for GNOME Panel
-for instance), LibreOffice will had its menu structure.
-
-For more information, visit the official website:
-http://launchpad.net/lo-menubar
-
-Known Issues
-------------
-- The menubar is shown briefly before it is hidden.
-- The LibreOffice Start Center does not hide/export its menu structure.
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
deleted file mode 100644
index f1a3321..0000000
--- a/framework/source/lomenubar/exports.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * A LibreOffice extension to send the menubar structure through DBusMenu
- *
- * Copyright 2011 Canonical, Ltd.
- * Authors:
- * Alberto Ruiz <alberto.ruiz at codethink.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the the GNU Lesser General Public License version 3, as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR PURPOSE. See the applicable
- * version of the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#include <stdio.h>
-
-#include <osl/mutex.hxx>
-#include <osl/thread.h>
-#include <cppuhelper/factory.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sal/types.h>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include "DesktopJob.hxx"
-#include "FrameJob.hxx"
-
-namespace css = ::com::sun::star;
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName ,
- void* pServiceManager,
- void* /*pRegistryKey*/ )
-{
- if ( !pServiceManager || !pImplName )
- return 0;
-
- css::uno::Reference< css::lang::XSingleServiceFactory > xFactory ;
- css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR (reinterpret_cast< css::lang::XMultiServiceFactory* >(pServiceManager), css::uno::UNO_QUERY);
- ::rtl::OUString sImplName = ::rtl::OUString::createFromAscii(pImplName);
-
- if (sImplName.equalsAscii(DESKTOPJOB_IMPLEMENTATION_NAME))
- {
- css::uno::Sequence< ::rtl::OUString > lNames(1);
- lNames[0] = ::rtl::OUString::createFromAscii(DESKTOPJOB_IMPLEMENTATION_NAME);
- xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, DesktopJob_createInstance, lNames);
- }
- if (sImplName.equalsAscii(FRAMEJOB_IMPLEMENTATION_NAME))
- {
- css::uno::Sequence< ::rtl::OUString > lNames(1);
- lNames[0] = ::rtl::OUString::createFromAscii(FRAMEJOB_IMPLEMENTATION_NAME);
- xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, FrameJob_createInstance, lNames);
- }
-
-
- if (!xFactory.is())
- return 0;
-
- xFactory->acquire();
- return xFactory.get();
-}
-
-} // extern C
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/util/lomenubar.component b/framework/util/lomenubar.component
deleted file mode 100644
index 279ab3a..0000000
--- a/framework/util/lomenubar.component
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Major Contributor(s):
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- *-->
-<component loader="com.sun.star.loader.SharedLibrary" prefix="lomenubar"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="org.libreoffice.comp.framework.lomenubar.FrameJob">
- <service name="com.sun.star.task.Job"/>
- </implementation>
- <implementation name="org.libreoffice.comp.framework.lomenubar.DesktopJob">
- <service name="com.sun.star.task.Job"/>
- </implementation>
-</component>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a18394e..47c6c2b 100644
--- a/postprocess/packcomponents/makefile.mk
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list