[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.0' - 23 commits - configure.ac desktop/source extensions/source include/sfx2 lo.xcent.in Makefile.in officecfg/registry pyuno/Package_python_shell.mk registry/Module_registry.mk Repository.mk scp2/source sfx2/Library_sfx.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk solenv/bin sysui/desktop ure/Package_install.mk vcl/Module_vcl.mk
Tomaž Vajngerl
tomaz.vajngerl at collabora.com
Tue Aug 25 23:15:01 PDT 2015
Makefile.in | 25
Repository.mk | 10
configure.ac | 4
desktop/source/app/officeipcthread.cxx | 5
extensions/source/macosx/spotlight/mdimporter/Info.plist | 2
include/sfx2/app.hxx | 3
include/sfx2/sfx.hrc | 3
include/sfx2/sfxbasecontroller.hxx | 2
lo.xcent.in | 9
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 6
pyuno/Package_python_shell.mk | 4
registry/Module_registry.mk | 6
scp2/source/ooo/common_brand.scp | 2
scp2/source/ooo/file_ooo.scp | 4
sfx2/Library_sfx.mk | 1
sfx2/UIConfig_sfx.mk | 1
sfx2/source/appl/appdata.cxx | 3
sfx2/source/appl/appmisc.cxx | 10
sfx2/source/dialog/ApplicationStartupDialog.cxx | 128 +
sfx2/source/inc/ApplicationStartupDialog.hxx | 40
sfx2/source/inc/appdata.hxx | 1
sfx2/source/view/sfxbasecontroller.cxx | 27
sfx2/source/view/view.src | 12
sfx2/uiconfig/ui/applicationstartupdialog.ui | 325 ++
solenv/bin/macosx-codesign-app-bundle | 124 -
sysui/desktop/macosx/Info.plist.in | 1475 ++++++++-----
ure/Package_install.mk | 2
vcl/Module_vcl.mk | 2
28 files changed, 1623 insertions(+), 613 deletions(-)
New commits:
commit 8a217da6e01cf55a41786945d955ae21741fd47b
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.com>
Date: Wed Apr 16 12:11:46 2014 +0200
Introducing "application startup message"
Application startup message is an infobar which is shown on LO
startup. The message can be dismissed when entering into "Details"
dialog. The code to disable the dialog between restarts is also
included in this commit.
Conflicts:
sfx2/source/view/sfxbasecontroller.cxx
Change-Id: I7bbf8edc87b3eec8ac9010e2c4f60fb0f4f06894
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index cf2b132..febbd5d 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -190,6 +190,9 @@ public:
bool IsDowning() const;
void ResetLastDir();
+ bool shouldShowApplicationStartupMessage();
+ void hideApplicationStartupMessage();
+
SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 4f63e526..101290a 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -153,6 +153,9 @@
#define STR_READONLY_DOCUMENT (RID_SFX_START+128)
#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129)
#define STR_MODULENOTINSTALLED (RID_SFX_START+130)
+#define BT_APPLICATION_STARTUP (RID_SFX_START+131)
+#define STR_APPLICATION_STARTUP_MESSAGE (RID_SFX_START+132)
+
#define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157)
#define SFX_THUMBNAIL_TEXT (RID_SFX_START+158)
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 0f77a44..c95c56e 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -191,7 +191,7 @@ private:
SAL_DLLPRIVATE void ShowInfoBars( );
DECL_LINK( CheckOutHandler, void * );
-
+ DECL_LINK( ApplicationStartupHandler, void * );
// private variables
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 730c712..5072dde 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6604,6 +6604,12 @@
<desc>Uses cfg package Jobs instead of this component.</desc>
</info>
</set>
+ <prop oor:name="StartupMessage" oor:type="xs:boolean" oor:nillable="false">
+ <info>
+ <desc>Specifies whether to display startup message in LibreOffice Vanilla from Apple App Store</desc>
+ </info>
+ <value>true</value>
+ </prop>
</group>
<group oor:name="SmartTags">
<info>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 0a1100e..f6187ad 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -161,6 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/control/thumbnailviewacc \
sfx2/source/control/thumbnailview \
sfx2/source/control/unoctitm \
+ sfx2/source/dialog/ApplicationStartupDialog \
sfx2/source/dialog/alienwarn \
sfx2/source/dialog/backingcomp \
sfx2/source/dialog/backingwindow \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 9a555b9..8248fba 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,sfx))
$(eval $(call gb_UIConfig_add_uifiles,sfx,\
+ sfx2/uiconfig/ui/applicationstartupdialog \
sfx2/uiconfig/ui/alienwarndialog \
sfx2/uiconfig/ui/bookmarkdialog \
sfx2/uiconfig/ui/checkin \
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 4e98840..51e7187 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -50,6 +50,8 @@
#include <basic/basicmanagerrepository.hxx>
#include <basic/basmgr.hxx>
+#include <officecfg/Office/Common.hxx>
+
using ::basic::BasicManagerRepository;
using ::basic::BasicManagerCreationListener;
using ::com::sun::star::uno::Reference;
@@ -127,6 +129,7 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, bInQuit( false )
, bInvalidateOnUnlock( false )
, bODFVersionWarningLater( false )
+ , bShowApplicationStartupMessage(officecfg::Office::Common::Startup::StartupMessage::get())
{
#if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index fb4a17b..a8fbbef 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -223,4 +223,14 @@ BitmapEx SfxApplication::GetApplicationLogo(long nWidth)
return aBitmap;
}
+bool SfxApplication::shouldShowApplicationStartupMessage()
+{
+ return pAppData_Impl->bShowApplicationStartupMessage;
+}
+
+void SfxApplication::hideApplicationStartupMessage()
+{
+ pAppData_Impl->bShowApplicationStartupMessage = false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/ApplicationStartupDialog.cxx b/sfx2/source/dialog/ApplicationStartupDialog.cxx
new file mode 100644
index 0000000..86e5212
--- /dev/null
+++ b/sfx2/source/dialog/ApplicationStartupDialog.cxx
@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
+
+#include <comphelper/anytostring.hxx>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/exc_hlp.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/msgbox.hxx>
+
+#include <officecfg/Office/Common.hxx>
+
+#include "ApplicationStartupDialog.hxx"
+
+using namespace css::system;
+using namespace css::uno;
+using namespace comphelper;
+
+SfxApplicationStartupDialog::SfxApplicationStartupDialog(Window* pParent) :
+ SfxModalDialog(pParent, "ApplicationStartupDialog", "sfx/ui/applicationstartupdialog.ui")
+{
+ get(mpDontShowAgainCB, "checkbutton1");
+ get(mpOkButton, "ok");
+ get(mpLinkButton, "link");
+ get(mpLinkButton1, "linkbutton1");
+ get(mpLinkButton2, "linkbutton2");
+ mpOkButton->SetClickHdl(LINK(this, SfxApplicationStartupDialog, OkButtonClick));
+ mpLinkButton->SetClickHdl(LINK(this, SfxApplicationStartupDialog, LinkClick));
+ mpLinkButton1->SetClickHdl(LINK(this, SfxApplicationStartupDialog, LinkButton1Click));
+ mpLinkButton2->SetClickHdl(LINK(this, SfxApplicationStartupDialog, LinkButton2Click));
+}
+
+SfxApplicationStartupDialog::~SfxApplicationStartupDialog()
+{
+ disposeOnce();
+}
+
+void SfxApplicationStartupDialog::dispose()
+{
+ mpDontShowAgainCB.clear();
+ mpOkButton.clear();
+ mpLinkButton.clear();
+ mpLinkButton1.clear();
+ mpLinkButton2.clear();
+ SfxModalDialog::dispose();
+}
+
+IMPL_LINK_NOARG(SfxApplicationStartupDialog, OkButtonClick)
+{
+ if( mpDontShowAgainCB->IsChecked() )
+ {
+ std::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
+ officecfg::Office::Common::Startup::StartupMessage::set(false, batch);
+ batch->commit();
+ }
+
+ EndDialog( RET_OK );
+
+ return 0;
+}
+
+IMPL_LINK_NOARG(SfxApplicationStartupDialog, LinkClick)
+{
+ try
+ {
+ Reference<XSystemShellExecute> xSystemShellExecute(SystemShellExecute::create(comphelper::getProcessComponentContext()));
+ xSystemShellExecute->execute(mpLinkButton->GetURL(), OUString(), SystemShellExecuteFlags::URIS_ONLY );
+ }
+ catch (const Exception&)
+ {
+ Any aException(cppu::getCaughtException());
+ OUString aMessage(comphelper::anyToString(aException));
+ const SolarMutexGuard guard;
+ ErrorBox aErrorBox( NULL, WB_OK, aMessage);
+ aErrorBox.SetText(GetText());
+ aErrorBox.Execute();
+ }
+ return 0;
+}
+
+IMPL_LINK_NOARG(SfxApplicationStartupDialog, LinkButton1Click)
+{
+ try
+ {
+ Reference<XSystemShellExecute> xSystemShellExecute(SystemShellExecute::create(comphelper::getProcessComponentContext()));
+ xSystemShellExecute->execute(mpLinkButton1->GetURL(), OUString(), SystemShellExecuteFlags::URIS_ONLY );
+ }
+ catch (const Exception&)
+ {
+ Any aException(cppu::getCaughtException());
+ OUString aMessage(comphelper::anyToString(aException));
+ const SolarMutexGuard guard;
+ ErrorBox aErrorBox( NULL, WB_OK, aMessage);
+ aErrorBox.SetText(GetText());
+ aErrorBox.Execute();
+ }
+ return 0;
+}
+
+IMPL_LINK_NOARG(SfxApplicationStartupDialog, LinkButton2Click)
+{
+ try
+ {
+ Reference<XSystemShellExecute> xSystemShellExecute(SystemShellExecute::create(comphelper::getProcessComponentContext()));
+ xSystemShellExecute->execute(mpLinkButton2->GetURL(), OUString(), SystemShellExecuteFlags::URIS_ONLY );
+ }
+ catch (const Exception&)
+ {
+ Any aException(cppu::getCaughtException());
+ OUString aMessage(comphelper::anyToString(aException));
+ const SolarMutexGuard guard;
+ ErrorBox aErrorBox( NULL, WB_OK, aMessage);
+ aErrorBox.SetText(GetText());
+ aErrorBox.Execute();
+ }
+ return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/ApplicationStartupDialog.hxx b/sfx2/source/inc/ApplicationStartupDialog.hxx
new file mode 100644
index 0000000..fe1e1c5
--- /dev/null
+++ b/sfx2/source/inc/ApplicationStartupDialog.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+#ifndef INCLUDED_SFX2_SOURCE_INC_APPLICATIONSTARTUPDIALOG_HXX
+#define INCLUDED_SFX2_SOURCE_INC_APPLICATIONSTARTUPDIALOG_HXX
+
+#include <vcl/button.hxx>
+#include <vcl/fixedhyper.hxx>
+#include <vcl/layout.hxx>
+#include <sfx2/basedlgs.hxx>
+
+class SfxApplicationStartupDialog : public SfxModalDialog
+{
+private:
+ VclPtr<CheckBox> mpDontShowAgainCB;
+ VclPtr<PushButton> mpOkButton;
+ VclPtr<FixedHyperlink> mpLinkButton;
+ VclPtr<FixedHyperlink> mpLinkButton1;
+ VclPtr<FixedHyperlink> mpLinkButton2;
+
+ DECL_LINK(OkButtonClick, void*);
+ DECL_LINK(LinkClick, void*);
+ DECL_LINK(LinkButton1Click, void*);
+ DECL_LINK(LinkButton2Click, void*);
+
+public:
+ SfxApplicationStartupDialog(Window* pParent);
+ virtual ~SfxApplicationStartupDialog();
+ virtual void dispose() SAL_OVERRIDE;
+};
+
+#endif // INCLUDED_SFX2_SOURCE_INC_APPLICATIONENTRYDIALOG_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 3c17d3b..35cc10e 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -135,6 +135,7 @@ public:
bool bInQuit : 1;
bool bInvalidateOnUnlock : 1;
bool bODFVersionWarningLater : 1;
+ bool bShowApplicationStartupMessage : 1;
SfxAppData_Impl( SfxApplication* );
~SfxAppData_Impl();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 2bcac22..7fa9fcc 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -80,6 +80,8 @@
#include <unordered_map>
+#include "ApplicationStartupDialog.hxx"
+
#define TIMEOUT_START_RESCHEDULE 10L /* 10th s */
using namespace ::com::sun::star;
@@ -1419,6 +1421,18 @@ void SfxBaseController::ShowInfoBars( )
{
if ( m_pData->m_pViewShell )
{
+ if (SfxGetpApp()->shouldShowApplicationStartupMessage())
+ {
+ SfxViewFrame* pViewFrame = m_pData->m_pViewShell->GetFrame();
+ SfxInfoBarWindow* pInfoBar = pViewFrame->AppendInfoBar( "application-startup", SfxResId( STR_APPLICATION_STARTUP_MESSAGE ) );
+ if (pInfoBar)
+ {
+ VclPtrInstance<PushButton> pBtn( &pViewFrame->GetWindow(), SfxResId( BT_APPLICATION_STARTUP ) );
+ pBtn->SetClickHdl( LINK( this, SfxBaseController, ApplicationStartupHandler ) );
+ pInfoBar->addButton(pBtn);
+ }
+ }
+
// CMIS verifications
Reference< document::XCmisDocument > xCmisDoc( m_pData->m_pViewShell->GetObjectShell()->GetModel(), uno::UNO_QUERY );
if ( xCmisDoc.is( ) && xCmisDoc->canCheckOut( ) )
@@ -1468,7 +1482,20 @@ IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler )
return 0;
}
+IMPL_LINK_NOARG ( SfxBaseController, ApplicationStartupHandler )
+{
+ if (!m_pData->m_pViewShell)
+ return 0;
+ SfxApplicationStartupDialog aDialog(NULL);
+ if (aDialog.Execute() == RET_OK)
+ {
+ SfxViewFrame* pViewFrame = m_pData->m_pViewShell->GetFrame();
+ SfxGetpApp()->hideApplicationStartupMessage();
+ pViewFrame->RemoveInfoBar("application-startup");
+ }
+ return 0;
+}
Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper ()
{
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 1cb6c13..d05559c 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -104,4 +104,16 @@ PushButton BT_READONLY_EDIT
Text[ en-US ] = "Edit Document";
};
+PushButton BT_APPLICATION_STARTUP
+{
+ Pos = MAP_APPFONT( 0 , 0 );
+ Size = MAP_APPFONT( 30 , 0 );
+ Text[ en-US ] = "Details";
+};
+
+String STR_APPLICATION_STARTUP_MESSAGE
+{
+ Text [ en-US ] = "Find out about LibreOffice Vanilla..." ;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/uiconfig/ui/applicationstartupdialog.ui b/sfx2/uiconfig/ui/applicationstartupdialog.ui
new file mode 100644
index 0000000..6b62c8f
--- /dev/null
+++ b/sfx2/uiconfig/ui/applicationstartupdialog.ui
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkDialog" id="ApplicationStartupDialog">
+ <property name="can_focus">False</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="baseline_row">1</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">LibreOffice Vanilla is based on the most recent version of LibreOffice available. This build is provided for you by Collabora Productivity.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">62</property>
+ <property name="track_visited_links">False</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">LibreOffice Vanilla</property>
+ <attributes>
+ <attribute name="size" value="20000"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton1">
+ <property name="label" translatable="yes">Don't show this at next startup</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">LibreOffice-from-Collabora</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="size" value="12000"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Collabora provides and maintains LibreOffice products on iTunes. Collabora's enterprise-grade productivity suite LibreOffice-from-Collabora for Mac delivers long term stability and support for demanding environments. Deployment and administration utilities together with fast-response bug-fix support are available for enterprise customers.
+
+App Store purchases of LibreOffice-from-Collabora support ongoing development and enhancement of LibreOffice for Mac. Get extended features and stability while funding LibreOffice for Mac development by buying LibreOffice-from-Collabora today.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">70</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">More information:</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="link">
+ <property name="label" translatable="yes">LibreOffice-from-Collabora</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">12</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="uri">https://itunes.apple.com/us/app/libreoffice-from-collabora/id918120011</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">The Document Foundation</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="size" value="12000"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">The Document Foundation provides oversight and governance for the LibreOffice community, and supports the work of thousands of LibreOffice volunteers and contributors. Please consider donating to support their work.</property>
+ <property name="justify">fill</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">70</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">More information:</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="linkbutton1">
+ <property name="label" translatable="yes">The Document Foundation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">12</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="uri">https://www.documentfoundation.org/</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Donate:</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="linkbutton2">
+ <property name="label" translatable="yes">Document Foundation Website</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_left">12</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="relief">none</property>
+ <property name="xalign">0</property>
+ <property name="uri">https://www.libreoffice.org/donate/nonav/</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
commit e2f4c9eae3f53aaba968d7567f912df6fa911326
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jun 30 19:42:45 2015 +0300
tdf#92191: Don't use any IPC pipe in a sandboxed OS X app
Creating the pipe fails when sandboxed. This caused us to not start
the OfficeIPCThread, and that then meant that the file open requests
coming in through VCL_NSApplication's application:openFile: method in
vclnsapp.mm were not processed properly.
The OS takes care of not starting multiple LO apps simultaneously
anyway, so we don't really need any pipe, I hope.
Conflicts:
desktop/source/app/officeipcthread.cxx
Change-Id: Ia920520ce2928787313f83199028f9c9942f61f3
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index cb6ad0b..0168764 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -534,6 +534,10 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
if ( aUserInstallPathHashCode.isEmpty() )
return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we cannot create a valid hash code!
+#if HAVE_FEATURE_MACOSX_SANDBOX
+ nPipeMode = PIPEMODE_CREATED;
+#else
+
OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode );
do
@@ -577,6 +581,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
}
} while ( nPipeMode == PIPEMODE_DONTKNOW );
+#endif
}
if ( nPipeMode == PIPEMODE_CREATED )
commit c10b53544c6fca8939a1deeb73e0a4bcfab11e81
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 10:56:20 2015 +0200
Don't build ui-previewer in the App Store case
Conflicts:
vcl/Module_vcl.mk
Change-Id: I1b095586b66fbbe582b0e7266609895bb288c6fb
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index aa26183..a4be891 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Package_opengl \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
- $(if $(ENABLE_HEADLESS),, \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
Executable_ui-previewer) \
$(if $(filter LINUX MACOSX WNT,$(OS)), \
Executable_outdevgrind \
commit d7127e73274794e00335a3deed74e35ad3c4eed5
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Aug 24 12:02:29 2015 +0200
OS X codesign
Change-Id: I15ef2f52cd58e94945956c1fa2ec3bc22a9bdaf0
diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle
index e65d8e6..c6632f6 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -1,9 +1,8 @@
#!/bin/bash
-# Script to sign dylibs and frameworks in an app bundle plus the
-# bundle itself. Called from
-# installer::simplepackage::create_package() in
-# solenv/bin/modules/installer/simplepackage.pm
+# Script to sign executables, dylibs and frameworks in an app bundle
+# plus the bundle itself. Called from
+# the test-install target in Makefile.in
test `uname` = Darwin || { echo This is for OS X only; exit 1; }
@@ -19,90 +18,97 @@ for V in \
fi
done
-echo "codesigning using MACSOX_CODESIGNING_IDENTITY=[${MACOSX_CODESIGNING_IDENTITY?}]"
-
APP_BUNDLE="$1"
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
+ # In a sandboxed build executables need the entitlements
+ entitlements="--entitlements $BUILDDIR/lo.xcent"
+ # We use --enable-canonical-installation-tree-structure so all
+ # data files in Resources are included in the app bundle signature
+ # through that. I think.
+ other_files=''
+else
+ # In a non-sandboxed build (distributed outside the App Store)
+ # we traditionally have use --resource-rules. Let's not touch that?
+ resource_rules="--resource-rules $SRCDIR/setup_native/source/mac/CodesignRules.plist"
+ # And there we then want to sign data files, too, hmm.
+ other_files="\
+ -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
+ -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name 'LICENSE.html' \
+ -or -name '*.applescript'"
+fi
+
# Sign dylibs
#
-# Executables get signed right after linking, see
-# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
-# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
-# right after linking. So do it here.
-#
# The dylibs in the Python framework are called *.so. Go figure
#
# On Mavericks also would like to have data files signed...
# add some where it makes sense. Make a depth-first search to sign the contents
# of e.g. the spotlight plugin before attempting to sign the plugin itself
-find -d "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.so' -or -name '*.fodt' \
- -or -name 'schema.strings' -or -name 'schema.xml' -or -name '*.mdimporter' \
- -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name 'LICENSE.html' \
- -or -name '*.applescript' \) ! -type l | grep -v "LibreOfficePython\.framework" | \
+find "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \
+ $other_files \) ! -type l |
while read file; do
id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
- codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$file" || exit 1
+ codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$file"
done
-find $APP_BUNDLE -name '*.dylib.*' ! -type l | \
-while read dylib; do \
- id=`basename "$dylib"`; \
- id=`echo $id | sed -e 's/dylib.*/dylib/'`; \
- codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$dylib" || exit 1
+# Sign executables
+
+find "$APP_BUNDLE/Contents/MacOS" -type f |
+while read file; do
+ id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
+ codesign --force --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
done
-# The executables have already been signed by
-# gb_LinkTarget__command_dynamiclink in
-# solenv/gbuild/platform/macosx.mk, but sign the handful of scripts remaining
-# in MacOS
-# (<https://developer.apple.com/library/mac/technotes/tn2206/_index.html> "OS X
-# Code Signing In Depth" suggests we should get rid of them rather sooner than
-# later, but they appear to be OK for now):
-
-for i in gengal python senddoc unoinfo
-do
- if [ -f "$APP_BUNDLE/Contents/MacOS/$i" ]
- then
- codesign --verbose --identifier="$MACOSX_BUNDLE_IDENTIFIER.$i" \
- --sign "$MACOSX_CODESIGNING_IDENTITY" "$APP_BUNDLE/Contents/MacOS/$i" \
- || exit 1
- fi
+# Sign included bundles. First .app ones (i.e. the Python.app inside
+# the LibreOfficePython.framework. Be generic for kicks...)
+
+find "$APP_BUNDLE" -name '*.app' -type d |
+while read app; do
+ fn=`basename "$app"`
+ fn=${fn%.*}
+ # Assume the app has a XML (and not binary) Info.plist
+ id=`grep -A 1 '<key>CFBundleIdentifier</key>' $app/Contents/Info.plist | tail -1 | sed -e 's,.*<string>,,' -e 's,</string>.*,,'`
+ codesign --verbose --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$app"
done
-# Sign frameworks.
-#
-# Yeah, we don't bundle any other framework than our Python one, and
-# it has just one version, so this generic search is mostly for
-# completeness.
+# Then .framework ones. Again, be generic just for kicks.
-for framework in `find $APP_BUNDLE -name '*.framework' -type d`; do \
- fn="$(basename $framework)"
+find "$APP_BUNDLE" -name '*.framework' -type d |
+while read framework; do
+ fn=`basename "$framework"`
fn=${fn%.*}
- for version in $framework/Versions/*; do \
- if test ! -L $version -a -d $version; then
- codesign --force --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign "$MACOSX_CODESIGNING_IDENTITY" $version/$fn || exit 1
- codesign --force --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign "$MACOSX_CODESIGNING_IDENTITY" $version || exit 1
- fi; \
- done; \
+ for version in "$framework"/Versions/*; do
+ if test ! -L "$version" -a -d "$version"; then
+ # Assume the framework has a XML (and not binary) Info.plist
+ id=`grep -A 1 '<key>CFBundleIdentifier</key>' $version/Resources/Info.plist | tail -1 | sed -e 's,.*<string>,,' -e 's,</string>.*,,'`
+ codesign --verbose --identifier=$id --sign "$MACOSX_CODESIGNING_IDENTITY" "$version"
+ fi
+ done
+done
+
+# Then mdimporters
+
+find "$APP_BUNDLE" -name '*.mdimporter' -type d |
+while read bundle; do
+ codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign "$MACOSX_CODESIGNING_IDENTITY" "$bundle"
done
-# Sign the app bundle as a whole which means finally signing the
-# CFBundleExecutable from Info.plist, i.e. soffice (which is exempted from the
-# on-the-go executable signing in gb_LinkTarget__command_dynamiclink in
-# solenv/gbuild/platform/macosx.mk), plus the contents
+# Sign the app bundle as a whole which means (re-)signing the
+# CFBundleExecutable from Info.plist, i.e. soffice, plus the contents
# of the Resources tree (which unless you used
# --enable-canonical-installation-tree-structure is not much, far from
# all of our non-code "resources").
#
# At this stage we also attach the entitlements in the sandboxing case
+#
+# Also omit some files from the Bundle's seal via the resource-rules
+# (bootstraprc and similar that the user might adjust and image files)
+# See also https://developer.apple.com/library/mac/technotes/tn2206/
id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
-if test -n "$ENABLE_MACOSX_SANDBOX"; then
- entitlements="--entitlements $BUILDDIR/lo.xcent"
-fi
-
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements $APP_BUNDLE || exit 1
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}" $resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE"
exit 0
commit f16f8ee5c2a269339a36bf6af9b24b50b4328a37
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 11:43:08 2015 +0200
remove unopkg script from MacOSX folder of sandboxed app
Change-Id: Ib59953225480e6923e418b966cce289f07f863b5
diff --git a/Makefile.in b/Makefile.in
index 7fb74f7..fbb5cc0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -325,8 +325,9 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
ifneq ($ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal.bin binary that we don't want
+# Remove the gengal.bin binary and unopkg script that we don't want
rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
+ rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg
endif
#
# Then use the macosx-codesign-app-bundle script
commit d6785e162fa8cc4b03de76cd2d089d62ae45c068
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 11:39:44 2015 +0200
Don't put symlink to MacOS folder of sandboxed app
Conflicts:
ure/Package_install.mk
Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 99801c7..e8b6515 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -14,7 +14,9 @@ $(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
endif
ifeq (MACOSX,$(OS))
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
endif
+endif
# vim:set noet sw=4 ts=4:
commit ec51b41ba4831ce43a4f3ead47c72d2d6a884f61
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 11:07:14 2015 +0200
Don't package unoinfo in case of Mac OS X like app structure
Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 507ebce..5b9113a 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -511,7 +511,7 @@ File gid_Brand_File_Desktophelper_Txt
End
#endif
-#if !defined WNT
+#if !defined WNT && !defined MACOSX
File gid_Brand_File_Bin_Unoinfo
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
commit bacfd003d4045825d21fe46f623ad15440e15088
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 10:59:11 2015 +0200
Don't package gengal script in App Store case
Conflicts:
scp2/source/ooo/file_ooo.scp
Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d261b3..0be456e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -48,7 +48,7 @@ File gid_File_Basic_User_Standard
Name = "wizards_basicsrvstandard.filelist";
End
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Script_Gengal
BIN_FILE_BODY;
commit c5d91c02192f4272ad2a200beffa059a7dc7a146
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri May 15 17:05:17 2015 +0200
shell script in Contents/MacOS is not accepted
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b0f3382..7d261b3 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -84,7 +84,7 @@ End
#endif
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;
commit 91902ef1411943f65da296fefd15fff9170d9c0c
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 11 22:26:29 2015 +0200
create empty .lproj directories for languages supported by OS X
The previous solution had problems. InfoPlist.strings were empty,
because localization has not been working since the CFBundleTypeIconFile
entries were removed from Info.plist. Icon file basename was the key
in documents.ulf. So we packages 0 bytes long files. The second problem
was that we used LibreOffice language codes, and OS X language codes are
different in some cases. This caused problems such as French strings on
English UI (e.g. Open/Save dialogs), because the system did not
recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
Conflicts:
Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 8bcad34..7fb74f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -307,14 +307,13 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
- set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
- bn=`basename $$F .zip`; \
- lang=$${bn#InfoPlist_}; \
+#
+# Create Resources/*.lproj directories for languages supported by OS X
+ set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
mkdir $$lproj; \
- (cd $$lproj; unzip $$F); \
done
+#
# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
#
commit 53c396c7008b807cffcc501171520b28c3f2ad24
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 9 10:35:51 2014 +0300
Remove potential old leftover before moving the app bundle
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
diff --git a/Makefile.in b/Makefile.in
index c4a5bf6..8bcad34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,6 +338,7 @@ endif
mac-app-store-package: test-install
ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+ rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg
else
commit fc01d27ea172809ae7bdbd85df161d5a033d4533
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 14:57:52 2014 +0300
Seems that we don't need the com.apple.application-identifier after all
Conflicts:
lo.xcent.in
Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6
diff --git a/lo.xcent.in b/lo.xcent.in
index 19802dd..02d8929 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.application-identifier</key>
- <string>@MACOSX_BUNDLE_IDENTIFIER@</string>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.bookmarks.app-scope</key>
commit 54486c4ffe44813dc58633b50b55326b1c060bf4
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 00:27:58 2014 +0300
We need the gengal program at build time
But don't bother shipping it on OS X, at least not in the sandboxed
(App Store) case.
(cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)
Conflicts:
Makefile.in
Repository.mk
Conflicts:
Makefile.in
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
diff --git a/Makefile.in b/Makefile.in
index f5186e5..c4a5bf6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -317,6 +317,20 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
done
# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
+#
+# Remove unnecessary executables in the LibreOfficePython framework
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin
+#
+# Remove the python.o object file which is weird and interferes with app store uploading
+# And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either.
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
+#
+ifneq ($ENABLE_MACOSX_SANDBOX),)
+# Remove the gengal.bin binary that we don't want
+ rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
+endif
+#
+# Then use the macosx-codesign-app-bundle script
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
diff --git a/Repository.mk b/Repository.mk
index c7ae480..afbfa7f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -143,9 +143,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- $(if $(ENABLE_MACOSX_SANDBOX),, \
- gengal \
- )\
+ gengal \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index ab26b9f..67dbe01 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_check_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
$(if $(filter-out WNT,$(OS)), \
@@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_targets,svx,\
Executable_pixelctl) \
))
endif
-endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit d78c567c78e9d0f4e122caab527da23f69dec6d3
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Sep 21 23:55:38 2014 +0300
We don't build the Apple Remote code when sandboxed
So no need for the related entitlements.
Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5
(cherry picked from commit a1379c6d2555c77b1b096165ac2aab42808e90a7)
diff --git a/lo.xcent.in b/lo.xcent.in
index ca636d7..19802dd 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -20,13 +20,6 @@
<true/>
<key>com.apple.security.device.bluetooth</key>
<true/>
- <!-- usb needed for the apple_remote thingie... -->
- <key>com.apple.security.device.usb</key>
- <true/>
- <key>com.apple.security.temporary-exception.apple-events</key>
- <array>
- <string>mac.remotecontrols</string>
- </array>
<key>com.apple.security.print</key>
<true/>
</dict>
commit d1386eb0ea2113911a5ed841e45313407bdf21ba
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Sep 20 01:01:09 2014 +0300
Skip some executables in the OS X sandboxed (Mac App Store) case
I doubt end-users will miss gengal.bin, regview, or regmerge.
Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
(cherry picked from commit beb30bbd867f9a28878e0d004458c3507f6c0956)
Conflicts:
Repository.mk
diff --git a/Repository.mk b/Repository.mk
index e8338e7..c7ae480 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -143,7 +143,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- gengal \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ gengal \
+ )\
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
@@ -183,8 +185,10 @@ endif
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
- regmerge \
- regview \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ regmerge \
+ regview \
+ ) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
))
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index fb962c6..5f70ed9 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
Library_reg \
$(if $(filter-out $(OS),IOS), \
- Executable_regmerge \
- Executable_regview \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ Executable_regmerge \
+ Executable_regview \
+ ) \
StaticLibrary_registry_helper \
) \
))
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 67dbe01..ab26b9f 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_check_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
$(if $(filter-out WNT,$(OS)), \
@@ -44,6 +45,7 @@ $(eval $(call gb_Module_add_targets,svx,\
Executable_pixelctl) \
))
endif
+endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit 48e5048f740c123966161b139627dccbdf0471e7
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Aug 24 11:42:33 2015 +0200
Info.plist.in
Change-Id: Iec1074587ab678c2f021f2608c4e5d0b875188d4
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index b9c78c0..c6bb7d9 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -21,7 +21,7 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
- <!-- UTI declarations for OS X >= 10.4 -->
+
<key>UTExportedTypeDeclarations</key>
<array>
<!-- Writer documents -->
@@ -48,6 +48,8 @@
<string>application/vnd.stardivision.writer</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>text.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -70,28 +72,8 @@
<string>application/vnd.oasis.opendocument.text</string>
</array>
</dict>
- </dict>
- <dict>
- <key>UTTypeIdentifier</key>
- <string>vnd.oasis.opendocument.text-flat-xml</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Text (Flat XML)</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>fodt</string>
- </array>
- <key>public.mime-type</key>
- <array>
- <string>application/vnd.oasis.opendocument.text-flat-xml</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-text.icns</string>
</dict>
<!-- Calc documents -->
@@ -118,6 +100,8 @@
<string>application/vnd.stardivision.calc</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>spreadsheet.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -140,28 +124,8 @@
<string>application/vnd.oasis.opendocument.spreadsheet</string>
</array>
</dict>
- </dict>
- <dict>
- <key>UTTypeIdentifier</key>
- <string>vnd.oasis.opendocument.spreadsheet-flat-xml</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Spreadsheet (Flat XML)</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>fods</string>
- </array>
- <key>public.mime-type</key>
- <array>
- <string>application/vnd.oasis.opendocument.spreadsheet-flat-xml</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-spreadsheet.icns</string>
</dict>
<!-- Impress documents -->
@@ -190,6 +154,8 @@
<string>application/vnd.stardivision.impress-packed</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>presentation.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -212,28 +178,8 @@
<string>application/vnd.oasis.opendocument.presentation</string>
</array>
</dict>
- </dict>
- <dict>
- <key>UTTypeIdentifier</key>
- <string>vnd.oasis.opendocument.presentation-flat-xml</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Presentation</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>fodp</string>
- </array>
- <key>public.mime-type</key>
- <array>
- <string>application/vnd.oasis.opendocument.presentation-flat-xml</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-presentation.icns</string>
</dict>
<!-- Draw documents -->
@@ -260,6 +206,8 @@
<string>application/vnd.stardivision.draw</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>drawing.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -282,12 +230,16 @@
<string>application/vnd.oasis.opendocument.graphics</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-drawing.icns</string>
</dict>
+
+ <!-- Chart documents -->
<dict>
<key>UTTypeIdentifier</key>
- <string>vnd.oasis.opendocument.graphics-flat-xml</string>
+ <string>org.oasis-open.opendocument.chart</string>
<key>UTTypeDescription</key>
- <string>OpenDocument Drawing (Flat XML)</string>
+ <string>OpenDocument Chart</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
@@ -297,11 +249,11 @@
<dict>
<key>public.filename-extension</key>
<array>
- <string>fodg</string>
+ <string>odc</string>
</array>
<key>public.mime-type</key>
<array>
- <string>application/vnd.oasis.opendocument.graphics-flat-xml</string>
+ <string>application/vnd.oasis.opendocument.chart</string>
</array>
</dict>
</dict>
@@ -328,6 +280,8 @@
<string>application/vnd.sun.xml.writer.global</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>master-document.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -350,6 +304,8 @@
<string>application/vnd.oasis.opendocument.text-master</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-master-document.icns</string>
</dict>
<!-- Math documents -->
@@ -376,6 +332,8 @@
<string>application/vnd.stardivision.math</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>formula.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -398,6 +356,8 @@
<string>application/vnd.oasis.opendocument.formula</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-formula.icns</string>
</dict>
<!-- Text template documents -->
@@ -422,6 +382,8 @@
<string>application/vnd.sun.xml.writer.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>text-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -444,30 +406,8 @@
<string>application/vnd.oasis.opendocument.text-template</string>
</array>
</dict>
- </dict>
-
- <!-- Writer master document templates -->
- <dict>
- <key>UTTypeIdentifier</key>
- <string>org.oasis-open.opendocument.text-master-template</string>
- <key>UTTypeDescription</key>
- <string>OpenDocument Text Master Template</string>
- <key>UTTypeConformsTo</key>
- <array>
- <string>public.data</string>
- <string>public.content</string>
- </array>
- <key>UTTypeTagSpecification</key>
- <dict>
- <key>public.filename-extension</key>
- <array>
- <string>otm</string>
- </array>
- <key>public.mime-type</key>
- <array>
- <string>application/vnd.oasis.opendocument.text-master-template</string>
- </array>
- </dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-text-template.icns</string>
</dict>
<!-- Spreadsheet template documents -->
@@ -492,6 +432,8 @@
<string>application/vnd.sun.xml.calc.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>spreadsheet-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -514,6 +456,8 @@
<string>application/vnd.oasis.opendocument.spreadsheet-template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-spreadsheet-template.icns</string>
</dict>
<!-- Presentation template documents -->
@@ -538,6 +482,8 @@
<string>application/vnd.sun.xml.impress.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>presentation-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -560,6 +506,8 @@
<string>application/vnd.oasis.opendocument.presentation-template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-presentation-template.icns</string>
</dict>
<!-- Drawing template documents -->
@@ -584,6 +532,8 @@
<string>application/vnd.sun.xml.draw.template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>drawing-template.icns</string>
</dict>
<dict>
<key>UTTypeIdentifier</key>
@@ -606,6 +556,8 @@
<string>application/vnd.oasis.opendocument.graphics-template</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-drawing-template.icns</string>
</dict>
<!-- Base documents -->
@@ -630,6 +582,8 @@
<string>application/vnd.oasis.opendocument.database</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>oasis-database.icns</string>
</dict>
<!-- Extensions -->
@@ -654,12 +608,36 @@
<string>application/vnd.openofficeorg.extension</string>
</array>
</dict>
+ <key>UTTypeIconFile</key>
+ <string>extension.icns</string>
</dict>
</array>
<key>UTImportedTypeDeclarations</key>
<array>
- <!-- Microsoft Word XML -->
+ <!-- Microsoft Word Template -->
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.composite-content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Microsoft Word Template</string>
+ <key>UTTypeIdentifier</key>
+ <string>com.microsoft.word.dot</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dot</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/msword</string> <!-- ??? -->
+ </array>
+ </dict>
+ </dict>
+ <!-- OOXML wordprocessing -->
<dict>
<key>UTTypeConformsTo</key>
<array>
@@ -751,7 +729,7 @@
</dict>
</dict>
- <!-- Microsoft Excel XML -->
+ <!-- OOXML spreadsheet -->
<dict>
<key>UTTypeConformsTo</key>
<array>
@@ -866,7 +844,7 @@
</dict>
</dict>
- <!-- Microsoft Powerpoint XML -->
+ <!-- OOXML presentation -->
<dict>
<key>UTTypeConformsTo</key>
<array>
@@ -917,7 +895,6 @@
<array>
<string>org.openxmlformats.openxml</string>
<string>public.presentation</string>
- <string>public.executable</string>
</array>
<key>UTTypeDescription</key>
<string>Office Open XML presentation template</string>
@@ -958,581 +935,1013 @@
</array>
</dict>
</dict>
- </array>
- <!-- Document type declaration for OS X < 10.4 -->
- <key>CFBundleDocumentTypes</key>
- <array>
+ <!-- Others -->
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxw</string>
- <string>sdw</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.writer</string>
- <string>application/vnd.stardivision.writer</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>text.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Text</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>WordPerfect Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.wpd-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wpd</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/vnd.wordperfect</string>
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odt</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.oasis.opendocument.text</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-text.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Text</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>PalmDoc eBook </string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.pdb-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>pdb</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/x-aportisdoc</string>
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxc</string>
- <string>sdc</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.calc</string>
- <string>application/vnd.stardivision.calc</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>spreadsheet.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Spreadsheet</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>Hangul WP 97 Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.hwp-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>hwp</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/x-hwp-document</string> <!-- ??? -->
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>ods</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.oasis.opendocument.spreadsheet</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-spreadsheet.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Spreadsheet</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>Microsoft Works for Mac Document (v1 - v4)</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.wks-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wps</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/vnd.ms-works</string>
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxi</string>
- <string>sdd</string>
- <string>sdp</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.impress</string>
- <string>application/vnd.stardivision.impress</string>
- <string>application/vnd.stardivision.impress-packed</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>presentation.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Presentation</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>Data Interchange Format</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.dif-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dif</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/x-dif-document</string> <!-- ??? -->
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odp</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.oasis.opendocument.presentation</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-presentation.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Presentation</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>UTTypeDescription</key>
+ <string>SYLK Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.slk-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>slk</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/x-slk-document</string> <!-- ??? -->
+ </array>
+ </dict>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxd</string>
- <string>sda</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.sun.xml.draw</string>
- <string>application/vnd.stardivision.draw</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>drawing.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Drawing</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
+ <key>UTTypeDescription</key>
+ <string>Comma-Separated Value Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.csv-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>csv</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/x-csv-document</string> <!-- ??? -->
+ </array>
+ </dict>
+ </dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>UTTypeConformsTo</key>
<array>
- <string>odg</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>UTTypeDescription</key>
+ <string>dBASE Document</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.dbf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dbf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/x-dbf-document</string> <!-- ??? -->
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
<array>
- <string>application/vnd.oasis.opendocument.graphics</string>
+ <string>public.data</string>
+ <string>public.content</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-drawing.icns</string>
+ <key>UTTypeDescription</key>
+ <string>Lotus 1-2-3 Spreadsheet</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.123-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wk1</string>
+ <string>wks</string>
+ <string>123</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/vnd.lotus-1-2-3</string>
+ <string>application/vnd.lotus-1-2-3</string>
+ <string>application/vnd.lotus-1-2-3</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Computer Graphics Metafile</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.cgm-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>cgm</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/cgm</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>AutoCAD Interchange Format</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.dxf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>dxf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/vnd.dxf</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Windows Enhanced Metafile</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.emf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>emf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/x-emf</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ <string>public.image</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Windows Metafile</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.libreoffice.wmf-document</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>wmf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>image/x-wmf</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Plain Text File</string>
+ <key>UTTypeIdentifier</key>
+ <string>public.plain-text</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>txt</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>text/plain</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ <string>public.content</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Rich Text Format</string>
+ <key>UTTypeIdentifier</key>
+ <string>public.rtf</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>rtf</string>
+ </array>
+ <key>public.mime-type</key>
+ <array>
+ <string>application/rtf</string>
+ </array>
+ </dict>
+ </dict>
+
+ </array>
+
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Text</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.text</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Text</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.text</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.spreadsheet</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Spreadsheet</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.spreadsheet</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Presentation</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.presentation</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Presentation</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.presentation</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Drawing</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.graphics</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Drawing</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.graphics</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Chart</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.chart</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Master</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.text-master</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Master</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.text-master</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Formula</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.formula</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Formula</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.formula</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Text Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.text-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Text Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.text-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Spreadsheet Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.spreadsheet-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Spreadsheet Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.spreadsheet-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Presentation Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.presentation-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Presentation Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.presentation-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenOffice.org 1.0 Drawing Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.graphics-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Drawing Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.graphics-template</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>OpenDocument Database</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.oasis-open.opendocument.database</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>@PRODUCTNAME@ Extension</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openoffice.extension</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Word Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.microsoft.word.doc</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Word Template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>com.microsoft.word.dot</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML word processing document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openxmlformats.wordprocessingml.document</string>
+ </array>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML word processing document (macros enabled)</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openxmlformats.wordprocessingml.document.macroenabled</string>
+ </array>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Drawing</string>
+ <string>Office Open XML word processing template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxg</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.sun.xml.writer.global</string>
+ <string>org.openxmlformats.wordprocessingml.template</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>master-document.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Master</string>
+ <string>Office Open XML word processing template (macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odm</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.text-master</string>
+ <string>org.openxmlformats.wordprocessingml.template.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-master-document.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Master</string>
+ <string>Microsoft Excel Spreadsheet</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sxm</string>
- <string>smf</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.sun.xml.math</string>
- <string>application/vnd.stardivision.math</string>
+ <string>com.microsoft.excel.xls</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>formula.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Formula</string>
+ <string>Office Open XML spreadsheet template</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>odf</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.formula</string>
+ <string>org.openxmlformats.spreadsheetml.template</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-formula.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Formula</string>
+ <string>Office Open XML spreadsheet template (macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>stw</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.sun.xml.writer.template</string>
+ <string>org.openxmlformats.spreadsheetml.template.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>text-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Text Template</string>
+ <string>Office Open XML spreadsheet</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>ott</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.text-template</string>
+ <string>org.openxmlformats.spreadsheetml.sheet</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-text-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Text Template</string>
+ <string>Microsoft Excel 2007 spreadsheet (macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>otm</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.text-master-template</string>
+ <string>com.microsoft.excel.sheet.binary.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-master-template.icns</string>
- <key>CFBundleTypeName</key>
- <string>OpenDocument Master Template</string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>stc</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
- <array>
- <string>application/vnd.sun.xml.calc.template</string>
- </array>
- <key>CFBundleTypeIconFile</key>
- <string>spreadsheet-template.icns</string>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Spreadsheet Template</string>
+ <string>Office Open XML spreadsheet (macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>ots</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.spreadsheet-template</string>
+ <string>org.openxmlformats.spreadsheetml.sheet.macroenabled</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-spreadsheet-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Spreadsheet Template</string>
+ <string>Microsoft Powerpoint Presentation</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>sti</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.sun.xml.impress.template</string>
+ <string>com.microsoft.powerpoint.ppt</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>presentation-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Presentation Template</string>
+ <string>Office Open XML presentation</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>otp</string>
- </array>
- <key>CFBundleTypeMIMETypes</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.presentation-template</string>
+ <string>org.openxmlformats.presentationml.presentation</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-presentation-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Presentation Template</string>
+ <string>Office Open XML presentation (macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>std</string>
+ <string>org.openxmlformats.presentationml.presentation.macroenabled</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Office Open XML presentation template</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.sun.xml.draw.template</string>
+ <string>org.openxmlformats.presentationml.template</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>drawing-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenOffice.org 1.0 Drawing Template</string>
+ <string>Office Open XML presentation template (macros enabled)</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.openxmlformats.presentationml.template.macroenabled</string>
+ </array>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>CFBundleTypeName</key>
+ <string>WordPerfect Document</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>otg</string>
+ <string>org.libreoffice.wpd-document</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>PalmDoc eBook </string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.graphics-template</string>
+ <string>org.libreoffice.pdb-document</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-drawing-template.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Drawing Template</string>
+ <string>Hangul WP 97 Document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
+ <array>
+ <string>org.libreoffice.hwp-document</string>
+ </array>
</dict>
<dict>
- <key>CFBundleTypeExtensions</key>
+ <key>CFBundleTypeName</key>
+ <string>Microsoft Works for Mac Document (v1 - v4)</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>odb</string>
+ <string>org.libreoffice.wks-document</string>
</array>
- <key>CFBundleTypeMIMETypes</key>
+ </dict>
+ <dict>
+ <key>CFBundleTypeName</key>
+ <string>Data Interchange Format</string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>LSHandlerRank</key>
+ <string>Owner</string>
+ <key>LSItemContentTypes</key>
<array>
- <string>application/vnd.oasis.opendocument.database</string>
+ <string>org.libreoffice.dif-document</string>
</array>
- <key>CFBundleTypeIconFile</key>
- <string>oasis-database.icns</string>
+ </dict>
+ <dict>
<key>CFBundleTypeName</key>
- <string>OpenDocument Database</string>
+ <string>SYLK Document</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
- <key>LSIsAppleDefaultForType</key>
- <true/>
- </dict>
- <dict>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>doc</string>
- <string>dot</string>
- <string>rtf</string>
- <string>html</string>
- <string>htm</string>
- <string>pdb</string>
- <string>xml</string>
- <string>psw</string>
- <string>wpd</string>
- <string>jtd</string>
- <string>jtt</string>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list