[Libreoffice-commits] .: 4 commits - framework/AllLangResTarget_fwe.mk framework/JunitTest_framework_complex.mk framework/JunitTest_framework_unoapi.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/Library_lomenubar.mk framework/Makefile framework/Module_framework.mk framework/Package_dtd.mk framework/Package_inc.mk framework/Package_uiconfig.mk framework/Package_unotypes.mk framework/source framework/util svx/AllLangResTarget_about.mk svx/AllLangResTarget_gal.mk svx/AllLangResTarget_ofa.mk svx/AllLangResTarget_svx.mk svx/AllLangResTarget_textconversiondlgs.mk svx/JunitTest_svx_unoapi.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk svx/Makefile svx/Module_svx.mk svx/Package_inc.mk svx/Package_sdi.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Apr 1 04:27:38 PDT 2011
framework/Library_lomenubar.mk | 2 -
framework/source/lomenubar/DesktopJob.hxx | 4 +--
framework/source/lomenubar/FrameJob.hxx | 2 -
framework/util/lomenubar.component | 38 ++++++++++++++++++++++++++++++
4 files changed, 42 insertions(+), 4 deletions(-)
New commits:
commit ef761468593c1140f5c85810153a77e0f7149c17
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Apr 1 13:26:24 2011 +0200
add component file for lomenubar
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
index f4d82e8..e8fe7c6 100644
--- a/framework/Library_lomenubar.mk
+++ b/framework/Library_lomenubar.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,lomenubar))
-#$(eval $(call gb_Library_set_componentfile,lomenubar,MODULE/COMPONENT_FILE))
+$(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
# FIXME pkg-config call belong in ./configure obviously
diff --git a/framework/util/lomenubar.component b/framework/util/lomenubar.component
new file mode 100755
index 0000000..628bcb7
--- /dev/null
+++ b/framework/util/lomenubar.component
@@ -0,0 +1,38 @@
+<?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"
+ 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>
commit c6c7647f5f9ef0855475fca564d133d079107755
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Apr 1 13:18:45 2011 +0200
rename service and implementation
diff --git a/framework/source/lomenubar/DesktopJob.hxx b/framework/source/lomenubar/DesktopJob.hxx
index e19e1da..09e72bc 100644
--- a/framework/source/lomenubar/DesktopJob.hxx
+++ b/framework/source/lomenubar/DesktopJob.hxx
@@ -32,8 +32,8 @@
#include <cppuhelper/implbase2.hxx>
#define LIBREOFFICE_BUSNAME "org.libreoffice.dbusmenu"
-#define DESKTOPJOB_IMPLEMENTATION_NAME "org.libreoffice.desktop.AppMenuJob"
-#define DESKTOPJOB_SERVICE_NAME "org.libreoffice.desktop.AppMenuJob"
+#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;
diff --git a/framework/source/lomenubar/FrameJob.hxx b/framework/source/lomenubar/FrameJob.hxx
index ae5369f..ee6fe2b 100644
--- a/framework/source/lomenubar/FrameJob.hxx
+++ b/framework/source/lomenubar/FrameJob.hxx
@@ -40,7 +40,7 @@
#include <glib.h>
#include <libdbusmenu-glib/menuitem.h>
-#define FRAMEJOB_IMPLEMENTATION_NAME "com.sun.star.comp.Office.MyJob"
+#define FRAMEJOB_IMPLEMENTATION_NAME "org.libreoffice.comp.framework.lomenubar.FrameJob"
#define FRAMEJOB_SERVICE_NAME "com.sun.star.task.Job"
namespace css = ::com::sun::star;
commit 435440d5c300112007b2938995802c4d5e877c05
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Apr 1 09:53:02 2011 +0200
removing useless executable flag from makefiles
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
old mode 100755
new mode 100644
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
old mode 100755
new mode 100644
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
old mode 100755
new mode 100644
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
old mode 100755
new mode 100644
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
old mode 100755
new mode 100644
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
old mode 100755
new mode 100644
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
old mode 100755
new mode 100644
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
old mode 100755
new mode 100644
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
old mode 100755
new mode 100644
diff --git a/framework/Makefile b/framework/Makefile
old mode 100755
new mode 100644
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
old mode 100755
new mode 100644
diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk
old mode 100755
new mode 100644
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
old mode 100755
new mode 100644
diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk
old mode 100755
new mode 100644
diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk
old mode 100755
new mode 100644
commit 18311016fc8e15e685d8018d4db4a45984a27130
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Apr 1 09:47:09 2011 +0200
removing useless executable flag from makefiles
diff --git a/svx/AllLangResTarget_about.mk b/svx/AllLangResTarget_about.mk
old mode 100755
new mode 100644
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
old mode 100755
new mode 100644
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
old mode 100755
new mode 100644
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
old mode 100755
new mode 100644
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
old mode 100755
new mode 100644
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk
old mode 100755
new mode 100644
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
old mode 100755
new mode 100644
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
old mode 100755
new mode 100644
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
old mode 100755
new mode 100644
diff --git a/svx/Makefile b/svx/Makefile
old mode 100755
new mode 100644
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
old mode 100755
new mode 100644
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
old mode 100755
new mode 100644
diff --git a/svx/Package_sdi.mk b/svx/Package_sdi.mk
old mode 100755
new mode 100644
More information about the Libreoffice-commits
mailing list