comphelper/source/misc/lok.cxx | 2 +-
configure.ac | 1 +
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +-
oox/source/drawingml/chart/datasourcecontext.cxx | 2 +-
sc/source/ui/inc/mvtabdlg.hxx | 1 +
sc/source/ui/miscdlgs/mvtabdlg.cxx | 7 +++++++
sc/source/ui/view/tabvwsh3.cxx | 4 ++++
7 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 01842c4a5bb3c6c5af1cc026deb9bbae43a4b046
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Feb 26 16:05:12 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 10:07:40 2021 +0200
lok: mark calc document as modified when adjusting split-panes (2)
Change-Id: I91231770ebf02218ae0380ddf76a8664dc6e5e19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111651
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 094c8c47a8ed..a5b7e621efa1 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -1068,6 +1068,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rOtherBind.Invalidate( SID_WINDOW_FIX );
rOtherBind.Invalidate(nSlot);
});
+ if (!GetViewData().GetDocShell()->IsReadOnly())
+ GetViewData().GetDocShell()->SetDocumentModified();
}
}
else
commit c267c7e828e534a48f4182d68c4e124c13fda34a
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Feb 25 21:44:40 2021 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 10:07:23 2021 +0200
lok: mark calc document as modified when adjusting split-panes.
Change-Id: I592ee4dc4317f27fae24141b2052475ef26e9fc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111599
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Dennis Francis <dennis.fran...@collabora.com>
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 72e6a72707ab..094c8c47a8ed 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -1029,6 +1029,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rOtherBind.Invalidate( SID_WINDOW_FIX_COL );
rOtherBind.Invalidate( SID_WINDOW_FIX_ROW );
});
+ if (!GetViewData().GetDocShell()->IsReadOnly())
+ GetViewData().GetDocShell()->SetDocumentModified();
}
}
}
commit 5c3b57695b5ef8387a1f0e6e5faa31418781c565
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Feb 21 00:02:08 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 10:06:39 2021 +0200
fix variable name in SAL_INFO
Change-Id: Ie6da9b1677e60b4e9dfe507e1571cc68610a6cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111187
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 82e5c7aed4f9..c2a44872755f 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -73,7 +73,7 @@ public:
{
if (maLocaleLanguageTag != rLocaleLanguageTag)
{
- SAL_INFO("comphelper.lok", "Setting locale from " <<
maLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
+ SAL_INFO("comphelper.lok", "Setting locale from " <<
maLocaleLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
maLocaleLanguageTag = rLocaleLanguageTag;
}
}
commit 0ecb22821cb1ad350040d4a0350950deb1848b2a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Feb 17 12:58:20 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 10:06:06 2021 +0200
On aarch64 platform deb package platform string should be arm64 actually
Change-Id: I0b4b04e4a6f5c474b3961e5223128e0c835b8c44
diff --git a/configure.ac b/configure.ac
index b47477b14daa..e38091b29615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4839,6 +4839,7 @@ linux-gnu*)
CPUNAME=AARCH64
PLATFORMID=linux_aarch64
RTL_ARCH=AARCH64
+ EPM_FLAGS="-a arm64"
;;
alpha)
CPUNAME=AXP
commit a23417623bbfd60d133f184bd4ccbf68ec93f54a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Feb 9 12:00:45 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 10:05:36 2021 +0200
Fix chart label import, use the locale as MS Office does
Change-Id: Ic2b9198d37c102721c3043825113567d703d72b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110630
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx
b/oox/source/drawingml/chart/datasourcecontext.cxx
index 1112ba2e5c39..e9f2f3b189f6 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -156,7 +156,7 @@ SvNumberFormatter*
DoubleSequenceContext::getNumberFormatter()
uno::Reference<uno::XComponentContext> rContext =
getFilter().getComponentContext();
mpNumberFormatter.reset(
- new SvNumberFormatter(rContext, LANGUAGE_DONTKNOW) );
+ new SvNumberFormatter(rContext, LANGUAGE_SYSTEM) );
}
return mpNumberFormatter.get();
}
commit ea4de94a137dd70174338d276c5a5e1e96a44a27
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Nov 29 21:09:14 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 10:04:53 2021 +0200
LOKit: hide 'To document' dropdown
In Online sheets can be copied/moved only in current document
Change-Id: Ic30d9ae1e48184ab2aadccedcc670e0fea357296
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106844
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 9836cc544639..bd372005408a 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -63,6 +63,7 @@ private:
std::unique_ptr<weld::RadioButton> m_xBtnMove;
std::unique_ptr<weld::RadioButton> m_xBtnCopy;
+ std::unique_ptr<weld::Label> m_xFtDoc;
std::unique_ptr<weld::ComboBox> m_xLbDoc;
std::unique_ptr<weld::TreeView> m_xLbTable;
std::unique_ptr<weld::Entry> m_xEdTabName;
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 5ba94735d9ce..ff8657fb96a3 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -24,6 +24,7 @@
#include <docsh.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
+#include <comphelper/lok.hxx>
ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, const OUString& rDefault)
: GenericDialogController(pParent, "modules/scalc/ui/movecopysheet.ui",
"MoveCopySheetDialog")
@@ -36,6 +37,7 @@ ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, const
OUString& rDefault)
, mbEverEdited(false)
, m_xBtnMove(m_xBuilder->weld_radio_button("move"))
, m_xBtnCopy(m_xBuilder->weld_radio_button("copy"))
+ , m_xFtDoc(m_xBuilder->weld_label("toDocumentLabel"))
, m_xLbDoc(m_xBuilder->weld_combo_box("toDocument"))
, m_xLbTable(m_xBuilder->weld_tree_view("insertBefore"))
, m_xEdTabName(m_xBuilder->weld_entry("newName"))
@@ -190,6 +192,11 @@ void ScMoveTableDlg::Init()
m_xFtWarn->hide();
InitDocListBox();
SelHdl(*m_xLbDoc);
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ m_xFtDoc->hide();
+ m_xLbDoc->hide();
+ }
}
void ScMoveTableDlg::InitDocListBox()
commit 826fc7b331021e1015136e08730c70f67b880410
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Sep 22 18:35:02 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 31 09:57:55 2021 +0200
[cp] switch to Collabora's help instance
Change-Id: I70df6d7b7601f47b923c922c97436b0a826fc32e
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 93e22c99ce84..579c66c5e018 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3696,7 +3696,7 @@
<desc>Specifies the root URL to the Office help pages. Blank disables
Help buttons on dialogs in LibreOffice Online.</desc>
</info>
- <value>https://help.libreoffice.org/help.html?</value>
+ <value>https://help.collaboraoffice.com/help.html?</value>
</prop>
<group oor:name="StartCenter">
<info>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
