Rebased ref, commits from common ancestor:
commit a921abe1fb43d2ba35b34230f04f6df722f20a0d
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Feb 5 10:56:11 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:56:11 2020 +0100
Release 6.3.5.2
Change-Id: Ibffcf5168432ba19ef930a2f9b321354150d0d21
diff --git a/configure.ac b/configure.ac
index aa954f4edbb7..bb17f3ef95a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.3.5.1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.5.2],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 5c25e8c3a93cf6c0ce13e442ce824ed283424a87
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Feb 4 10:36:09 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:52:08 2020 +0100
Allow opt-out from document events check
Commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 added a warning on load
when a document binds events to a macro.
This adds an option to restore the old behavior, so that the warning only
appears when a document actually has Macros.
Change-Id: I5ad398d3d503a0954a746f4cba150f68630b820c
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6d54c8159706..cc7fd9f2d85d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2698,6 +2698,12 @@
</info>
<value>false</value>
</prop>
+ <prop oor:name="CheckDocumentEvents" oor:type="xs:boolean"
oor:nillable="false">
+ <info>
+ <desc>Warn on load when a document binds an event to a macro</desc>
+ </info>
+ <value>true</value>
+ </prop>
<set oor:name="TrustedAuthors" oor:node-type="TrustedAuthor">
<info>
<desc>List with trusted authors.</desc>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b3092cd1cce8..b865ce456b7d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3609,7 +3609,9 @@ void SfxObjectShell::SetMacroCallsSeenWhileLoading()
bool SfxObjectShell::GetMacroCallsSeenWhileLoading() const
{
- return pImpl->m_bMacroCallsSeenWhileLoading;
+ if
(officecfg::Office::Common::Security::Scripting::CheckDocumentEvents::get())
+ return pImpl->m_bMacroCallsSeenWhileLoading;
+ return false;
}
bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference<
task::XInteractionHandler >& xHandler )
commit ac27e33e554d350051d5aa1f9a065bb59f840101
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Mon Jul 1 12:35:43 2019 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:52:08 2020 +0100
tdf#126088 Display InternalPaths in UI
Reviewed-on: https://gerrit.libreoffice.org/74952
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
(cherry picked from commit ed7e547e1241cf913e138436fa3d7bca8319ec1d)
Conflicts:
cui/source/options/optpath.cxx
cui/uiconfig/ui/optpathspage.ui
Change-Id: Ib729be9ff79a3e43d7ec838646b530be8beff2d8
(cherry picked from commit d2c2ca6832b1ae18597c9c7e4b29effe630ee4cd)
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 4e53c34fdb3a..7f9b0475f7a4 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -65,7 +65,8 @@ using namespace svx;
#define TAB_WIDTH_MIN 10
#define ITEMID_TYPE 1
-#define ITEMID_PATH 2
+#define ITEMID_USER_PATHS 2
+#define ITEMID_INTERNAL_PATHS 3
#define POSTFIX_INTERNAL "_internal"
#define POSTFIX_USER "_user"
@@ -96,6 +97,7 @@ struct PathUserData_Impl
sal_uInt16 nRealId;
SfxItemState eState;
OUString sUserPath;
+ OUString sInternalPath;
OUString sWritablePath;
explicit PathUserData_Impl( sal_uInt16 nId ) :
@@ -217,16 +219,21 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent,
const SfxItemSet& rSet)
rBar.InsertItem( ITEMID_TYPE, get<FixedText>("type")->GetText(),
0,
HeaderBarItemBits::LEFT |
HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
- rBar.InsertItem( ITEMID_PATH, get<FixedText>("path")->GetText(),
+ rBar.InsertItem( ITEMID_USER_PATHS,
get<FixedText>("user_paths")->GetText(),
+ 0,
+ HeaderBarItemBits::LEFT );
+ rBar.InsertItem( ITEMID_INTERNAL_PATHS,
get<FixedText>("internal_paths")->GetText(),
0,
HeaderBarItemBits::LEFT );
long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_TYPE));
- long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_PATH));
+ long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_USER_PATHS));
+ long nWidth3 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_INTERNAL_PATHS));
- long aTabs[] = {0, 0, 0};
+ long aTabs[] = {0, 0, 0, 0};
aTabs[1] = nWidth1 + 12;
aTabs[2] = aTabs[1] + nWidth2 + 12;
+ aTabs[3] = aTabs[2] + nWidth3 + 12;
pPathBox->SetTabs(SAL_N_ELEMENTS(aTabs), aTabs, MapUnit::MapPixel);
pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage,
DoubleClickPathHdl_Impl ) );
@@ -283,6 +290,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
HeaderBar &rBar = pPathBox->GetTheHeaderBar();
long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(1));
long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(2));
+ long nWidth3 = rBar.GetTextWidth(rBar.GetItemText(3));
for( sal_uInt16 i = 0; i <=
sal_uInt16(SvtPathOptions::PATH_CLASSIFICATION); ++i )
{
@@ -348,6 +356,11 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
const OUString aValue = Convert_Impl( sTmpPath );
nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue));
aStr += aValue;
+ aStr += "\t";
+ const OUString aValueInternal = Convert_Impl( sInternal );
+ nWidth3 = std::max(nWidth3,
pPathBox->GetTextWidth(aValueInternal));
+ aStr += aValueInternal;
+
SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr );
if ( bReadOnly )
{
@@ -361,9 +374,10 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
}
- long aTabs[] = {0, 0, 0};
+ long aTabs[] = {0, 0, 0, 0};
aTabs[1] = nWidth1 + 12;
aTabs[2] = aTabs[1] + nWidth2 + 12;
+ aTabs[3] = aTabs[2] + nWidth3 + 12;
pPathBox->SetTabs(SAL_N_ELEMENTS(aTabs), aTabs, MapUnit::MapPixel);
PathSelect_Impl( nullptr );
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index 9b42e041f74a..383cdf4c6ab3 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkBox" id="OptPathsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -42,21 +44,17 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="path">
+ <object class="GtkLabel" id="user_paths">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optpathspage|path">Path</property>
+ <property name="label" translatable="yes"
context="optpathspage|user_paths">User Paths</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -66,10 +64,8 @@
<property name="label" translatable="yes"
context="optpathspage|editpaths">Edit Paths: %1</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">3</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -79,10 +75,19 @@
<property name="pixbuf">res/lock.png</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="internal_paths">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="optpathspage|internal_paths ">Internal Paths</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -98,6 +103,9 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
index 02f6f21dc73c..759e0b7cdd0b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Paths.xcs
@@ -44,7 +44,7 @@
</prop>
<set oor:name="InternalPaths" oor:node-type="MultiPath">
<info>
- <desc>Contains path values configured by an administrator or package
(not visible for the user).</desc>
+ <desc>Contains path values configured by an administrator or package
(read-only for the user).</desc>
</info>
</set>
<prop oor:name="UserPaths" oor:type="oor:string-list">
commit b784785f969c93839415f87dc69032309401cc0b
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Jan 12 16:47:40 2017 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:52:08 2020 +0100
Disable CrashReportUI
since we don't offer upload - only want the dumps
Change-Id: I6d084757d83204cb960905d7eb78571b13f8f875
(cherry picked from commit 261862f000dce95013843d4a183ad09fe1639041)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 32489065c7b1..3dd7d5e9a066 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -928,7 +928,8 @@ bool crashReportInfoExists()
#if HAVE_FEATURE_BREAKPAD
void handleCrashReport()
{
- static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
+ // Don't show the dialog since we don't offer upload - only want the dumps
+ /*static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
@@ -942,7 +943,7 @@ void handleCrashReport()
css::util::URL aURL;
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyValue >());
bool bRet = false;
- aRet >>= bRet;
+ aRet >>= bRet;*/
}
#endif
commit 4a12694329e7796173b6e011014dc0c2c6930f30
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed May 8 12:13:51 2019 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:52:07 2020 +0100
Load explorerframe.dll at startup
Change-Id: Idbee388aafe56bd6b607fb25b2d5d653d2c7fd60
(cherry picked from commit 6b4f38893c7a1666738b40d858b6ae3c404aee67)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3fb7b6017c70..32489065c7b1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -125,6 +125,8 @@
#include <svtools/apearcfg.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/window.hxx>
+#include <osl/module.hxx>
+
#include "langselect.hxx"
#if HAVE_FEATURE_BREAKPAD
@@ -445,6 +447,13 @@ Desktop::Desktop()
m_firstRunTimer.SetTimeout(3000); // 3 sec.
m_firstRunTimer.SetInvokeHandler(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.SetDebugName( "desktop::Desktop m_firstRunTimer" );
+
+ static ::osl::Module aMod;
+ aMod.load("explorerframe.dll");
+ if (aMod.is())
+ SAL_WARN("desktop.app", "loading explorerframe.dll successful");
+ else
+ SAL_WARN("desktop.app", "loading explorerframe.dll failed");
}
Desktop::~Desktop()
commit 0aef117ee59de5e5f471bbf34b64c3be9eec633d
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Mon Jul 29 12:28:26 2019 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:52:07 2020 +0100
remove LibreLogo from build
Change-Id: I62b45ea4890f5693e7d12f2b8c4ae43a9a03d16e
(cherry picked from commit 7bbe69ba8f2febcdcfc0c0298c832ff87663c0e7)
diff --git a/Repository.mk b/Repository.mk
index a88b0f282897..639c0db413eb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1080,10 +1080,6 @@ $(eval $(call
gb_Helper_register_packages_for_install,python_scriptprovider, \
scripting_scriptproviderforpython \
))
-$(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \
- librelogo \
- librelogo_properties \
-))
endif # DISABLE_PYTHON
# External executables
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e6f93c869ccd..53516e05e429 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jurt \
jvmaccess \
jvmfwk \
- librelogo \
libreofficekit \
lingucomponent \
linguistic \
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 4cbe0be407ac..9619a3f74d35 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -141,14 +141,12 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists gid_Module_Optional_Pymailmerge
$FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Pyuno
$FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Script_Provider_For_Python
$FILELISTSDIR/pyuno_list.txt
- merge_flists gid_Module_Optional_Pyuno_LibreLogo
$FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Xsltfiltersamples
$FILELISTSDIR/common_list.txt
else
merge_flists gid_Module_Optional_Grfflt
$FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Headless
$FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge
$FILELISTSDIR/mailmerge_list.txt
merge_flists gid_Module_Pyuno
$FILELISTSDIR/pyuno_list.txt
- merge_flists gid_Module_Optional_Pyuno_LibreLogo
$FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Script_Provider_For_Python
$FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Xsltfiltersamples
$FILELISTSDIR/filters_list.txt
fi
@@ -157,7 +155,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
merge_flists gid_Module_Optional_Headless
$FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge
$FILELISTSDIR/common_list.txt
merge_flists gid_Module_Pyuno
$FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Pyuno_LibreLogo
$FILELISTSDIR/common_list.txt
merge_flists gid_Module_Script_Provider_For_Python
$FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Xsltfiltersamples
$FILELISTSDIR/common_list.txt
fi
diff --git a/officecfg/Configuration_officecfg.mk
b/officecfg/Configuration_officecfg.mk
index 9ce55fafcc4a..3190baa8e0f9 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -72,7 +72,6 @@ $(eval $(call
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Accelerators-macosx.xcu \
org/openoffice/Office/Accelerators-reportbuilder.xcu \
org/openoffice/Office/Accelerators-unxwnt.xcu \
- org/openoffice/Office/Addons-librelogo.xcu \
org/openoffice/Office/Common-writer.xcu \
org/openoffice/Office/Common-calc.xcu \
org/openoffice/Office/Common-draw.xcu \
@@ -111,7 +110,6 @@ $(eval $(call
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Embedding-base.xcu \
org/openoffice/Office/Embedding-reportbuilder.xcu \
org/openoffice/Office/Embedding-writer.xcu \
- org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \
org/openoffice/Office/UI/Controller-reportbuilder.xcu \
org/openoffice/TypeDetection/UISort-writer.xcu \
org/openoffice/TypeDetection/UISort-calc.xcu \
@@ -131,7 +129,6 @@ $(eval $(call
gb_Configuration_add_spool_langpack,registry,officecfg/registry/da
$(eval $(call
gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
org/openoffice/Setup.xcu \
org/openoffice/Office/Accelerators.xcu \
- org/openoffice/Office/Addons.xcu \
org/openoffice/Office/Common.xcu \
org/openoffice/Office/DataAccess.xcu \
org/openoffice/Office/PresentationMinimizer.xcu \
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 7cceb8669a38..32c0845edf8c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -844,20 +844,6 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolbar/addon_LibreLogo.OfficeToolBar"
oor:op="replace" install:module="librelogo">
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Logo</value>
- </prop>
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="Locked" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- </node>
<node oor:name="private:resource/toolbar/changes" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,2</value>
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 71a60175f0b0..63ea7e243e49 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -27,7 +27,6 @@ postprocess_XCDS := \
draw.xcd \
graphicfilter.xcd \
impress.xcd \
- librelogo.xcd \
lingucomponent.xcd \
main.xcd \
math.xcd \
@@ -110,11 +109,6 @@ postprocess_FILES_impress := \
$(postprocess_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \
$(postprocess_MOD)/org/openoffice/Setup-impress.xcu
-postprocess_DEPS_librelogo := main writer
-postprocess_FILES_librelogo := \
- $(postprocess_MOD)/org/openoffice/Office/Addons-librelogo.xcu \
-
$(postprocess_MOD)/org/openoffice/Office/UI/WriterWindowState-librelogo.xcu
-
postprocess_DEPS_lingucomponent := main
postprocess_FILES_lingucomponent := \
$(SRCDIR)/lingucomponent/config/Linguistic-lingucomponent-hyphenator.xcu \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7c9d6c4538bd..e198eaa5e3d0 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -39,7 +39,6 @@ $(eval $(call
gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST))
$(eval $(call
gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call
gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call
gb_AutoInstall_add_module,python_scriptprovider,,,,PACKAGE_FILELIST))
-$(eval $(call gb_AutoInstall_add_module,python_librelogo,,,,PACKAGE_FILELIST))
$(eval $(call
gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
$(eval $(call
gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index e38d58a9b821..fef10924a62f 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\
python \
python_scriptprovider \
- python_librelogo \
))
ifeq ($(DISABLE_PYTHON),TRUE)
@@ -37,12 +36,7 @@ endif
$(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\
scp2/source/python/file_python \
- scp2/source/python/file_python_librelogo \
scp2/source/python/module_python \
))
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\
- scp2/source/python/module_python_librelogo \
-))
-
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/setup_native/source/packinfo/packinfo_office.txt
b/setup_native/source/packinfo/packinfo_office.txt
index 63a2c93b1682..66c016b4ad40 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -267,6 +267,8 @@ module = "gid_Module_Pyuno"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core,
SUNWPython"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno"
+linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
+linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION
%PACKAGEVERSION-%PACKAGEREVISION"
copyright = "2019 The Document Foundation"
@@ -277,21 +279,6 @@ destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
-Start
-module = "gid_Module_Optional_Pyuno_LibreLogo"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-librelogo"
-solarisrequires =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer,SUNWPython"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
-freebsdrequires =
"%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno %PACKAGEVERSION
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-copyright = "2019 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "LibreLogo toolbar for %PRODUCTNAME %PRODUCTVERSION Writer"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
Start
module = "gid_Module_Script_Provider_For_Python"
solarispackagename =
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-python-script-provider"
commit 21df1f4dbf8716b32f708d12abf1c2ed5f8394b1
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Feb 4 15:51:18 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Feb 5 10:52:05 2020 +0100
.gitreview: Update default branch
Change-Id: Ifc54f351adf9a1ba5182797e55076c2c00cf836b
diff --git a/.gitreview b/.gitreview
index 82c37d7762ea..c4d492adf26d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
port=29418
project=core
defaultremote=logerrit
-defaultbranch=libreoffice-6-3-5
+defaultbranch=feature/cib_contract57d
commit 9a62adaf9abe90e8fef419f29114b0176dd66801
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Jan 28 18:25:15 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Jan 28 18:25:15 2020 +0100
Version 6.3.5.1, tag libreoffice-6.3.5.1
diff --git a/dictionaries b/dictionaries
index 168a02fe27c1..e39b9e8da0f9 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 168a02fe27c1d28ee4919fb96119aaedac9556c7
+Subproject commit e39b9e8da0f921ff384084fd34b054b13e2d3b3b
diff --git a/helpcontent2 b/helpcontent2
index 059c641292e2..06770155c352 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 059c641292e22c3ac6fd18a01b1d3a194017c5e2
+Subproject commit 06770155c3529ba4a1ab9ff0bd1c00e653a3a00d
diff --git a/translations b/translations
index 9e0fcd06182e..108acfdce234 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9e0fcd06182e3b95eb900af5155dfa03f60704ae
+Subproject commit 108acfdce2340ff8913c713c1f54884db4f729f6
commit 4d97adc71bdd66cddc97abeed20a74a4099eb4c4
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Jan 28 18:24:34 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Jan 28 18:24:34 2020 +0100
bump product version to 6.3.5.1
Change-Id: I3920198465bdf47bc13717e52f4f8a10b417da80
diff --git a/configure.ac b/configure.ac
index ed0aa7df8cd5..aa954f4edbb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.3.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.5.1],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 1b05ed857f0f6a0b8faa0dcda108b71092cde50c
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Jan 28 18:21:40 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Jan 28 18:21:40 2020 +0100
Branch libreoffice-6-3-5
This is 'libreoffice-6-3-5' - the stable branch for the 6.3.5 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.
If you want to build something cool, unstable, and risky, use master.
diff --git a/.gitreview b/.gitreview
index 1e6ce73905e8..82c37d7762ea 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
port=29418
project=core
defaultremote=logerrit
-defaultbranch=libreoffice-6-3
+defaultbranch=libreoffice-6-3-5
diff --git a/dictionaries b/dictionaries
index b29122518a4d..168a02fe27c1 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b29122518a4d462aad03cd8b7cb3b2aa0b4a844a
+Subproject commit 168a02fe27c1d28ee4919fb96119aaedac9556c7
diff --git a/helpcontent2 b/helpcontent2
index 8e34671f7dc2..059c641292e2 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8e34671f7dc259bac69350f8cf6d0ec0cbfad7c1
+Subproject commit 059c641292e22c3ac6fd18a01b1d3a194017c5e2
diff --git a/translations b/translations
index 1a20bc7121f9..9e0fcd06182e 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1a20bc7121f96500463e181bbcead205b6e84254
+Subproject commit 9e0fcd06182e3b95eb900af5155dfa03f60704ae
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
