extras/source/autotext/lang/am/standard/FN/content.xml | 6 ++--- extras/source/autotext/lang/ar/standard/FN/content.xml | 6 ++--- sc/source/ui/app/scmod.cxx | 19 +++++++++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-)
New commits: commit 8e358c73b5f5e7423e0eb85c6f5e76d07457c060 Author: Laurent BP <laurent.balland-poir...@laposte.net> AuthorDate: Thu Sep 12 21:25:53 2019 +0200 Commit: Laurent BP <laurent.balland-poir...@laposte.net> CommitDate: Tue Sep 24 21:18:49 2019 +0200 Improve FN AutoText for ar Translate names which appear in Navigator Change-Id: Iab965081761885c9ba4cb4d3deef056fef75c612 Reviewed-on: https://gerrit.libreoffice.org/78842 Tested-by: Jenkins Reviewed-by: Laurent BP <laurent.balland-poir...@laposte.net> diff --git a/extras/source/autotext/lang/ar/standard/FN/content.xml b/extras/source/autotext/lang/ar/standard/FN/content.xml index b41b40baf853..33e5cad3fc6b 100644 --- a/extras/source/autotext/lang/ar/standard/FN/content.xml +++ b/extras/source/autotext/lang/ar/standard/FN/content.xml @@ -34,13 +34,13 @@ <text:sequence-decl text:display-outline-level="0" text:name="Text"/> <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> </text:sequence-decls> - <table:table table:name="Tabel1" table:style-name="FormulaTable"> + <table:table table:name="الجدول1" table:style-name="FormulaTable"> <table:table-column table:style-name="FormulaTable.A"/> <table:table-column table:style-name="FormulaTable.B"/> <table:table-header-rows> <table:table-row> <table:table-cell table:style-name="FormulaTable.A1" office:value-type="string"> - <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Objek1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="كائن1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> <svg:desc>formula</svg:desc> </draw:frame></text:p> </table:table-cell> @@ -52,4 +52,4 @@ </table:table> </office:text> </office:body> -</office:document-content> \ No newline at end of file +</office:document-content> commit 55167fb88d98b606dd61fe71507d0b6ddd7524b3 Author: Laurent BP <laurent.balland-poir...@laposte.net> AuthorDate: Thu Sep 12 21:17:56 2019 +0200 Commit: Laurent BP <laurent.balland-poir...@laposte.net> CommitDate: Tue Sep 24 21:18:21 2019 +0200 Improve FN AutoText for am Translate names which appear in Navigator Change-Id: I2d837475006c158325fc6ab38c80307eea9d5314 Reviewed-on: https://gerrit.libreoffice.org/78841 Tested-by: Jenkins Reviewed-by: Laurent BP <laurent.balland-poir...@laposte.net> diff --git a/extras/source/autotext/lang/am/standard/FN/content.xml b/extras/source/autotext/lang/am/standard/FN/content.xml index b41b40baf853..7e1d4a225195 100644 --- a/extras/source/autotext/lang/am/standard/FN/content.xml +++ b/extras/source/autotext/lang/am/standard/FN/content.xml @@ -34,13 +34,13 @@ <text:sequence-decl text:display-outline-level="0" text:name="Text"/> <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/> </text:sequence-decls> - <table:table table:name="Tabel1" table:style-name="FormulaTable"> + <table:table table:name="ሰንጠረዥ1" table:style-name="FormulaTable"> <table:table-column table:style-name="FormulaTable.A"/> <table:table-column table:style-name="FormulaTable.B"/> <table:table-header-rows> <table:table-row> <table:table-cell table:style-name="FormulaTable.A1" office:value-type="string"> - <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="Objek1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> + <text:p text:style-name="P1"><draw:frame draw:style-name="fr1" draw:name="እቃ1" text:anchor-type="as-char" draw:z-index="0"><draw:object xlink:href="./Object_1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> <svg:desc>formula</svg:desc> </draw:frame></text:p> </table:table-cell> @@ -52,4 +52,4 @@ </table:table> </office:text> </office:body> -</office:document-content> \ No newline at end of file +</office:document-content> commit 240ec23841cc1e9728f9273d88c1f9a170cf3fb8 Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Tue Nov 6 09:43:11 2018 +0100 Commit: Michael Meeks <michael.me...@collabora.com> CommitDate: Tue Sep 24 21:18:00 2019 +0200 Keep reference mode if only one dialog closed Change-Id: I9cf7988da7f83c28a0919c69ace131ee93054486 Reviewed-on: https://gerrit.libreoffice.org/79466 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.me...@collabora.com> diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index d8eb515e8eda..e21a83310256 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1483,7 +1483,16 @@ void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) //if ( pViewFrm ) // pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher - m_nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow + // before SetChildWindow + if ( comphelper::LibreOfficeKit::isActive() ) + { + if ( bVis ) + m_nCurRefDlgId = nId; + } + else + { + m_nCurRefDlgId = bVis ? nId : 0; + } if ( pViewFrm ) { @@ -1753,7 +1762,13 @@ void ScModule::EndReference() //FIXME: ShowRefFrame at InputHdl, if the Function AutoPilot is open? if ( m_nCurRefDlgId ) { - SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( m_nCurRefDlgId ); + SfxChildWindow* pChildWnd = nullptr; + + if ( comphelper::LibreOfficeKit::isActive() ) + pChildWnd = lcl_GetChildWinFromCurrentView( m_nCurRefDlgId ); + else + pChildWnd = lcl_GetChildWinFromAnyView( m_nCurRefDlgId ); + OSL_ENSURE( pChildWnd, "NoChildWin" ); if ( pChildWnd ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits