[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 2 commits - configure.ac include/sfx2 sfx2/source
configure.ac |2 +-
include/sfx2/objsh.hxx |2 ++
include/sfx2/viewsh.hxx |2 --
sfx2/source/doc/objmisc.cxx |9 +
sfx2/source/view/viewfrm.cxx |8 +++-
sfx2/source/view/viewsh.cxx |7 ---
6 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 3af811c768eabd775c4ca33a1ac1e0ccd448
Author: Samuel Mehrbrodt
AuthorDate: Wed Apr 8 08:51:38 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Wed Apr 8 08:51:38 2020 +0200
Release 6.2.9.6
Change-Id: Ief9b61b825a7460ce91fb4aa3ec6331b66fa623f
diff --git a/configure.ac b/configure.ac
index 7120703cfeb8..e9c6a8b04fa8 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.2.9.5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.9.6],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit e24e780f18830218666514e4e4b83243acf153e8
Author: Samuel Mehrbrodt
AuthorDate: Tue Apr 7 16:21:08 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Wed Apr 8 07:42:16 2020 +0200
Fix edit button still appearing in Calc
... even when editing readonly docs was disabled.
Viewshell was not yet available at this point, so
move the code where it belongs, into the object shell.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91832
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 523922ee9d033fd304d2b50a72b76853ddcfbcdf)
Change-Id: I71cbaf9c912beeeb0b8177538999049f7f8b4e03
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 7f14bce2f0c8..50112062cf90 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -598,6 +598,8 @@ public:
const
css::uno::Reference& xTarget,
const css::uno::Sequence&
rExceptions = css::uno::Sequence());
+bool isEditDocLocked();
+
// The functions from SvPersist
voidEnableSetModified( bool bEnable = true );
boolIsEnableSetModified() const;
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index a88fe07c58dd..cb185bb7b058 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -295,8 +295,6 @@ public:
voidAddRemoveClipboardListener( const
css::uno::Reference < css::datatransfer::clipboard::XClipboardListener>&, bool
);
css::uno::Reference< css::datatransfer::clipboard::XClipboardNotifier >
GetClipboardNotifier();
-bool isEditDocLocked();
-
SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const
css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor );
SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const
css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 0aad46e02258..f6b1e16c54df 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -84,6 +84,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1860,4 +1862,11 @@ bool
SfxObjectShell::IsContinueImportOnFilterExceptions(const OUString& aErrMess
return mbContinueImportOnFilterExceptions == yes;
}
+bool SfxObjectShell::isEditDocLocked()
+{
+if (!officecfg::Office::Common::Misc::AllowEditReadonlyDocs::get())
+return true;
+return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b1d29d0f09fa..b14a16bfa335 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -278,9 +278,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags &
SfxLoadedFlags::MAINDOCUMENT ))
break;
-
-SfxViewShell* pViewSh = GetViewShell();
-if (pViewSh && pViewSh->isEditDocLocked())
+if (pSh->isEditDocLocked())
break;
// Only change read-only UI and remove info bar when we succeed
@@ -868,7 +866,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
const SfxShell *pFSh;
if ( !pSh->HasName() ||
!( pSh->Get_Impl()->nLoadedFlags &
SfxLoadedFlags::MAINDOCUMENT ) ||
- (GetViewShell() && GetViewShell()->isEditDocLocked()) ||
+ (pSh->isEditDocLocked()) ||
( pSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
( !(pVSh = pSh->GetViewShell()) ||
[Libreoffice-commits] core.git: 2 commits - helpcompiler/source i18nlangtag/source
helpcompiler/source/HelpLinker.cxx | 54
i18nlangtag/source/languagetag/languagetag.cxx | 84 -
2 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 0cd436ca0f769329ce23dc7c5fdd41877931ae87
Author: Noel Grandin
AuthorDate: Tue Apr 7 20:01:46 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Apr 8 08:48:59 2020 +0200
loplugin:flatten in i18nlangtag
Change-Id: I52124d0ca56da3769810c8fce2684267f6c25156
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91845
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 403981a30768..1463ca8aef50 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -536,28 +536,28 @@ LanguageTag::LanguageTag( const OUString& rBcp47, const
OUString& rLanguage,
mbInitializedLangID( false),
mbIsFallback( false)
{
-if (!mbSystemLocale && !mbInitializedBcp47)
+if (mbSystemLocale || mbInitializedBcp47)
+return;
+
+if (rScript.isEmpty())
{
-if (rScript.isEmpty())
-{
-maBcp47 = rLanguage + "-" + rCountry;
-mbInitializedBcp47 = true;
-maLocale.Language = rLanguage;
-maLocale.Country = rCountry;
-mbInitializedLocale = true;
-}
+maBcp47 = rLanguage + "-" + rCountry;
+mbInitializedBcp47 = true;
+maLocale.Language = rLanguage;
+maLocale.Country = rCountry;
+mbInitializedLocale = true;
+}
+else
+{
+if (rCountry.isEmpty())
+maBcp47 = rLanguage + "-" + rScript;
else
-{
-if (rCountry.isEmpty())
-maBcp47 = rLanguage + "-" + rScript;
-else
-maBcp47 = rLanguage + "-" + rScript + "-" + rCountry;
-mbInitializedBcp47 = true;
-maLocale.Language = I18NLANGTAG_QLT;
-maLocale.Country = rCountry;
-maLocale.Variant = maBcp47;
-mbInitializedLocale = true;
-}
+maBcp47 = rLanguage + "-" + rScript + "-" + rCountry;
+mbInitializedBcp47 = true;
+maLocale.Language = I18NLANGTAG_QLT;
+maLocale.Country = rCountry;
+maLocale.Variant = maBcp47;
+mbInitializedLocale = true;
}
}
@@ -1508,31 +1508,31 @@ void LanguageTag::convertFromRtlLocale()
// Variant: [.codeset][@modifier]
// Variant effectively contains anything that follows the territory, not
// looking for '.' dot delimiter or '@' modifier content.
-if (!maLocale.Variant.isEmpty())
-{
-OString aStr = OUStringToOString( maLocale.Language + "_" +
maLocale.Country + maLocale.Variant,
-RTL_TEXTENCODING_UTF8);
-/* FIXME: let liblangtag parse this entirely with
- * lt_tag_convert_from_locale() but that needs a patch to pass the
- * string. */
+if (maLocale.Variant.isEmpty())
+return;
+
+OString aStr = OUStringToOString( maLocale.Language + "_" +
maLocale.Country + maLocale.Variant,
+RTL_TEXTENCODING_UTF8);
+/* FIXME: let liblangtag parse this entirely with
+ * lt_tag_convert_from_locale() but that needs a patch to pass the
+ * string. */
#if 0
-myLtError aError;
-theDataRef::get().init();
-mpImplLangtag = lt_tag_convert_from_locale( aStr.getStr(), &aError.p);
-maBcp47 = OStringToOUString( lt_tag_get_string( mpImplLangtag),
RTL_TEXTENCODING_UTF8);
-mbInitializedBcp47 = true;
+myLtError aError;
+theDataRef::get().init();
+mpImplLangtag = lt_tag_convert_from_locale( aStr.getStr(), &aError.p);
+maBcp47 = OStringToOUString( lt_tag_get_string( mpImplLangtag),
RTL_TEXTENCODING_UTF8);
+mbInitializedBcp47 = true;
#else
-mnLangID = MsLangId::convertUnxByteStringToLanguage( aStr);
-if (mnLangID == LANGUAGE_DONTKNOW)
-{
-SAL_WARN( "i18nlangtag", "LanguageTag(rtl_Locale) - unknown: " <<
aStr);
-mnLangID = LANGUAGE_ENGLISH_US; // we need _something_ here
-}
-mbInitializedLangID = true;
-#endif
-maLocale = lang::Locale();
-mbInitializedLocale = false;
+mnLangID = MsLangId::convertUnxByteStringToLanguage( aStr);
+if (mnLangID == LANGUAGE_DONTKNOW)
+{
+SAL_WARN( "i18nlangtag", "LanguageTag(rtl_Locale) - unknown: " <<
aStr);
+mnLangID = LANGUAGE_ENGLISH_US; // we need _something_ here
}
+mbInitializedLangID = true;
+#endif
+maLocale = lang::Locale();
+mbInitializedLocale = false;
}
commit 4eb75e416e7245e4cb0291ea186e7e5a40bdfe60
Author: Noel Grandin
AuthorDate: Tue Apr 7 20:03:33 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Apr 8 08:48:54 2020 +0200
loplugin:flatten in helpcompiler
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
4 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 4 of 4 defect(s)
** CID 1461388: Error handling issues (CHECKED_RETURN)
/sd/source/ui/animations/CustomAnimationList.cxx: 482 in
sd::CustomAnimationList::DragBeginHdl(bool &)()
*** CID 1461388: Error handling issues (CHECKED_RETURN)
/sd/source/ui/animations/CustomAnimationList.cxx: 482 in
sd::CustomAnimationList::DragBeginHdl(bool &)()
476
mDndEffectsSelected.emplace_back(mxTreeView->make_iterator(&rEntry));
477 return false;
478 });
479
480 // Note: pEntry is the effect with focus (if multiple effects are
selected)
481 mxDndEffectDragging = mxTreeView->make_iterator();
>>> CID 1461388: Error handling issues (CHECKED_RETURN)
>>> Calling "get_cursor" without checking return value (as is done
>>> elsewhere 37 out of 41 times).
482 mxTreeView->get_cursor(mxDndEffectDragging.get());
483 mxDndEffectInsertBefore =
mxTreeView->make_iterator(mxDndEffectDragging.get());
484
485 // Allow normal processing.
486 return false;
487 }
** CID 1461387: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/unoobj/textuno.cxx: 900 in ScCellTextObj::~ScCellTextObj()()
*** CID 1461387: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/unoobj/textuno.cxx: 900 in ScCellTextObj::~ScCellTextObj()()
894 ScCellTextObj::ScCellTextObj(ScDocShell* pDocSh, const ScAddress& rP) :
895 ScCellTextData( pDocSh, rP ),
896 SvxUnoText( GetOriginalSource(), ScCellObj::GetEditPropertySet(),
uno::Reference() )
897 {
898 }
899
>>> CID 1461387: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause
>>> a call to unexpected() which usually calls terminate().
900 ScCellTextObj::~ScCellTextObj() throw()
901 {
902 }
903
** CID 1461386: Error handling issues (CHECKED_RETURN)
/sd/source/ui/animations/CustomAnimationList.cxx: 1103 in
_ZZNK2sd19CustomAnimationList12getSelectionB5cxx11EvENKUlRN4weld8TreeIterEE_clES3_()
*** CID 1461386: Error handling issues (CHECKED_RETURN)
/sd/source/ui/animations/CustomAnimationList.cxx: 1103 in
_ZZNK2sd19CustomAnimationList12getSelectionB5cxx11EvENKUlRN4weld8TreeIterEE_clES3_()
1097
1098 // if the selected effect is not expanded and has children
1099 // we say that the children are automatically selected
1100 if (!mxTreeView->get_row_expanded(rEntry) &&
mxTreeView->iter_has_child(rEntry))
1101 {
1102 std::unique_ptr xChild =
mxTreeView->make_iterator(&rEntry);
>>> CID 1461386: Error handling issues (CHECKED_RETURN)
>>> Calling "iter_children" without checking return value (as is done
>>> elsewhere 37 out of 39 times).
1103 mxTreeView->iter_children(*xChild);
1104
1105 do
1106 {
1107 if (!mxTreeView->is_selected(*xChild))
1108 {
** CID 1461385: Error handling issues (CHECKED_RETURN)
/vcl/source/bitmap/bitmap.cxx: 329 in Bitmap::ImplMakeUnique()()
*** CID 1461385: Error handling issues (CHECKED_RETURN)
/vcl/source/bitmap/bitmap.cxx: 329 in Bitmap::ImplMakeUnique()()
323 void Bitmap::ImplMakeUnique()
324 {
325 if (mxSalBmp && mxSalBmp.use_count() > 1)
326 {
327 std::shared_ptr xOldImpBmp = mxSalBmp;
328 mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap();
>>> CID 1461385: Error handling issues (CHECKED_RETURN)
>>> Calling "Create" without checking return value (as is done elsewhere 4
>>> out of 5 times).
329 mxSalBmp->Create(*xOldImpBmp);
330 }
331 }
332
333 void Bitmap::ReassignWithSize(const Bitmap& rBitmap)
334 {
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/ls/click?upn=nJaKvJSIH-2FPAfmty-2BK5tYpPklAc1eEA-2F1zfUjH6teExViPHTTReBArhCRZ3BE4kCjKjDqn2Dq3ZyEbAvAs31gRpU3vMPHDnoSx68vDAWjNU-3D-kXS_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJifVxcoG0A5GoPBbA567qw4NnZ-2F3BiwqSItoPxW5jeZ2wSizx9sOjXW8P0CyfH-2BOZCLWFZVBcQqjKJDApVX3
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/absoluterecord.png |binary icon-themes/elementary/cmd/32/deleterecord.png|binary icon-themes/elementary/cmd/32/insertdoc.png |binary icon-themes/elementary/cmd/32/newrecord.png |binary icon-themes/elementary/cmd/32/recsave.png |binary icon-themes/elementary/cmd/32/recundo.png |binary icon-themes/elementary/cmd/32/solverdialog.png|binary icon-themes/elementary/cmd/lc_absoluterecord.png |binary icon-themes/elementary/cmd/lc_deleterecord.png|binary icon-themes/elementary/cmd/lc_insertdoc.png |binary icon-themes/elementary/cmd/lc_newrecord.png |binary icon-themes/elementary/cmd/lc_recsave.png |binary icon-themes/elementary/cmd/lc_recundo.png |binary icon-themes/elementary/cmd/lc_solverdialog.png|binary icon-themes/elementary/cmd/sc_absoluterecord.png |binary icon-themes/elementary/cmd/sc_deleterecord.png|binary icon-themes/elementary/cmd/sc_insertdoc.png |binary icon-themes/elementary/cmd/sc_newrecord.png |binary icon-themes/elementary/cmd/sc_recsave.png |binary icon-themes/elementary/cmd/sc_recundo.png |binary icon-themes/elementary/cmd/sc_solverdialog.png|binary icon-themes/elementary/database/linked_text_table.png |binary icon-themes/elementary/dbaccess/res/all_left.png |binary icon-themes/elementary/dbaccess/res/all_right.png |binary icon-themes/elementary/dbaccess/res/jo02.png |binary icon-themes/elementary/dbaccess/res/lc039.png |binary icon-themes/elementary/dbaccess/res/lc040.png |binary icon-themes/elementary/dbaccess/res/one_left.png |binary icon-themes/elementary/dbaccess/res/one_right.png |binary icon-themes/elementary/dbaccess/res/pkey.png |binary icon-themes/elementary/dbaccess/res/sc039.png |binary icon-themes/elementary/dbaccess/res/sc040.png |binary icon-themes/elementary/links.txt | 58 ++ icon-themes/elementary/svtools/res/ed01.png |binary icon-themes/elementary/svtools/res/ed03.png |binary icon-themes/elementary/svtools/res/ed04.png |binary icon-themes/elementary/svtools/res/ed05.png |binary icon-themes/elementary/svtools/res/ed07.png |binary icon-themes/elementary/svtools/res/ed08.png |binary icon-themes/elementary/svx/res/galdefl.png|binary icon-themes/elementary/svx/res/galdefs.png|binary icon-themes/elementary/svx/res/galnorl.png|binary icon-themes/elementary/svx/res/galnors.png|binary icon-themes/elementary/svx/res/galrdol.png|binary icon-themes/elementary_svg/cmd/32/absoluterecord.svg |1 icon-themes/elementary_svg/cmd/32/deleterecord.svg|1 icon-themes/elementary_svg/cmd/32/insertdoc.svg |1 icon-themes/elementary_svg/cmd/32/newrecord.svg |1 icon-themes/elementary_svg/cmd/32/recsave.svg |1 icon-themes/elementary_svg/cmd/32/recundo.svg |1 icon-themes/elementary_svg/cmd/32/solverdialog.svg|2 icon-themes/elementary_svg/cmd/lc_absoluterecord.svg |1 icon-themes/elementary_svg/cmd/lc_deleterecord.svg|1 icon-themes/elementary_svg/cmd/lc_insertdoc.svg |1 icon-themes/elementary_svg/cmd/lc_newrecord.svg |1 icon-themes/elementary_svg/cmd/lc_recsave.svg |1 icon-themes/elementary_svg/cmd/lc_recundo.svg |1 icon-themes/elementary_svg/cmd/lc_solverdialog.svg|2 icon-themes/elementary_svg/cmd/sc_absoluterecord.svg |1 icon-themes/elementary_svg/cmd/sc_deleterecord.svg|1 icon-themes/elementary_svg/cmd/sc_insertdoc.svg |1 icon-themes/elementary_svg/cmd/sc_newrecord.svg |1 icon-themes/elementary_svg/cmd/sc_recsave.svg |1 icon-themes/elementary_svg/cmd/sc_recundo.svg |1 icon-themes/elementary_svg/cmd/sc_solverdialog.svg|2 icon-themes/elementary_svg/database/linked_text_table.svg |1 icon-themes/elementary_svg/dbaccess/res/all_left.svg |1 icon-themes/elementary_svg/dbaccess/res/all_right.svg |1 icon-themes/elementary_svg/dbaccess/res/jo02.svg |2 icon-themes/elementary_svg/dbaccess/res/lc039.svg |1 icon-themes/elementary_svg/dbaccess/res/lc040.svg |1 icon-themes/elementary_svg/dbaccess/res/one_left.svg |1 icon-themes/elementary_svg/dbaccess/res/one_right.svg |1 icon-themes/elementary_svg/dbaccess/res/pkey.svg |2 icon-themes/elementary_svg
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/objsh.hxx |2 ++
include/sfx2/viewsh.hxx |1 -
sfx2/source/doc/objmisc.cxx | 13 +
sfx2/source/view/viewfrm.cxx |7 +++
sfx2/source/view/viewsh.cxx | 11 ---
5 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 523922ee9d033fd304d2b50a72b76853ddcfbcdf
Author: Samuel Mehrbrodt
AuthorDate: Tue Apr 7 16:21:08 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Wed Apr 8 07:30:17 2020 +0200
Fix edit button still appearing in Calc
... even when editing readonly docs was disabled.
Viewshell was not yet available at this point, so
move the code where it belongs, into the object shell.
Change-Id: I71cbaf9c912beeeb0b8177538999049f7f8b4e03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91832
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index dd7d637a7de1..ae7d32e34d54 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -585,6 +585,8 @@ public:
const
css::uno::Reference& xTarget,
const css::uno::Sequence&
rExceptions = css::uno::Sequence());
+bool isEditDocLocked();
+
// The functions from SvPersist
voidEnableSetModified( bool bEnable = true );
boolIsEnableSetModified() const;
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index e81d2db11b7b..47a50f23a3df 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -293,7 +293,6 @@ public:
bool isExportLocked();
bool isPrintLocked();
bool isSaveLocked();
-bool isEditDocLocked();
SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const
css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 7bf2c77de4ef..7cc979a87e43 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -75,6 +75,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1867,4 +1869,15 @@ bool
SfxObjectShell::IsContinueImportOnFilterExceptions(const OUString& aErrMess
return mbContinueImportOnFilterExceptions == yes;
}
+bool SfxObjectShell::isEditDocLocked()
+{
+Reference xModel = GetModel();
+if (!xModel.is())
+return false;
+if (!officecfg::Office::Common::Misc::AllowEditReadonlyDocs::get())
+return true;
+comphelper::NamedValueCollection aArgs(xModel->getArgs());
+return aArgs.getOrDefault("LockEditDoc", false);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6267aee23ed1..3a0572058932 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -291,8 +291,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags &
SfxLoadedFlags::MAINDOCUMENT ))
break;
-SfxViewShell* pViewSh = GetViewShell();
-if (pViewSh && pViewSh->isEditDocLocked())
+if (pSh->isEditDocLocked())
break;
// Only change read-only UI and remove info bar when we succeed
@@ -911,7 +910,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
const SfxShell *pFSh;
if ( !pSh->HasName() ||
!( pSh->Get_Impl()->nLoadedFlags &
SfxLoadedFlags::MAINDOCUMENT ) ||
- (GetViewShell() && GetViewShell()->isEditDocLocked()) ||
+ (pSh->isEditDocLocked()) ||
( pSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
( !(pVSh = pSh->GetViewShell()) ||
!(pFSh = pVSh->GetFormShell()) ||
@@ -1399,7 +1398,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
}
bool showEditDocumentButton = true;
-if (m_xObjSh->GetViewShell() &&
m_xObjSh->GetViewShell()->isEditDocLocked())
+if (m_xObjSh->isEditDocLocked())
showEditDocumentButton = false;
if (showEditDocumentButton)
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 62c20909102c..d34b1d817a07 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1779,17 +1779,6 @@ bool SfxViewShell::isPrintLocked()
return aArgs.getOrDefault("LockPrint", false);
}
-bool SfxViewShell::isEditDocLocked()
-{
-Reference xModel = GetCurrentDocument();
-if (!xModel.is())
-return false;
-if (!officecfg::Office::Common::Misc::AllowEditReadonlyDocs::get())
-return true;
-
[Libreoffice-commits] core.git: icon-themes/sukapura
icon-themes/sukapura/links.txt | 24 1 file changed, 24 insertions(+) New commits: commit 5f47b3f56ac324ee02ea18d7362524380381b835 Author: Rizal Muttaqin AuthorDate: Wed Apr 8 11:12:08 2020 +0700 Commit: Rizal Muttaqin CommitDate: Wed Apr 8 07:06:37 2020 +0200 Sukapura: Fix for tdf#131974 Undo & Redo for RTL UI Change-Id: Ide762b6b9c908a9df12abe86d422c1b6e5cee571 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91864 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt index bb2c104d1773..a43bdc0c4d31 100644 --- a/icon-themes/sukapura/links.txt +++ b/icon-themes/sukapura/links.txt @@ -385,6 +385,8 @@ cmd/32/ar/bulletliststyle.png cmd/32/ar/defaultbullet.png cmd/32/ar/linenumberdialog.png cmd/32/ar/linenumberingdialog.png cmd/32/ar/numberliststyle.png cmd/32/ar/defaultnumbering.png cmd/32/ar/outlinebullet.png cmd/32/ar/bulletsandnumberingdialog.png +cmd/32/ar/redo.png cmd/32/undo.png +cmd/32/ar/undo.png cmd/32/redo.png cmd/32/bg/addtextbox.png cmd/32/bg/insertfixedtext.png cmd/32/bg/autoformatmenu.png cmd/32/bg/autocorrectdlg.png cmd/32/bg/sortdown.png cmd/32/bg/sortdescending.png @@ -419,10 +421,12 @@ cmd/32/fa/linenumberingdialog.png cmd/32/ar/linenumberingdialog.png cmd/32/fa/numberingstart.png cmd/32/ar/numberingstart.png cmd/32/fa/numberliststyle.png cmd/32/ar/defaultnumbering.png cmd/32/fa/outlinebullet.png cmd/32/ar/bulletsandnumberingdialog.png +cmd/32/fa/redo.png cmd/32/undo.png cmd/32/fa/removebullets.png cmd/32/ar/removebullets.png cmd/32/fa/romanliststyle.png cmd/32/ar/romanliststyle.png cmd/32/fa/romanlowliststyle.png cmd/32/ar/romanlowliststyle.png cmd/32/fa/setoutline.png cmd/32/ar/setoutline.png +cmd/32/fa/undo.png cmd/32/redo.png cmd/32/fr/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png cmd/32/fr/numberformatdecimal.png cmd/32/de/numberformatdecimal.png cmd/32/fr/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png @@ -443,10 +447,12 @@ cmd/32/he/linenumberingdialog.png cmd/32/ar/linenumberingdialog.png cmd/32/he/numberingstart.png cmd/32/ar/numberingstart.png cmd/32/he/numberliststyle.png cmd/32/ar/defaultnumbering.png cmd/32/he/outlinebullet.png cmd/32/ar/bulletsandnumberingdialog.png +cmd/32/he/redo.png cmd/32/undo.png cmd/32/he/removebullets.png cmd/32/ar/removebullets.png cmd/32/he/romanliststyle.png cmd/32/ar/romanliststyle.png cmd/32/he/romanlowliststyle.png cmd/32/ar/romanlowliststyle.png cmd/32/he/setoutline.png cmd/32/ar/setoutline.png +cmd/32/he/undo.png cmd/32/redo.png cmd/32/hu/bold.png cmd/32/de/bold.png cmd/32/hu/underlinesimple.png cmd/32/hu/underline.png cmd/32/id/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png @@ -510,16 +516,22 @@ cmd/32/ur/linenumberingdialog.png cmd/32/ar/linenumberingdialog.png cmd/32/ur/numberingstart.png cmd/32/ar/numberingstart.png cmd/32/ur/numberliststyle.png cmd/32/ar/defaultnumbering.png cmd/32/ur/outlinebullet.png cmd/32/ar/bulletsandnumberingdialog.png +cmd/32/ur/redo.png cmd/32/undo.png cmd/32/ur/removebullets.png cmd/32/ar/removebullets.png cmd/32/ur/romanliststyle.png cmd/32/ar/romanliststyle.png cmd/32/ur/romanlowliststyle.png cmd/32/ar/romanlowliststyle.png cmd/32/ur/setoutline.png cmd/32/ar/setoutline.png +cmd/32/ur/undo.png cmd/32/redo.png cmd/ar/lc_bulletliststyle.png cmd/ar/lc_defaultbullet.png cmd/ar/lc_numberliststyle.png cmd/ar/lc_defaultnumbering.png cmd/ar/lc_outlinebullet.png cmd//ar/lc_bulletsandnumberingdialog.png +cmd/ar/lc_redo.png cmd/lc_undo.png +cmd/ar/lc_undo.png cmd/lc_redo.png cmd/ar/sc_bulletliststyle.png cmd/ar/sc_defaultbullet.png cmd/ar/sc_numberliststyle.png cmd/ar/sc_defaultnumbering.png cmd/ar/sc_outlinebullet.png cmd//ar/sc_bulletsandnumberingdialog.png +cmd/ar/sc_redo.png cmd/sc_undo.png +cmd/ar/sc_undo.png cmd/sc_redo.png cmd/bg/lc_addtextbox.png cmd/bg/lc_insertfixedtext.png cmd/bg/lc_autoformatmenu.png cmd/bg/lc_autocorrectdlg.png cmd/bg/lc_sortdown.png cmd/bg/lc_sortdescending.png @@ -575,10 +587,12 @@ cmd/fa/lc_linenumberingdialog.png cmd/ar/sc_linenumberingdialog.png cmd/fa/lc_numberingstart.png cmd/ar/lc_numberingstart.png cmd/fa/lc_numberliststyle.png cmd/ar/lc_defaultnumbering.png cmd/fa/lc_outlinebullet.png cmd/ar/lc_bulletsandnumberingdialog.png +cmd/fa/lc_redo.png cmd/lc_undo.png cmd/fa/lc_removebullets.png cmd/ar/lc_removebullets.png cmd/fa/lc_romanliststyle.png cmd/ar/lc_romanliststyle.png cmd/fa/lc_romanlowliststyle.png cmd/ar/lc_romanlowliststyle.png cmd/fa/lc_setoutline.png cmd/ar/lc_setoutline.png +cmd/fa/lc_undo.png cmd/lc_redo.png cmd/fa/sc_alphaliststyle.png cmd/ar/sc_alphaliststyle.png cmd/fa/sc_alphalowliststyle.png cmd/ar/sc_alphalowliststyle.png cmd/fa/sc_bulletliststyle.png cmd/ar/sc_defaultbullet.png @@ -592,10 +606,12 @@ cmd/fa/sc_linenumberingdialog.png cmd/ar/sc_linenumberingdialog.png cmd/fa/sc_numberingstart.png cmd/ar/sc_numberingsta
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/absoluterecord.png |binary icon-themes/elementary/cmd/32/deleterecord.png|binary icon-themes/elementary/cmd/32/insertdoc.png |binary icon-themes/elementary/cmd/32/newrecord.png |binary icon-themes/elementary/cmd/32/recsave.png |binary icon-themes/elementary/cmd/32/recundo.png |binary icon-themes/elementary/cmd/32/solverdialog.png|binary icon-themes/elementary/cmd/lc_absoluterecord.png |binary icon-themes/elementary/cmd/lc_deleterecord.png|binary icon-themes/elementary/cmd/lc_insertdoc.png |binary icon-themes/elementary/cmd/lc_newrecord.png |binary icon-themes/elementary/cmd/lc_recsave.png |binary icon-themes/elementary/cmd/lc_recundo.png |binary icon-themes/elementary/cmd/lc_solverdialog.png|binary icon-themes/elementary/cmd/sc_absoluterecord.png |binary icon-themes/elementary/cmd/sc_deleterecord.png|binary icon-themes/elementary/cmd/sc_insertdoc.png |binary icon-themes/elementary/cmd/sc_newrecord.png |binary icon-themes/elementary/cmd/sc_recsave.png |binary icon-themes/elementary/cmd/sc_recundo.png |binary icon-themes/elementary/cmd/sc_solverdialog.png|binary icon-themes/elementary/database/linked_text_table.png |binary icon-themes/elementary/dbaccess/res/all_left.png |binary icon-themes/elementary/dbaccess/res/all_right.png |binary icon-themes/elementary/dbaccess/res/jo02.png |binary icon-themes/elementary/dbaccess/res/lc039.png |binary icon-themes/elementary/dbaccess/res/lc040.png |binary icon-themes/elementary/dbaccess/res/one_left.png |binary icon-themes/elementary/dbaccess/res/one_right.png |binary icon-themes/elementary/dbaccess/res/pkey.png |binary icon-themes/elementary/dbaccess/res/sc039.png |binary icon-themes/elementary/dbaccess/res/sc040.png |binary icon-themes/elementary/links.txt | 58 ++ icon-themes/elementary/svtools/res/ed01.png |binary icon-themes/elementary/svtools/res/ed03.png |binary icon-themes/elementary/svtools/res/ed04.png |binary icon-themes/elementary/svtools/res/ed05.png |binary icon-themes/elementary/svtools/res/ed07.png |binary icon-themes/elementary/svtools/res/ed08.png |binary icon-themes/elementary/svx/res/galdefl.png|binary icon-themes/elementary/svx/res/galdefs.png|binary icon-themes/elementary/svx/res/galnorl.png|binary icon-themes/elementary/svx/res/galnors.png|binary icon-themes/elementary/svx/res/galrdol.png|binary icon-themes/elementary_svg/cmd/32/absoluterecord.svg |1 icon-themes/elementary_svg/cmd/32/deleterecord.svg|1 icon-themes/elementary_svg/cmd/32/insertdoc.svg |1 icon-themes/elementary_svg/cmd/32/newrecord.svg |1 icon-themes/elementary_svg/cmd/32/recsave.svg |1 icon-themes/elementary_svg/cmd/32/recundo.svg |1 icon-themes/elementary_svg/cmd/32/solverdialog.svg|2 icon-themes/elementary_svg/cmd/lc_absoluterecord.svg |1 icon-themes/elementary_svg/cmd/lc_deleterecord.svg|1 icon-themes/elementary_svg/cmd/lc_insertdoc.svg |1 icon-themes/elementary_svg/cmd/lc_newrecord.svg |1 icon-themes/elementary_svg/cmd/lc_recsave.svg |1 icon-themes/elementary_svg/cmd/lc_recundo.svg |1 icon-themes/elementary_svg/cmd/lc_solverdialog.svg|2 icon-themes/elementary_svg/cmd/sc_absoluterecord.svg |1 icon-themes/elementary_svg/cmd/sc_deleterecord.svg|1 icon-themes/elementary_svg/cmd/sc_insertdoc.svg |1 icon-themes/elementary_svg/cmd/sc_newrecord.svg |1 icon-themes/elementary_svg/cmd/sc_recsave.svg |1 icon-themes/elementary_svg/cmd/sc_recundo.svg |1 icon-themes/elementary_svg/cmd/sc_solverdialog.svg|2 icon-themes/elementary_svg/database/linked_text_table.svg |1 icon-themes/elementary_svg/dbaccess/res/all_left.svg |1 icon-themes/elementary_svg/dbaccess/res/all_right.svg |1 icon-themes/elementary_svg/dbaccess/res/jo02.svg |2 icon-themes/elementary_svg/dbaccess/res/lc039.svg |1 icon-themes/elementary_svg/dbaccess/res/lc040.svg |1 icon-themes/elementary_svg/dbaccess/res/one_left.svg |1 icon-themes/elementary_svg/dbaccess/res/one_right.svg |1 icon-themes/elementary_svg/dbaccess/res/pkey.svg |2 icon-themes/elementary_svg
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx |2 +-
sc/inc/document.hxx|3 ++-
sc/inc/table.hxx |6 --
sc/source/core/data/column.cxx |8 +++-
sc/source/core/data/document.cxx |5 +++--
sc/source/core/data/table2.cxx | 30 +-
sc/source/ui/docshell/dbdocfun.cxx |4 ++--
sc/source/ui/docshell/editable.cxx | 12 ++--
sc/source/ui/inc/editable.hxx |9 +++--
9 files changed, 53 insertions(+), 26 deletions(-)
New commits:
commit b1da67699bd05b26ee11460347ca7077d366c2fc
Author: Eike Rathke
AuthorDate: Wed Apr 8 00:47:09 2020 +0200
Commit: Eike Rathke
CommitDate: Wed Apr 8 01:57:45 2020 +0200
Resolves: tdf#131442 Sort must not contain matrix formula except 1x1 array
Change-Id: Idc7a9646a70c59fceee0b36426f38a938cf073ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91858
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 576a88a8f71a..0eb2ad5f1c85 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -234,7 +234,7 @@ public:
voidFindUsed( SCROW nStartRow, SCROW nEndRow,
mdds::flat_segment_tree& rUsed ) const;
SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const;
-sc::MatrixEdge GetBlockMatrixEdges(SCROW nRow1, SCROW nRow2,
sc::MatrixEdge nMask ) const;
+sc::MatrixEdge GetBlockMatrixEdges(SCROW nRow1, SCROW nRow2,
sc::MatrixEdge nMask, bool bNoMatrixAtAll ) const;
boolHasSelectionMatrixFragment(const ScMarkData& rMark) const;
boolGetFirstVisibleAttr( SCROW& rFirstRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 847a4c42ccee..99c328157347 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -900,7 +900,8 @@ public:
boolIsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW
nStartRow,
SCCOL nEndCol, SCROW nEndRow,
- bool* pOnlyNotBecauseOfMatrix = nullptr )
const;
+ bool* pOnlyNotBecauseOfMatrix = nullptr,
+ bool bNoMatrixAtAll = false ) const;
boolIsSelectionEditable( const ScMarkData& rMark,
bool* pOnlyNotBecauseOfMatrix =
nullptr ) const;
boolHasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW
nStartRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 8feb233480cf..7de7f24b59c2 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -392,11 +392,13 @@ public:
voidUnlockTable();
boolIsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
-SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = nullptr )
const;
+SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = nullptr,
+bool bNoMatrixAtAll = false ) const;
boolIsSelectionEditable( const ScMarkData& rMark,
bool* pOnlyNotBecauseOfMatrix = nullptr ) const;
-boolHasBlockMatrixFragment( const SCCOL nCol1, SCROW nRow1, const
SCCOL nCol2, SCROW nRow2 ) const;
+boolHasBlockMatrixFragment( const SCCOL nCol1, SCROW nRow1, const
SCCOL nCol2, SCROW nRow2,
+bool bNoMatrixAtAll = false ) const;
boolHasSelectionMatrixFragment( const ScMarkData& rMark ) const;
boolIsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, bool bIgnoreNotes ) const;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 7fa1c4c30286..9388e01ee1f0 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -110,7 +110,8 @@ SCROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp )
const
return pAttrArray->GetNextUnprotected(nRow, bUp);
}
-sc::MatrixEdge ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2,
sc::MatrixEdge nMask ) const
+sc::MatrixEdge ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2,
sc::MatrixEdge nMask,
+bool bNoMatrixAtAll ) const
{
using namespace sc;
@@ -163,6 +164,11 @@ sc::MatrixEdge ScColumn::GetBlockMatrixEdges( SCROW nRow1,
SCROW nRow2, sc::Matr
if (nEdges == MatrixEdge::Nothing)
continue;
+// A 1x1 matrix array formula is OK even for no matrix at all.
+if (bNoMatrixAtAll
+&& (nEdges != (MatrixEdge::Top | MatrixEdge::Left |
MatrixEdge::Bottom | MatrixEdge::Right)))
+return MatrixEdge::Inside; // per convention Inside
+
if (nEdges & MatrixEdge::Top)
bOpen = true; // top edge opens, keep on looking
else if (!bOpen)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4ecd59225f45..ad292b70b7e2 100644
--- a/sc/source/core
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/collator/data/ko_charset.txt | 1354 ++- 1 file changed, 1118 insertions(+), 236 deletions(-) New commits: commit b3363960f97dcb7eaa10dfa708d71198a345924c Author: DaeHyun Sung AuthorDate: Sat Jan 18 21:21:05 2020 +0900 Commit: Eike Rathke CommitDate: Wed Apr 8 00:54:44 2020 +0200 fix Korean Hangul Syllable Character order tdf#130067 i18npool/source/collator/data/ko_charset.txt Korean Hangul syllables ordering is wrong. Some hangul syllables are dissapeared on the text file. Hangul Syllable ordering is already specified on Unicode Code chart. Ref. Hangul Syllables Range: AC00–D7AF https://unicode.org/charts/PDF/UAC00.pdf That commit applies only Hangul Syllables range. Korean Hanja[한자/漢字] range will require investigation. hanja[한자/漢字] is korean name for chinese character. Change-Id: I31e5cbf04294ee3bd6bff3277f9fe1328530ac3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87018 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/i18npool/source/collator/data/ko_charset.txt b/i18npool/source/collator/data/ko_charset.txt index 4c0b2ea0eb2e..4e5de8916ad2 100644 --- a/i18npool/source/collator/data/ko_charset.txt +++ b/i18npool/source/collator/data/ko_charset.txt @@ -19,242 +19,1124 @@ # Collation rule for Korean charset & [top] -<가<각 -<간<갇<갈<갉<갊<감<갑<값<갓<갔 -<강<갖<갗<같<갚<갛<개<객<갠<갤 -<갬<갭<갯<갰<갱<갸<갹<갼<걀<걋 -<걍<걔<걘<걜<거<걱<건<걷<걸<걺 -<검<겁<것<겄<겅<겆<겉<겊<겋<게 -<겐<겔<겜<겝<겟<겠<겡<겨<격<겪 -<견<겯<결<겸<겹<겻<겼<경<곁<계 -<곈<곌<곕<곗<고<곡<곤<곧<골<곪 -<곬<곯<곰<곱<곳<공<곶<과<곽<관 -<괄<괆<괌<괍<괏<광<괘<괜<괠<괩 -<괬<괭<괴<괵<괸<괼<굄<굅<굇<굉 -<교<굔<굘<굡<굣<구<국<군<굳<굴 -<굵<굶<굻<굼<굽<굿<궁<궂<궈<궉 -<권<궐<궜<궝<궤<궷<귀<귁<귄<귈 -<귐<귑<귓<규<균<귤<그<극<근<귿 -<글<긁<금<급<긋<긍<긔<기<긱<긴 -<긷<길<긺<김<깁<깃<깅<깆<깊<까 -<깍<깎<깐<깔<깖<깜<깝<깟<깠<깡 -<깥<깨<깩<깬<깰<깸<깹<깻<깼<깽 -<꺄<꺅<꺌<꺼<꺽<꺾<껀<껄<껌<껍 -<껏<껐<껑<께<껙<껜<껨<껫<껭<껴 -<껸<껼<꼇<꼈<꼍<꼐<꼬<꼭<꼰<꼲 -<꼴<꼼<꼽<꼿<꽁<꽂<꽃<꽈<꽉<꽐 -<꽜<꽝<꽤<꽥<꽹<꾀<꾄<꾈<꾐<꾑 -<꾕<꾜<꾸<꾹<꾼<꿀<꿇<꿈<꿉<꿋 -<꿍<꿎<꿔<꿜<꿨<꿩<꿰<꿱<꿴<꿸 -<뀀<뀁<뀄<뀌<뀐<뀔<뀜<뀝<뀨<끄 -<끅<끈<끊<끌<끎<끓<끔<끕<끗<끙 -<끝<끼<끽<낀<낄<낌<낍<낏<낑<나 -<낙<낚<난<낟<날<낡<낢<남<납<낫 -<났<낭<낮<낯<낱<낳<내<낵<낸<낼 -<냄<냅<냇<냈<냉<냐<냑<냔<냘<냠 -<냥<너<넉<넋<넌<널<넒<넓<넘<넙 -<넛<넜<넝<넣<네<넥<넨<넬<넴<넵 -<넷<넸<넹<녀<녁<년<녈<념<녑<녔 -<녕<녘<녜<녠<노<녹<논<놀<놂<놈 -<놉<놋<농<높<놓<놔<놘<놜<놨<뇌 -<뇐<뇔<뇜<뇝<뇟<뇨<뇩<뇬<뇰<뇹 -<뇻<뇽<누<눅<눈<눋<눌<눔<눕<눗 -<눙<눠<눴<눼<뉘<뉜<뉠<뉨<뉩<뉴 -<뉵<뉼<늄<늅<늉<느<늑<는<늘<늙 -<늚<늠<늡<늣<능<늦<늪<늬<늰<늴 -<니<닉<닌<닐<닒<님<닙<닛<닝<닢 -<다<닥<닦<단<닫<달<닭<닮<닯<닳 -<담<답<닷<닸<당<닺<닻<닿<대<댁 -<댄<댈<댐<댑<댓<댔<댕<댜<더<덕 -<덖<던<덛<덜<덞<덟<덤<덥<덧<덩 -<덫<덮<데<덱<덴<델<뎀<뎁<뎃<뎄 -<뎅<뎌<뎐<뎔<뎠<뎡<뎨<뎬<도<독 -<돈<돋<돌<돎<돐<돔<돕<돗<동<돛 -<돝<돠<돤<돨<돼<됐<되<된<될<됨 -<됩<됫<됴<두<둑<둔<둘<둠<둡<둣 -<둥<둬<뒀<뒈<뒝<뒤<뒨<뒬<뒵<뒷 -<뒹<듀<듄<듈<듐<듕<드<득<든<듣 -<들<듦<듬<듭<듯<등<듸<디<딕<딘 -<딛<딜<딤<딥<딧<딨<딩<딪<따<딱 -<딴<딸<땀<땁<땃<땄<땅<땋<때<땍 -<땐<땔<땜<땝<땟<땠<땡<떠<떡<떤 -<떨<떪<떫<떰<떱<떳<떴<떵<떻<떼 -<떽<뗀<뗄<뗌<뗍<뗏<뗐<뗑<뗘<뗬 -<또<똑<똔<똘<똥<똬<똴<뙈<뙤<뙨 -<뚜<뚝<뚠<뚤<뚫<뚬<뚱<뛔<뛰<뛴 -<뛸<뜀<뜁<뜅<뜨<뜩<뜬<뜯<뜰<뜸 -<뜹<뜻<띄<띈<띌<띔<띕<띠<띤<띨 -<띰<띱<띳<띵<라<락<란<랄<람<랍 -<랏<랐<랑<랒<랖<랗<래<랙<랜<랠 -<램<랩<랫<랬<랭<랴<략<랸<럇<량 -<러<럭<런<럴<럼<럽<럿<렀<렁<렇 -<레<렉<렌<렐<렘<렙<렛<렝<려<력 -<련<렬<렴<렵<렷<렸<령<례<롄<롑 -<롓<로<록<론<롤<롬<롭<롯<롱<롸 -<롼<뢍<뢨<뢰<뢴<뢸<룀<룁<룃<룅 -<료<룐<룔<룝<룟<룡<루<룩<룬<룰 -<룸<룹<룻<룽<뤄<뤘<뤠<뤼<뤽<륀 -<륄<륌<륏<륑<류<륙<륜<률<륨<륩 -<륫<륭<르<륵<른<를<름<릅<릇<릉 -<릊<릍<릎<리<릭<린<릴<림<립<릿 -<링<마<막<만<많<맏<말<맑<맒<맘 -<맙<맛<망<맞<맡<맣<매<맥<맨<맬 -<맴<맵<맷<맸<맹<맺<먀<먁<먈<먕 -<머<먹<먼<멀<멂<멈<멉<멋<멍<멎 -<멓<메<멕<멘<멜<멤<멥<멧<멨<멩 -<며<멱<면<멸<몃<몄<명<몇<몌<모 -<목<몫<몬<몰<몲<몸<몹<못<몽<뫄 -<뫈<뫘<뫙<뫼<묀<묄<묍<묏<묑<묘 -<묜<묠<묩<묫<무<묵<묶<문<묻<물 -<묽<묾<뭄<뭅<뭇<뭉<뭍<뭏<뭐<뭔 -<뭘<뭡<뭣<뭬<뮈<뮌<뮐<뮤<뮨<뮬 -<뮴<뮷<므<믄<믈<믐<믓<미<믹<민 -<믿<밀<밂<밈<밉<밋<밌<밍<및<밑 -<바<박<밖<밗<반<받<발<밝<밞<밟 -<밤<밥<밧<방<밭<배<백<밴<밸<뱀 -<뱁<뱃<뱄<뱅<뱉<뱌<뱍<뱐<뱝<버 -<벅<번<벋<벌<벎<범<법<벗<벙<벚 -<베<벡<벤<벧<벨<벰<벱<벳<벴<벵 -<벼<벽<변<별<볍<볏<볐<병<볕<볘 -<볜<보<복<볶<본<볼<봄<봅<봇<봉 -<봐<봔<봤<봬<뵀<뵈<뵉<뵌<뵐<뵘 -<뵙<뵤<뵨<부<북<분<붇<불<붉<붊 -<붐<붑<붓<붕<붙<붚<붜<붤<붰<붸 -<뷔<뷕<뷘<뷜<뷩<뷰<뷴<뷸<븀<븃 -<븅<브<븍<븐<블<븜<븝<븟<비<빅 -<빈<빌<빎<빔<빕<빗<빙<빚<빛<빠 -<빡<빤<빨<빪<빰<빱<빳<빴<빵<빻 -<빼<빽<뺀<뺄<뺌<뺍<뺏<뺐<뺑<뺘 -<뺙<뺨<뻐<뻑<뻔<뻗<뻘<뻠<뻣<뻤 -<뻥<뻬<뼁<뼈<뼉<뼘<뼙<뼛<뼜<뼝 -<뽀<뽁<뽄<뽈<뽐<뽑<뽕<뾔<뾰<뿅 -<뿌<뿍<뿐<뿔<뿜<뿟<뿡<쀼<쁑<쁘 -<쁜<쁠<쁨<쁩<삐<삑<삔<삘<삠<삡 -<삣<삥<사<삭<삯<산<삳<살<삵<삶 -<삼<삽<삿<샀<상<샅<새<색<샌<샐 -<샘<샙<샛<샜<생<샤<샥<샨<샬<샴 -<샵<샷<샹<섀<섄<섈<섐<섕<서<석 -<섞<섟<선<섣<설<섦<섧<섬<섭<섯 -<섰<성<섶<세<섹<센<셀<셈<셉<셋 -<셌<셍<셔<셕<션<셜<셤<셥<셧<셨 -<셩<셰<셴<셸<솅<소<속<솎<손<솔 -<솖<솜<솝<솟<송<솥<솨<솩<솬<솰 -<솽<쇄<쇈<쇌<쇔<쇗<쇘<쇠<쇤<쇨 -<쇰<쇱<쇳<쇼<쇽<숀<숄<숌<숍<숏 -<숑<수<숙<순<숟<술<숨<숩<숫<숭 -<숯<숱<숲<숴<쉈<쉐<쉑<쉔<쉘<쉠 -<쉥<쉬<쉭<쉰<쉴<쉼<쉽<쉿<슁<슈 -<슉<슐<슘<슛<슝<스<슥<슨<슬<슭 -<슴<습<슷<승<시<식<신<싣<실<싫 -<심<십<싯<싱<싶<싸<싹<싻<싼<쌀 -<쌈<쌉<쌌<쌍<쌓<쌔<쌕<쌘<쌜<쌤 -<쌥<쌨<쌩<썅<써<썩<썬<썰<썲<썸 -<썹<썼<썽<쎄<쎈<쎌<쏀<쏘<쏙<쏜 -<쏟<쏠<쏢<쏨<쏩<쏭<쏴<쏵<쏸<쐈 -<쐐<쐤<쐬<쐰<쐴<쐼<쐽<쑈<쑤<쑥 -<쑨<쑬<쑴<쑵<쑹<쒀<쒔<쒜<쒸<쒼 -<쓩<쓰<쓱<쓴<쓸<쓺<쓿<씀<씁<씌 -<씐<씔<씜<씨<씩<씬<씰<씸<씹<씻 -<씽<아<악<안<앉<않<알<앍<앎<앓 -<암<압<앗<았<앙<앝<앞<애<액<앤 -<앨<앰<앱<앳<앴<앵<야<약<얀<얄 -<얇<얌<얍<얏<양<얕<얗<얘<얜<얠 -<얩<어<억<언<얹<얻<얼<얽<얾<엄 -<업<없<엇<었<엉<엊<엌<엎<에<엑 -<엔<엘<엠<엡<엣<엥<여<역<엮<연 -<열<엶<엷<염<엽<엾<엿<였<영<옅 -<옆<옇<예<옌<옐<옘<옙<옛<옜<오 -<옥<온<올<옭<옮<옰<옳<옴<옵<옷 -<옹<옻<와<왁<완<왈<왐<왑<왓<왔 -<왕<왜<왝<왠<왬<왯<왱<외<왹<왼 -<욀<욈<욉<욋<욍<요<욕<욘<욜<욤 -<욥<욧<용<우<욱<운<울<욹<욺<움 -<웁<웃<웅<워<웍<원<월<웜<웝<웠 -<웡<웨<웩<웬<웰<웸<웹<웽<위<윅 -<윈<윌<윔<윕<윗<윙<유<육<윤<율 -<윰<윱<윳<융<윷<으<윽<은<을<읊 -<음<읍<읏<응<읒<읓<읔<읕<읖<읗 -<의<읜<읠<읨<읫<이<익<인<일<읽 -<읾<잃<임<입<잇<있<잉<잊<잎<자 -<작<잔<잖<잗<잘<잚<잠<잡<잣<잤 -<장<잦<재<잭<잰<잴<잼<잽<잿<쟀 -<쟁<쟈<쟉<쟌<쟎<쟐<쟘<쟝<쟤<쟨 -<쟬<저<적<전<절<젊<점<접<젓<정 -<젖<제<젝<젠<젤<젬<젭<젯<젱<져 -<젼<졀<졈<졉<졌<졍<졔<조<족<존 -<졸<졺<좀<좁<좃<종<좆<좇<좋<좌 -<좍<좔<좝<좟<좡<좨<
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14c85e7752e7edfc175e6f619110851f1ad8fbca Author: LibreOfficiant AuthorDate: Tue Apr 7 23:47:50 2020 +0100 Commit: Gerrit Code Review CommitDate: Wed Apr 8 00:47:50 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 2748a458c312743c81f295e170aa26f626d2bff7 - Precise Call statement options - Document keyword args as opposed to positional args - Explicit parentheses/brackets usage - Display DLLs stuff under Win context ..not so certain this is needed in light of Mono/Linux mixed env. Change-Id: Iee2f0088e3a560212bb6f2dd15e76b95ba652d48 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91706 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 731026465ce3..2748a458c312 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 731026465ce3b0d69c0974627037348dda4eccd0 +Subproject commit 2748a458c312743c81f295e170aa26f626d2bff7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03090401.xhp | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 2748a458c312743c81f295e170aa26f626d2bff7 Author: LibreOfficiant AuthorDate: Sat Apr 4 14:03:17 2020 +0100 Commit: Olivier Hallot CommitDate: Wed Apr 8 00:47:50 2020 +0200 Precise Call statement options - Document keyword args as opposed to positional args - Explicit parentheses/brackets usage - Display DLLs stuff under Win context ..not so certain this is needed in light of Mono/Linux mixed env. Change-Id: Iee2f0088e3a560212bb6f2dd15e76b95ba652d48 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91706 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03090401.xhp b/source/text/sbasic/shared/03090401.xhp index b63978d0c..662580d96 100644 --- a/source/text/sbasic/shared/03090401.xhp +++ b/source/text/sbasic/shared/03090401.xhp @@ -1,5 +1,4 @@ - - @@ -33,7 +31,7 @@ Call statement Call Statement -Transfers the control of the program to a subroutine, a function, or a DLL procedure. +Transfers the control of the program to a subroutine, a function, or a procedure of a Dynamic Link Library (DLL). The keyword, type and number of parameters is dependent on the routine that is being called. Syntax: @@ -43,21 +41,23 @@ Parameters: -name: Name of the subroutine, the function, or the DLL that you want to call +name: Name of the subroutine, the function, or the DLL that you want to call -param: Parameters to pass to the procedure. The keyword, type and number of parameters is dependent on the routine that is being called. -A keyword is optional when you call a procedure. If a function is executed as an expression, the parameters must be enclosed by brackets in the statement. If a DLL is called, it must first be specified in the Declare-Statement. +param: Keyword parameter name to pass to the routine, followed by its value. The name must match the routine declaration. Keywords are optional and can be used in any order. +value: Positional parameter value. The type is dependent on the routine that is being called +When mixing positional and keyword parameters, make sure positional parameters are following the routine declaration order. +When a function is used as an expression, enclosing parameters with brackets becomes necessary. Using a Declare statement is compulsory prior to call a DLL. Example: Sub ExampleCall -Dim sVar As String -sVar = "LibreOffice" -Call f_callFun sVar -f_callFun sText := sVar +Dim value As String +value = "LibreOffice" +Call aRoutine value +aRoutine text := value End Sub -Sub f_callFun (sText as String) -Msgbox sText +Sub aRoutine (text as String) +Msgbox text End Sub ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/Mobile wsd/DocumentBroker.cpp
ios/Mobile/CODocument.h |1
ios/Mobile/CODocument.mm | 20 +--
ios/Mobile/DocumentViewController.mm | 36 +++
wsd/DocumentBroker.cpp |8 +++
4 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit 0930286e2d8fd2ba1e4820758246ee3766040254
Author: Tor Lillqvist
AuthorDate: Tue Apr 7 21:21:55 2020 +0300
Commit: Tor Lillqvist
CommitDate: Wed Apr 8 00:01:30 2020 +0200
Fix problems after my 293f4913d2cdfe5385e2cdc0e3bebde281da1578
It is enough to call the -[UIDocument
saveToURL:forSaveOperation:completionHandler:] only in
DocumentBroker::sendUnoSave(). And on the other hand, in
-[DocumentViewController bye] we can't want for the
LOOLWSD::lokit_main_mutex as the main queue is needed for parts of
what the saveToURL does.
Also, use a separate copy of the document as the file that is actually
edited by LO core. This matches what the Android app does. I think it
is useful to do this in order to avoid some hangs that I noticed. They
probably were caused by both LO core and the system frameworks
occasionally accessing the same document file at the same time.
Change-Id: Idb65be23a7cb6ad1288fbbd23c7471e0fb8d52f4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91851
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/ios/Mobile/CODocument.h b/ios/Mobile/CODocument.h
index 82e2e80e3..79f772a1b 100644
--- a/ios/Mobile/CODocument.h
+++ b/ios/Mobile/CODocument.h
@@ -18,6 +18,7 @@
@interface CODocument : UIDocument {
@public
int fakeClientFd;
+NSURL *copyFileURL;
}
@property (weak) DocumentViewController *viewController;
diff --git a/ios/Mobile/CODocument.mm b/ios/Mobile/CODocument.mm
index 095d449ea..5dcd9b136 100644
--- a/ios/Mobile/CODocument.mm
+++ b/ios/Mobile/CODocument.mm
@@ -37,14 +37,7 @@
@implementation CODocument
- (id)contentsForType:(NSString*)typeName error:(NSError **)errorPtr {
-// Somehow this doesn't feel right, creating an NSFileWrapper around the
file that was given to
-// us for loadFromContents. I get the vague feeling that the file is
perhaps just a temporary
-// data container created by the system for us to be used while loading
the document data, and
-// not the actual permanent document, especially in the case of things
like NextCloud. Or is it?
-// Is saving back to the file (which we have already saved to in the core
code by the time we
-// get here) correct? This does seem to work, though. Sadly the Apple
documentation is a bit
-// lacking about how these things *really* work.
-return [[NSFileWrapper alloc] initWithURL:[self fileURL] options:0
error:errorPtr];
+return [NSData dataWithContentsOfFile:[copyFileURL path] options:0
error:errorPtr];
}
- (BOOL)loadFromContents:(id)contents ofType:(NSString *)typeName
error:(NSError **)errorPtr {
@@ -55,11 +48,18 @@
return YES;
fakeClientFd = fakeSocketSocket();
-NSString *uri = [[self fileURL] absoluteString];
+
+copyFileURL = [[[NSFileManager defaultManager] temporaryDirectory]
URLByAppendingPathComponent:[[[self fileURL] path] lastPathComponent]];
+
+NSError *error;
+[[NSFileManager defaultManager] removeItemAtURL:copyFileURL error:nil];
+[[NSFileManager defaultManager] copyItemAtURL:[self fileURL]
toURL:copyFileURL error:&error];
+if (error != nil)
+return NO;
NSURL *url = [[NSBundle mainBundle] URLForResource:@"loleaflet"
withExtension:@"html"];
NSURLComponents *components = [NSURLComponents componentsWithURL:url
resolvingAgainstBaseURL:NO];
-components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"file_path"
value:uri],
+components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"file_path"
value:[copyFileURL absoluteString]],
[NSURLQueryItem
queryItemWithName:@"closebutton" value:@"1"],
[NSURLQueryItem queryItemWithName:@"permission"
value:@"edit"],
[NSURLQueryItem queryItemWithName:@"lang"
value:app_locale]
diff --git a/ios/Mobile/DocumentViewController.mm
b/ios/Mobile/DocumentViewController.mm
index 94dbd839c..97ac7ab96 100644
--- a/ios/Mobile/DocumentViewController.mm
+++ b/ios/Mobile/DocumentViewController.mm
@@ -348,7 +348,7 @@ static IMP standardImpOfInputAccessoryView = nil;
// First we simply send it the URL. This corresponds to the GET
request with Upgrade to
// WebSocket.
-std::string url([[[self.document fileURL] absoluteString]
UTF8String]);
+std::string url([[self.document->copyFileURL absoluteString]
UTF8String]);
p.fd = self.document->fakeClientFd;
p.events = POLLOUT;
fakeSocketPoll(&p, 1, -1);
@@ -469,21 +469,25 @@ static IMP standardImpOfInputAccessoryVi
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - EULA loolwsd.spec.in Makefile.am
EULA| 293 Makefile.am |3 loolwsd.spec.in |1 3 files changed, 296 insertions(+), 1 deletion(-) New commits: commit c576f5ae48d9e69ede9569b5366a2a926f71d66c Author: Andras Timar AuthorDate: Tue Apr 7 22:54:49 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 22:55:09 2020 +0200 [cp] EULA 2020-04-07 Change-Id: I3935154d2873de9a3f4b8660e3d367cc4f9c368c diff --git a/EULA b/EULA new file mode 100644 index 0..3e601e804 --- /dev/null +++ b/EULA @@ -0,0 +1,293 @@ +End User License and Subscription Agreement +Collabora Office (“Software”) + + +An individual acting on their own behalf or on behalf of any corporate entity +which employs them or which they represent (“an Organisation”) represents that +he or she has the authority to enter into this agreement on behalf of that +Organisation. In this Licence Agreement, “You” includes both the reader and any +Organisation. + +PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING +THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE +TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE +READ AND UNDERSTAND THIS AGREEMENT. + +IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE +SOFTWARE OR SUBSCRIPTION SERVICES. + +PARTIES. This software licence and subscription agreement (“Agreement”) is a +legally binding agreement between You and Collabora Productivity Limited, +incorporated and registered in England and Wales with company number 08644931 +whose registered office is at The Platinum Building, St John’s Innovation Park, +Cambridge, CB4 0DS, United Kingdom (“Collabora”) and where applicable +references to Collabora shall also refer to its authorised resellers and third +party distributors from time to time. + +SOFTWARE. The Software and each of its components are owned by Collabora or +other licensors and are protected as copyrighted works of authorship, and are +also protected under applicable database and other applicable laws. To the +extent that they are not accompanied by a separate Collabora software licence +agreement, any modification, update or upgrade to the Software that You may +download or receive, whether as Subscription Services detailed below or +otherwise, is included as Software and governed by the “Licenses” heading below +and generally by this Agreement. + +LICENCES. Provided that You have subscribed to the Subscription Services as +detailed below and Your compliance with the other terms and conditions of this +Agreement, Collabora grants to You a perpetual, non-transferable, worldwide +licence (“Licence”) to reproduce and use copies of the Software within Your +Organization. The Software is licensed (not sold) to You. Accordingly no title +to or ownership of the Software is transferred to You. You should also be aware +that in addition to this grant of Licence, many of the individual components of +the Software are subject to open source licences, as detailed further below +under “Open Source Licences and Limitations”. + +SUBSCRIPTION SERVICES. The Licence to reproduce and use a copy of the Software +is granted subject to the initial purchase by You of Software maintenance +and/or support services entitlements (“Subscription Services Entitlements”) +equivalent in number to the total number of units of the Software that you +intend to deploy, install or use in Your Organization. +The Subscription Services Entitlements entitle You during the subscription +period to make use of the following services (“Subscription Services”): +a) in the case of maintenance services, to any security fixes and Software +updates which may be issued by Collabora, including existing fixes from the +support services set out at (b), on the terms set out in this Agreement and +from time to time at http://www.CollaboraOffice.com/ +b) in the case of support services, to fee based technical support on the +terms set out in this Agreement, or any separate agreement, and from time to +time at http://www.CollaboraOffice.com/. +All Subscription Services will be supplied in a professional manner in +accordance with generally accepted industry standards. +Unless the Subscription Services and Subscription Services Entitlements are set +out in a separate contract with Collabora, they are offered to You subject to +the terms set out in this Agreement. + +IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED +WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE +SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF +COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL +UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF +ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR +SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE O
[Libreoffice-commits] online.git: Branch 'feature/proxyhack' - 107 commits - android/app android/lib common/FileUtil.cpp common/LOOLWebSocket.hpp common/Session.hpp common/Util.cpp common/Util.hpp con
Rebased ref, commits from common ancestor:
commit 023dc01cb8aa60efa99a86400d56b7ff14e2dda5
Author: Michael Meeks
AuthorDate: Sat Mar 21 20:03:37 2020 +
Commit: Michael Meeks
CommitDate: Tue Apr 7 18:12:03 2020 +0100
Proxy: don't leave out sockets lingering around for the !flush case.
Change-Id: I13ad123a6c3a068a676eae5e509367e727e9ac06
diff --git a/wsd/ProxyProtocol.cpp b/wsd/ProxyProtocol.cpp
index 6af0a33bf..6b0db2261 100644
--- a/wsd/ProxyProtocol.cpp
+++ b/wsd/ProxyProtocol.cpp
@@ -181,11 +181,14 @@ void
ProxyProtocolHandler::handleIncomingMessage(SocketDisposition &disposition)
int ProxyProtocolHandler::sendMessage(const char *msg, const size_t len, bool
text, bool flush)
{
_writeQueue.push_back(std::make_shared(msg, len, text));
-auto sock = popOutSocket();
-if (sock && flush)
+if (flush)
{
-flushQueueTo(sock);
-sock->shutdown();
+auto sock = popOutSocket();
+if (sock)
+{
+flushQueueTo(sock);
+sock->shutdown();
+}
}
return len;
commit 3237cef6f5b50b3b9e92f78a3b618853a387b3de
Author: Michael Meeks
AuthorDate: Sat Mar 21 15:07:10 2020 +
Commit: Michael Meeks
CommitDate: Tue Apr 7 18:12:03 2020 +0100
Proxy: improve debugging & naming.
Change-Id: Ifba669a33855a67c9a4e968db42ef1a2cb301d63
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index eb2a0d88b..adcda3bde 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -216,7 +216,7 @@
};
this.parseIncomingArray = function(arr) {
var decoder = new TextDecoder();
- console.debug('Parse incoming array of length ' +
arr.length);
+ console.debug('proxy: parse incoming array of length '
+ arr.length);
for (var i = 0; i < arr.length; ++i)
{
var left = arr.length - i;
@@ -274,7 +274,7 @@
if (this.status == 200)
that.parseIncomingArray(new
Uint8Array(this.response));
else
- console.debug('Error on
incoming response');
+ console.debug('proxy: error on
incoming response');
});
}
req.send(that.sendQueue);
@@ -300,21 +300,24 @@
this.sendTimeout = setTimeout(this.doSend, 2 /*
ms */);
};
this.close = function() {
- console.debug('close socket');
+ console.debug('proxy: close socket');
this.readyState = 3;
this.onclose();
+ clearInterval(this.waitInterval);
+ this.waitInterval = undefined;
};
this.getEndPoint = function(type) {
var base = this.uri;
return base.replace(/^ws/, 'http') + '/' + type;
};
- console.debug('New proxy socket ' + this.id + ' ' + this.uri);
+ console.debug('proxy: new socket ' + this.id + ' ' + this.uri);
// queue fetch of session id.
this.getSessionId();
// horrors ...
- this.readInterval = setInterval(function() {
+ this.waitConnect = function() {
+ console.debug('proxy: waiting - ' + that.readWaiting +
' on session ' + that.sessionId);
if (that.readWaiting > 4) // max 4 waiting connections
concurrently.
return;
if (that.sessionId == 'fetchsession')
@@ -329,13 +332,16 @@
});
req.addEventListener('loadend', function() {
that.readWaiting--;
+ console.debug('proxy: wait ended, re-issue');
+ that.waitConnect();
});
- req.open('GET', that.getEndPoint('read'));
+ req.open('GET', that.getEndPoint('wait'));
req.setRequestHeader('SessionId', that.sessionId);
req.responseType = 'arraybuffer';
req.send('');
that.readWaiting++;
- }, 250);
+ };
+ this.waitInterval = setInterval(this.waitConnect, 250);
};
if (global.socketProxy)
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index c1e745a6e..a71bce1b3 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2855,7 +2855,7 @@ private:
none, url, docKey, _id, uriPublic);
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - readlicense_oo/license setup_native/source
readlicense_oo/license/EULA.odt |binary
readlicense_oo/license/EULA_en-US.rtf | 199 -
setup_native/source/packinfo/sla.r| 4635 +-
3 files changed, 2427 insertions(+), 2407 deletions(-)
New commits:
commit 741127f2cc995bb8dc8b4ee57145fa5387af227e
Author: Andras Timar
AuthorDate: Tue Apr 7 22:38:39 2020 +0200
Commit: Andras Timar
CommitDate: Tue Apr 7 22:41:25 2020 +0200
[cp] EULA 2020-04-07
Change-Id: I5b4f35340e8c7b2bfd66d989277301c799f22581
diff --git a/readlicense_oo/license/EULA.odt b/readlicense_oo/license/EULA.odt
index 56ff3b330517..e5c937f15401 100644
Binary files a/readlicense_oo/license/EULA.odt and
b/readlicense_oo/license/EULA.odt differ
diff --git a/readlicense_oo/license/EULA_en-US.rtf
b/readlicense_oo/license/EULA_en-US.rtf
index ee850441a6c0..b5f8e682645b 100644
--- a/readlicense_oo/license/EULA_en-US.rtf
+++ b/readlicense_oo/license/EULA_en-US.rtf
@@ -1,94 +1,105 @@
-{\rtf1\ansi\ansicpg1250\deff0\deflang1038{\fonttbl{\f0\fnil\fprq8\fcharset0
Arial, Arial;}{\f1\fnil\fcharset0 Calibri;}}
-{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;\red51\green51\blue51;}
-{\*\generator Msftedit
5.41.21.2510;}\viewkind4\uc1\pard\qj\cf1\lang1169\b\f0\fs28 End User License
and Subscription Agreement\par
-\pard\qj Collabora Office (\ldblquote Software\rdblquote )\par
-\cf0\b0\f1\fs22\par
-\par
-\cf1\b\f0\fs20 An individual acting on their own behalf or on behalf of any
corporate entity which employs them or which they represent (\ldblquote an
Organisation\rdblquote ) represents that he or she has the authority to enter
into this agreement on behalf of that Organisation. In this Licence Agreement,
\ldblquote You\rdblquote includes both the reader and any Organisation.\par
-\cf0\b0\f1\fs22\par
-\pard\qj\cf1\f0\fs20 PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING,
INSTALLING AND/OR USING THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS
COMPONENTS), YOU AGREE TO THE TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT
AND ACKNOWLEDGE THAT YOU HAVE READ AND UNDERSTAND THIS AGREEMENT. \par
-\cf0\f1\fs22\par
-\cf1\f0\fs20 IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD,
INSTALL OR USE THE SOFTWARE OR SUBSCRIPTION SERVICES. \par
-\cf0\f1\fs22\par
-\pard\qj\cf1\b\f0\fs20 PARTIES.\b0 This software licence and subscription
agreement (\ldblquote Agreement\rdblquote ) is a legally binding agreement
between You and Collabora Productivity Limited, incorporated and registered in
England and Wales with company number 08644931 whose registered office is at
The Platinum Building, St John’s Innovation Park, Cambridge, CB4 0DS, United
Kingdom (\ldblquote Collabora\rdblquote ) and where applicable references to
Collabora shall also refer to its authorised resellers and third party
distributors from time to time. \par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 SOFTWARE\b0 . The Software and each of its components are owned
by Collabora or other licensors and are protected as copyrighted works of
authorship, and are also protected under applicable database and other
applicable laws. To the extent that they are not accompanied by a separate
Collabora software licence agreement, any modification, update or upgrade to
the Software that You may download or receive, whether as Subscription Services
detailed below or otherwise, is included as Software and governed by the
\ldblquote Licenses\rdblquote heading below and generally by this
Agreement.\par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 LICENCES.\b0 Provided that You have subscribed to the
Subscription Services as detailed below and Your compliance with the other
terms and conditions of this Agreement, Collabora grants to You a perpetual,
non-transferable, worldwide licence (\ldblquote Licence\rdblquote ) to
reproduce and use copies of the Software within Your Organization. The Software
is licensed (not sold) to You. Accordingly no title to or ownership of the
Software is transferred to You. You should also be aware that in addition to
this grant of Licence, many of the individual components of the Software are
subject to open source licences, as detailed further below under \ldblquote
Open Source Licences and Limitations\rdblquote .\par
-\cf0\f1\fs22\par
-\cf1\b\f0\fs20 SUBSCRIPTION SERVICES. \b0 The Licence to reproduce and use a
copy of the Software is granted subject to the initial purchase by You of
Software maintenance and/or support services entitlements (\ldblquote
Subscription Services Entitlements\rdblquote ) equivalent in number to the
total number of units of the Software that you intend to deploy, install or use
in Your Organization.\par
-\pard\qj The Subscription Services Entitlements entitle You during the
subscription period to make use of the following services (\ldblquote
Subscription Services\rdblquote ):\par
-a) in the case of maintenance services, to any security fixes and Software
updates which may be issued by Collabora, including existing fixe
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf119037.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 56
2 files changed, 56 insertions(+)
New commits:
commit e282a84d041232d62a49e67587f73634b536fe9a
Author: Xisco Fauli
AuthorDate: Tue Apr 7 20:49:02 2020 +0200
Commit: Xisco Faulí
CommitDate: Tue Apr 7 21:46:36 2020 +0200
tdf#119037: Add unittest
Change-Id: I9323b73c23350937a25889a564995e6be52fe43b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91850
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/ooxmlexport/data/tdf119037.odt
b/sw/qa/extras/ooxmlexport/data/tdf119037.odt
new file mode 100644
index ..b795b6b34b42
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119037.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 81f286c6e3da..fa913eb02718 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -692,6 +692,62 @@ DECLARE_OOXMLEXPORT_TEST(testTbrlFrameVml,
"tbrl-frame-vml.docx")
}
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf119037, "tdf119037.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pBdr/w:top",
"val", "single");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pBdr/w:left",
"val", "single");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pBdr/w:right",
"val", "single");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pBdr/w:bottom",
"val", "single");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr/w:pBdr/w:top",
"val", "dotted");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr/w:pBdr/w:left",
"val", "dotted");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr/w:pBdr/w:right",
"val", "dotted");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr/w:pBdr/w:bottom",
"val", "dotted");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:pPr/w:pBdr/w:top",
"val", "dashed");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:pPr/w:pBdr/w:left",
"val", "dashed");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:pPr/w:pBdr/w:right",
"val", "dashed");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:pPr/w:pBdr/w:bottom",
"val", "dashed");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:pBdr/w:top",
"val", "dashSmallGap");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:pBdr/w:left",
"val", "dashSmallGap");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:pBdr/w:right",
"val", "dashSmallGap");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:pBdr/w:bottom",
"val", "dashSmallGap");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[9]/w:pPr/w:pBdr/w:top",
"val", "dotDash");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[9]/w:pPr/w:pBdr/w:left",
"val", "dotDash");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[9]/w:pPr/w:pBdr/w:right",
"val", "dotDash");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[9]/w:pPr/w:pBdr/w:bottom",
"val", "dotDash");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[11]/w:pPr/w:pBdr/w:top",
"val", "dotDotDash");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[11]/w:pPr/w:pBdr/w:left",
"val", "dotDotDash");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[11]/w:pPr/w:pBdr/w:right",
"val", "dotDotDash");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[11]/w:pPr/w:pBdr/w:bottom",
"val", "dotDotDash");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[13]/w:pPr/w:pBdr/w:top",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[13]/w:pPr/w:pBdr/w:left",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[13]/w:pPr/w:pBdr/w:right",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[13]/w:pPr/w:pBdr/w:bottom",
"val", "double");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[15]/w:pPr/w:pBdr/w:top",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[15]/w:pPr/w:pBdr/w:left",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[15]/w:pPr/w:pBdr/w:right",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[15]/w:pPr/w:pBdr/w:bottom",
"val", "double");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[17]/w:pPr/w:pBdr/w:top",
"val", "thinThickSmallGap");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[17]/w:pPr/w:pBdr/w:left",
"val", "thinThickSmallGap");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[17]/w:pPr/w:pBdr/w:right",
"val", "thinThickSmallGap");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[17]/w:pPr/w:pBdr/w:bottom",
"val", "thinThickSmallGap");
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[19]/w:pPr/w:pBdr/w:top",
"val", "double");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[19]/w:pPr/w:pBdr
[Libreoffice-commits] core.git: include/vcl vcl/source vcl/unx
include/vcl/weld.hxx |3 +++
vcl/source/app/salvtables.cxx | 17 +
vcl/unx/gtk3/gtk3gtkinst.cxx | 15 +++
3 files changed, 35 insertions(+)
New commits:
commit ec8961c08dda313a22acf85638b0db3071e22db7
Author: Caolán McNamara
AuthorDate: Tue Apr 7 17:17:45 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Apr 7 21:30:44 2020 +0200
allow setting combobox font
so it can be made italic for the font name combobox
Change-Id: I35e819b1401d2ebbaa1e9ce8e2ce9e031662c999
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91840
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 3f3689fccc61..7dbe6643491e 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -677,6 +677,9 @@ public:
virtual void set_entry_completion(bool bEnable, bool bCaseSensitive =
false) = 0;
virtual void set_entry_placeholder_text(const OUString& rText) = 0;
+// font size is in points, not pixels, e.g. see Window::[G]etPointFont
+virtual void set_entry_font(const vcl::Font& rFont) = 0;
+
virtual bool get_popup_shown() const = 0;
void connect_entry_insert_text(const Link& rLink)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 706a874229e6..febffea547fc 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5946,6 +5946,8 @@ public:
virtual void set_entry_placeholder_text(const OUString&) override {
assert(false); }
+virtual void set_entry_font(const vcl::Font&) override { assert(false); }
+
virtual ~SalInstanceComboBoxWithoutEdit() override
{
m_xComboBox->SetSelectHdl(Link());
@@ -6061,6 +6063,14 @@ public:
return rSelection.Len();
}
+virtual void set_entry_font(const vcl::Font& rFont) override
+{
+Edit* pEdit = m_xComboBox->GetSubEdit();
+assert(pEdit);
+pEdit->SetPointFont(*pEdit, rFont);
+pEdit->Invalidate();
+}
+
virtual ~SalInstanceComboBoxWithEdit() override
{
m_xComboBox->SetTextFilter(nullptr);
@@ -6132,6 +6142,13 @@ public:
rEntry.SetAutocompleteHdl(Link());
}
+virtual void set_entry_font(const vcl::Font& rFont) override
+{
+Edit& rEntry = m_pEntry->getEntry();
+rEntry.SetPointFont(rEntry, rFont);
+rEntry.Invalidate();
+}
+
virtual void set_entry_placeholder_text(const OUString& rText) override
{
Edit& rEntry = m_pEntry->getEntry();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8b644d22d1c5..29d1ad3b0b9f 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13403,6 +13403,16 @@ public:
gtk_entry_set_placeholder_text(pEntry, rText.toUtf8().getStr());
}
+virtual void set_entry_font(const vcl::Font& rFont) override
+{
+PangoAttrList* pAttrList = create_attr_list(rFont);
+GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox));
+assert(pChild && GTK_IS_ENTRY(pChild));
+GtkEntry* pEntry = GTK_ENTRY(pChild);
+gtk_entry_set_attributes(pEntry, pAttrList);
+pango_attr_list_unref(pAttrList);
+}
+
virtual void disable_notify_events() override
{
if (GtkEntry* pEntry = get_entry())
@@ -13701,6 +13711,11 @@ public:
m_xEntry->set_placeholder_text(rText);
}
+virtual void set_entry_font(const vcl::Font& rFont) override
+{
+m_xEntry->set_font(rFont);
+}
+
virtual void grab_focus() override { m_xEntry->grab_focus(); }
virtual void connect_focus_in(const Link& rLink) override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |8
loleaflet/src/control/Control.Toolbar.js |8 +---
loleaflet/src/main.js|2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit b7de8a91dc79afd999411e491cb5dead19a83ec3
Author: mert
AuthorDate: Wed Mar 25 23:15:10 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Apr 7 21:20:38 2020 +0200
mobile: Add search in the readonly mode
Change-Id: I059b0337096f9eed21031724dbec22f29807a979
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91072
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
(cherry picked from commit f634264d89896be25f2853952241afe4e9d4c45c)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91722
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index e2396faf5..f7aa69111 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -489,6 +489,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
+ {name: _('Search'), id: 'searchdialog', type: 'action'},
{name: _UNO('.uno:ChangesMenu', 'text'), id:
'changesmenu', type: 'menu', menu: [
{uno: '.uno:TrackChanges'},
{uno: '.uno:ShowTrackedChanges'},
@@ -535,6 +536,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
+ {name: _('Search'), id: 'searchdialog', type: 'action'},
{name: _UNO('.uno:TableMenu', 'text'/*HACK should be
'presentation', but not in xcu*/), id: 'tablemenu', type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
{uno: '.uno:InsertRowsAfter'},
@@ -580,6 +582,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
+ {name: _('Search'), id: 'searchdialog', type: 'action'},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), id:
'sheetmenu', type: 'menu', menu: [
{name: _UNO('.uno:InsertRowsMenu',
'spreadsheet'), id: 'insertrowsmenu', type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
@@ -1194,6 +1197,11 @@ L.Control.Menubar = L.Control.extend({
}
} else if (id === 'repair') {
this._map._socket.sendMessage('commandvalues
command=.uno:DocumentRepair');
+ } else if (id === 'searchdialog') {
+ $('#toolbar-down').hide();
+ $('#toolbar-search').show();
+ $('#mobile-edit-button').hide();
+ L.DomUtil.get('search-input').focus();
}
// Inform the host if asked
if (postmessage)
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 6a61894df..21a434d56 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -186,7 +186,11 @@ function onClick(e, id, item, subItem) {
}
else if (id === 'hidesearchbar') {
$('#toolbar-search').hide();
- $('#toolbar-down').show();
+ if (map._permission === 'edit')
+ $('#toolbar-down').show();
+ /** show edit button if only we are able to edit but in
readonly mode */
+ if (window.docPermission === 'edit' && map._permission ===
'readonly')
+ $('#mobile-edit-button').show();
}
else if (id === 'searchprev') {
map.search(L.DomUtil.get('search-input').value, true);
@@ -2304,7 +2308,6 @@ function onUpdatePermission(e) {
toolbar.enable(id);
});
}
- $('#search-input').prop('disabled', false);
if (window.mode.isMobile()) {
$('#toolbar-down').show();
@@ -2347,7 +2350,6 @@ function onUpdatePermission(e) {
toolbar.disable(id);
});
}
- $('#search-input').prop('disabled', true);
if (window.mode.isMobile()) {
$('#toolbar-down').hide();
diff --git a/loleaflet/src/main.js b/loleaflet/src/main.js
index 7fdbee43d..5b2799df6 100644
--- a/loleaflet/src/main.js
+++ b/loleaflet/src/main.js
@@ -49,7 +49,6 @@ if (wopiSrc
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - android/app
android/app/src/main/AndroidManifest.xml |1 - 1 file changed, 1 deletion(-) New commits: commit 5294af832aca497f715ddf113b7282a87fa11c26 Author: Jan Holesovsky AuthorDate: Tue Apr 7 17:08:19 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 21:04:45 2020 +0200 Revert "android: Force portrait for the moment." Landscape is OK again. This reverts commit db585f8c64b32ba423f5c311ddd04d39809d34b4. Change-Id: I82cafe8229a5c170eee66467ad15dbdab668f1dd Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91843 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar (cherry picked from commit af4e93010715bb25d68ecf165ec051b293335186) Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91720 Tested-by: Andras Timar diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ecda89bbb..6912a0b57 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -51,7 +51,6 @@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - ios/Mobile
ios/Mobile/Info.plist.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 0026cbb3557a2e9acda59c74f3c30225acc6315d Author: Jan Holesovsky AuthorDate: Tue Apr 7 20:47:15 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 21:05:19 2020 +0200 Revert "Force portrait for the moment also for iPhone in the iOS app" Landscape is supposedly working fine now. This reverts commit d474f060409328c1f40c63074396b1bc579de72e. Change-Id: I28e6d521ee0c4906e07b99b8cc6c24761b20f2b3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91849 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar (cherry picked from commit 61ad718671b7a317573017120ce9ff9e664d868c) Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91721 Tested-by: Andras Timar diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in index c5b9ea0df..b210255bf 100644 --- a/ios/Mobile/Info.plist.in +++ b/ios/Mobile/Info.plist.in @@ -430,6 +430,8 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait +UIInterfaceOrientationLandscapeLeft +UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - android/app ios/Mobile
android/app/src/main/AndroidManifest.xml |1 - ios/Mobile/Info.plist.in |2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 61ad718671b7a317573017120ce9ff9e664d868c Author: Jan Holesovsky AuthorDate: Tue Apr 7 20:47:15 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 21:04:08 2020 +0200 Revert "Force portrait for the moment also for iPhone in the iOS app" Landscape is supposedly working fine now. This reverts commit d474f060409328c1f40c63074396b1bc579de72e. Change-Id: I28e6d521ee0c4906e07b99b8cc6c24761b20f2b3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91849 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in index c5b9ea0df..b210255bf 100644 --- a/ios/Mobile/Info.plist.in +++ b/ios/Mobile/Info.plist.in @@ -430,6 +430,8 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait +UIInterfaceOrientationLandscapeLeft +UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad commit af4e93010715bb25d68ecf165ec051b293335186 Author: Jan Holesovsky AuthorDate: Tue Apr 7 17:08:19 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 21:03:59 2020 +0200 Revert "android: Force portrait for the moment." Landscape is OK again. This reverts commit db585f8c64b32ba423f5c311ddd04d39809d34b4. Change-Id: I82cafe8229a5c170eee66467ad15dbdab668f1dd Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91843 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ecda89bbb..6912a0b57 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -51,7 +51,6 @@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |8
loleaflet/src/control/Control.Toolbar.js |8 +---
loleaflet/src/main.js|2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit f634264d89896be25f2853952241afe4e9d4c45c
Author: mert
AuthorDate: Wed Mar 25 23:15:10 2020 +0300
Commit: Jan Holesovsky
CommitDate: Tue Apr 7 20:28:40 2020 +0200
mobile: Add search in the readonly mode
Change-Id: I059b0337096f9eed21031724dbec22f29807a979
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91072
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index e2396faf5..f7aa69111 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -489,6 +489,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
+ {name: _('Search'), id: 'searchdialog', type: 'action'},
{name: _UNO('.uno:ChangesMenu', 'text'), id:
'changesmenu', type: 'menu', menu: [
{uno: '.uno:TrackChanges'},
{uno: '.uno:ShowTrackedChanges'},
@@ -535,6 +536,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
+ {name: _('Search'), id: 'searchdialog', type: 'action'},
{name: _UNO('.uno:TableMenu', 'text'/*HACK should be
'presentation', but not in xcu*/), id: 'tablemenu', type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
{uno: '.uno:InsertRowsAfter'},
@@ -580,6 +582,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:Paste'},
{uno: '.uno:SelectAll'}
]},
+ {name: _('Search'), id: 'searchdialog', type: 'action'},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), id:
'sheetmenu', type: 'menu', menu: [
{name: _UNO('.uno:InsertRowsMenu',
'spreadsheet'), id: 'insertrowsmenu', type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
@@ -1194,6 +1197,11 @@ L.Control.Menubar = L.Control.extend({
}
} else if (id === 'repair') {
this._map._socket.sendMessage('commandvalues
command=.uno:DocumentRepair');
+ } else if (id === 'searchdialog') {
+ $('#toolbar-down').hide();
+ $('#toolbar-search').show();
+ $('#mobile-edit-button').hide();
+ L.DomUtil.get('search-input').focus();
}
// Inform the host if asked
if (postmessage)
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 6a61894df..21a434d56 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -186,7 +186,11 @@ function onClick(e, id, item, subItem) {
}
else if (id === 'hidesearchbar') {
$('#toolbar-search').hide();
- $('#toolbar-down').show();
+ if (map._permission === 'edit')
+ $('#toolbar-down').show();
+ /** show edit button if only we are able to edit but in
readonly mode */
+ if (window.docPermission === 'edit' && map._permission ===
'readonly')
+ $('#mobile-edit-button').show();
}
else if (id === 'searchprev') {
map.search(L.DomUtil.get('search-input').value, true);
@@ -2304,7 +2308,6 @@ function onUpdatePermission(e) {
toolbar.enable(id);
});
}
- $('#search-input').prop('disabled', false);
if (window.mode.isMobile()) {
$('#toolbar-down').show();
@@ -2347,7 +2350,6 @@ function onUpdatePermission(e) {
toolbar.disable(id);
});
}
- $('#search-input').prop('disabled', true);
if (window.mode.isMobile()) {
$('#toolbar-down').hide();
diff --git a/loleaflet/src/main.js b/loleaflet/src/main.js
index 7fdbee43d..5b2799df6 100644
--- a/loleaflet/src/main.js
+++ b/loleaflet/src/main.js
@@ -49,7 +49,6 @@ if (wopiSrc != '') {
}
var notWopiButIframe = getParameterByName('NotWOPIButIframe') != '';
-
var map = L.map('map', {
server: host,
doc: docURL,
@@ -90,6 +89,
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - 4 commits - configure.ac debian/changelog debian/control debian/rules .gitreview loolkitconfig.xcu loolwsd.spec.in
.gitreview|2
configure.ac |2
debian/changelog | 64 +--
debian/control| 18 ++-
debian/rules |4 -
loolkitconfig.xcu |9 ++-
loolwsd.spec.in | 125 +-
7 files changed, 151 insertions(+), 73 deletions(-)
New commits:
commit 944a3f1efeddd73d81fb3d1b8595569428142e7b
Author: Andras Timar
AuthorDate: Mon Dec 9 18:09:48 2019 +0100
Commit: Andras Timar
CommitDate: Tue Apr 7 19:59:12 2020 +0200
Bump package version to 4.2.2-1 and update deb/rpm package files
Change-Id: I935425f644f373acdd4bf8d073ec8be3f29313b8
diff --git a/configure.ac b/configure.ac
index 1edd5408f..092998061 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.2], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 56cbc5563..180cdd713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,59 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
+loolwsd (4.2.2-1) unstable; urgency=medium
- * Fix crash in Impress.
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.2-1
- -- Jan Holesovsky Thu, 11 Aug 2016 16:46:00 +0100
+ -- Andras Timar Tue, 07 Apr 2020 18:00:00 +0100
-loolwsd (1.8.0-1) unstable; urgency=medium
+loolwsd (4.2.1-3) unstable; urgency=medium
- [ Tor Lillqvist ]
- * Back to packaging this for Debian.
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-3
- [ Jan Holesovsky ]
- * Update to match Collabora Office 5.1
+ -- Andras Timar Thu, 02 Apr 2020 18:00:00 +0100
- -- Jan Holesovsky Fri, 05 Aug 2016 16:51:54 +0100
+loolwsd (4.2.1-2) unstable; urgency=medium
-loolwsd (1.0.0-1) unstable; urgency=low
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-2
- * Initial release
+ -- Andras Timar Thu, 26 Mar 2020 18:00:00 +0100
- * Local Variables:
- * Mode: fundamental
- * End:
+loolwsd (4.2.1-1) unstable; urgency=medium
- -- Tor Lillqvist Fri, 15 May 2015 11:10:20 +0300
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-1
+
+ -- Andras Timar Thu, 19 Mar 2020 12:53:00 +0100
+
+loolwsd (4.2.0-6) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-6
+
+ -- Andras Timar Wed, 04 Mar 2020 11:26:00 +0100
+
+loolwsd (4.2.0-5) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-5
+
+ -- Andras Timar Tue, 25 Feb 2020 11:58:00 +0100
+
+loolwsd (4.2.0-4) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-4
+
+ -- Andras Timar Tue, 28 Jan 2020 18:58:00 +0100
+
+loolwsd (4.2.0-3) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-3
+
+ -- Andras Timar Thu, 09 Jan 2020 22:12:00 +0100
+
+loolwsd (4.2.0-2) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-2
+
+ -- Andras Timar Fri, 20 Dec 2019 13:27:00 +0100
+
+loolwsd (4.2.0-1) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-1
+
+ -- Andras Timar Tue, 10 Dec 2019 20:47:00 +0100
diff --git a/debian/control b/debian/control
index 532367872..5184feb1d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,27 @@ Source: loolwsd
Section: web
Priority: optional
Maintainer: Andras Timar
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin,
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs,
python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev,
libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin,
libpcre3-dev, libpng-dev, linux-libc-dev, nodejs, python3-polib, python3-lxml,
fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts, m4
Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx,
libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ locales-all, adduser, expat, fontconfig, cpio, libcap2-bin,
+ collaboraofficebasis6.2-calc,
+ collaboraofficebasis6.2-core,
+ collaboraofficebasis6.2-graphicfilter,
+ collaboraofficebasis6.2-images,
+ collaboraofficebasis6.2-impress,
+ collaboraofficebasis6.2-ooofonts,
+ collaboraofficebasis6.2-writer,
+ collaboraoffice6.2,
+ collaboraoffice6.2-ure,
+ collaboraofficebasis6.2-en-us,
+ collaboraofficebasis6.2-draw,
+ collaboraofficebasis6.2-extension-pdf-i
[Libreoffice-commits] core.git: idl/source
idl/source/objects/slot.cxx | 35 +--
idl/source/prj/parser.cxx | 24
2 files changed, 29 insertions(+), 30 deletions(-)
New commits:
commit 8ee2063fa8e0871fb91e1e92c52dbc5ecb73c9ab
Author: Noel Grandin
AuthorDate: Tue Apr 7 16:13:10 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 19:56:18 2020 +0200
loplugin:flatten in idl
Change-Id: I7e8fe338a366d146c7951fe54f74cc5e42bde039
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91833
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index e9b2d9986410..1793da697c5c 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -386,28 +386,27 @@ void SvMetaSlot::WriteSlotStubs( const OString&
rShellName,
}
aMethodName = GetStateMethod();
-if (!aMethodName.isEmpty() &&
-aMethodName != "NoState")
+if (aMethodName.isEmpty() || aMethodName == "NoState")
+return;
+
+bool bIn = false;
+for ( size_t n=0; n < rList.size(); n++ )
{
-bool bIn = false;
-for ( size_t n=0; n < rList.size(); n++ )
+if (rList[n] == aMethodName)
{
-if (rList[n] == aMethodName)
-{
-bIn = true;
-break;
-}
+bIn = true;
+break;
}
+}
-if ( !bIn )
-{
-rList.push_back( aMethodName );
-rOutStm.WriteCharPtr( "SFX_STATE_STUB(" )
- .WriteOString( rShellName )
- .WriteChar( ',' )
- .WriteOString( aMethodName )
- .WriteChar( ')' ) << endl;
-}
+if ( !bIn )
+{
+rList.push_back( aMethodName );
+rOutStm.WriteCharPtr( "SFX_STATE_STUB(" )
+ .WriteOString( rShellName )
+ .WriteChar( ',' )
+ .WriteOString( aMethodName )
+ .WriteChar( ')' ) << endl;
}
}
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index be948e8ec31f..dc5bb4f1 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -431,20 +431,20 @@ void SvIdlParser::ReadInterfaceOrShellMethod(
SvMetaAttribute& rAttr )
xT->SetRef(rAttr.GetType() );
rAttr.aType = xT;
rAttr.aType->SetType( MetaTypeType::Method );
-if (!ReadIf(')'))
+if (ReadIf(')'))
+return;
+
+while (true)
{
-while (true)
-{
-tools::SvRef xParamAttr( new SvMetaAttribute() );
-xParamAttr->aType = ReadKnownType();
-xParamAttr->SetName( ReadIdentifier() );
-ReadSlotId(xParamAttr->aSlotId);
-rAttr.aType->GetAttrList().push_back( xParamAttr.get() );
-if (!ReadIfDelimiter())
-break;
-}
-Read(')');
+tools::SvRef xParamAttr( new SvMetaAttribute() );
+xParamAttr->aType = ReadKnownType();
+xParamAttr->SetName( ReadIdentifier() );
+ReadSlotId(xParamAttr->aSlotId);
+rAttr.aType->GetAttrList().push_back( xParamAttr.get() );
+if (!ReadIfDelimiter())
+break;
}
+Read(')');
}
void SvIdlParser::ReadSlotId(SvIdentifier& rSlotId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'distro/collabora/co-4-2-2'
New branch 'distro/collabora/co-4-2-2' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source
sd/source/ui/view/drviews5.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 3bd5dcc02b84da14286af4492f28bc776d765146
Author: Mert Tumer
AuthorDate: Tue Apr 7 15:36:34 2020 +0300
Commit: Andras Timar
CommitDate: Tue Apr 7 19:27:49 2020 +0200
fix ODP roundtripped in online opens with huge zoom in desktop
Change-Id: Ia3192cfeaab8ac643bba7b499240882f403b6388
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91822
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 2266c7981d06..dea2c58d795f 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -61,6 +61,7 @@
#include
#include
#include
+#include
namespace sd {
@@ -343,6 +344,12 @@ void DrawViewShell::WriteFrameViewData()
Size aVisSizePixel = GetActiveWindow()->GetOutputSizePixel();
::tools::Rectangle aVisArea = GetActiveWindow()->PixelToLogic(
::tools::Rectangle( Point(0,0), aVisSizePixel) );
+if (comphelper::LibreOfficeKit::isActive())
+{
+// aVisArea is nonsensical in the LOK case, use the slide size
+aVisArea = ::tools::Rectangle(Point(), getCurrentPage()->GetSize());
+}
+
mpFrameView->SetVisArea(aVisArea);
if( mePageKind == PageKind::Handout )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idlc/source
idlc/source/astdump.cxx | 37 +--
idlc/source/astinterface.cxx | 137 +--
idlc/source/fehelper.cxx | 38 +--
idlc/source/idlc.cxx | 66 ++--
4 files changed, 141 insertions(+), 137 deletions(-)
New commits:
commit f9151f426281de0fb7f446d7b968f2b0c09b7a9b
Author: Noel Grandin
AuthorDate: Tue Apr 7 14:22:27 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 18:55:33 2020 +0200
loplugin:flatten in idlc
Change-Id: Ieef78720d4569d59bc69b40a1bea02839667b847
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91819
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 081671615912..79613e137fb9 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -383,24 +383,25 @@ void AstAttribute::dumpExceptions(
typereg::Writer & writer, OUString const & documentation,
DeclList const & exceptions, RTMethodMode flags, sal_uInt16 * methodIndex)
const
{
-if (!exceptions.empty()) {
-OSL_ASSERT(methodIndex != nullptr);
-sal_uInt16 idx = (*methodIndex)++;
-// exceptions.size() <= SAL_MAX_UINT16 already checked in
-// AstInterface::dump:
-writer.setMethodData(
-idx, documentation, flags,
-OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8),
-"void", 0,
-static_cast< sal_uInt16 >(exceptions.size()));
-sal_uInt16 exceptionIndex = 0;
-for (auto const& elem : exceptions)
-{
-writer.setMethodExceptionTypeName(
-idx, exceptionIndex++,
-OStringToOUString(
-elem->getRelativName(), RTL_TEXTENCODING_UTF8));
-}
+if (exceptions.empty())
+return;
+
+OSL_ASSERT(methodIndex != nullptr);
+sal_uInt16 idx = (*methodIndex)++;
+// exceptions.size() <= SAL_MAX_UINT16 already checked in
+// AstInterface::dump:
+writer.setMethodData(
+idx, documentation, flags,
+OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8),
+"void", 0,
+static_cast< sal_uInt16 >(exceptions.size()));
+sal_uInt16 exceptionIndex = 0;
+for (auto const& elem : exceptions)
+{
+writer.setMethodExceptionTypeName(
+idx, exceptionIndex++,
+OStringToOUString(
+elem->getRelativName(), RTL_TEXTENCODING_UTF8));
}
}
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 991759384869..a5f2ed21bf2c 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -253,54 +253,55 @@ void AstInterface::checkInheritedInterfaceClashes(
std::set< OString > & seenInterfaces, AstInterface const * ifc,
bool direct, bool optional, bool mainOptional) const
{
-if (direct || optional
-|| seenInterfaces.insert(ifc->getScopedName()).second)
-{
-VisibleInterfaces::const_iterator visible(
-m_visibleInterfaces.find(ifc->getScopedName()));
-if (visible != m_visibleInterfaces.end()) {
-switch (visible->second) {
-case INTERFACE_INDIRECT_OPTIONAL:
-if (direct && optional) {
-doubleDeclarations.interfaces.push_back(ifc);
-return;
-}
-break;
-
-case INTERFACE_DIRECT_OPTIONAL:
-if (direct || !mainOptional) {
-doubleDeclarations.interfaces.push_back(ifc);
-}
-return;
-
-case INTERFACE_INDIRECT_MANDATORY:
-if (direct) {
-doubleDeclarations.interfaces.push_back(ifc);
-}
+if (!(direct || optional
+|| seenInterfaces.insert(ifc->getScopedName()).second))
+return;
+
+VisibleInterfaces::const_iterator visible(
+m_visibleInterfaces.find(ifc->getScopedName()));
+if (visible != m_visibleInterfaces.end()) {
+switch (visible->second) {
+case INTERFACE_INDIRECT_OPTIONAL:
+if (direct && optional) {
+doubleDeclarations.interfaces.push_back(ifc);
return;
+}
+break;
-case INTERFACE_DIRECT_MANDATORY:
-if (direct || (!optional && !mainOptional)) {
-doubleDeclarations.interfaces.push_back(ifc);
-}
-return;
+case INTERFACE_DIRECT_OPTIONAL:
+if (direct || !mainOptional) {
+doubleDeclarations.interfaces.push_back(ifc);
}
-}
-if (direct || !optional) {
-for (DeclList::const_iterator i(ifc->getIteratorBegin());
- i != ifc->getIteratorEnd(); ++i)
-{
-checkMemberClashes(
-doubleDeclarations.members, *i, !mainOptional);
[Libreoffice-commits] core.git: include/LibreOfficeKit vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |1 +
vcl/source/window/floatwin.cxx |7 ++-
vcl/source/window/winproc.cxx| 10 --
3 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit f91745c82128bfd6bf795f4e2e1cc290448f1cdb
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 10:31:51 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 18:17:24 2020 +0200
lok: Use a different window type for tooltips.
Change-Id: I211cd6bc2249475dbacd80f944e22465b19aff77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91829
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index e1321898bd2d..5ad801a7a74f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -614,6 +614,7 @@ typedef enum
* - "dialog" - window is a dialog
* - "child" - window is a floating window (combo boxes, etc.)
* - "deck" - window is a docked/floating deck (i.e. the sidebar)
+ * - "tooltip" - window is a tooltip popup
*
* "action" can take following values:
* - "created" - window is created in the backend, client can render it now
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index a010533c79aa..749ceacd09d0 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -653,7 +654,11 @@ void FloatingWindow::StateChanged( StateChangedType nType )
else
{
SetLOKNotifier(pParent->GetLOKNotifier());
-aItems.emplace_back("type", "child");
+if (dynamic_cast(this))
+aItems.emplace_back("type", "tooltip");
+else
+aItems.emplace_back("type", "child");
+
aItems.emplace_back("parentId",
OString::number(pParent->GetLOKWindowId()));
if (mbInPopupMode)
aItems.emplace_back("position",
mpImplData->maPos.toString()); // pixels
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index e0fad45bf34f..6ae5be59debb 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -160,16 +160,6 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point& rMousePo
static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point&
rMousePos )
{
-if (comphelper::LibreOfficeKit::isActive())
-{
-// Ignore tooltips in popup color palettes
-// (e.g. Character Properties dialog -> Font Effects -> Font Color)
-if(pChild->GetType() == WindowType::CONTROL &&
- pChild->GetParent() && pChild->GetParent()->GetParent() &&
- pChild->GetParent()->GetParent()->GetType() ==
WindowType::DOCKINGWINDOW)
-return;
-}
-
ImplSVHelpData& aHelpData = ImplGetSVHelpData();
if ( !aHelpData.mpHelpWin ||
!( aHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/LibreOfficeKit vcl/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |1 +
vcl/source/window/floatwin.cxx |7 ++-
vcl/source/window/winproc.cxx| 10 --
3 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit bbcf587faa73d8ec7242f287421337b247b51cc5
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 10:31:51 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 18:17:00 2020 +0200
lok: Use a different window type for tooltips.
Change-Id: I211cd6bc2249475dbacd80f944e22465b19aff77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91837
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 7ef3a3884e92..de547df505ea 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -614,6 +614,7 @@ typedef enum
* - "dialog" - window is a dialog
* - "child" - window is a floating window (combo boxes, etc.)
* - "deck" - window is a docked/floating deck (i.e. the sidebar)
+ * - "tooltip" - window is a tooltip popup
*
* "action" can take following values:
* - "created" - window is created in the backend, client can render it now
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 0ef5125e92c7..006ac60caaa7 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -653,7 +654,11 @@ void FloatingWindow::StateChanged( StateChangedType nType )
else
{
SetLOKNotifier(pParent->GetLOKNotifier());
-aItems.emplace_back("type", "child");
+if (dynamic_cast(this))
+aItems.emplace_back("type", "tooltip");
+else
+aItems.emplace_back("type", "child");
+
aItems.emplace_back("parentId",
OString::number(pParent->GetLOKWindowId()));
if (mbInPopupMode)
aItems.emplace_back("position",
mpImplData->maPos.toString()); // pixels
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 8377691e1527..31620bc6a0ac 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -160,16 +160,6 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point& rMousePo
static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point&
rMousePos )
{
-if (comphelper::LibreOfficeKit::isActive())
-{
-// Ignore tooltips in popup color pallets
-// (e.g. Character Properties dialog -> Font Effects -> Font Color)
-if(pChild->GetType() == WindowType::CONTROL &&
- pChild->GetParent() && pChild->GetParent()->GetParent() &&
- pChild->GetParent()->GetParent()->GetType() ==
WindowType::SCROLLWINDOW)
-return;
-}
-
ImplSVHelpData& aHelpData = ImplGetSVHelpData();
if ( !aHelpData.mpHelpWin ||
!( aHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/common/mobile_helper.js |2 +-
cypress_test/integration_tests/mobile/calc/calc_helper.js|4 ++--
cypress_test/integration_tests/mobile/calc/spellchecking_spec.js |3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 35290a048748ff8e5d7ec64e9064df2392ae23f5
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 17:48:50 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 18:06:11 2020 +0200
cypress: mobile: improve logging related to calc spellchecking test.
Change-Id: I8a57e9d90eff157f22d0cb37a59a4059ac862fd7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91839
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/common/mobile_helper.js
b/cypress_test/integration_tests/common/mobile_helper.js
index 3f9b4aa72..53eac5d6d 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -67,7 +67,7 @@ function detectLOCoreVersion() {
function longPressOnDocument(posX, posY) {
cy.log('Emulating a long press - start.');
cy.log('Param - posX: ' + posX);
- cy.log('Param - posX: ' + posY);
+ cy.log('Param - posY: ' + posY);
cy.get('.leaflet-pane.leaflet-map-pane')
.then(function(items) {
diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js
b/cypress_test/integration_tests/mobile/calc/calc_helper.js
index d3530f48c..12e20b6e0 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js
@@ -72,7 +72,7 @@ function copyContentToClipboard() {
}
function removeTextSelection() {
- cy.log('Removing all text - start.');
+ cy.log('Removing text selection - start.');
// TODO: select all does not work with core/master
// if we have a column selected
@@ -90,7 +90,7 @@ function removeTextSelection() {
.should('exist');
}
- cy.log('Removing all text - end.');
+ cy.log('Removing text selection - end.');
}
function selectAllMobile() {
diff --git a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
index 379221e58..70a91270f 100644
--- a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
@@ -29,10 +29,13 @@ describe('Calc spell checking menu.', function() {
cy.get('.leaflet-marker-icon')
.then(function(markers) {
expect(markers.length).to.have.greaterThan(1);
+ cy.log('Markers length: ' + markers.length);
for (var i = 0; i < markers.length; i++) {
if
(markers[i].classList.contains('leaflet-selection-marker-start')) {
+ cy.log('Found start marker at
pos: ' + markers[i].getBoundingClientRect().right);
var XPos =
markers[i].getBoundingClientRect().right + 10;
} else if
(markers[i].classList.contains('leaflet-selection-marker-end')) {
+ cy.log('Found end marker at
pos: ' + markers[i].getBoundingClientRect().top);
var YPos =
markers[i].getBoundingClientRect().top - 10;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf107020.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 14 ++
2 files changed, 14 insertions(+)
New commits:
commit bb0c4119b7e63e370bb3a66d0debbe5e3b19b67a
Author: Xisco Fauli
AuthorDate: Tue Apr 7 16:17:26 2020 +0200
Commit: Xisco Faulí
CommitDate: Tue Apr 7 17:58:35 2020 +0200
tdf#107020: Add unittest
Change-Id: I6d3cf82651d07e147f0dce0e6c41230ab0ca3894
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91830
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/ooxmlexport/data/tdf107020.docx
b/sw/qa/extras/ooxmlexport/data/tdf107020.docx
new file mode 100644
index ..9c6cf6d9583b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf107020.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index abac561df575..e88b902aee0a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -70,6 +70,20 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130814model,
"tdf130814.docx")
CPPUNIT_ASSERT_EQUAL(OUString("Arial Unicode MS"),
getProperty(getRun(getParagraph(2), 1), "CharFontNameAsian"));
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf107020, "tdf107020.docx")
+{
+xmlDocPtr p_XmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(p_XmlDoc);
+assertXPath(
+p_XmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:srcRect",
"l", "4910");
+assertXPath(
+p_XmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:srcRect",
"t", "27183");
+assertXPath(
+p_XmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:srcRect",
"r", "57638");
+assertXPath(
+p_XmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:blipFill/a:srcRect",
"b", "48360");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130814ooxml, "tdf130814.docx")
{
xmlDocPtr p_XmlDoc = parseExport("word/document.xml");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/html
loleaflet/html/loleaflet.html.m4 |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ab44bfaf5fd8452a1e4ee43a278ed4f943ff37b4
Author: Tor Lillqvist
AuthorDate: Tue Apr 7 18:24:44 2020 +0300
Commit: Tor Lillqvist
CommitDate: Tue Apr 7 17:56:05 2020 +0200
In the iOS app we have the branding files in the Branding folder
(So that it is easier to copy them freshly in the configure script.)
Change-Id: Ib8210850abcb259cb6be7ff0d708de0cf05c135d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91838
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 8f8890209..9c83d213c 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -263,10 +263,10 @@ brandingLink.setAttribute("rel", "stylesheet");
brandingLink.setAttribute("type", "text/css");
if (window.mode.isMobile()) {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-mobile.css');]
-[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-mobile.css');]
+[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])m4_ifelse(IOSAPP,[true],[Branding/])[branding-mobile.css');]
} else if (window.mode.isTablet()) {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-tablet.css');]
-[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-tablet.css');]
+[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])m4_ifelse(IOSAPP,[true],[Branding/])[branding-tablet.css');]
} else {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-desktop.css');]
[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-desktop.css');]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Need Help - How to Build Starter project from command line
Hi Samuel/Team, Need some more help. I have used the export wizard and used "Generate Ant Script File" options. Ran the generate build.xml as Ant Build. When tried to install the generated oxt it gives out error. [image: image.png] Please help. Thanks Harish On Mon, Apr 6, 2020 at 8:14 PM Harish Kumar wrote: > Hi Samuel, > > That was a great help. I was able to build my project from command line > with the ant script generated. Thanks a lot. > > On Mon, Apr 6, 2020 at 10:53 AM Samuel Mehrbrodt > wrote: > >> You can use the export wizard to create an Ant script to build the >> project. >> >> Maybe that helps? >> >> Regards >> Samuel >> Am 04.04.20 um 10:28 schrieb Harish Kumar: >> >> Please help >> >> -- Forwarded message -- >> From: *Harish Kumar* >> Date: Friday, April 3, 2020 >> Subject: Need Help - How to Build Starter project from command line >> To: libreoffice@lists.freedesktop.org >> >> >> Hi Team, >> >> I am currently building LibreOffice starter project - (Java version) in >> Eclipse with the help of LOEclipse plugin. >> I want to integrate the build process with my Jenkins server for which* i >> want to know if there is any way to build the project from command line. >> Please help.* >> My Operating System is Windows 10. >> >> -- >> Best Regards, >> Harish Kumar.B >> >> >> >> -- >> Best Regards, >> Harish Kumar.B >> >> >> ___ >> LibreOffice mailing >> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice >> >> >> > > -- > Best Regards, > Harish Kumar.B > -- Best Regards, Harish Kumar.B ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9866b83a31a5f7c4ed026de71c645049c722d861 Author: Christian Lohmaier AuthorDate: Tue Apr 7 17:27:18 2020 +0200 Commit: Christian Lohmaier CommitDate: Tue Apr 7 17:27:18 2020 +0200 bump product version to 6.4.3.2.0+ Change-Id: I6c4502ec95e2d6c77d651420176d5e9ece15a9cd diff --git a/configure.ac b/configure.ac index bf464ce8f4b4..b7b2b02b68a4 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.4.3.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.4.3.2.0+],[],[],[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 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.4.3.2'
Tag 'libreoffice-6.4.3.2' created by Christian Lohmaier at 2020-04-07 15:26 + Tag libreoffice-6.4.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6Mm8IACgkQ9DSh76/u rqPL+RAApaCue2IvffsTWT8nZM+XXdSiqssojDBxxiqEweMEmK8V5PwXnc55QaMP sD4coArMbkte/VPoiDFWXuqPueeS5VKXNrN/WRptYbXgECdDThgzsUf4sAnl5/II Ea7aRGo05t8Q/lXbA191rsBm95T/Za96yBxHhCA4fs+4iisM6O1EZbIgedvGMX8o 8mX/ImC5sg5lZeKXZpl45Q8UML3L6h6dchgUzeIpZg2uXFaxp6qPaPFfqIOb9c+w NbTdxNgVbje7VODdVgmzxNH1BDcDG2Nd3EjrxAIt2JXHFnC7G73CIVQLjQc0BVIW NzjpZvpEB7inmJdP6HqcleOuUt6zo6VL04NPVx97OIC4/wXyBWNdQIfTtB3K9UY8 F+qlag9AiJ8oqqjYLvRYq7tXeIGq9Pr0R1uLJFuhkZz/45YfxgVL5SAWoDgXq5kG 572xv0H3SEy1iuHYAYqM+g2FZQdK1Ccg73cwDyvTBaqAwRo/btjRFtpqPV1VC2Qr +qJVVm7XL7cXVsLOsuoA7u5YeapgT4+12sjc/xg/tBnJtxVNuk2o5j2c8X13Dz1F f1fTb3gWrf7Logbfn3WQ+Rq3NFEGNOpckMvd/iCScg68X670qyWl3NU070ydHsyP iISln2HHcZUazDWCI3102FjgReiyZ9b6hcyxFxinJHp7lgvtK9Q= =o6iy -END PGP SIGNATURE- Changes since libreoffice-6-4-branch-point-851: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.4.3.2'
Tag 'libreoffice-6.4.3.2' created by Christian Lohmaier at 2020-04-07 15:26 + Tag libreoffice-6.4.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6Mm78ACgkQ9DSh76/u rqOQfg//aJHVWAzvXdfdrsRBL9l9/q/DHed3bUOXGg/Cl41jW3XcHoeDO6Lf59Rs hjT1Hv/sG39JDfqBxkk83BS42y0lOcO0VaqF3TOK2ZoGuJTC0zPD8NijoIV0+ITE R74RsjxIRLPyF2tgAJMilEjDg0F/vZg3Iycyu9j2d+fWLX/KCF/MEZUN+2Xa4hkh 9RxojGOhAUs426DAfrPu0z31e4vexMtp4RzIuauAKcp8sW78ykbm797ZnjgpIx43 it8CZaYiwQgaGjAqb1IjDmYIYL7cIgWjA8Z9sPQ5aS45blvCVdZJm5bGZ+7ErGeB FkRq7JotJf69RGzG5+eEzTifWoX69cSZc87qx5oce7e6PQScvidou2/PtYqK2G4L q6l1oiLsoyONoZV0CjoHYr60tQlv7kI9l0G1EeAyxsaf/QmnNo6mWisNXyLhbI9f XfLFkX9PV4qtaZn7BcHKoctlqZ63Npalcx+/k9R5BMMzX4dmLTHLA6SAeqUvp38d l+aHx+JupthLvohHUKoKel1KkXL+XfYY/5SaBEkgJlKFJVWnNu2stJuv50XcYorG hij30aRlO3+gBrDT6zZTsXOWUFMmPJ3lfTZs//xJq8riR63dFJOp2z7bBIegN69A anijXFNaLMF85u9b0WQUIZRF7cFWELXD6UovAW8DA6e/UwSOVw8= =BM3D -END PGP SIGNATURE- Changes since libreoffice-6-4-branch-point-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.4.3.2'
Tag 'libreoffice-6.4.3.2' created by Christian Lohmaier at 2020-04-07 15:26 + Tag libreoffice-6.4.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6Mm8IACgkQ9DSh76/u rqNpaQ//cvsmAmKRDWrvVYZ3yUjl/gTyVGJMHhGMn0BbfAyuhROFpxbe2xTRnVnq J89l9mlvGT09HMfXVn5bIlIJNeH7k9uN+GwUVuWjWwCp0NTynfkkUvQfUBNTO9Ik pnkRQx/hIPZoSN2ZShUOI9Bhn7BjOgwuMrhSrolzzOEhDrYgoyACt5v6JxUuIGvZ 0neCcBgWW4EuVwjTToNyzwNJIDJTi4TCqJbSNmtSslnuTjv2hrzU0IcpCWxYUIpp uT4gj4Wm8WlbsKC3yywDIBFXe+KI/SQ/kyfcMCLL1rBTHgpskbyH7InklxR5M++c h2qFQhtq17ygRbdVTMxTjWh9Pj7cPuwrcuC3tut8LFxxjFRtHGdntZuDtw2EHYtS TgDVWpeYXp0Bp7QDZqITuP0T65cbLIpp0DMlB/qtlprugcURFcml+ibOafsgsw1+ kx977RJxsa3pfZ1aK4ay1/Gd8rx9PEKnbntU3kLb5bkFX0a8mTHdgvtaotuhxHS3 fb8rKJ6VQVQgsiwkfwUp2z/3aJ3ti1+huChie4+FR1bJivaT3zHN5ScRiIkCy+Rg uz6512u998zQ9iVroMnpT7NokKtTGoY7r9SFd4u8zLEyNUCurM71TRC4/frPQX/9 Hf/zrZ9wJ6dXY6Loh1fw8y66Xi1XGwYB9VUIaPGk4uvR7RYObTs= =v11i -END PGP SIGNATURE- Changes since libreoffice-6-4-branch-point-51: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.4.3.2'
Tag 'libreoffice-6.4.3.2' created by Christian Lohmaier at 2020-04-07 15:26 + Tag libreoffice-6.4.3.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6Mm8IACgkQ9DSh76/u rqM9QhAAojgZA/LeCcJahhXuIvmR/Fax+UiGdEWtXYusGbbzBmH2sOlKRKF4xmkW n5DKTZbH2m30fPdtnxXq6MsWO/IfNVyxruBMGP2XCqCf6JGs9Lc+VLprytmf54oZ Asd8MyM/R3ZfGaBofOv3wbCREW7VrlvHl+ndnpZ8LS9Xx33PV1Z4DRNJiwIlkkmF vo/oOXO4wc0CeXKEVBDtdtMjpV89RasFkwRy9a9VzsNf5SjE4CZYknjII3DnZrmq CViODoxvFLP0u5NHydXs8QB0UY14AYGOZL0pLZu7L12dvPRlkzMFoJuFiNEJGUCY B/vLIo+f6rRCns/fCPVJ8bMx+rRvU54HkzVmuE4fUEPOjGuLpSPpFYOWro3C6UGY QopomjXjfGjHMRclQB3sNY7vjFX2bGjfxyHQhCOcnXqVrlGFZ5qegLs0cl5HaCF1 aF8Jo8b2BXpp0ojBrxI5cLEmBEwOqOdDjOefLCmLhV/KUBgHfMrNUbgIwcJLPGRC kL36bdE77Xd7NmbdA4U6DtpmJHArzVMasW4fgpiXIX1q50Qx60aOAZs8LcWQ4WQF rXmyKDLjtrl41ftUhXhgohzdnm8sKR6yQiAP8S/lfO/9QbbIyQ5s1ZM0kc59+TEs ka/Gc1k2e2OCKGdOuGGWAwtm4zuuVifMuXx+Xd+BqwaTQC29nP8= =QQ63 -END PGP SIGNATURE- Changes since libreoffice-6-4-branch-point-21: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - sc/source
sc/source/ui/miscdlgs/crnrdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4349e6143df81d7ddb9f19791af6b9f36f802e06 Author: Caolán McNamara AuthorDate: Mon Apr 6 21:15:55 2020 +0100 Commit: Christian Lohmaier CommitDate: Tue Apr 7 17:21:43 2020 +0200 Resolves: tdf#131170 columns tagged as delimiter not column Change-Id: I889c3ba38776a63587a68c7827956b6747c08e38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91715 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit f97aa84465473062061d742acf9929195db17eca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91719 Reviewed-by: Xisco Faulí Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 1098f2772b86..9cf579ffe134 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -401,7 +401,7 @@ void ScColRowNameRangesDlg::UpdateNames() //@008 Add string to listbox OUString aInsStr = aString + strShow.makeStringAndClear(); aRangeMap.emplace( aInsStr, aRange ); -m_xLbRange->append(OUString::number(nEntryDataDelim), aInsStr); +m_xLbRange->append(OUString::number(nEntryDataCol), aInsStr); } } aString = strDelim + ScResId( STR_ROW ) + strDelim; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - extensions/source
extensions/source/propctrlr/standardcontrol.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a116f3ef7d159569f7059079c0d1b1707429cbac
Author: Thorsten Behrens
AuthorDate: Fri Mar 27 01:47:44 2020 +0100
Commit: Christian Lohmaier
CommitDate: Tue Apr 7 17:20:27 2020 +0200
tdf#131522 get notified when user edits in OMultilineEditControl
Change-Id: I2a9e080143a1aa37661ef2aef8c0d37c8e774c8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91186
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 7cf70cffc305fc6c470f7230a897d6c70b18ffad)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91176
Reviewed-by: Xisco Faulí
Reviewed-by: Michael Weghorn
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index 776b691e0fb1..e5327d0e33f0 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -955,6 +955,7 @@ namespace pcr
void DropDownEditControl::setControlHelper( CommonBehaviourControlHelper&
_rControlHelper )
{
m_pHelper = &_rControlHelper;
+SetModifyHdl( LINK( &_rControlHelper, CommonBehaviourControlHelper,
EditModifiedHdl ) );
m_pFloatingEdit->getEdit().SetModifyHdl( LINK( &_rControlHelper,
CommonBehaviourControlHelper, EditModifiedHdl ) );
m_pImplEdit->SetGetFocusHdl( LINK( &_rControlHelper,
CommonBehaviourControlHelper, GetFocusHdl ) );
m_pImplEdit->SetModifyHdl( LINK( &_rControlHelper,
CommonBehaviourControlHelper, EditModifiedHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source
sfx2/source/dialog/templdlg.cxx | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 2d5ea18732c6cc34d82575ae15d2c495da94375b
Author: Jim Raykowski
AuthorDate: Sun Mar 15 23:46:22 2020 -0800
Commit: Eike Rathke
CommitDate: Tue Apr 7 16:47:48 2020 +0200
tdf#131190 Make custom page styles deletable again in Calc
This is a combination of 2 commits.
tdf#131190 Make custom page styles deletable again in Calc
Here is a patch to return the ability to delete custom page styles in
Calc. This was lost in commit 30c9bc76d0718f0c01d34f81845d88413645b42c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90547
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit bb844eb299b614c1fa56e140630db070cf709a02)
tdf#131190 Make custom page styles deletable again in Calc
Return the ability to delete custom page styles in Calc. This was lost
in commit 30c9bc76d0718f0c01d34f81845d88413645b42c
ae402cc048fde7ffd3ca2696c08d5e54cc30d1be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91672
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Change-Id: I18936585cfbe45e0254beb882adc8709781f57e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91404
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 55d8a0f7d515..1714f65dbe00 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2011,8 +2011,27 @@ void SfxCommonTemplateDialog_Impl::EnableDelete()
pStyleSheetPool->Find(aTemplName,eFam, pTreeBox->IsVisible()?
SfxStyleSearchBits::All : nFilter);
OSL_ENSURE(pStyle, "Style not found");
-if (pStyle && pStyle->IsUserDefined() && (pStyle->HasParentSupport()
|| !pStyle->IsUsed()))
-bEnableDelete = true;
+if (pStyle && pStyle->IsUserDefined())
+{
+if (pStyle->HasClearParentSupport() || !pStyle->IsUsed())
+{
+bEnableDelete = true;
+}
+else if (pStyle->GetFamily() == SfxStyleFamily::Page)
+{
+// Hack to allow Calc page styles to be deleted,
+// remove when IsUsed is fixed for Calc page styles.
+SfxViewFrame* pFrame = GetObjectShell()->GetFrame();
+if (pFrame)
+{
+uno::Reference xFrame =
pFrame->GetFrame().GetFrameInterface();
+if (vcl::CommandInfoProvider::GetModuleIdentifier(xFrame)
== "com.sun.star.sheet.SpreadsheetDocument")
+{
+bEnableDelete = true;
+}
+}
+}
+}
}
EnableDel(bEnableDelete);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests loleaflet/src
cypress_test/integration_tests/common/helper.js | 13 +
cypress_test/integration_tests/common/mobile_helper.js | 14 ++
cypress_test/integration_tests/mobile/calc/calc_helper.js | 18 +++
cypress_test/integration_tests/mobile/impress/impress_helper.js |4 +
cypress_test/integration_tests/mobile/writer/writer_helper.js |8 +++
loleaflet/src/control/Control.LokDialog.js | 23
+-
6 files changed, 78 insertions(+), 2 deletions(-)
New commits:
commit af40fb36184b2c523ec7d927ed2127367ef19557
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 16:13:23 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 16:36:59 2020 +0200
cypress: add some logging for helper functions.
Change-Id: Ib8ff54208d47c7d921615f72b530e2404c26f3a6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91828
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/common/helper.js
b/cypress_test/integration_tests/common/helper.js
index acaa71927..795973a55 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -1,6 +1,11 @@
/* global cy Cypress expect*/
function loadTestDoc(fileName, subFolder, mobile) {
+ cy.log('Loading test document - start.');
+ cy.log('Param - fileName: ' + fileName);
+ cy.log('Param - subFolder: ' + subFolder);
+ cy.log('Param - mobile: ' + mobile);
+
// Get a clean test document
if (subFolder === undefined) {
cy.task('copyFile', {
@@ -44,7 +49,10 @@ function loadTestDoc(fileName, subFolder, mobile) {
}});
// Wait for the document to fully load
cy.get('.leaflet-tile-loaded', {timeout : 1});
+
+ cy.log('Loading test document - end.');
}
+
// Assert that NO keyboard input is accepted (i.e. keyboard should be HIDDEN).
function assertNoKeyboardInput() {
cy.window().then(win => {
@@ -129,6 +137,9 @@ function expectTextForClipboard(expectedPlainText) {
}
function afterAll(fileName) {
+ cy.log('Waiting for closing the document - start.');
+ cy.log('Param - fileName: ' + fileName);
+
// Make sure that the document is closed
cy.visit('http://admin:admin@localhost:' +
Cypress.env('SERVER_PORT') +
@@ -139,6 +150,8 @@ function afterAll(fileName) {
cy.get('#doclist td:nth-child(2)')
.should('not.contain.text', fileName);
+
+ cy.log('Waiting for closing the document - end.');
}
module.exports.loadTestDoc = loadTestDoc;
diff --git a/cypress_test/integration_tests/common/mobile_helper.js
b/cypress_test/integration_tests/common/mobile_helper.js
index 787d7e428..3f9b4aa72 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -4,6 +4,8 @@ var helper = require('./helper');
// Enable editing if we are in read-only mode.
function enableEditingMobile() {
+ cy.log('Enabling editing mode - start.');
+
cy.get('#mobile-edit-button')
.then(function(button) {
if (button.css('display') !== 'none') {
@@ -14,6 +16,8 @@ function enableEditingMobile() {
cy.get('#tb_actionbar_item_mobile_wizard')
.should('not.have.class', 'disabled');
+
+ cy.log('Enabling editing mode - end.');
}
function beforeAllMobile(fileName, subFolder) {
@@ -23,6 +27,8 @@ function beforeAllMobile(fileName, subFolder) {
}
function detectLOCoreVersion() {
+ cy.log('Detecting core version - start.');
+
if (Cypress.env('LO_CORE_VERSION') === undefined) {
// Open hamburger menu
openHamburgerMenu();
@@ -54,9 +60,15 @@ function detectLOCoreVersion() {
cy.get('.vex-content')
.should('not.exist');
}
+
+ cy.log('Detecting core version - end.');
}
function longPressOnDocument(posX, posY) {
+ cy.log('Emulating a long press - start.');
+ cy.log('Param - posX: ' + posX);
+ cy.log('Param - posX: ' + posY);
+
cy.get('.leaflet-pane.leaflet-map-pane')
.then(function(items) {
expect(items).have.length(1);
@@ -79,6 +91,8 @@ function longPressOnDocument(posX, posY) {
cy.get('.leaflet-pane.leaflet-map-pane')
.trigger('pointerup', eventOptions);
});
+
+ cy.log('Emulating a long press - end.');
}
function openHamburgerMenu() {
diff --git a/cypress_test/integration_tests/mobile/calc/calc_helper.js
b/cypress_test/integration_tests/mobile/calc/calc_helper.js
index 25155ec73..d3530f48c 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_helper.js
@@ -3,6 +3,10 @@
var mobileHelpe
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/common/mobile_helper.js |
38 +-
cypress_test/integration_tests/mobile/writer/focus_spec.js |
4 -
cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js |
9 +-
cypress_test/integration_tests/mobile/writer/writer_helper.js|
2
4 files changed, 42 insertions(+), 11 deletions(-)
New commits:
commit 7826d75b45cda2835634a7524d3afdd214c06c18
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 15:44:57 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 16:24:53 2020 +0200
cypress: mobile: extract openHamburgerMenu() and closeHamburgerMenu()
method.
Change-Id: Ib288ccabee7aa06c5e9b8b0c54ac88055c1ae820
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91827
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/common/mobile_helper.js
b/cypress_test/integration_tests/common/mobile_helper.js
index c3a077bca..787d7e428 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -25,7 +25,7 @@ function beforeAllMobile(fileName, subFolder) {
function detectLOCoreVersion() {
if (Cypress.env('LO_CORE_VERSION') === undefined) {
// Open hamburger menu
- pushHamburgerMenuIconMobile();
+ openHamburgerMenu();
// Open about dialog
cy.get('.ui-header.level-0 .menu-entry-with-icon')
@@ -81,9 +81,40 @@ function longPressOnDocument(posX, posY) {
});
}
-function pushHamburgerMenuIconMobile() {
+function openHamburgerMenu() {
+ cy.log('Opening hamburger menu - start.');
+
+ cy.get('#toolbar-hamburger')
+ .should('not.have.class', 'menuwizard-opened');
+
cy.get('#toolbar-hamburger .main-menu-btn-icon')
.click({force: true});
+
+ cy.get('#toolbar-hamburger')
+ .should('have.class', 'menuwizard-opened');
+
+ cy.get('#mobile-wizard-content')
+ .should('not.be.empty');
+
+ cy.log('Opening hamburger menu - end.');
+}
+
+function closeHamburgerMenu() {
+ cy.log('Closing hamburger menu - start.');
+
+ cy.get('#toolbar-hamburger')
+ .should('have.class', 'menuwizard-opened');
+
+ cy.get('#toolbar-hamburger .main-menu-btn-icon')
+ .click({force: true});
+
+ cy.get('#toolbar-hamburger')
+ .should('not.have.class', 'menuwizard-opened');
+
+ cy.get('#mobile-wizard-content')
+ .should('be.empty');
+
+ cy.log('Closing hamburger menu - end.');
}
function openMobileWizard() {
@@ -123,6 +154,7 @@ function closeMobileWizard() {
module.exports.enableEditingMobile = enableEditingMobile;
module.exports.beforeAllMobile = beforeAllMobile;
module.exports.longPressOnDocument = longPressOnDocument;
-module.exports.pushHamburgerMenuIconMobile = pushHamburgerMenuIconMobile;
+module.exports.openHamburgerMenu = openHamburgerMenu;
+module.exports.closeHamburgerMenu = closeHamburgerMenu;
module.exports.openMobileWizard = openMobileWizard;
module.exports.closeMobileWizard = closeMobileWizard;
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js
b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 5991f9b90..a8558763e 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -204,14 +204,14 @@ describe('Focus tests', function() {
.should('be.eq', 'clipboard');
// Open hamburger menu
- mobileHelper.pushHamburgerMenuIconMobile();
+ mobileHelper.openHamburgerMenu();
// No focus
cy.document().its('activeElement.tagName')
.should('be.eq', 'BODY');
// Close hamburger menu
- mobileHelper.pushHamburgerMenuIconMobile();
+ mobileHelper.closeHamburgerMenu();
// No focus
cy.document().its('activeElement.tagName')
diff --git
a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
index 18b260f39..741ce3e47 100644
--- a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
@@ -32,15 +32,13 @@ describe('Mobile wizard state tests', function() {
mobileHelper.openMobileWizard();
// Open hamburger menu
- mobileHelper.pushHamburgerMenuIconMobile();
+ mobileHelper.openHamburgerMenu();
+
cy.get('.ui-header.level-0.mobile-wizard.ui-widget
.menu-entry-with-icon')
.contains('About');
// Clo
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 5 commits - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon
Rebased ref, commits from common ancestor: commit ff1145d3aa1579a073990d0dee5b6e4a163e7bde Author: andreas kainz AuthorDate: Tue Feb 18 20:18:19 2020 +0100 Commit: Thorsten Behrens CommitDate: Tue Apr 7 16:08:02 2020 +0200 tdf#130648 add colibre 32px protect icons Change-Id: I5c1d2a37f88745820cbae693a1e9897c922de13c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88981 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 55981cd0bea950a24b89059c22bc291877205419) diff --git a/icon-themes/colibre/cmd/32/protectbookmarks.png b/icon-themes/colibre/cmd/32/protectbookmarks.png new file mode 100644 index ..49602ab97aa6 Binary files /dev/null and b/icon-themes/colibre/cmd/32/protectbookmarks.png differ diff --git a/icon-themes/colibre/cmd/32/protectfields.png b/icon-themes/colibre/cmd/32/protectfields.png new file mode 100644 index ..04393b6c317c Binary files /dev/null and b/icon-themes/colibre/cmd/32/protectfields.png differ diff --git a/icon-themes/colibre_svg/cmd/32/protectbookmarks.svg b/icon-themes/colibre_svg/cmd/32/protectbookmarks.svg new file mode 100644 index ..268ecb9ef7d8 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/protectbookmarks.svg @@ -0,0 +1,13 @@ +http://www.w3.org/2000/svg";> + + + + diff --git a/icon-themes/colibre_svg/cmd/32/protectfields.svg b/icon-themes/colibre_svg/cmd/32/protectfields.svg new file mode 100644 index ..d9c81572a396 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/protectfields.svg @@ -0,0 +1,14 @@ +http://www.w3.org/2000/svg";> + + + + commit d8630a47d741cfda33dc41457c66e061383017f4 Author: andreas kainz AuthorDate: Mon Feb 17 22:42:34 2020 +0100 Commit: Thorsten Behrens CommitDate: Tue Apr 7 16:08:02 2020 +0200 tdf#130648 Add icons for ProtectField and PrtectBookmarks Change-Id: I064c9ac69b224937b281ea5c9a1eefc3cdfeba6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88894 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 2d1994dc01f162ccab68abab45ef3cce381aacbd) Only adding _new_ protect icons here. Change-Id: I1be7ee9874f16faf0631f62a01445e930bf65d22 Conflicts: icon-themes/colibre_svg/cmd/sc_protect.svg diff --git a/icon-themes/colibre/cmd/lc_protectbookmarks.png b/icon-themes/colibre/cmd/lc_protectbookmarks.png new file mode 100644 index ..5c5482dc0a5f Binary files /dev/null and b/icon-themes/colibre/cmd/lc_protectbookmarks.png differ diff --git a/icon-themes/colibre/cmd/lc_protectfields.png b/icon-themes/colibre/cmd/lc_protectfields.png new file mode 100644 index ..5d9911cb3d8a Binary files /dev/null and b/icon-themes/colibre/cmd/lc_protectfields.png differ diff --git a/icon-themes/colibre/cmd/sc_protectbookmarks.png b/icon-themes/colibre/cmd/sc_protectbookmarks.png new file mode 100644 index ..b2fb1169ea32 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_protectbookmarks.png differ diff --git a/icon-themes/colibre/cmd/sc_protectfields.png b/icon-themes/colibre/cmd/sc_protectfields.png new file mode 100644 index ..f80506913565 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_protectfields.png differ diff --git a/icon-themes/colibre_svg/cmd/lc_protectbookmarks.svg b/icon-themes/colibre_svg/cmd/lc_protectbookmarks.svg new file mode 100644 index ..e537bf9e1bcd --- /dev/null +++ b/icon-themes/colibre_svg/cmd/lc_protectbookmarks.svg @@ -0,0 +1,17 @@ + http://www.w3.org/2000/svg";> + + + + + diff --git a/icon-themes/colibre_svg/cmd/lc_protectfields.svg b/icon-themes/colibre_svg/cmd/lc_protectfields.svg new file mode 100644 index ..edbcf1b04d4e --- /dev/null +++ b/icon-themes/colibre_svg/cmd/lc_protectfields.svg @@ -0,0 +1,14 @@ +http://www.w3.org/2000/svg";> + + + + diff --git a/icon-themes/colibre_svg/cmd/sc_protectbookmarks.svg b/icon-themes/colibre_svg/cmd/sc_protectbookmarks.svg new file mode 100644 index ..6b1264c47b98 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/sc_protectbookmarks.svg @@ -0,0 +1,14 @@ +http://www.w3.org/2000/svg";> + + + + diff --git a/icon-themes/colibre_svg/cmd/sc_protectfields.svg b/icon-themes/colibre_svg/cmd/sc_protectfields.svg new file mode 100644 index ..035193fc42e6 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/sc_protectfields.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg";> + + + commit 09f6c05298e9b90e8f0a926103e3eb63c0d48d58 Author: rizmut AuthorDate: Sat Feb 15 20:36:26 2020 +0700 Commit: Thorsten Behrens CommitDate: Tue Apr 7 16:08:01 2020 +0200 tdf#130648:+ icons for new .uno:ProtectBookmarks & .uno:ProtectFields Change-Id: Ie9bee00bec79f2bc1d85e5e17556676e71842ef7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88757 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 7415a70
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
New commits:
commit f6328abe3fcd7fb2ec72779ba3754abe761f626b
Author: Jim Raykowski
AuthorDate: Fri Apr 3 14:02:19 2020 -0800
Commit: Eike Rathke
CommitDate: Tue Apr 7 15:51:18 2020 +0200
tdf#131190 Make custom page styles deletable again in Calc
Return the ability to delete custom page styles in Calc. This was lost
in commit 30c9bc76d0718f0c01d34f81845d88413645b42c
Change-Id: Iae402cc048fde7ffd3ca2696c08d5e54cc30d1be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91672
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 5389cd906044..8ec385bff416 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2060,13 +2060,27 @@ void SfxCommonTemplateDialog_Impl::EnableDelete()
pStyleSheetPool->Find(aTemplName,eFam, pTreeBox->IsVisible()?
SfxStyleSearchBits::All : nFilter);
OSL_ENSURE(pStyle, "Style not found");
-// bIsCalcPageStyle is a hack to allow Calc page styles to be deleted
-// remove when IsUsed is fixed for Calc page style
-uno::Reference xFrame =
GetObjectShell()->GetFrame()->GetFrame().GetFrameInterface();
-bool bIsCalcPageStyle =
(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame) ==
"com.sun.star.sheet.SpreadsheetDocument") &&
-(pStyle->GetFamily() == SfxStyleFamily::Page);
-if (pStyle && pStyle->IsUserDefined() && (bIsCalcPageStyle ||
pStyle->HasParentSupport() || !pStyle->IsUsed()))
-bEnableDelete = true;
+if (pStyle && pStyle->IsUserDefined())
+{
+if (pStyle->HasClearParentSupport() || !pStyle->IsUsed())
+{
+bEnableDelete = true;
+}
+else if (pStyle->GetFamily() == SfxStyleFamily::Page)
+{
+// Hack to allow Calc page styles to be deleted,
+// remove when IsUsed is fixed for Calc page styles.
+SfxViewFrame* pFrame = GetObjectShell()->GetFrame();
+if (pFrame)
+{
+uno::Reference xFrame =
pFrame->GetFrame().GetFrameInterface();
+if (vcl::CommandInfoProvider::GetModuleIdentifier(xFrame)
== "com.sun.star.sheet.SpreadsheetDocument")
+{
+bEnableDelete = true;
+}
+}
+}
+}
}
EnableDel(bEnableDelete);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/mobilewizard.css|2 +-
loleaflet/images/lc_decimalplaces.svg | 17 -
loleaflet/images/lc_leadingzeroes.svg | 15 ++-
3 files changed, 31 insertions(+), 3 deletions(-)
New commits:
commit 504ad7c48e080d22ce2da78dab3cf0cd96814e53
Author: Pedro Pinto Silva
AuthorDate: Tue Apr 7 15:26:53 2020 +0200
Commit: Pedro Pinto da Silva
CommitDate: Tue Apr 7 15:43:17 2020 +0200
Mobile: Calc: mWizard: format number: add missing icons and adjust css
Change-Id: I50e0c0c96d8d13082c977ca2538d2f4c4cc89a24
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91826
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Pinto da Silva
Reviewed-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 4bc42c09b..3c3c8ec6b 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -39,7 +39,7 @@ span#main-menu-btn-icon {
filter: none !important;
}
-#denominatorplaces .spinfieldimage, #leadingzeroes .spinfieldimage,
#decimalplaces .spinfieldimage{
+#denominatorplaces .spinfieldimage{
display: none;
}
diff --git a/loleaflet/images/lc_decimalplaces.svg
b/loleaflet/images/lc_decimalplaces.svg
index 6df498a3c..20e5b667a 100644
--- a/loleaflet/images/lc_decimalplaces.svg
+++ b/loleaflet/images/lc_decimalplaces.svg
@@ -1 +1,16 @@
-http://www.w3.org/2000/svg";
width="1" height="1"/>
+http://www.w3.org/2000/svg";
xmlns:cc="http://creativecommons.org/ns#";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"/>
+
+
+
+
+
+
+
+
+
+
diff --git a/loleaflet/images/lc_leadingzeroes.svg
b/loleaflet/images/lc_leadingzeroes.svg
index 6df498a3c..3a3c9461f 100644
--- a/loleaflet/images/lc_leadingzeroes.svg
+++ b/loleaflet/images/lc_leadingzeroes.svg
@@ -1 +1,14 @@
-http://www.w3.org/2000/svg";
width="1" height="1"/>
+http://www.w3.org/2000/svg";
xmlns:cc="http://creativecommons.org/ns#";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+
+
+
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"/>
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: io/source
io/source/stm/odata.cxx| 75 -
io/source/stm/opump.cxx| 22 ++--
io/source/stm/streamhelper.cxx | 29 ---
3 files changed, 63 insertions(+), 63 deletions(-)
New commits:
commit 33b3439e65bc22c2d149eb18c3d7d9da43699246
Author: Noel Grandin
AuthorDate: Tue Apr 7 14:19:30 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 15:37:24 2020 +0200
loplugin:flatten in io
Change-Id: I4f4dbbd4ce279cb25a8e4deba1967b5c23ce1385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91818
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 6ffd12c89387..3e802b2d37a5 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -907,30 +907,29 @@ void OObjectOutputStream::writeObject( const Reference<
XPersistObject > & xPObj
void OObjectOutputStream::connectToMarkable()
{
-if( ! m_bValidMarkable ) {
-if( ! m_bValidStream )
+if( m_bValidMarkable )
+return;
+
+if( ! m_bValidStream )
+throw NotConnectedException();
+
+// find the markable stream !
+Reference< XInterface > rTry(m_output);
+while( true ) {
+if( ! rTry.is() )
{
throw NotConnectedException();
}
-
-// find the markable stream !
-Reference< XInterface > rTry(m_output);
-while( true ) {
-if( ! rTry.is() )
-{
-throw NotConnectedException();
-}
-Reference < XMarkableStream > markable( rTry , UNO_QUERY );
-if( markable.is() )
-{
-m_rMarkable = markable;
-break;
-}
-Reference < XActiveDataSource > source( rTry , UNO_QUERY );
-rTry = source;
+Reference < XMarkableStream > markable( rTry , UNO_QUERY );
+if( markable.is() )
+{
+m_rMarkable = markable;
+break;
}
-m_bValidMarkable = true;
+Reference < XActiveDataSource > source( rTry , UNO_QUERY );
+rTry = source;
}
+m_bValidMarkable = true;
}
@@ -1180,30 +1179,30 @@ Reference< XPersistObject >
OObjectInputStream::readObject()
void OObjectInputStream::connectToMarkable()
{
-if( ! m_bValidMarkable ) {
-if( ! m_bValidStream )
+if( m_bValidMarkable )return;
+
+if( ! m_bValidStream )
+{
+throw NotConnectedException( );
+}
+
+// find the markable stream !
+Reference< XInterface > rTry(m_input);
+while( true ) {
+if( ! rTry.is() )
{
throw NotConnectedException( );
}
-
-// find the markable stream !
-Reference< XInterface > rTry(m_input);
-while( true ) {
-if( ! rTry.is() )
-{
-throw NotConnectedException( );
-}
-Reference< XMarkableStream > markable( rTry , UNO_QUERY );
-if( markable.is() )
-{
-m_rMarkable = markable;
-break;
-}
-Reference < XActiveDataSink > sink( rTry , UNO_QUERY );
-rTry = sink;
+Reference< XMarkableStream > markable( rTry , UNO_QUERY );
+if( markable.is() )
+{
+m_rMarkable = markable;
+break;
}
-m_bValidMarkable = true;
+Reference < XActiveDataSink > sink( rTry , UNO_QUERY );
+rTry = sink;
}
+m_bValidMarkable = true;
}
sal_Int32 OObjectInputStream::createMark()
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 29f09bdd3e81..cba66d3c50fc 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -146,19 +146,19 @@ void Pump::fireClose()
}
}
-if( bFire )
+if( !bFire )
+return;
+
+OInterfaceIteratorHelper iter( m_cnt );
+while( iter.hasMoreElements() )
{
-OInterfaceIteratorHelper iter( m_cnt );
-while( iter.hasMoreElements() )
+try
{
-try
-{
-static_cast< XStreamListener * > ( iter.next() )->closed( );
-}
-catch ( const RuntimeException & )
-{
-
TOOLS_WARN_EXCEPTION("io.streams","com.sun.star.comp.stoc.Pump: unexpected
exception during calling listeners");
-}
+static_cast< XStreamListener * > ( iter.next() )->closed( );
+}
+catch ( const RuntimeException & )
+{
+TOOLS_WARN_EXCEPTION("io.streams","com.sun.star.comp.stoc.Pump:
unexpected exception during calling listeners");
}
}
}
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 2eace1e70d4c..4a2df5891be1 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -68,21 +68,22 @@ void MemRingBuffer::resizeBuffer(
[Libreoffice-commits] core.git: uitest/libreoffice
uitest/libreoffice/connection.py | 16
1 file changed, 4 insertions(+), 12 deletions(-)
New commits:
commit 8b898063f718b51732c8b47b6f7704fd8659d2a9
Author: Stephan Bergmann
AuthorDate: Tue Apr 7 11:51:21 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Apr 7 15:35:15 2020 +0200
Revert "UITest: Actually time-out the wait"
This reverts commit 150b67b57bd25ba9c8ec9c28c7aed3cc0b557bfd.
Reason for revert: With the above change, a hung soffice process would
cause
the UITest that spawned it to fail, but that would not terminate the hung
soffice process. This is especially problematic for Gerrit Jenkins builds,
where a leftover hung soffice process from a previous build will typically
cause
unrelated subsequent builds to fail. So: For a manual developer build, it
is
arguably better to leave the hung UITest in the hung state (both the python
and
the soffice process) to be able to debug it. And for an automated Gerrit
Jenkins build it is even vital that the hung UITest hangs the build, so that
Jenkins will eventually abort it and lode's bin/kill-wrapper will reliably
kill
any remaining processes, incl. the hung soffice process. (But of course it
is
unfortunate that we now get less feedback from a hung UITest.)
Change-Id: I6cc577dda362d3cb71846decae9c2bb6bed90b6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91717
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 3dbae4cca355..cb3ae1a0128e 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -9,7 +9,6 @@ import subprocess
import time
import uuid
import os
-import sys
try:
import pyuno
@@ -131,17 +130,10 @@ class OfficeConnection:
else:
self.soffice.terminate()
-
-try:
-if sys.version_info >= (3,3):
-ret = self.soffice.wait(30) # will throw when timed out
-else:
-ret = self.soffice.wait() # no timeout in python that old
-finally:
-self.xContext = None
-self.socket = None
-self.soffice = None
-
+ret = self.soffice.wait()
+self.xContext = None
+self.socket = None
+self.soffice = None
if ret != 0:
raise Exception("Exit status indicates failure: " + str(ret))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/common/mobile_helper.js
| 36
cypress_test/integration_tests/mobile/calc/apply_font_spec.js
| 52 +-
cypress_test/integration_tests/mobile/calc/number_format_spec.js
| 61 +--
cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
|3
cypress_test/integration_tests/mobile/writer/apply_font_spec.js
| 84 +
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
| 85 ++
cypress_test/integration_tests/mobile/writer/focus_spec.js
| 37
cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
| 61 ---
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
| 21 --
cypress_test/integration_tests/mobile/writer/table_properties_spec.js
| 68 ++--
10 files changed, 132 insertions(+), 376 deletions(-)
New commits:
commit dd42ea0da7a02bdea144327bee6b66d61f41c848
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 11:39:57 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 15:32:16 2020 +0200
cypress: mobile: extract openMobileWizard() and closeMobileWizard() method.
Change-Id: I02e33406510ade9cfc6de5f31854cee99a7c1fc0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91823
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/common/mobile_helper.js
b/cypress_test/integration_tests/common/mobile_helper.js
index 796d7d8a1..c3a077bca 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -86,7 +86,43 @@ function pushHamburgerMenuIconMobile() {
.click({force: true});
}
+function openMobileWizard() {
+ cy.log('Opening mobile wizard - start.');
+
+ // Open mobile wizard
+ cy.get('#tb_actionbar_item_mobile_wizard')
+ .should('not.have.class', 'disabled')
+ .click();
+
+ // Mobile wizard is opened and it has content
+ cy.get('#mobile-wizard-content')
+ .should('not.be.empty');
+ cy.get('#tb_actionbar_item_mobile_wizard table')
+ .should('have.class', 'checked');
+
+ cy.log('Opening mobile wizard - end.');
+}
+
+function closeMobileWizard() {
+ cy.log('Closing mobile wizard - start.');
+
+ cy.get('#tb_actionbar_item_mobile_wizard table')
+ .should('have.class', 'checked');
+
+ cy.get('#tb_actionbar_item_mobile_wizard')
+ .click();
+
+ cy.get('#mobile-wizard')
+ .should('not.be.visible');
+ cy.get('#tb_actionbar_item_mobile_wizard table')
+ .should('not.have.class', 'checked');
+
+ cy.log('Closing mobile wizard - end.');
+}
+
module.exports.enableEditingMobile = enableEditingMobile;
module.exports.beforeAllMobile = beforeAllMobile;
module.exports.longPressOnDocument = longPressOnDocument;
module.exports.pushHamburgerMenuIconMobile = pushHamburgerMenuIconMobile;
+module.exports.openMobileWizard = openMobileWizard;
+module.exports.closeMobileWizard = closeMobileWizard;
diff --git a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
index d9edb2638..c494a07f5 100644
--- a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
@@ -17,10 +17,7 @@ describe('Apply font changes.', function() {
.should('be.visible');
// Open mobile wizard
- cy.get('#tb_actionbar_item_mobile_wizard')
- .click();
- cy.get('#mobile-wizard-content')
- .should('not.be.empty');
+ mobileHelper.openMobileWizard();
// Open character properties
cy.get('#TextPropertyPanel')
@@ -38,9 +35,7 @@ describe('Apply font changes.', function() {
cy.get('#Bold')
.click();
- // Close mobile wizard
- cy.get('#tb_actionbar_item_mobile_wizard')
- .click();
+ mobileHelper.closeMobileWizard();
calcHelper.copyContentToClipboard();
@@ -52,10 +47,7 @@ describe('Apply font changes.', function() {
cy.get('#Italic')
.click();
- // Close mobile wizard
- cy.get('#tb_actionbar_item_mobile_wizard')
- .click();
-
+ mobileHelper.closeMobileWizard();
calcHelper.copyContentToClipboard();
cy.get('#copy-paste-container table td i')
@@ -66,9 +58,7 @@ describe('Apply font changes.', function() {
cy.get('#Underline')
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source
sc/source/ui/miscdlgs/crnrdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1dbfeee796bb39766877526f5b45187f2721a9e Author: Caolán McNamara AuthorDate: Mon Apr 6 21:15:55 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Apr 7 15:29:43 2020 +0200 Resolves: tdf#131170 columns tagged as delimiter not column Change-Id: I889c3ba38776a63587a68c7827956b6747c08e38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91716 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index ccd9076570a4..102a19f23729 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -404,7 +404,7 @@ void ScColRowNameRangesDlg::UpdateNames() //@008 Add string to listbox OUString aInsStr = aString + strShow.makeStringAndClear(); aRangeMap.emplace( aInsStr, aRange ); -m_xLbRange->append(OUString::number(nEntryDataDelim), aInsStr); +m_xLbRange->append(OUString::number(nEntryDataCol), aInsStr); } } aString = strDelim; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
sc/source/ui/miscdlgs/crnrdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f97aa84465473062061d742acf9929195db17eca Author: Caolán McNamara AuthorDate: Mon Apr 6 21:15:55 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Apr 7 15:29:11 2020 +0200 Resolves: tdf#131170 columns tagged as delimiter not column Change-Id: I889c3ba38776a63587a68c7827956b6747c08e38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91715 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 1098f2772b86..9cf579ffe134 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -401,7 +401,7 @@ void ScColRowNameRangesDlg::UpdateNames() //@008 Add string to listbox OUString aInsStr = aString + strShow.makeStringAndClear(); aRangeMap.emplace( aInsStr, aRange ); -m_xLbRange->append(OUString::number(nEntryDataDelim), aInsStr); +m_xLbRange->append(OUString::number(nEntryDataCol), aInsStr); } } aString = strDelim + ScResId( STR_ROW ) + strDelim; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 5 commits - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon
icon-themes/breeze/cmd/32/protectbookmarks.png |binary icon-themes/breeze/cmd/32/protectfields.png |binary icon-themes/breeze/cmd/lc_protectbookmarks.png |binary icon-themes/breeze/cmd/lc_protectfields.png |binary icon-themes/breeze/cmd/sc_protectbookmarks.png |binary icon-themes/breeze/cmd/sc_protectfields.png |binary icon-themes/breeze_dark/cmd/32/protectbookmarks.png |binary icon-themes/breeze_dark/cmd/32/protectfields.png|binary icon-themes/breeze_dark/cmd/lc_protectbookmarks.png |binary icon-themes/breeze_dark/cmd/lc_protectfields.png|binary icon-themes/breeze_dark/cmd/sc_protectbookmarks.png |binary icon-themes/breeze_dark/cmd/sc_protectfields.png|binary icon-themes/breeze_dark_svg/cmd/32/protectbookmarks.svg |1 icon-themes/breeze_dark_svg/cmd/32/protectfields.svg|1 icon-themes/breeze_dark_svg/cmd/lc_protectbookmarks.svg |1 icon-themes/breeze_dark_svg/cmd/lc_protectfields.svg|1 icon-themes/breeze_dark_svg/cmd/sc_protectbookmarks.svg |2 icon-themes/breeze_dark_svg/cmd/sc_protectfields.svg|1 icon-themes/breeze_svg/cmd/32/protectbookmarks.svg |1 icon-themes/breeze_svg/cmd/32/protectfields.svg |1 icon-themes/breeze_svg/cmd/lc_protectbookmarks.svg |1 icon-themes/breeze_svg/cmd/lc_protectfields.svg |1 icon-themes/breeze_svg/cmd/sc_protectbookmarks.svg |2 icon-themes/breeze_svg/cmd/sc_protectfields.svg |1 icon-themes/colibre/cmd/32/protectbookmarks.png |binary icon-themes/colibre/cmd/32/protectfields.png|binary icon-themes/colibre/cmd/lc_protectbookmarks.png |binary icon-themes/colibre/cmd/lc_protectfields.png|binary icon-themes/colibre/cmd/sc_protectbookmarks.png |binary icon-themes/colibre/cmd/sc_protectfields.png|binary icon-themes/colibre_svg/cmd/32/protectbookmarks.svg | 13 + icon-themes/colibre_svg/cmd/32/protectfields.svg| 14 ++ icon-themes/colibre_svg/cmd/lc_protectbookmarks.svg | 17 +++ icon-themes/colibre_svg/cmd/lc_protectfields.svg| 14 ++ icon-themes/colibre_svg/cmd/sc_protectbookmarks.svg | 14 ++ icon-themes/colibre_svg/cmd/sc_protectfields.svg| 10 icon-themes/elementary/cmd/32/protectbookmarks.png |binary icon-themes/elementary/cmd/32/protectfields.png |binary icon-themes/elementary/cmd/lc_protectbookmarks.png |binary icon-themes/elementary/cmd/lc_protectfields.png |binary icon-themes/elementary/cmd/sc_protectbookmarks.png |binary icon-themes/elementary/cmd/sc_protectfields.png |binary icon-themes/elementary_svg/cmd/32/protectbookmarks.svg |1 icon-themes/elementary_svg/cmd/32/protectfields.svg |1 icon-themes/elementary_svg/cmd/lc_protectbookmarks.svg |1 icon-themes/elementary_svg/cmd/lc_protectfields.svg |1 icon-themes/elementary_svg/cmd/sc_protectbookmarks.svg |1 icon-themes/elementary_svg/cmd/sc_protectfields.svg |1 icon-themes/karasa_jaga/cmd/32/protectbookmarks.png |binary icon-themes/karasa_jaga/cmd/32/protectfields.png|binary icon-themes/karasa_jaga/cmd/lc_protectbookmarks.png |binary icon-themes/karasa_jaga/cmd/lc_protectfields.png|binary icon-themes/karasa_jaga/cmd/sc_protectbookmarks.png |binary icon-themes/karasa_jaga/cmd/sc_protectfields.png|binary icon-themes/karasa_jaga_svg/cmd/32/protectbookmarks.svg |1 icon-themes/karasa_jaga_svg/cmd/32/protectfields.svg|1 icon-themes/karasa_jaga_svg/cmd/lc_protectbookmarks.svg |1 icon-themes/karasa_jaga_svg/cmd/lc_protectfields.svg|1 icon-themes/karasa_jaga_svg/cmd/sc_protectbookmarks.svg |1 icon-themes/karasa_jaga_svg/cmd/sc_protectfields.svg|1 icon-themes/sifr/cmd/32/protectbookmarks.png|binary icon-themes/sifr/cmd/32/protectfields.png |binary icon-themes/sifr/cmd/lc_protectbookmarks.png|binary icon-themes/sifr/cmd/lc_protectfields.png |binary icon-themes/sifr/cmd/sc_protectbookmarks.png|binary icon-themes/sifr/cmd/sc_protectfields.png |binary icon-themes/sifr_dark/cmd/32/protectbookmarks.png |binary icon-themes/sifr_dark/cmd/32/protectfields.png |binary icon-themes/sifr_dark/cmd/lc_protectbookmarks.png |binary icon-themes/sifr_dark/cmd/lc_protectfields.png |binary icon-themes/sifr_dark/cmd/sc_protectbookmarks.png |binary icon-themes/sifr_dark/cmd/sc_protectfields.png |binary icon-themes/sifr_dark_svg/cmd/32/protectbookmarks.svg |1 icon-themes/sifr_dark_svg/cmd/32/protectfields.svg |1 icon-themes/sifr_dark_svg/cmd/lc_protectbookmarks.svg |1 icon-themes/sifr_dark_svg/cmd/lc_protectfields.svg |1 icon-themes/sifr_dark_sv
[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 60 ++---
jvmfwk/source/fwkbase.cxx | 34
2 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit 21eb6c98bcfb1d453f8eb9f73bd87f6dd87aa882
Author: Noel Grandin
AuthorDate: Tue Apr 7 14:16:40 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 15:12:35 2020 +0200
loplugin:flatten in jvmfwk
Change-Id: Ic58bc539ad6b4e1ef1d8049ec97547d1420be8a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91817
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index ff540cc52325..db855d9ce4f4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -1049,44 +1049,44 @@ void addJavaInfosFromPath(
#if !defined JVM_ONE_PATH_CHECK
// Get Java from PATH environment variable
char *szPath= getenv("PATH");
-if(szPath)
+if(!szPath)
+return;
+
+OUString usAllPath(szPath, strlen(szPath), osl_getThreadTextEncoding());
+sal_Int32 nIndex = 0;
+do
{
-OUString usAllPath(szPath, strlen(szPath),
osl_getThreadTextEncoding());
-sal_Int32 nIndex = 0;
-do
+OUString usToken = usAllPath.getToken( 0, SAL_PATHSEPARATOR, nIndex );
+OUString usTokenUrl;
+if(File::getFileURLFromSystemPath(usToken, usTokenUrl) == File::E_None)
{
-OUString usToken = usAllPath.getToken( 0, SAL_PATHSEPARATOR,
nIndex );
-OUString usTokenUrl;
-if(File::getFileURLFromSystemPath(usToken, usTokenUrl) ==
File::E_None)
+if(!usTokenUrl.isEmpty())
{
-if(!usTokenUrl.isEmpty())
+OUString usBin;
+if(usTokenUrl == ".")
{
-OUString usBin;
-if(usTokenUrl == ".")
-{
-OUString usWorkDirUrl;
-if(osl_Process_E_None ==
osl_getProcessWorkingDir(&usWorkDirUrl.pData))
-usBin= usWorkDirUrl;
-}
-else if(usTokenUrl == "..")
-{
-OUString usWorkDir;
-if(osl_Process_E_None ==
osl_getProcessWorkingDir(&usWorkDir.pData))
-usBin= getDirFromFile(usWorkDir);
-}
-else
-{
-usBin = usTokenUrl;
-}
-if(!usBin.isEmpty())
-{
-addJREInfoFromBinPath(usBin, allInfos, addedInfos);
-}
+OUString usWorkDirUrl;
+if(osl_Process_E_None ==
osl_getProcessWorkingDir(&usWorkDirUrl.pData))
+usBin= usWorkDirUrl;
+}
+else if(usTokenUrl == "..")
+{
+OUString usWorkDir;
+if(osl_Process_E_None ==
osl_getProcessWorkingDir(&usWorkDir.pData))
+usBin= getDirFromFile(usWorkDir);
+}
+else
+{
+usBin = usTokenUrl;
+}
+if(!usBin.isEmpty())
+{
+addJREInfoFromBinPath(usBin, allInfos, addedInfos);
}
}
}
-while ( nIndex >= 0 );
}
+while ( nIndex >= 0 );
#endif
}
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 332d84ebb07b..7f3cd0a132ae 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -94,23 +94,23 @@ VendorSettings::VendorSettings()
SAL_WARN( "jfw", sMsg );
throw FrameworkException(JFW_E_CONFIGURATION, sMsg);
}
-if (!sSettingsPath.isEmpty())
-{
-m_xmlDocVendorSettings = xmlParseFile(sSettingsPath.getStr());
-if (m_xmlDocVendorSettings == nullptr)
-throw FrameworkException(
-JFW_E_ERROR,
-OStringLiteral("[Java framework] Error while parsing file: ")
-+ sSettingsPath + ".");
-
-m_xmlPathContextVendorSettings =
xmlXPathNewContext(m_xmlDocVendorSettings);
-int res = xmlXPathRegisterNs(
-m_xmlPathContextVendorSettings, reinterpret_cast("jf"),
-reinterpret_cast(NS_JAVA_FRAMEWORK));
-if (res == -1)
-throw FrameworkException(JFW_E_ERROR,
-"[Java framework] Error in constructor
VendorSettings::VendorSettings() (fwkbase.cxx)");
-}
+if (sSettingsPath.isEmpty())
+return;
+
+m_xmlDocVendorSettings = xmlParseFile(sSettingsPath.getStr());
+if (m_xmlDocVendorSettings == nullptr)
+throw FrameworkException(
+JFW_E_ERROR,
+
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/win/gdiimpl.cxx | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) New commits: commit bac708dbd19940bfc7c211951bc7b198c9f0cdeb Author: Luboš Luňák AuthorDate: Tue Apr 7 13:38:48 2020 +0200 Commit: Luboš Luňák CommitDate: Tue Apr 7 15:05:41 2020 +0200 simplify code Change-Id: I8806e5ac0f086c0356ae87bcc3020a3dc6d45e54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91814 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx index 50082d2fc51b..42c9078316f2 100644 --- a/vcl/skia/win/gdiimpl.cxx +++ b/vcl/skia/win/gdiimpl.cxx @@ -247,16 +247,7 @@ sk_sp SkiaCompatibleDC::getAsMaskImage() const alpha.setPixelRef(sk_ref_sp(bitmap8.pixelRef()), bitmap8.pixelRefOrigin().x(), bitmap8.pixelRefOrigin().y()); alpha.setImmutable(); -sk_sp surface -= SkiaHelper::createSkSurface(alpha.width(), alpha.height(), kAlpha_8_SkColorType); -// https://bugs.chromium.org/p/skia/issues/detail?id=9692 -// Raster kAlpha_8_SkColorType surfaces need empty contents for SkBlendMode::kSrc. -if (!surface->getCanvas()->getGrContext()) -surface->getCanvas()->clear(SkColorSetARGB(0x00, 0x00, 0x00, 0x00)); -SkPaint paint; -paint.setBlendMode(SkBlendMode::kSrc); // set as is, including alpha -surface->getCanvas()->drawBitmap(alpha, 0, 0, &paint); -return surface->makeImageSnapshot(); +return SkiaHelper::createSkImage(alpha); } sk_sp SkiaCompatibleDC::getAsImage() const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Common.hpp kit/ForKit.cpp net/Socket.hpp wsd/Admin.cpp wsd/Admin.hpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp
common/Common.hpp |1
kit/ForKit.cpp | 124 ---
net/Socket.hpp |5 +
wsd/Admin.cpp |7 -
wsd/Admin.hpp |3
wsd/DocumentBroker.hpp | 124 +--
wsd/LOOLWSD.cpp| 102 ++---
wsd/LOOLWSD.hpp| 172 -
8 files changed, 333 insertions(+), 205 deletions(-)
New commits:
commit 70af76e28cbca4a45869fcecfe221d21eb7a3790
Author: Gabriel Masei
AuthorDate: Thu Apr 2 18:11:36 2020 +0300
Commit: Michael Meeks
CommitDate: Tue Apr 7 15:04:47 2020 +0200
Replaced pipe with websocket based on Unix socket in communication with
ForKit
Change-Id: I80f1a4e84ca6820503966a8ee5d9958a150eac14
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91585
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/common/Common.hpp b/common/Common.hpp
index 7a02dfaae..82f848579 100644
--- a/common/Common.hpp
+++ b/common/Common.hpp
@@ -36,6 +36,7 @@ constexpr const char JAILED_DOCUMENT_ROOT[] = "/user/docs/";
constexpr const char CHILD_URI[] = "/loolws/child?";
constexpr const char NEW_CHILD_URI[] = "/loolws/newchild";
constexpr const char LO_JAIL_SUBPATH[] = "lo";
+constexpr const char FORKIT_URI[] = "/loolws/forkit";
constexpr const char CAPABILITIES_END_POINT[] = "/hosting/capabilities";
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 4ebd57907..8b18ef34e 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
@@ -64,75 +65,88 @@ int ClientPortNumber = DEFAULT_CLIENT_PORT_NUMBER;
std::string MasterLocation;
#endif
-/// Dispatcher class to demultiplex requests from
-/// WSD and handles them.
-class CommandDispatcher : public IoUtil::PipeReader
+class ServerWSHandler;
+
+// We have a single thread and a single connection so we won't bother with
+// access synchronization
+std::shared_ptr WSHandler;
+
+class ServerWSHandler final : public WebSocketHandler
{
+std::string _socketName;
+
public:
-CommandDispatcher(const int pipe) :
-PipeReader("wsd_pipe_rd", pipe)
+ServerWSHandler(const std::string& socketName) :
+WebSocketHandler(/* isClient = */ true, /* isMasking */ false),
+_socketName(socketName)
{
}
-/// Polls WSD commands and handles them.
-bool pollAndDispatch()
+protected:
+void handleMessage(const std::vector& data) override
{
-std::string message;
-const int ready = readLine(message, [](){ return
SigUtil::getTerminationFlag(); });
-if (ready <= 0)
+std::string message(data.data(), data.size());
+
+#if !MOBILEAPP
+if (UnitKit::get().filterKitMessage(this, message))
+return;
+#endif
+StringVector tokens = LOOLProtocol::tokenize(message);
+Log::StreamLogger logger = Log::debug();
+if (logger.enabled())
{
-// Termination is done via SIGTERM, which breaks the wait.
-if (ready < 0)
+logger << _socketName << ": recv [";
+for (const auto& token : tokens)
{
-if (SigUtil::getTerminationFlag())
-{
-LOG_INF("Poll interrupted in " << getName() << " and
TerminationFlag is set.");
-}
-
-// Break.
-return false;
+logger << tokens.getParam(token) << ' ';
}
-// Timeout.
-return true;
+LOG_END(logger, true);
}
-LOG_INF("ForKit command: [" << message << "].");
-try
+// Note: Syntax or parsing errors here are unexpected and fatal.
+if (SigUtil::getTerminationFlag())
{
-StringVector tokens = LOOLProtocol::tokenize(message);
-if (tokens.size() == 2 && tokens.equals(0, "spawn"))
+LOG_DBG("Termination flag set: skip message processing");
+}
+else if (tokens.size() == 2 && tokens.equals(0, "spawn"))
+{
+const int count = std::stoi(tokens[1]);
+if (count > 0)
{
-const int count = std::stoi(tokens[1]);
-if (count > 0)
-{
-LOG_INF("Setting to spawn " << tokens[1] << " child" <<
(count == 1 ? "" : "ren") << " per request.");
-ForkCounter = count;
-}
-else
-{
-LOG_WRN("Cannot spawn " << tokens[1] << " children as
requested.");
-}
+LOG_INF("Setting to spawn " << tokens[1] << " child" << (count
== 1 ? "" : "ren") << " per request.");
+ForkCounter = count;
}
-else if (tokens.size() == 3 && tokens.equals(0, "setconfig"))
+else
{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3280 ++-- 1 file changed, 1663 insertions(+), 1617 deletions(-) New commits: commit 42a0a11c661d9aa1e33ce2fd2eebf30d119f18fa Author: Christian Lohmaier AuthorDate: Tue Apr 7 14:50:53 2020 +0200 Commit: Christian Lohmaier CommitDate: Tue Apr 7 14:55:11 2020 +0200 update credits Change-Id: I54aa5f399f8c1a7117d0f206752a25a02bb3819a (cherry picked from commit 990a9bbc3121a12c7300955e9b7566f6065bd434) (cherry picked from commit 522c986d0cae68667152ed3850c6a3ce743ea007) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index b22351ea7316..6da17c8f07af 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1. 0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://op enoffice.org/2005/report" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.1.2$Linux_X86_64 LibreOffice_project/4d224e95b98b138af42a64d84056446d090829322012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.2.2$Linux_X86_64 LibreOffice_project/4e471d8c02c9c90f512f7f9ead8875b57fcb1ec32012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 626 + 531 501 - 33907 - 19879 + 50592 + 27360 true true view2 - 1293 + 3577 3434 501 - 626 - 34406 - 20503 + 531 + 51091 + 27889 0 0 false @@ -113,7 +113,7 @@ true false true - 9140481 + 9174382 false false false @@ -148,15 +148,15 @@ - - + + - + @@ -180,7 +180,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,14 +235,14 @@ - + - + @@ -334,16 +334,16 @@ - + - + - + - + @@ -351,7 +351,7 @@ - + @@ -418,24 +418,24 @@ - + - + - + - + - + @@ -1070,8 +1070,8 @@ pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII= - Credits -1519 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-03-11 15:16:20. + Credits +1528 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-04-06 12:02:10. * marks deve
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3280 ++-- 1 file changed, 1663 insertions(+), 1617 deletions(-) New commits: commit 522c986d0cae68667152ed3850c6a3ce743ea007 Author: Christian Lohmaier AuthorDate: Tue Apr 7 14:50:53 2020 +0200 Commit: Christian Lohmaier CommitDate: Tue Apr 7 14:53:51 2020 +0200 update credits Change-Id: I54aa5f399f8c1a7117d0f206752a25a02bb3819a (cherry picked from commit 990a9bbc3121a12c7300955e9b7566f6065bd434) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index b22351ea7316..6da17c8f07af 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1. 0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://op enoffice.org/2005/report" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.1.2$Linux_X86_64 LibreOffice_project/4d224e95b98b138af42a64d84056446d090829322012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.2.2$Linux_X86_64 LibreOffice_project/4e471d8c02c9c90f512f7f9ead8875b57fcb1ec32012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 626 + 531 501 - 33907 - 19879 + 50592 + 27360 true true view2 - 1293 + 3577 3434 501 - 626 - 34406 - 20503 + 531 + 51091 + 27889 0 0 false @@ -113,7 +113,7 @@ true false true - 9140481 + 9174382 false false false @@ -148,15 +148,15 @@ - - + + - + @@ -180,7 +180,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,14 +235,14 @@ - + - + @@ -334,16 +334,16 @@ - + - + - + - + @@ -351,7 +351,7 @@ - + @@ -418,24 +418,24 @@ - + - + - + - + - + @@ -1070,8 +1070,8 @@ pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII= - Credits -1519 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-03-11 15:16:20. + Credits +1528 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-04-06 12:02:10. * marks developers whose first contributions happened after 2010-09-28. Develop
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3280 ++-- 1 file changed, 1663 insertions(+), 1617 deletions(-) New commits: commit 1c9261794069b95de8ccb0f3c83875e88b492974 Author: Christian Lohmaier AuthorDate: Tue Apr 7 14:50:53 2020 +0200 Commit: Christian Lohmaier CommitDate: Tue Apr 7 14:52:10 2020 +0200 update credits Change-Id: I54aa5f399f8c1a7117d0f206752a25a02bb3819a (cherry picked from commit 990a9bbc3121a12c7300955e9b7566f6065bd434) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index b22351ea7316..6da17c8f07af 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1. 0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://op enoffice.org/2005/report" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.1.2$Linux_X86_64 LibreOffice_project/4d224e95b98b138af42a64d84056446d090829322012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.2.2$Linux_X86_64 LibreOffice_project/4e471d8c02c9c90f512f7f9ead8875b57fcb1ec32012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 626 + 531 501 - 33907 - 19879 + 50592 + 27360 true true view2 - 1293 + 3577 3434 501 - 626 - 34406 - 20503 + 531 + 51091 + 27889 0 0 false @@ -113,7 +113,7 @@ true false true - 9140481 + 9174382 false false false @@ -148,15 +148,15 @@ - - + + - + @@ -180,7 +180,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,14 +235,14 @@ - + - + @@ -334,16 +334,16 @@ - + - + - + - + @@ -351,7 +351,7 @@ - + @@ -418,24 +418,24 @@ - + - + - + - + - + @@ -1070,8 +1070,8 @@ pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII= - Credits -1519 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-03-11 15:16:20. + Credits +1528 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-04-06 12:02:10. * marks developers whose first contributions happened after 2010-09-28. Develop
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3280 ++-- 1 file changed, 1663 insertions(+), 1617 deletions(-) New commits: commit 990a9bbc3121a12c7300955e9b7566f6065bd434 Author: Christian Lohmaier AuthorDate: Tue Apr 7 14:50:53 2020 +0200 Commit: Christian Lohmaier CommitDate: Tue Apr 7 14:50:53 2020 +0200 update credits Change-Id: I54aa5f399f8c1a7117d0f206752a25a02bb3819a diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index b22351ea7316..6da17c8f07af 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1. 0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://op enoffice.org/2005/report" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.1.2$Linux_X86_64 LibreOffice_project/4d224e95b98b138af42a64d84056446d090829322012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.4.2.2$Linux_X86_64 LibreOffice_project/4e471d8c02c9c90f512f7f9ead8875b57fcb1ec32012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 626 + 531 501 - 33907 - 19879 + 50592 + 27360 true true view2 - 1293 + 3577 3434 501 - 626 - 34406 - 20503 + 531 + 51091 + 27889 0 0 false @@ -113,7 +113,7 @@ true false true - 9140481 + 9174382 false false false @@ -148,15 +148,15 @@ - - + + - + @@ -180,7 +180,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,14 +235,14 @@ - + - + @@ -334,16 +334,16 @@ - + - + - + - + @@ -351,7 +351,7 @@ - + @@ -418,24 +418,24 @@ - + - + - + - + - + @@ -1070,8 +1070,8 @@ pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII= - Credits -1519 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-03-11 15:16:20. + Credits +1528 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-04-06 12:02:10. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1095,16 +1095,16 @@
[Libreoffice-commits] core.git: desktop/source include/vcl vcl/Library_vcl.mk vcl/source
desktop/source/app/app.cxx |5 +
desktop/source/app/sofficemain.cxx |9 -
include/vcl/glxtestprocess.hxx | 18 ++
vcl/Library_vcl.mk |8
vcl/source/opengl/OpenGLHelper.cxx | 18 ++
vcl/source/salmain/salmain.cxx |2 --
6 files changed, 45 insertions(+), 15 deletions(-)
New commits:
commit 43b8ee70fcedfb1a2c3ef996cea4842e06e020b0
Author: Luboš Luňák
AuthorDate: Tue Apr 7 13:10:01 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 14:46:03 2020 +0200
reap the glxtest child even if OpenGL is not used
E.g. with Skia enabled (thus blocking OpenGL) the zombie stays around.
Change-Id: I9769ec804e4727189bbfe58d415e8ad3a6b234ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91811
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c00885433eac..2fb7b048231f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1558,13 +1558,10 @@ int Desktop::Main()
#endif
// In headless mode, reap the process started by
fire_glxtest_process() early in soffice_main
-// (desktop/source/app/sofficemain.cxx), in a code block that needs to
be covered by the same
-// #if condition as this code block:
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID &&
HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL
+// (desktop/source/app/sofficemain.cxx).
if (rCmdLineArgs.IsHeadless()) {
reap_glxtest_process();
}
-#endif
// Release solar mutex just before we wait for our client to connect
{
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index 90e322260c1e..d95356fd255d 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -59,17 +59,8 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
CrashReporter::installExceptionHandler();
#endif
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID &&
HAVE_FEATURE_UI && HAVE_FEATURE_OPENGL
-/* Run test for OpenGL support in own process to avoid crash with broken
- * OpenGL drivers. Start process as early as possible.
- * In non-headless mode, the process will be reaped in
X11OpenGLDeviceInfo::GetData
- * (vcl/opengl/x11/X11DeviceInfo.cxx). In headless mode, the process will
be reaped late in
- * Desktop::Main (desktop/source/app/app.cxx), in a code block that needs
to be covered by the
- * same #if condition as this code block.
- */
bool bSuccess = fire_glxtest_process();
SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with glxtest");
-#endif
#if defined ANDROID
try {
diff --git a/include/vcl/glxtestprocess.hxx b/include/vcl/glxtestprocess.hxx
index b13312ebda64..848135442867 100644
--- a/include/vcl/glxtestprocess.hxx
+++ b/include/vcl/glxtestprocess.hxx
@@ -10,11 +10,29 @@
#ifndef INCLUDED_INCLUDE_VCL_GLXTESTPROCESS_HXX
#include
+#include
+
+#if defined(UNX) && !defined MACOSX && !defined IOS && !defined ANDROID &&
HAVE_FEATURE_UI \
+&& HAVE_FEATURE_OPENGL
+/* Run test for OpenGL support in own process to avoid crash with broken
+ * OpenGL drivers. Start process as early as possible.
+ * In non-headless mode, the process will be reaped in
X11OpenGLDeviceInfo::GetData
+ * (vcl/opengl/x11/X11DeviceInfo.cxx). In headless mode, the process will be
reaped late in
+ * Desktop::Main (desktop/source/app/app.cxx).
+ */
bool fire_glxtest_process();
void reap_glxtest_process();
+#else
+
+inline bool fire_glxtest_process() { return true; }
+
+inline void reap_glxtest_process() {}
+
+#endif
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 39d99957883e..25b2e7f66be1 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -724,4 +724,12 @@ $(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
$(eval $(call gb_Library_use_package,vcl,postprocess_images))
endif
+ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
+ifeq ($(USING_X11),TRUE)
+$(eval $(call gb_Library_use_static_libraries,vcl,\
+ glxtest \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 60f023b7dc4c..1ea130942ba0 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID &&
!defined HAIKU
#include
@@ -903,11 +904,26 @@ PreDefaultWinNoOpenGLZone::~PreDefaultWinNoOpenGLZone()
bTempOpenGLDisabled = false;
}
+static void reapGlxTest()
+{
+// Reap the glxtest child, or it'll stay around as a zombie,
+// as X11OpenGLDeviceInfo::GetData()
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15b87befc9d21f1e972368346c5e4839c502c0f3 Author: Christian Lohmaier AuthorDate: Tue Apr 7 14:35:45 2020 +0200 Commit: Gerrit Code Review CommitDate: Tue Apr 7 14:35:45 2020 +0200 Update git submodules * Update translations from branch 'libreoffice-6-4-3' to a8f08ec638fcc905d7becb465f95264c9a4d1400 - update translations for 6.4.3 rc2 and force-fix errors using pocheck Change-Id: I21921dd81e58fbd2c0f8ce1fd44cdd0ea27d7b58 (cherry picked from commit d9d8ae075592448276e014cfcab9864b570c0c5d) diff --git a/translations b/translations index 54db27dc3342..a8f08ec638fc 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 54db27dc3342801539ba71f27a8e8a1c7c67bb23 +Subproject commit a8f08ec638fcc905d7becb465f95264c9a4d1400 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 356151c6a8d503408faca6993a123b5197b0499f Author: Christian Lohmaier AuthorDate: Tue Apr 7 14:33:14 2020 +0200 Commit: Gerrit Code Review CommitDate: Tue Apr 7 14:33:14 2020 +0200 Update git submodules * Update translations from branch 'libreoffice-6-4' to d9d8ae075592448276e014cfcab9864b570c0c5d - update translations for 6.4.3 rc2 and force-fix errors using pocheck Change-Id: I21921dd81e58fbd2c0f8ce1fd44cdd0ea27d7b58 diff --git a/translations b/translations index d0b268751042..d9d8ae075592 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit d0b2687510429e3f329f5f6beaeabb0e966df450 +Subproject commit d9d8ae075592448276e014cfcab9864b570c0c5d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |7 ---
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|9 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx |6 ++
3 files changed, 19 insertions(+), 3 deletions(-)
New commits:
commit f1c7aa5267a8045892890954df3c269a3abaab99
Author: László Németh
AuthorDate: Mon Apr 6 12:02:10 2020 +0200
Commit: László Németh
CommitDate: Tue Apr 7 14:24:45 2020 +0200
tdf#131819 DOCX import: fix fixed size nested table
Auto width nested table with fixed width cells
is imported as fixed width table to keep the
original cell widths, which define the width of
the table, too.
Partial revert of commit bed818c5d5e92a0b189f25e18495fc205d949128
(tdf#104876 writerfilter: m_bTableSizeTypeInserted = false here).
Change-Id: If58c58a792853e1084ff1d8f9bf6ef74a593b1bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91764
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index f19a95342714..1a59b2f8f920 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -371,11 +371,12 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo73389,"fdo73389.docx")
{
// The width of the inner table was too large. The first fix still
converted
-// the "auto" table width to a fixed one. The recent fix uses variable
width.
+// the "auto" table width to a fixed one. The second fix used variable
width.
+// The recent fix uses fixed width again, according to the fixed width
cells.
xmlDocPtr pXmlDoc = parseExport();
-assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","type","pct");
-assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","5000");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","type","dxa");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","1611");
}
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 511b8f0ff890..3eac4838f146 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -226,6 +226,15 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testNumberedList,"NumberedList.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]/w:p[3]/w:pPr[1]/w:numPr/w:numId","val",
"0");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131819, "NumberedList.docx")
+{
+// keep width of fixed size cells in the nested table
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// These were 4030 and 4249.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblGrid/w:gridCol[1]", "w",
"3841");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblGrid/w:gridCol[2]", "w",
"4049");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO76597, "fdo76597.docx")
{
// check XML
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 891a00d4a63c..a1bb10e74850 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -180,6 +180,12 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
pPropMap->setValue(
TablePropertyMap::TABLE_WIDTH, 0 );
m_bTableSizeTypeInserted = true;
}
+else if (getTableDepth() > 1)
+{
+// tdf#131819 limiting the fix for nested
tables temporarily
+// TODO revert the fix for tdf#104876 and
reopen it
+m_bTableSizeTypeInserted = true;
+}
}
}
#ifdef DBG_UTIL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/salvtables.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6a6c6b9242b699b993acb2eeead609cb4faa862d
Author: Caolán McNamara
AuthorDate: Tue Apr 7 11:22:52 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Apr 7 14:14:33 2020 +0200
Resolves: tdf#131715 don't keep trying the same page if we're already on it
return of false means we didn't change page for some reason, the idea is
that it might be blocked to go to another page, in which case sync with
what page we ended up on, but don't bother with that if the dest page
would be the same as the current page
Change-Id: I280128240601413fb6d027d001b2ecc9a4efa76f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91809
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 14dab888e080..706a874229e6 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1853,8 +1853,9 @@ IMPL_LINK_NOARG(SalInstanceAssistant,
OnRoadmapItemSelected, LinkParamNone*, voi
{
if (notify_events_disabled())
return;
-int nPageIndex(find_id(m_xWizard->GetCurrentRoadmapItemID()));
-if (!signal_jump_page(get_page_ident(nPageIndex)))
+auto nCurItemId = m_xWizard->GetCurrentRoadmapItemID();
+int nPageIndex(find_id(nCurItemId));
+if (!signal_jump_page(get_page_ident(nPageIndex)) && nCurItemId !=
m_xWizard->GetCurLevel())
m_xWizard->SelectRoadmapItemByID(m_xWizard->GetCurLevel());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests cypress_test/support
cypress_test/integration_tests/common/helper.js
| 89 -
cypress_test/integration_tests/common/impress.js
| 36 ---
cypress_test/integration_tests/common/mobile_helper.js
| 92 ++
cypress_test/integration_tests/mobile/calc/apply_font_spec.js
|5
cypress_test/integration_tests/mobile/calc/calc_helper.js
|6
cypress_test/integration_tests/mobile/calc/focus_spec.js
|9
cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js
|5
cypress_test/integration_tests/mobile/calc/number_format_spec.js
|7
cypress_test/integration_tests/mobile/calc/spellchecking_spec.js
|5
cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
|9
cypress_test/integration_tests/mobile/impress/impress_helper.js
| 39
cypress_test/integration_tests/mobile/impress/spellchecking_spec.js
| 11 -
cypress_test/integration_tests/mobile/writer/apply_font_spec.js
|5
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
|5
cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
|5
cypress_test/integration_tests/mobile/writer/focus_spec.js
| 29 +--
cypress_test/integration_tests/mobile/writer/insert_field_spec.js
|5
cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
|5
cypress_test/integration_tests/mobile/writer/insert_object_spec.js
|5
cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js
| 15 -
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
|5
cypress_test/integration_tests/mobile/writer/spellchecking_spec.js
|7
cypress_test/integration_tests/mobile/writer/table_properties_spec.js
|5
cypress_test/integration_tests/mobile/writer/toolbar_spec.js
| 19 +-
cypress_test/integration_tests/mobile/writer/writer_helper.js
|8
cypress_test/support/index.js
|2
26 files changed, 230 insertions(+), 203 deletions(-)
New commits:
commit b045fa90f281304ce3ed1a4c736b5209f695d146
Author: Tamás Zolnai
AuthorDate: Tue Apr 7 11:22:38 2020 +0200
Commit: Tamás Zolnai
CommitDate: Tue Apr 7 13:50:07 2020 +0200
cypress: mobile: create a separate mobile helper file.
Change-Id: I3d57a8a691f8085db12b00e7b508295ce8f33a26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91807
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/common/helper.js
b/cypress_test/integration_tests/common/helper.js
index d5f110056..acaa71927 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -45,21 +45,6 @@ function loadTestDoc(fileName, subFolder, mobile) {
// Wait for the document to fully load
cy.get('.leaflet-tile-loaded', {timeout : 1});
}
-
-// Enable editing if we are in read-only mode.
-function enableEditingMobile() {
- cy.get('#mobile-edit-button')
- .then(function(button) {
- if (button.css('display') !== 'none') {
- cy.get('#mobile-edit-button')
- .click();
- }
- });
-
- cy.get('#tb_actionbar_item_mobile_wizard')
- .should('not.have.class', 'disabled');
-}
-
// Assert that NO keyboard input is accepted (i.e. keyboard should be HIDDEN).
function assertNoKeyboardInput() {
cy.window().then(win => {
@@ -143,12 +128,6 @@ function expectTextForClipboard(expectedPlainText) {
});
}
-function beforeAllMobile(fileName, subFolder) {
- loadTestDoc(fileName, subFolder, true);
-
- detectLOCoreVersion();
-}
-
function afterAll(fileName) {
// Make sure that the document is closed
cy.visit('http://admin:admin@localhost:' +
@@ -162,72 +141,7 @@ function afterAll(fileName) {
.should('not.contain.text', fileName);
}
-function detectLOCoreVersion() {
- if (Cypress.env('LO_CORE_VERSION') === undefined) {
- // Open hamburger menu
- pushHamburgerMenuIconMobile();
-
- // Open about dialog
- cy.get('.ui-header.level-0 .menu-entry-with-icon')
- .contains('About')
- .click();
-
- cy.get('.vex-content')
- .should('exist');
-
- // Get the version
- cy.get('#lokit-version')
- .then(function(
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
New commits:
commit c571d9286df907f05838e6f1fca3139aae62cbc5
Author: Martin Milata
AuthorDate: Thu Jan 30 17:44:31 2020 +0100
Commit: Michael Meeks
CommitDate: Tue Apr 7 13:22:42 2020 +0200
tdf#129895: handle symlinks when populating chroot
In linkOrCopy, the nftw() function is used without the FTW_PHYS flag to
populate child roots from systemplate. From man nftw:
FTW_PHYS
If set, do not follow symbolic links. (This is what you want.)
If not set, symbolic links are followed, but no file is reported twice.
Because the order in which directory entries are visited is not defined,
having multiple symlinks to a file results in only one of the paths
being created in the chroot.
This is not really a problem because loolwsd-systemplate-setup creates
systemplate without symlinks. Fixing it might prevent unpleasant
surprises in the future though, and might possibly allow to make
systemplate and chroots smaller (also the manpage says that you want
it:)).
The commit adds FTW_PHYS flag to the call as well as symlink handling.
Change-Id: I01354f529b5d340185988ed026f266caf17a6881
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87749
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f647f1e8f..e99ec8e61 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -210,7 +210,7 @@ namespace
if (link(fpath, newPath.toString().c_str()) == -1)
{
LOG_INF("link(\"" << fpath << "\", \"" <<
-newPath.toString() << "\") failed. Will copy.");
+newPath.toString() << "\") failed: " << strerror(errno) <<
". Will copy.");
try
{
File(fpath).copyTo(newPath.toString());
@@ -226,7 +226,7 @@ namespace
}
int linkOrCopyFunction(const char *fpath,
- const struct stat* /*sb*/,
+ const struct stat* sb,
int typeflag,
struct FTW* /*ftwbuf*/)
{
@@ -282,6 +282,22 @@ namespace
}
}
break;
+case FTW_SL:
+{
+size_t size = sb->st_size;
+char target[size + 1];
+ssize_t written = readlink(fpath, target, size);
+if (written <= 0 || static_cast(written) > size) {
+LOG_FTL("readlink(\"" << std::string(fpath) << "\")
failed: " << strerror(errno));
+Log::shutdown();
+std::_Exit(EX_SOFTWARE);
+}
+target[written] = '\0';
+
+File(newPath.parent()).createDirectories();
+File(target).linkTo(newPath.toString(),
Poco::File::LinkType::LINK_SYMBOLIC);
+}
+break;
case FTW_DNR:
LOG_ERR("Cannot read directory '" << fpath << "'");
return 1;
@@ -306,7 +322,7 @@ namespace
sourceForLinkOrCopy.pop_back();
destinationForLinkOrCopy = destination;
linkOrCopyStartTime = std::chrono::steady_clock::now();
-if (nftw(source.c_str(), linkOrCopyFunction, 10, FTW_ACTIONRETVAL) ==
-1)
+if (nftw(source.c_str(), linkOrCopyFunction, 10,
FTW_ACTIONRETVAL|FTW_PHYS) == -1)
{
LOG_ERR("linkOrCopy: nftw() failed for '" << source << "'");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/cfgmerge.cxx | 77 ++--
l10ntools/source/helpmerge.cxx | 110 -
l10ntools/source/lngmerge.cxx | 34 ++--
l10ntools/source/xmlparse.cxx | 56 ++--
4 files changed, 139 insertions(+), 138 deletions(-)
New commits:
commit 6a2d03e7c796ad90c4d9d134ad1a91d527953c66
Author: Noel Grandin
AuthorDate: Tue Apr 7 10:58:29 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 13:11:10 2020 +0200
loplugin:flatten in l10ntools
Change-Id: Ib1f698eddea1da2a6e06e17d1c4fec9ef717e132
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91804
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index ae75f973724f..e02e497d5d21 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -347,29 +347,30 @@ CfgExport::~CfgExport()
void CfgExport::WorkOnResourceEnd()
{
-if ( bLocalize ) {
-if ( !pStackData->sText["en-US"].isEmpty() )
-{
-OString sXComment = pStackData->sText[OString("x-comment")];
-OString sLocalId = pStackData->sIdentifier;
-OString sGroupId;
-if ( aStack.size() == 1 ) {
-sGroupId = sLocalId;
-sLocalId = "";
-}
-else {
-sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
-}
+if ( !bLocalize )
+return;
+
+if ( pStackData->sText["en-US"].isEmpty() )
+return;
+
+OString sXComment = pStackData->sText[OString("x-comment")];
+OString sLocalId = pStackData->sIdentifier;
+OString sGroupId;
+if ( aStack.size() == 1 ) {
+sGroupId = sLocalId;
+sLocalId = "";
+}
+else {
+sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
+}
-OString sText = pStackData->sText[ "en-US" ];
-sText = helper::UnQuotHTML( sText );
+OString sText = pStackData->sText[ "en-US" ];
+sText = helper::UnQuotHTML( sText );
-common::writePoEntry(
-"Cfgex", pOutputStream, sPath, pStackData->sResTyp,
-sGroupId, sLocalId, sXComment, sText);
-}
-}
+common::writePoEntry(
+"Cfgex", pOutputStream, sPath, pStackData->sResTyp,
+sGroupId, sLocalId, sXComment, sText);
}
void CfgExport::WorkOnText(
@@ -418,27 +419,27 @@ CfgMerge::~CfgMerge()
void CfgMerge::WorkOnText(OString &, const OString& rLangIndex)
{
-
-if ( pMergeDataFile && bLocalize ) {
-if ( !pResData ) {
-OString sLocalId = pStackData->sIdentifier;
-OString sGroupId;
-if ( aStack.size() == 1 ) {
-sGroupId = sLocalId;
-sLocalId.clear();
-}
-else {
-sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
-}
-
-pResData.reset( new ResData( sGroupId, sFilename ) );
-pResData->sId = sLocalId;
-pResData->sResTyp = pStackData->sResTyp;
+if ( !(pMergeDataFile && bLocalize) )
+return;
+
+if ( !pResData ) {
+OString sLocalId = pStackData->sIdentifier;
+OString sGroupId;
+if ( aStack.size() == 1 ) {
+sGroupId = sLocalId;
+sLocalId.clear();
+}
+else {
+sGroupId = aStack.GetAccessPath( aStack.size() - 2 );
}
-if (rLangIndex.equalsIgnoreAsciiCase("en-US"))
-bEnglish = true;
+pResData.reset( new ResData( sGroupId, sFilename ) );
+pResData->sId = sLocalId;
+pResData->sResTyp = pStackData->sResTyp;
}
+
+if (rLangIndex.equalsIgnoreAsciiCase("en-US"))
+bEnglish = true;
}
void CfgMerge::Output(const OString& rOutput)
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index ee442e91475b..abab8a5a03a1 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -194,67 +194,67 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM ,
const OString& sCur , ResDa
XMLElement* pXMLElement = nullptr;
MergeEntrys *pEntrys= nullptr;
-if( !sCur.equalsIgnoreAsciiCase("en-US") ){
-pXMLElement = (*aLangHM)[ "en-US" ];
-if( pXMLElement == nullptr )
+if( sCur.equalsIgnoreAsciiCase("en-US") )
+return;
+
+pXMLElement = (*aLangHM)[ "en-US" ];
+if( pXMLElement == nullptr )
+{
+printf("Error: Can't find en-US entry\n");
+}
+if( pXMLElement == nullptr )
+return;
+
+OString sNewText;
+OString sNewdata;
+OString sSourceText(
+pXMLElement->ToOString().
+replaceAll(
+"\n",
+OString()).
+replaceAll(
+"\t",
+OString()));
+// re-add spaces to the beginning of translated string,
+// important for indentation of Basic code
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/convdicxml.cxx | 26 -
linguistic/source/dicimp.cxx | 38 +-
linguistic/source/dlistimp.cxx| 118 +++
linguistic/source/gciterator.cxx | 70 ++--
linguistic/source/iprcache.cxx| 26 -
linguistic/source/lngprophelp.cxx | 164 +-
linguistic/source/lngsvcmgr.cxx | 620 +++---
7 files changed, 531 insertions(+), 531 deletions(-)
New commits:
commit e41106332982faef3c8b343b96904eeaa9ff6f60
Author: Noel Grandin
AuthorDate: Tue Apr 7 10:14:17 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 13:11:35 2020 +0200
loplugin:flatten in linguistic
Change-Id: I5dc83e3f3697ccd6a482c799af267587a77563c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91799
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index fe5ff97105aa..99e9959957ff 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -228,21 +228,21 @@ void ConvDicXMLEntryTextContext_Impl::startFastElement(
sal_Int32 /*Element*/,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& rxAttrList
)
{
-if ( rxAttrList.is() )
-{
-sax_fastparser::FastAttributeList *pAttribList =
-sax_fastparser::FastAttributeList::castToFastAttributeList(
rxAttrList );
+if ( !rxAttrList.is() )
+return;
-for (auto &aIter : *pAttribList)
+sax_fastparser::FastAttributeList *pAttribList =
+sax_fastparser::FastAttributeList::castToFastAttributeList( rxAttrList
);
+
+for (auto &aIter : *pAttribList)
+{
+switch (aIter.getToken())
{
-switch (aIter.getToken())
-{
-case XML_NAMESPACE_TCD | XML_LEFT_TEXT:
-aLeftText = aIter.toString();
-break;
-default:
-;
-}
+case XML_NAMESPACE_TCD | XML_LEFT_TEXT:
+aLeftText = aIter.toString();
+break;
+default:
+;
}
}
}
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index e2fc1d53832c..cae5f9871858 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -764,31 +764,31 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool
bActivate )
{
MutexGuard aGuard( GetLinguMutex() );
-if (bIsActive != bool(bActivate))
+if (bIsActive == bool(bActivate))
+return;
+
+bIsActive = bActivate;
+sal_Int16 nEvent = bIsActive ?
+DictionaryEventFlags::ACTIVATE_DIC :
DictionaryEventFlags::DEACTIVATE_DIC;
+
+// remove entries from memory if dictionary is deactivated
+if (!bIsActive)
{
-bIsActive = bActivate;
-sal_Int16 nEvent = bIsActive ?
-DictionaryEventFlags::ACTIVATE_DIC :
DictionaryEventFlags::DEACTIVATE_DIC;
+bool bIsEmpty = aEntries.empty();
-// remove entries from memory if dictionary is deactivated
-if (!bIsActive)
+// save entries first if necessary
+if (bIsModified && hasLocation() && !isReadonly())
{
-bool bIsEmpty = aEntries.empty();
-
-// save entries first if necessary
-if (bIsModified && hasLocation() && !isReadonly())
-{
-store();
+store();
-aEntries.clear();
-bNeedEntries = !bIsEmpty;
-}
-DBG_ASSERT( !bIsModified || !hasLocation() || isReadonly(),
-"lng : dictionary is still modified" );
+aEntries.clear();
+bNeedEntries = !bIsEmpty;
}
-
-launchEvent(nEvent, nullptr);
+DBG_ASSERT( !bIsModified || !hasLocation() || isReadonly(),
+"lng : dictionary is still modified" );
}
+
+launchEvent(nEvent, nullptr);
}
sal_Bool SAL_CALL DictionaryNeo::isActive( )
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 27ad955ca886..98ed47202f55 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -522,46 +522,46 @@ void SAL_CALL
{
osl::MutexGuard aGuard( GetLinguMutex() );
-if (!bDisposing)
-{
-bDisposing = true;
-EventObject aEvtObj( static_cast(this) );
+if (bDisposing)
+return;
+
+bDisposing = true;
+EventObject aEvtObj( static_cast(this) );
-aEvtListeners.disposeAndClear( aEvtObj );
-if (mxDicEvtLstnrHelper.is())
-mxDicEvtLstnrHelper->DisposeAndClear( aEvtObj );
+aEvtListeners.disposeAndClear( aEvtObj );
+if (mxDicEvtLstnrHelper.is())
+mxDicEvtLstnrHelper->DisposeAndClear( aEvtObj );
-//! avoid creation of dictionaries if not already done
-if ( !aDicList.empty() )
+//! avoid creation of dictionaries if not already done
+i
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 36 ++---
lingucomponent/source/languageguessing/guess.cxx | 73 +--
lingucomponent/source/languageguessing/guesslang.cxx | 80 ++---
lingucomponent/source/lingutil/lingutil.cxx | 110 +-
lingucomponent/source/numbertext/numbertext.cxx | 30 ++--
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 36 ++---
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 32 ++---
7 files changed, 198 insertions(+), 199 deletions(-)
New commits:
commit 35f9dec3645f7a4a8d1f7f9dfb62e28d73bc5244
Author: Noel Grandin
AuthorDate: Tue Apr 7 10:55:00 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 13:10:29 2020 +0200
loplugin:flatten in lingucomponent
Change-Id: Ic0bf912a22e8efeae1a4f4864397f3f3d474c632
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91803
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index e6692a1d0b50..d03aaf1df0ea 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -736,25 +736,25 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any
>& rArguments )
{
MutexGuard aGuard( GetLinguMutex() );
-if (!pPropHelper)
+if (pPropHelper)
+return;
+
+sal_Int32 nLen = rArguments.getLength();
+if (2 == nLen)
{
-sal_Int32 nLen = rArguments.getLength();
-if (2 == nLen)
-{
-Reference< XLinguProperties > xPropSet;
-rArguments.getConstArray()[0] >>= xPropSet;
-// rArguments.getConstArray()[1] >>= xDicList;
-
-//! Pointer allows for access of the non-UNO functions.
-//! And the reference to the UNO-functions while increasing
-//! the ref-count and will implicitly free the memory
-//! when the object is no longer used.
-pPropHelper.reset( new PropertyHelper_Hyphenation(
static_cast(this), xPropSet ) );
-pPropHelper->AddAsPropListener(); //! after a reference is
established
-}
-else {
-OSL_FAIL( "wrong number of arguments in sequence" );
-}
+Reference< XLinguProperties > xPropSet;
+rArguments.getConstArray()[0] >>= xPropSet;
+// rArguments.getConstArray()[1] >>= xDicList;
+
+//! Pointer allows for access of the non-UNO functions.
+//! And the reference to the UNO-functions while increasing
+//! the ref-count and will implicitly free the memory
+//! when the object is no longer used.
+pPropHelper.reset( new PropertyHelper_Hyphenation(
static_cast(this), xPropSet ) );
+pPropHelper->AddAsPropListener(); //! after a reference is
established
+}
+else {
+OSL_FAIL( "wrong number of arguments in sequence" );
}
}
diff --git a/lingucomponent/source/languageguessing/guess.cxx
b/lingucomponent/source/languageguessing/guess.cxx
index a2f3be35382b..45700ff7d1ff 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -58,47 +58,46 @@ Guess::Guess(const char * guess_str)
, country_str(DEFAULT_COUNTRY)
{
//if the guess is not like "UNKNOWN" or "SHORT", go into the brackets
-if(strcmp(guess_str + 1, TEXTCAT_RESULT_UNKNOWN_STR) != 0
- &&
- strcmp(guess_str + 1, TEXTCAT_RESULT_SHORT_STR) != 0)
-{
-// From how this ctor is called from SimpleGuesser::GuessLanguage and
-// SimpleGuesser::GetManagedLanguages in
-// lingucomponent/source/languageguessing/simpleguesser.cxx, guess_str
must start with "[":
-assert(guess_str[0] == GUESS_SEPARATOR_OPEN);
-auto const start = guess_str + 1;
-// Only look at the prefix of guess_str, delimited by the next "]" or
"[" or end-of-string;
-// split it into at most three segments separated by "-" (where excess
occurrences of "-"
-// would become part of the third segment), like "en-US-utf8"; the
first segment denotes the
-// language; if there are three segments, the second denotes the
country and the third the
-// encoding; otherwise, the second segment, if any (e.g., in
"haw-utf8"), denotes the
-// encoding:
-char const * dash1 = nullptr;
-char const * dash2 = nullptr;
-auto p = start;
-for (;; ++p) {
-auto const c = *p;
-if (c == '\0' || c == GUESS_SEPARATOR_OPEN || c ==
GUESS_SEPARATOR_CLOSE) {
+if(strcmp(guess_str + 1, TEXTCAT_RESULT_UNKNOWN_STR) == 0
+ || strcmp(guess_str + 1, TEXTCAT_RESULT_SHORT_STR) == 0)
+return;
+
+// From how this ctor is called from SimpleGuesser::GuessLanguage and
+// SimpleGuesser::GetManagedLanguages in
+// lingucomponent/s
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 28 ++---
sw/source/core/doc/textboxhelper.cxx |4 +
sw/source/core/unocore/unotext.cxx|4 -
sw/source/filter/ww8/docxsdrexport.cxx| 12 +
writerfilter/source/dmapper/GraphicImport.cxx | 33
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 37 --
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |3 -
7 files changed, 43 insertions(+), 78 deletions(-)
New commits:
commit 27d04f6dbf38aa28fb7215590d578c4567db5770
Author: Attila Bakos
AuthorDate: Thu Mar 19 14:40:36 2020 +0100
Commit: László Németh
CommitDate: Tue Apr 7 12:44:17 2020 +0200
tdf#119038 DOCX: fix FollowTextFlow handling
This fix also a clean-up for the following commits:
ad8857dab30e099a0cf6ec18d184a6c836b33317
(tdf#130120 DOCX: export o:allowincell)
14ad64270e4fbca3c24da6f55f260b1fb229556a
(tdf#129888 DOCX shape import: handle o:allowincell)
10f29d8bf05d44ca8bc11d34d1294ec17f8ac0f1
(tdf#87569 tdf#109411 DOCX import: fix shape anchor in tables)
where these patches ignored the option "Follow text flow"
and there was no possibility to switch this setting on GUI.
Now this is handled on GUI as well by replacing the
grab-bag with UNO property "IsFollowingTextFlow".
The tdf#119038 bug also fixed.
Note: Unit tests for the commits mentioned above were
modified for testing the new property, so new tests were
not added.
Change-Id: Ie35c6e280f8b33d8535ca4cd9749f110f9d592ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90753
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index e59b25a430a6..abac561df575 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -98,10 +98,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf129888vml,
"tdf129888vml.docx")
//to be calculated from the page frame instead of the table:
uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
-sal_Int16 nValue;
-xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+bool bValue;
+xShapeProperties->getPropertyValue("IsFollowingTextFlow") >>= bValue;
CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf129888vml The line shape has bad place!",
- text::RelOrientation::PAGE_FRAME, nValue);
+ false, bValue);
}
DECLARE_OOXMLIMPORT_TEST(testTdf129888dml, "tdf129888dml.docx")
@@ -112,18 +112,18 @@ DECLARE_OOXMLIMPORT_TEST(testTdf129888dml,
"tdf129888dml.docx")
//to be calculated from the page frame instead of the table:
uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
-sal_Int16 nValue;
-xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+bool bValue;
+xShapeProperties->getPropertyValue("IsFollowingTextFlow") >>= bValue;
CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf129888dml The shape has bad place!",
- text::RelOrientation::PAGE_FRAME, nValue);
+false, bValue);
}
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130120, "tdf130120.docx")
{
- //Text for exporting the allowincell attribute:
+//Text for exporting the allowincell attribute:
xmlDocPtr p_XmlDoc = parseExport("word/document.xml");
assertXPath(p_XmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r/mc:AlternateContent/"
- "mc:Choice/w:drawing/wp:anchor","layoutInCell","0");
+"mc:Choice/w:drawing/wp:anchor", "layoutInCell", "0");
}
@@ -131,10 +131,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf87569v,
"tdf87569_vml.docx")
{
//the original tdf87569 sample has vml shapes...
uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
-sal_Int16 nValue;
-xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+bool bValue;
+xShapeProperties->getPropertyValue("IsFollowingTextFlow") >>= bValue;
CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf87569_vml: The Shape is not in the
table!",
- text::RelOrientation::FRAME, nValue);
+ true, bValue);
}
DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.docx")
@@ -249,10 +249,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf87569d,
"tdf87569_drawingml.docx")
{
//if the original tdf87569 sample is upgraded it will have drawingml
shapes...
uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
-sal_Int16 nValue;
-xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+bool bValue;
+xShapeProperties->getPropertyValue("IsFollowingTextFlow") >>= bValue;
CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf87569_drawingml: The Shape is not in the
table!",
-
[Libreoffice-commits] online.git: cypress_test/Makefile.am
cypress_test/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aeb48c3ad53bb0cd8d2897063bc326c22f4d5682 Author: Tamás Zolnai AuthorDate: Tue Apr 7 12:02:08 2020 +0200 Commit: Tamás Zolnai CommitDate: Tue Apr 7 12:40:16 2020 +0200 cypress: Catch any "Error:" in log. Change-Id: Ia82f896e7ff4299e25ac38283f0e518bef25f875 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91808 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tamás Zolnai diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index b965fe298..73ce55751 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -204,7 +204,7 @@ endef define execute_run_parallel @mkdir -p $(dir $(2)) && touch $(2) && \ echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \ - if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught TypeError\|Error: Timed out retrying" $(2)` ];\ + if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught TypeError\|Error: " $(2)` ];\ then cat $(2);\ else cat $(2) >> $(ERROR_LOG);\ fi; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data3/tdf130685.odt |binary
sw/qa/extras/uiwriter/uiwriter3.cxx | 32 +-
2 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 9977fbeed1461a8f5cfa8029c02e914c099f3230
Author: Xisco Fauli
AuthorDate: Mon Apr 6 14:15:53 2020 +0200
Commit: Xisco Faulí
CommitDate: Tue Apr 7 12:24:41 2020 +0200
tdf#130685: Add unittest
Change-Id: I9f0b9a7129056ff3447e1cf91d4eaf188180a04c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91747
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/uiwriter/data3/tdf130685.odt
b/sw/qa/extras/uiwriter/data3/tdf130685.odt
new file mode 100644
index ..f83827ebb7e4
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf130685.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 7b35f1a85c83..2bafcd233e8f 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -318,6 +318,36 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130746)
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130685)
+{
+load(DATA_DIRECTORY, "tdf130685.odt");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Cut", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+// Without fix in place, this test would have failed with:
+//- Expected: 2
+//- Actual : 4
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+//FIXME: See tdf#131147
+//dispatchCommand(mxComponent, ".uno:Undo", {});
+//CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130680)
{
load(DATA_DIRECTORY, "tdf130680.odt");
@@ -337,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf130680)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
dispatchCommand(mxComponent, ".uno:Paste", {});
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-//FIXME: See https://bugs.documentfoundation.org/show_bug.cgi?id=130680#c5
+//FIXME: See tdf#131147
//dispatchCommand(mxComponent, ".uno:Undo", {});
//CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
//dispatchCommand(mxComponent, ".uno:Undo", {});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source svx/uiconfig
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |9
svx/source/sidebar/possize/PosSizePropertyPanel.hxx |2 +
svx/uiconfig/ui/sidebarpossize.ui | 37
3 files changed, 48 insertions(+)
New commits:
commit ed7a51ea8b319bc3c1dc03b7552817eeae3c1c75
Author: Pranam Lashkari
AuthorDate: Fri Apr 3 03:33:31 2020 +0530
Commit: Andras Timar
CommitDate: Tue Apr 7 12:17:25 2020 +0200
use "To Background" and "To Foreground" only in writer sidebar
Change-Id: Ib7ccac192721b663c9655417fc3d639766d0424d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91604
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index ccdfc1ee3f8c..24e7b8b205b2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -74,6 +74,8 @@ PosSizePropertyPanel::PosSizePropertyPanel(
mxFlipDispatch(new ToolbarUnoDispatcher(*mxFlipTbx, *m_xBuilder, rxFrame)),
mxArrangeTbx(m_xBuilder->weld_toolbar("arrangetoolbar")),
mxArrangeDispatch(new ToolbarUnoDispatcher(*mxArrangeTbx, *m_xBuilder,
rxFrame)),
+mxArrangeTbx2(m_xBuilder->weld_toolbar("arrangetoolbar2")),
+mxArrangeDispatch2(new ToolbarUnoDispatcher(*mxArrangeTbx2, *m_xBuilder,
rxFrame)),
mxBtnEditChart(m_xBuilder->weld_button("btnEditChart")),
maRect(),
mpView(nullptr),
@@ -137,7 +139,9 @@ void PosSizePropertyPanel::dispose()
mxFlipDispatch.reset();
mxFlipTbx.reset();
mxArrangeDispatch.reset();
+mxArrangeDispatch2.reset();
mxArrangeTbx.reset();
+mxArrangeTbx2.reset();
mxBtnEditChart.reset();
maTransfPosXControl.dispose();
@@ -268,12 +272,14 @@ void PosSizePropertyPanel::HandleContextChange(
bool bShowAngle = false;
bool bShowFlip = false;
bool bShowEditChart = false;
+bool bShowArrangeTbx2 = false;
switch (maContext.GetCombinedContext_DI())
{
case CombinedEnumContext(Application::WriterVariants, Context::Draw):
bShowAngle = true;
bShowFlip = true;
+bShowArrangeTbx2 = true;
break;
case CombinedEnumContext(Application::WriterVariants,
Context::Graphic):
@@ -333,6 +339,9 @@ void PosSizePropertyPanel::HandleContextChange(
// Edit Chart
mxBtnEditChart->set_visible(bShowEditChart);
+// Arrange tool bar 2
+mxArrangeTbx2->set_visible(bShowArrangeTbx2);
+
if (mxSidebar.is())
mxSidebar->requestLayout();
}
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index eacd06f4672e..2c78dd033253 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -109,6 +109,8 @@ private:
std::unique_ptr mxArrangeTbx;
std::unique_ptr mxArrangeDispatch;
+std::unique_ptr mxArrangeTbx2;
+std::unique_ptr mxArrangeDispatch2;
//edit charts button for online's mobile view
std::unique_ptr mxBtnEditChart;
diff --git a/svx/uiconfig/ui/sidebarpossize.ui
b/svx/uiconfig/ui/sidebarpossize.ui
index 86d5eaaa5a24..7b599ade42f3 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -262,6 +262,43 @@
1
+
+
+True
+False
+Arrange
+icons
+False
+2
+
+
+True
+False
+True
+
+
+False
+False
+
+
+
+
+True
+False
+True
+
+
+False
+False
+
+
+
+
+False
+True
+2
+
+
0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/gdiimpl.cxx | 52 ++-
1 file changed, 35 insertions(+), 17 deletions(-)
New commits:
commit 81edf0ceef264dbbb338d2ed91378baa59b7a3bf
Author: Luboš Luňák
AuthorDate: Mon Apr 6 17:10:20 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:54:13 2020 +0200
optimize SkiaSalGraphicsImpl area copying
SkSurface::draw() can avoid copies if it detects the source and
destination are the same surface. This can especially make
a difference on Windows with raster, because RasterWindowContext_win
shares the surface's pixel data with BITMAPINFO, which resets
SkSurface's fWeOwnThePixels, making even makeImageSnapshot()
do copies.
Can be seen in the profile e.g. for tdf#131408.
Change-Id: I08d08974c4725824e05c5644549b920f69b9ce64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91773
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index e4f064589b21..8b484ea124c7 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -852,6 +852,20 @@ bool
SkiaSalGraphicsImpl::drawPolyPolygonBezier(sal_uInt32, const sal_uInt32*,
return false;
}
+static void copyArea(SkCanvas* canvas, sk_sp surface, long nDestX,
long nDestY,
+ long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight)
+{
+// Using SkSurface::draw() should be more efficient than
SkSurface::makeImageSnapshot(),
+// because it may detect copying to itself and avoid some needless copies.
+// It cannot do a subrectangle though, so clip.
+canvas->save();
+canvas->clipRect(SkRect::MakeXYWH(nDestX, nDestY, nSrcWidth, nSrcHeight));
+SkPaint paint;
+paint.setBlendMode(SkBlendMode::kSrc); // copy as is, including alpha
+surface->draw(canvas, nDestX - nSrcX, nDestY - nSrcY, &paint);
+canvas->restore();
+}
+
void SkiaSalGraphicsImpl::copyArea(long nDestX, long nDestY, long nSrcX, long
nSrcY, long nSrcWidth,
long nSrcHeight, bool /*bWindowInvalidate*/)
{
@@ -861,12 +875,7 @@ void SkiaSalGraphicsImpl::copyArea(long nDestX, long
nDestY, long nSrcX, long nS
SAL_INFO("vcl.skia.trace", "copyarea(" << this << "): " << Point(nSrcX,
nSrcY) << "->"
<< Point(nDestX, nDestY) << "/"
<< Size(nSrcWidth, nSrcHeight));
-// Do not use makeImageSnapshot(rect), as that one may make a needless
data copy.
-sk_sp image = mSurface->makeImageSnapshot();
-SkPaint paint;
-paint.setBlendMode(SkBlendMode::kSrc); // copy as is, including alpha
-getDrawCanvas()->drawImageRect(image, SkIRect::MakeXYWH(nSrcX, nSrcY,
nSrcWidth, nSrcHeight),
- SkRect::MakeXYWH(nDestX, nDestY, nSrcWidth,
nSrcHeight), &paint);
+::copyArea(getDrawCanvas(), mSurface, nDestX, nDestY, nSrcX, nSrcY,
nSrcWidth, nSrcHeight);
if (mXorMode) // limit xor area update
mXorExtents = SkRect::MakeXYWH(nDestX, nDestY, nSrcWidth, nSrcHeight);
postDraw();
@@ -884,17 +893,26 @@ void SkiaSalGraphicsImpl::copyBits(const SalTwoRect&
rPosAry, SalGraphics* pSrcG
}
else
src = this;
-SAL_INFO("vcl.skia.trace", "copybits(" << this << "): (" << src << "):" <<
rPosAry);
-// Do not use makeImageSnapshot(rect), as that one may make a needless
data copy.
-sk_sp image = src->mSurface->makeImageSnapshot();
-SkPaint paint;
-paint.setBlendMode(SkBlendMode::kSrc); // copy as is, including alpha
-getDrawCanvas()->drawImageRect(
-image,
-SkIRect::MakeXYWH(rPosAry.mnSrcX, rPosAry.mnSrcY, rPosAry.mnSrcWidth,
rPosAry.mnSrcHeight),
-SkRect::MakeXYWH(rPosAry.mnDestX, rPosAry.mnDestY, rPosAry.mnDestWidth,
- rPosAry.mnDestHeight),
-&paint);
+if (rPosAry.mnSrcWidth == rPosAry.mnDestWidth && rPosAry.mnSrcHeight ==
rPosAry.mnDestHeight)
+{
+SAL_INFO("vcl.skia.trace", "copybits(" << this << "): copy area:" <<
rPosAry);
+::copyArea(getDrawCanvas(), src->mSurface, rPosAry.mnDestX,
rPosAry.mnDestY, rPosAry.mnSrcX,
+ rPosAry.mnSrcY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
+}
+else
+{
+SAL_INFO("vcl.skia.trace", "copybits(" << this << "): (" << src <<
"):" << rPosAry);
+// Do not use makeImageSnapshot(rect), as that one may make a needless
data copy.
+sk_sp image = src->mSurface->makeImageSnapshot();
+SkPaint paint;
+paint.setBlendMode(SkBlendMode::kSrc); // copy as is, including alpha
+getDrawCanvas()->drawImageRect(image,
+ SkIRect::MakeXYWH(rPosAry.mnSrcX,
rPosAry.mnSrcY,
+ rPosAry.mnSrcWidth,
rPosAry.mnSrcHeight),
+ SkRect::MakeXYWH(rPosAry.mnDestX,
rPosAry.mnDestY,
+
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/opengl vcl/skia vcl/source
include/vcl/bitmap.hxx |3 ++-
vcl/inc/opengl/salbmp.hxx |1 +
vcl/inc/salbmp.hxx |4
vcl/inc/skia/salbmp.hxx|1 +
vcl/opengl/salbmp.cxx |7 +++
vcl/skia/salbmp.cxx| 30 +++---
vcl/source/gdi/alpha.cxx |6 +++---
vcl/source/gdi/bitmap3.cxx | 13 -
8 files changed, 57 insertions(+), 8 deletions(-)
New commits:
commit 2fcfbd73768b69ba58607a054e7f851be2942992
Author: Luboš Luňák
AuthorDate: Fri Apr 3 22:50:12 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:53:54 2020 +0200
no gray conversion needed for VCL alpha hacks
AlphaMask doesn't need any conversion to gray, it's just enough
to make sure the alpha channel bitmap is 8bpp. And the conversion
is needed for the separate-OutputDevice-alpha hacks, where
GetBitmap() gives non-8bpp bitmap for the alpha contents, but there
all the R,G,B channels are the same, so just take red and avoid
pointless conversion.
Change-Id: Ib30fc8fa6d05067d582402ab2c0fcfb49a3742f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91772
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 77fef84ccaa3..1df24105e8bd 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -74,7 +74,8 @@ enum class BmpConversion
N24Bit,
N32Bit,
N8BitTrans,
-Ghosted
+Ghosted,
+N8BitNoConversion // make 8bit without color conversion (e.g. take the red
channel)
};
enum class BmpCombine
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index c1ae867e6e6e..a01eca89f0fe 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -80,6 +80,7 @@ public:
boolScale( const double& rScaleX, const double& rScaleY,
BmpScaleFlag nScaleFlag ) override;
boolReplace( const Color& rSearchColor, const Color&
rReplaceColor, sal_uInt8 nTol ) override;
boolConvertToGreyscale() override;
+boolInterpretAs8Bit() override;
public:
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index a526e2b6ee65..4244ae1a376f 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -81,6 +81,10 @@ public:
{
return false;
}
+virtual boolInterpretAs8Bit()
+{
+return false;
+}
void GetChecksum(BitmapChecksum& rChecksum) const
{
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index a5f264ae2ba1..cfdb9d3d2347 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -57,6 +57,7 @@ public:
BmpScaleFlag nScaleFlag) override;
virtual bool Replace(const Color& rSearchColor, const Color& rReplaceColor,
sal_uInt8 nTol) override;
+virtual bool InterpretAs8Bit() override;
virtual bool ConvertToGreyscale() override;
// Returns the contents as SkImage (possibly GPU-backed).
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 3b500b0945dc..4c8261858023 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -768,4 +768,11 @@ bool OpenGLSalBitmap::ConvertToGreyscale()
return true;
}
+// This is needed to just make the bitmap usable as an alpha channel.
+// Converting to 8bit grey will do.
+bool OpenGLSalBitmap::InterpretAs8Bit()
+{
+return ConvertToGreyscale();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index dd723b9ee55e..89c43bb31e93 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -351,9 +351,6 @@ bool SkiaSalBitmap::ConvertToGreyscale()
#endif
// Normally this would need to convert contents of mBuffer for all
possible formats,
// so just let the VCL algorithm do it.
-// The exception is when this bitmap contains only SkImage, which most
probably
-// comes from SkiaSalGraphicsImpl::GetBitmap(). That is often used by the
horrible
-// separate-alpha-outdev hack, and followed by a later call to
GetAlphaSkBitmap().
// Avoid the costly SkImage->buffer->SkImage conversion.
if (!mBuffer && mImage)
{
@@ -381,6 +378,33 @@ bool SkiaSalBitmap::ConvertToGreyscale()
return false;
}
+bool SkiaSalBitmap::InterpretAs8Bit()
+{
+#ifdef DBG_UTIL
+assert(mWriteAccessCount == 0);
+#endif
+if (mBitCount == 8 && mPalette == Bitmap::GetGreyPalette(256))
+return true;
+// This is usually used by AlphaMask, the point is just to treat
+// the content as an alpha channel. This is often used
+// by the horrible separate-alpha-outdev hack, where the bitmap comes
+// from SkiaSalGraphicsImpl::GetBitmap(), so only mImage is set,
+// and that is followed by a later call to GetAlphaSkBitmap().
+// Avoid the costly SkImage->buffer->SkImage conversion and simply
+// just treat the SkImage as being for 8bit bitmap. EnsureBitmapData()
+
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/salbmp.cxx | 84
1 file changed, 53 insertions(+), 31 deletions(-)
New commits:
commit 21719933e7632a504bf7c03e97a62b01bb938d6a
Author: Luboš Luňák
AuthorDate: Fri Apr 3 17:55:30 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:53:30 2020 +0200
optimize SkiaSalBitmap::GetAlphaSkImage()
This is again used by the ugly separate-alpha-outdev hack. So try
to avoid pixel operations.
Change-Id: I2956f03272b58831493b1eb4901a8ab5a3e587be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91771
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index f9fae9dd83e8..dd723b9ee55e 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -505,8 +505,42 @@ const sk_sp& SkiaSalBitmap::GetAlphaSkImage()
const
assert(mSize == mPixelsSize); // data has already been scaled if needed
return mAlphaImage;
}
+if (mImage)
+{
+SkiaZone zone;
+sk_sp surface = SkiaHelper::createSkSurface(mSize,
kAlpha_8_SkColorType);
+assert(surface);
+SkPaint paint;
+paint.setBlendMode(SkBlendMode::kSrc); // set as is, including alpha
+// Move the R channel value to the alpha channel. This seems to be the
only
+// way to reinterpret data in SkImage as an alpha SkImage without
accessing the pixels.
+// NOTE: The matrix is 4x5 organized as columns (i.e. each line is a
column, not a row).
+constexpr SkColorMatrix redToAlpha(0, 0, 0, 0, 0, // R column
+ 0, 0, 0, 0, 0, // G column
+ 0, 0, 0, 0, 0, // B column
+ 1, 0, 0, 0, 0); // A column
+paint.setColorFilter(SkColorFilters::Matrix(redToAlpha));
+bool scaling = mImage->width() != mSize.Width() || mImage->height() !=
mSize.Height();
+if (scaling)
+{
+assert(!mBuffer); // This code should be only called if only
mImage holds data.
+paint.setFilterQuality(mScaleQuality);
+}
+surface->getCanvas()->drawImageRect(mImage,
+SkRect::MakeWH(mImage->width(),
mImage->height()),
+SkRect::MakeWH(mSize.Width(),
mSize.Height()), &paint);
+if (scaling)
+SAL_INFO("vcl.skia.trace", "getalphaskimage(" << this << "): image
scaled "
+ <<
Size(mImage->width(), mImage->height())
+ << "->" << mSize <<
":"
+ <<
static_cast(mScaleQuality));
+else
+SAL_INFO("vcl.skia.trace", "getalphaskbitmap(" << this << ") from
image");
+SkiaSalBitmap* thisPtr = const_cast(this);
+thisPtr->mAlphaImage = surface->makeImageSnapshot();
+return mAlphaImage;
+}
SkiaZone zone;
-// TODO can we convert directly mImage -> mAlphaImage?
EnsureBitmapData();
assert(mSize == mPixelsSize); // data has already been scaled if needed
SkBitmap alphaBitmap;
@@ -522,40 +556,28 @@ const sk_sp& SkiaSalBitmap::GetAlphaSkImage()
const
[](void* addr, void*) { delete[]
static_cast(addr); }, nullptr))
abort();
alphaBitmap.setImmutable();
+sk_sp image = SkiaHelper::createSkImage(alphaBitmap);
+assert(image);
+const_cast&>(mAlphaImage) = image;
}
else
{
-SkBitmap originalBitmap = GetAsSkBitmap();
-// To make things more interesting, some LO code creates masks as
24bpp,
-// so we first need to convert to 8bit to be able to convert that to
8bit alpha.
-SkBitmap* convertedBitmap = nullptr;
-const SkBitmap* bitmap8 = &originalBitmap;
-if (originalBitmap.colorType() != kGray_8_SkColorType)
-{
-convertedBitmap = new SkBitmap;
-if (!convertedBitmap->tryAllocPixels(SkImageInfo::Make(
-mSize.Width(), mSize.Height(), kGray_8_SkColorType,
kOpaque_SkAlphaType)))
-abort();
-SkCanvas canvas(*convertedBitmap);
-SkPaint paint;
-paint.setBlendMode(SkBlendMode::kSrc); // copy and convert depth
-canvas.drawBitmap(originalBitmap, 0, 0, &paint);
-convertedBitmap->setImmutable();
-bitmap8 = convertedBitmap;
-}
-// Skia uses a bitmap as an alpha channel only if it's set as
kAlpha_8_SkColorType.
-// So create such SkBitmap and make it share bitmap8's data.
-alphaBitmap.setInfo(
-
bitmap8->info().makeColorType(kAlpha_8_SkColorType).makeAlphaType(kPremul_SkAlphaType),
-bitmap8->rowBytes());
-alphaBitmap.setPixelRef(sk_ref_sp(bitmap8->pixelRef()
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/salbmp.cxx | 34 +++---
1 file changed, 31 insertions(+), 3 deletions(-)
New commits:
commit eec512887d01ba9958f3e427ae0b1a2916564f46
Author: Luboš Luňák
AuthorDate: Fri Apr 3 17:52:57 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:53:13 2020 +0200
optimize SkiaSalBitmap::ConvertToGreyscale()
Normally VCL can handle the pixel buffer operations, but this is often
called by the separate-alpha-outdev hack, where we get only the SkImage.
So optimize to avoid the SkImage->buffer->SkImage conversion.
Change-Id: I9d2c11d102adc89aac41ff55f11553dbcee9cd97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91770
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 7c3d183a54d9..f9fae9dd83e8 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -33,6 +33,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -347,9 +349,35 @@ bool SkiaSalBitmap::ConvertToGreyscale()
#ifdef DBG_UTIL
assert(mWriteAccessCount == 0);
#endif
-// Skia can convert color SkBitmap to a greyscale one (draw using
SkCanvas),
-// but it uses different coefficients for the color->grey conversion than
VCL.
-// So just let VCL do it.
+// Normally this would need to convert contents of mBuffer for all
possible formats,
+// so just let the VCL algorithm do it.
+// The exception is when this bitmap contains only SkImage, which most
probably
+// comes from SkiaSalGraphicsImpl::GetBitmap(). That is often used by the
horrible
+// separate-alpha-outdev hack, and followed by a later call to
GetAlphaSkBitmap().
+// Avoid the costly SkImage->buffer->SkImage conversion.
+if (!mBuffer && mImage)
+{
+if (mBitCount == 8 && mPalette == Bitmap::GetGreyPalette(256))
+return true;
+sk_sp surface = SkiaHelper::createSkSurface(mPixelsSize);
+SkPaint paint;
+paint.setBlendMode(SkBlendMode::kSrc); // set as is, including alpha
+// VCL uses different coefficients for conversion to gray than Skia,
so use the VCL
+// values from Bitmap::ImplMakeGreyscales(). Do not use
kGray_8_SkColorType,
+// Skia would use its gray conversion formula.
+// NOTE: The matrix is 4x5 organized as columns (i.e. each line is a
column, not a row).
+constexpr SkColorMatrix toGray(77 / 256.0, 151 / 256.0, 28 / 256.0, 0,
0, // R column
+ 77 / 256.0, 151 / 256.0, 28 / 256.0, 0,
0, // G column
+ 77 / 256.0, 151 / 256.0, 28 / 256.0, 0,
0, // B column
+ 0, 0, 0, 1, 0); // don't modify alpha
+paint.setColorFilter(SkColorFilters::Matrix(toGray));
+surface->getCanvas()->drawImage(mImage, 0, 0, &paint);
+mBitCount = 8;
+mPalette = Bitmap::GetGreyPalette(256);
+ResetToSkImage(surface->makeImageSnapshot());
+SAL_INFO("vcl.skia.trace", "converttogreyscale(" << this << ")");
+return true;
+}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/skia
vcl/inc/skia/utils.hxx |3 +++
vcl/skia/SkiaHelper.cxx | 29 +
vcl/skia/gdiimpl.cxx|2 +-
vcl/skia/salbmp.cxx | 22 ++
4 files changed, 39 insertions(+), 17 deletions(-)
New commits:
commit fafc059a17416502722622ff52f38a3e4acd7998
Author: Luboš Luňák
AuthorDate: Fri Apr 3 10:50:58 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:52:58 2020 +0200
avoid Skia bitmap->image pixel copying in raster mode
SkImage::MakeFromBitmap() shares the pixels instead of copying,
so in raster mode this saves some work.
Change-Id: I89aa86c269c4b4f24e305dec390ae0f80e2537da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91769
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx
index c1f35e812d00..16e5addd6909 100644
--- a/vcl/inc/skia/utils.hxx
+++ b/vcl/inc/skia/utils.hxx
@@ -43,6 +43,9 @@ inline sk_sp createSkSurface(const Size& size,
SkColorType type = kN3
return createSkSurface(size.Width(), size.Height(), type);
}
+// Create SkImage, GPU-backed if possible.
+VCL_DLLPUBLIC sk_sp createSkImage(const SkBitmap& bitmap);
+
// Must be called in any VCL backend before any Skia functionality is used.
// If not set, Skia will be disabled.
VCL_DLLPUBLIC void
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index ed85cec00049..356570706f59 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -333,6 +333,35 @@ sk_sp createSkSurface(int width, int height,
SkColorType type)
return surface;
}
+sk_sp createSkImage(const SkBitmap& bitmap)
+{
+SkiaZone zone;
+assert(bitmap.colorType() == kN32_SkColorType || bitmap.colorType() ==
kAlpha_8_SkColorType);
+switch (SkiaHelper::renderMethodToUse())
+{
+case SkiaHelper::RenderVulkan:
+{
+if (GrContext* grContext = getSharedGrContext())
+{
+sk_sp surface = SkSurface::MakeRenderTarget(
+grContext, SkBudgeted::kNo,
bitmap.info().makeAlphaType(kPremul_SkAlphaType));
+assert(surface);
+SkPaint paint;
+paint.setBlendMode(SkBlendMode::kSrc); // set as is, including
alpha
+surface->getCanvas()->drawBitmap(bitmap, 0, 0, &paint);
+return surface->makeImageSnapshot();
+}
+break;
+}
+default:
+break;
+}
+// Create raster image as a fallback.
+sk_sp image = SkImage::MakeFromBitmap(bitmap);
+assert(image);
+return image;
+}
+
void cleanup()
{
delete sharedGrContext;
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index e68d620ac894..e4f064589b21 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -944,7 +944,7 @@ bool SkiaSalGraphicsImpl::blendAlphaBitmap(const
SalTwoRect& rPosAry,
// This was originally implemented for the OpenGL drawing method and it is
poorly documented.
// The source and mask bitmaps are the usual data and alpha bitmaps, and
'alpha'
// is the "alpha" layer of the VirtualDevice (the alpha in VirtualDevice
is also stored
-// as a separate bitmap). Now I understand it correctly these two alpha
masks first need
+// as a separate bitmap). Now if I understand it correctly these two alpha
masks first need
// to be combined into the actual alpha mask to be used. The formula for
TYPE_BLEND
// in opengl's combinedTextureFragmentShader.glsl is
// "result_alpha = 1.0 - (1.0 - floor(alpha)) * mask".
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index c000b391eaa2..7c3d183a54d9 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -460,12 +460,9 @@ const sk_sp& SkiaSalBitmap::GetSkImage() const
return mImage;
}
SkiaZone zone;
-sk_sp surface = SkiaHelper::createSkSurface(mSize);
-assert(surface);
-SkPaint paint;
-paint.setBlendMode(SkBlendMode::kSrc); // set as is, including alpha
-surface->getCanvas()->drawBitmap(GetAsSkBitmap(), 0, 0, &paint);
-const_cast&>(mImage) = surface->makeImageSnapshot();
+sk_sp image = SkiaHelper::createSkImage(GetAsSkBitmap());
+assert(image);
+const_cast&>(mImage) = image;
SAL_INFO("vcl.skia.trace", "getskimage(" << this << ")");
return mImage;
}
@@ -528,16 +525,9 @@ const sk_sp& SkiaSalBitmap::GetAlphaSkImage()
const
delete convertedBitmap;
alphaBitmap.setImmutable();
}
-sk_sp surface = SkiaHelper::createSkSurface(mSize,
kAlpha_8_SkColorType);
-assert(surface);
-// https://bugs.chromium.org/p/skia/issues/detail?id=9692
-// Raster kAlpha_8_SkColorType surfaces need empty contents for
SkBlendMode::kSrc.
-if (!surface->getCanvas()->getGrContext())
-surface->getCanvas()->clear(SkColorSetARGB(0x00, 0x00, 0x00, 0x00));
-SkPaint paint;
-paint.setBlendMode(SkBlendMode::kSrc); // set as is, i
[Libreoffice-commits] core.git: 2 commits - external/skia vcl/inc vcl/skia
external/skia/UnpackedTarball_skia.mk|1
external/skia/extend-rgb-to-rgba.patch.0 | 23 +++
vcl/inc/skia/salbmp.hxx |7 +
vcl/skia/salbmp.cxx | 198 ---
4 files changed, 187 insertions(+), 42 deletions(-)
New commits:
commit c27d2e9145be8972e5d2174fb3f317dc08930074
Author: Luboš Luňák
AuthorDate: Thu Apr 2 12:33:57 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:52:43 2020 +0200
optimize bit depth conversions to/from Skia where possible
Skia has an optimized function for RGB->RGBA conversion that
we are going to do often because 24bpp is the most common LO
image format. The function is private, so patch that.
Also optimize 32bpp->8bpp conversion with gray palette.
Change-Id: I48b06f80d5ca9e1c8e3ee51da61e87541bd83d5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91768
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index 99344871cb9d..da0a2a7a0547 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -32,6 +32,7 @@ skia_patches := \
windows-force-unicode-api.patch.0 \
operator-eq-bool.patch.0 \
fix-without-gl.patch.0 \
+extend-rgb-to-rgba.patch.0 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/extend-rgb-to-rgba.patch.0
b/external/skia/extend-rgb-to-rgba.patch.0
new file mode 100644
index ..f68dbab96336
--- /dev/null
+++ b/external/skia/extend-rgb-to-rgba.patch.0
@@ -0,0 +1,23 @@
+diff --git a/include/core/SkSwizzle.h b/include/core/SkSwizzle.h
+index 61e93b2da7..c19063bb91 100644
+--- ./include/core/SkSwizzle.h
./include/core/SkSwizzle.h
+@@ -16,4 +16,6 @@
+ */
+ SK_API void SkSwapRB(uint32_t* dest, const uint32_t* src, int count);
+
++SK_API void SkExtendRGBToRGBA(uint32_t* dest, const uint8_t* src, int count);
++
+ #endif
+diff --git a/src/core/SkSwizzle.cpp b/src/core/SkSwizzle.cpp
+index 301b0184f1..6e6dd27558 100644
+--- ./src/core/SkSwizzle.cpp
./src/core/SkSwizzle.cpp
+@@ -12,3 +12,7 @@
+ void SkSwapRB(uint32_t* dest, const uint32_t* src, int count) {
+ SkOpts::RGBA_to_BGRA(dest, src, count);
+ }
++
++void SkExtendRGBToRGBA(uint32_t* dest, const uint8_t* src, int count) {
++SkOpts::RGB_to_RGB1(dest, src, count);
++}
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index f0bffb500194..c000b391eaa2 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
@@ -387,19 +388,16 @@ SkBitmap SkiaSalBitmap::GetAsSkBitmap() const
else if (mBitCount == 24)
{
// Convert 24bpp RGB/BGR to 32bpp RGBA/BGRA.
-std::unique_ptr data(
-new sal_uInt8[mPixelsSize.Height() * mPixelsSize.Width() * 4]);
-sal_uInt8* dest = data.get();
+std::unique_ptr data(
+new uint32_t[mPixelsSize.Height() * mPixelsSize.Width()]);
+uint32_t* dest = data.get();
for (long y = 0; y < mPixelsSize.Height(); ++y)
{
const sal_uInt8* src = mBuffer.get() + mScanlineSize * y;
-for (long x = 0; x < mPixelsSize.Width(); ++x)
-{
-*dest++ = *src++;
-*dest++ = *src++;
-*dest++ = *src++;
-*dest++ = 0xff;
-}
+// This also works as BGR to BGRA (the function extends 3
bytes to 4
+// by adding 0xFF alpha, so position of B and R doesn't
matter).
+SkExtendRGBToRGBA(dest, src, mPixelsSize.Width());
+dest += mPixelsSize.Width();
}
if (!bitmap.installPixels(
SkImageInfo::MakeS32(mPixelsSize.Width(),
mPixelsSize.Height(),
@@ -647,6 +645,17 @@ void SkiaSalBitmap::EnsureBitmapData()
}
}
}
+else if (mBitCount == 8 && mPalette.IsGreyPalette())
+{
+for (long y = 0; y < mSize.Height(); ++y)
+{
+const uint8_t* src = static_cast(mBitmap.getAddr(0, y));
+sal_uInt8* dest = mBuffer.get() + mScanlineSize * y;
+// no actual data conversion, use one color channel as the gray
value
+for (long x = 0; x < mSize.Width(); ++x)
+dest[x] = src[x * 4];
+}
+}
else
{
std::unique_ptr pWriter
commit 912773d521fd6b8ff90d27f7bd3f5a46fd0df582
Author: Luboš Luňák
AuthorDate: Tue Mar 24 16:21:44 2020 +0100
Commit: Luboš Luňák
CommitDate: Tue Apr 7 11:52:32 2020 +0200
use delayed scaling in SalSkiaBitmap
This allows doing the scaling at least in some cases on the GPU.
Pending scaling is detected by mSize (logical size) != mPixelSize
(actual size of pixel data).
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |2 +-
loleaflet/src/control/Control.JSDialogBuilder.js |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 63744d641bdab2486afef9e763c90e8d698339ec
Author: Pedro Pinto Silva
AuthorDate: Tue Apr 7 11:13:17 2020 +0200
Commit: Pedro Pinto da Silva
CommitDate: Tue Apr 7 11:46:54 2020 +0200
Mobile: mWizard: make sure every row item with a checkbox is properly
aligned by
- Add class
- make sure there is no float position affecting those
(previously that ^css rule was applied to all elements that have in their
id the prefix checkbutton via "div[id^=checkbutton]" but not all elements were
being set with that convention in mind)
Change-Id: I285955d956a60002065421c4e8384df6359c4d68
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91806
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Pinto da Silva
Reviewed-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 95f3cc133..4bc42c09b 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -713,7 +713,7 @@ div#mobile-wizard-content .spinfield:active
.spinfieldimage, div#mobile-wizard-c
#top{background: url(images/sc_aligntop.svg) no-repeat center;}
#bottom{background: url(images/sc_alignbottom.svg) no-repeat center;}
#standard{background: url(images/sc_alignverticalcenter.svg) no-repeat center;}
-div[id^=checkbutton]{
+.checkbutton{
clear: both;
}
#mobile-wizard input[type=checkbox]:disabled{
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 6763cd9e3..8727e065c 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -561,6 +561,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
_checkboxControl: function(parentContainer, data, builder) {
var div = L.DomUtil.createWithId('div', data.id,
parentContainer);
+ L.DomUtil.addClass(div, 'checkbutton');
var checkboxLabel = L.DomUtil.create('label', '', div);
checkboxLabel.innerHTML = builder._cleanText(data.text);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source desktop/source editeng/source extensions/source filter/qa forms/source framework/source jvmfwk/plugins linguistic/source sdext/sou
compilerplugins/clang/unusedvariableplus.cxx | 510
++
dbaccess/source/filter/xml/xmlExport.cxx |1
desktop/source/deployment/registry/configuration/dp_configuration.cxx |1
desktop/source/deployment/registry/dp_backenddb.cxx |1
editeng/source/uno/unoedprx.cxx |1
extensions/source/bibliography/framectr.cxx |1
filter/qa/unit/textfilterdetect.cxx |2
forms/source/solar/component/navbarcontrol.cxx|1
framework/source/fwe/classes/addonmenu.cxx|1
jvmfwk/plugins/sunmajor/pluginlib/util.cxx|2
linguistic/source/convdic.cxx |6
sdext/source/pdfimport/tree/drawtreevisiting.cxx |3
svx/source/form/fmshimp.cxx |1
testtools/source/bridgetest/bridgetest.cxx|1
xmlsecurity/source/helper/xsecverify.cxx |1
15 files changed, 515 insertions(+), 18 deletions(-)
New commits:
commit f59d9e7ea09482c2e9e5f52a8d0445e4cebc3df5
Author: Noel Grandin
AuthorDate: Fri Apr 3 15:53:49 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 11:42:37 2020 +0200
new loplugin:unusedvariableplus
a particularly aggressive checker, which is why it is off by default
Change-Id: Id5a0faa50b3ecc75e01f4aedc6579c5209e585da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91643
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedvariableplus.cxx
b/compilerplugins/clang/unusedvariableplus.cxx
new file mode 100644
index ..fa0e9e3992b1
--- /dev/null
+++ b/compilerplugins/clang/unusedvariableplus.cxx
@@ -0,0 +1,510 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include "plugin.hxx"
+#include
+
+/*
+ * Very aggressive unused variable checker, we whitelist types that are known
+ * good when unused.
+*/
+
+namespace
+{
+static bool startswith(const std::string& rStr, const char* pSubStr)
+{
+return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
+}
+
+class UnusedVariablePlus : public loplugin::FilteringPlugin
+{
+public:
+explicit UnusedVariablePlus(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
+}
+
+virtual bool preRun() override
+{
+std::string fn(handler.getMainFileName());
+loplugin::normalizeDotDotInFilePath(fn);
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/canvas/workben/"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/vcl/source/uipreviewer/previewer.cxx"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/workben/"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/qa/"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/vcl/backendtest/"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/lotuswordpro/"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/salhelper/qa/"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR "/idl/source/prj/svidl.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sot/source/unoolestorage/xolesimplestorage.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sc/source/core/tool/interpr7.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sc/source/ui/vba/vbaapplication.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sw/source/core/doc/doccomp.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sw/source/core/swg/SwXMLTextBlocks.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sw/source/filter/ww8/wrtw8esh.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
+
"/shell/source/sessioninstall/SyncDbusSessionHelper.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/svl/qa/unit/items/test_IndexedStyleSheets.cxx"))
+return false;
+if (loplugin::isSamePathname(fn, SRCDIR
"/sd/qa/unit/export-tests-ooxml2.cxx"))
+return false;
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source
vcl/source/window/winproc.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b834f5fe933c0876ce61d8550a0d6144e098876f Author: Tamás Zolnai AuthorDate: Tue Apr 7 10:31:51 2020 +0200 Commit: Tamás Zolnai CommitDate: Tue Apr 7 11:40:19 2020 +0200 lok: Don't show tooltip for color picker. Change-Id: I0715875cdc194ac7d7a9683d644183d75984a466 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91802 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tamás Zolnai diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index b3ea4f5bf97e..8377691e1527 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -166,7 +166,7 @@ static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMouse // (e.g. Character Properties dialog -> Font Effects -> Font Color) if(pChild->GetType() == WindowType::CONTROL && pChild->GetParent() && pChild->GetParent()->GetParent() && - pChild->GetParent()->GetParent()->GetType() == WindowType::DOCKINGWINDOW) + pChild->GetParent()->GetParent()->GetType() == WindowType::SCROLLWINDOW) return; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/findreplacedialog.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97db1d17be599c8627110cbb4f57f0cb36da178c Author: Julien Nabet AuthorDate: Mon Apr 6 23:00:06 2020 +0200 Commit: Xisco Faulí CommitDate: Tue Apr 7 11:36:14 2020 +0200 tdf#131125: Fix improperly used ampersand "Find & Replace" => "Find and Replace" Change-Id: I055fb74d8c6ac0fbe3b11ca8ce9b6f0cc4ad80fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91785 Tested-by: Jenkins Reviewed-by: Sophie Gautier Reviewed-by: Xisco Faulí diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui index 2d3a68113ae5..84863685b070 100644 --- a/svx/uiconfig/ui/findreplacedialog.ui +++ b/svx/uiconfig/ui/findreplacedialog.ui @@ -5,7 +5,7 @@ False 6 -Find & Replace +Find and Replace False 0 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/table-position-15.docx |binary
sw/qa/extras/ooxmlexport/data/tdf119760_tableInTablePosition.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx| 26
--
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |3 -
sw/source/filter/ww8/docxattributeoutput.cxx |8 +--
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 13 +++--
6 files changed, 39 insertions(+), 11 deletions(-)
New commits:
commit d2db4bc9507653a46fdea282d41b9683910a072f
Author: Justin Luth
AuthorDate: Thu Apr 2 10:22:45 2020 +0300
Commit: Miklos Vajna
CommitDate: Tue Apr 7 11:29:27 2020 +0200
tdf#119760 docx: table starts at left, not mid-border
related to compatibilityMode = 15; the new export default.
In Word 2013+, it appears that the table starts immediately,
and then the border is added. In Writer, the table is
considered to start mid-border. So that difference needs
to be emulated by adjusting the table margin.
The same appears to be true for nested tables.
Negative margins appear to just be ignored for nested tables,
and Word's UI does not accept a negative value.
I modified the existing table-position-15.docx slightly (in Word 2016),
just to remove spacing between the caption and the table
so that it would be easy to visually compare the table position.
One slight difference is that WORD seems to add a small "margin"
to the the paragraph shading area - don't let that throw you off.
The existing unit test enforced settings that didn't match
how Word 2013 was showing the files, despite being written to
test exactly that. I assume the author was focusing more on
OLDER versions of Word and didn't care too much about the
NEW version. A man after my own heart.
MISC:
-I removed my earlier TODO which was just plain wrong.
-the ambiguous make::any caused me untold problems,
so I made it unambiguous by moving it into a variable.
Change-Id: I0685ab74777f1def2841c7d18ff1cdaf2753f47b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91608
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/table-position-15.docx
b/sw/qa/extras/ooxmlexport/data/table-position-15.docx
index d3dcaec40e78..91fbdbef00a2 100644
Binary files a/sw/qa/extras/ooxmlexport/data/table-position-15.docx and
b/sw/qa/extras/ooxmlexport/data/table-position-15.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf119760_tableInTablePosition.docx
b/sw/qa/extras/ooxmlexport/data/tdf119760_tableInTablePosition.docx
new file mode 100644
index ..0456fe206edb
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf119760_tableInTablePosition.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 1057ab93485c..f19a95342714 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1192,7 +1192,8 @@ DECLARE_OOXMLEXPORT_TEST(testTableMarginAdjustment,
"table.fodt")
// (old) Word: margin 0 means paragraph in table starts at 0
auto const xTable(getParagraphOrTable(1));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTable,
"LeftMargin"));
+// shifted very slightly to account for half of the thin border width, so
4, not 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty(xTable,
"LeftMargin"));
// Now that compatibilityMode is set to 2013's 15 (new), expect the new
values,
// since LO is exporting in the NEW way now instead of the OLD way.
@@ -1204,6 +1205,24 @@ DECLARE_OOXMLEXPORT_TEST(testTableMarginAdjustment,
"table.fodt")
assertXPath(pXmlDoc, "//w:tbl[1]/w:tblPr[1]/w:tblInd[1]", "w", "0");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf119760_tableInTablePosition,
"tdf119760_tableInTablePosition.docx")
+{
+if ( mbExported )
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+assertXPath(pXmlDoc,
"//w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]/w:tblPr[1]/w:tblInd[1]", "type", "dxa");
+assertXPath(pXmlDoc,
"//w:tbl[1]/w:tr[1]/w:tc[1]/w:tbl[1]//w:tblPr[1]/w:tblInd[1]", "w", "0");
+}
+
+uno::Reference< text::XTextTablesSupplier > xTablesSupplier( mxComponent,
uno::UNO_QUERY );
+uno::Reference< container::XIndexAccess > xTables(
xTablesSupplier->getTextTables(), uno::UNO_QUERY );
+uno::Reference< text::XTextTable > xTable( xTables->getByIndex(0),
uno::UNO_QUERY );
+// For compatibilityMode 15: margin 0 means table border starts at 0,
+// shifted to account for half of the thick border width, so 106, not 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(106), getProperty(xTable,
"LeftMargin"));
+}
+
DECLARE_OOXMLEXPORT_TEST( testTableCellMargin, "table-cell-margin.docx" )
{
sal_Int32 const cellLeftMarginF
[Libreoffice-commits] core.git: sd/Package_web.mk sd/res
dev/null |binary sd/Package_web.mk | 11 ++- sd/res/buttons/elementary.zip |binary sd/res/buttons/sukapura.zip |binary 4 files changed, 2 insertions(+), 9 deletions(-) New commits: commit a7f36ba45bf86ccd8f8a61c27f5b25d0999176b1 Author: andreas kainz AuthorDate: Sun Apr 5 01:32:53 2020 +0200 Commit: andreas_kainz CommitDate: Tue Apr 7 11:28:26 2020 +0200 tdf#131870 update button icons add elementary and sukapura Change-Id: Iada1ba5071ee4659ef0bb64b703be339f49a0833 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91701 Reviewed-by: andreas_kainz Tested-by: Jenkins diff --git a/sd/Package_web.mk b/sd/Package_web.mk index 62a8998641f7..1c7c6b80a537 100644 --- a/sd/Package_web.mk +++ b/sd/Package_web.mk @@ -28,17 +28,10 @@ $(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/webcast,\ )) $(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/wizard/web/buttons,\ - buttons/glas-blue.zip \ - buttons/glas-green.zip \ - buttons/glas-red.zip \ - buttons/round-gorilla.zip \ + buttons/elementary.zip \ + buttons/sukapura.zip \ buttons/round-white.zip \ buttons/simple.zip \ - buttons/square-blue.zip \ - buttons/square-gray.zip \ - buttons/square-green.zip \ - buttons/square-red.zip \ - buttons/square-yellow.zip \ )) # vim: set noet sw=4 ts=4: diff --git a/sd/res/buttons/elementary.zip b/sd/res/buttons/elementary.zip new file mode 100644 index ..070606683648 Binary files /dev/null and b/sd/res/buttons/elementary.zip differ diff --git a/sd/res/buttons/glas-blue.zip b/sd/res/buttons/glas-blue.zip deleted file mode 100644 index 93a380b6c522.. Binary files a/sd/res/buttons/glas-blue.zip and /dev/null differ diff --git a/sd/res/buttons/glas-green.zip b/sd/res/buttons/glas-green.zip deleted file mode 100644 index af1543545442.. Binary files a/sd/res/buttons/glas-green.zip and /dev/null differ diff --git a/sd/res/buttons/glas-red.zip b/sd/res/buttons/glas-red.zip deleted file mode 100644 index 914514c7f166.. Binary files a/sd/res/buttons/glas-red.zip and /dev/null differ diff --git a/sd/res/buttons/round-gorilla.zip b/sd/res/buttons/round-gorilla.zip deleted file mode 100644 index 727df6b92e52.. Binary files a/sd/res/buttons/round-gorilla.zip and /dev/null differ diff --git a/sd/res/buttons/square-blue.zip b/sd/res/buttons/square-blue.zip deleted file mode 100644 index 86c33465fb6d.. Binary files a/sd/res/buttons/square-blue.zip and /dev/null differ diff --git a/sd/res/buttons/square-gray.zip b/sd/res/buttons/square-gray.zip deleted file mode 100644 index 31713b7975c3.. Binary files a/sd/res/buttons/square-gray.zip and /dev/null differ diff --git a/sd/res/buttons/square-green.zip b/sd/res/buttons/square-green.zip deleted file mode 100644 index 6962225306d0.. Binary files a/sd/res/buttons/square-green.zip and /dev/null differ diff --git a/sd/res/buttons/square-red.zip b/sd/res/buttons/square-red.zip deleted file mode 100644 index 8199cbe736b6.. Binary files a/sd/res/buttons/square-red.zip and /dev/null differ diff --git a/sd/res/buttons/square-yellow.zip b/sd/res/buttons/square-yellow.zip deleted file mode 100644 index 27af86075ee5.. Binary files a/sd/res/buttons/square-yellow.zip and /dev/null differ diff --git a/sd/res/buttons/sukapura.zip b/sd/res/buttons/sukapura.zip new file mode 100644 index ..f50001f0c906 Binary files /dev/null and b/sd/res/buttons/sukapura.zip differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpborderstuff.cxx | 34 ++--
lotuswordpro/source/filter/lwpdoc.cxx | 95 ++--
lotuswordpro/source/filter/lwpfootnote.cxx | 48 +++---
lotuswordpro/source/filter/lwpframelayout.cxx | 184 +++-
lotuswordpro/source/filter/lwpfrib.cxx | 40 ++---
lotuswordpro/source/filter/lwpfribmark.cxx | 44 ++---
lotuswordpro/source/filter/lwpfribsection.cxx | 36 ++--
lotuswordpro/source/filter/lwpfribtext.cxx | 28 +--
lotuswordpro/source/filter/lwpgrfobj.cxx| 76 -
lotuswordpro/source/filter/lwplaypiece.cxx | 28 +--
lotuswordpro/source/filter/lwpnotes.cxx | 42 ++---
lotuswordpro/source/filter/lwpnumericfmt.cxx| 24 +--
lotuswordpro/source/filter/lwppagelayout.cxx| 110 +++---
lotuswordpro/source/filter/lwppara.cxx | 34 ++--
lotuswordpro/source/filter/lwpparastyle.cxx | 43 ++---
lotuswordpro/source/filter/lwpsdwfileloader.cxx | 28 +--
lotuswordpro/source/filter/lwptablelayout.cxx | 147 +--
lotuswordpro/source/filter/lwptoc.cxx | 96 ++--
18 files changed, 566 insertions(+), 571 deletions(-)
New commits:
commit 9f424bf2d71abcb7d30f2a4539169c4c10ffeb8c
Author: Noel Grandin
AuthorDate: Tue Apr 7 10:06:09 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Apr 7 11:19:13 2020 +0200
loplugin:flatten in lotuswordpro
Change-Id: I8b86d54c1c2706fde8b4288bb3349e2ed89d3c95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91798
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx
b/lotuswordpro/source/filter/lwpborderstuff.cxx
index 89cc11ac8f82..d3aebcdabdb7 100644
--- a/lotuswordpro/source/filter/lwpborderstuff.cxx
+++ b/lotuswordpro/source/filter/lwpborderstuff.cxx
@@ -131,24 +131,24 @@ voidLwpBorderStuff::Read(LwpObjectStream *pStrm)
m_nValid = pStrm->QuickReaduInt16();
pStrm->SkipExtra();
-if( LwpFileHeader::m_nFileRevision < 0x0010 )
+if( LwpFileHeader::m_nFileRevision >= 0x0010 )
+return;
+
+if( m_nBorderGroupIDLeft&EXTERNAL_ID )
{
-if( m_nBorderGroupIDLeft&EXTERNAL_ID )
-{
-m_nBorderGroupIDLeft = BGRP_SOLID;
-}
-if( m_nBorderGroupIDRight&EXTERNAL_ID )
-{
-m_nBorderGroupIDRight = BGRP_SOLID;
-}
-if( m_nBorderGroupIDTop&EXTERNAL_ID )
-{
-m_nBorderGroupIDTop = BGRP_SOLID;
-}
-if( m_nBorderGroupIDBottom&EXTERNAL_ID )
-{
-m_nBorderGroupIDBottom = BGRP_SOLID;
-}
+m_nBorderGroupIDLeft = BGRP_SOLID;
+}
+if( m_nBorderGroupIDRight&EXTERNAL_ID )
+{
+m_nBorderGroupIDRight = BGRP_SOLID;
+}
+if( m_nBorderGroupIDTop&EXTERNAL_ID )
+{
+m_nBorderGroupIDTop = BGRP_SOLID;
+}
+if( m_nBorderGroupIDBottom&EXTERNAL_ID )
+{
+m_nBorderGroupIDBottom = BGRP_SOLID;
}
}
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx
b/lotuswordpro/source/filter/lwpdoc.cxx
index fd6e567ee030..f42a510fef5e 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -260,19 +260,19 @@ void LwpDocument::RegisterLayoutStyles()
//set initial pagelayout in story for parsing pagelayout
LwpDivInfo* pDivInfo = dynamic_cast (m_DivInfo.obj(
VO_DIVISIONINFO).get());
-if (pDivInfo)
+if (!pDivInfo)
+return;
+
+LwpPageLayout* pPageLayout =
dynamic_cast(pDivInfo->GetInitialLayoutID().obj(VO_PAGELAYOUT).get());
+if(pPageLayout)
{
-LwpPageLayout* pPageLayout =
dynamic_cast(pDivInfo->GetInitialLayoutID().obj(VO_PAGELAYOUT).get());
-if(pPageLayout)
+//In Ole division, the content of pagelayout is VO_OLEOBJECT
+LwpStory* pStory =
dynamic_cast(pPageLayout->GetContent().obj(VO_STORY).get());
+if(pStory)
{
-//In Ole division, the content of pagelayout is VO_OLEOBJECT
-LwpStory* pStory =
dynamic_cast(pPageLayout->GetContent().obj(VO_STORY).get());
-if(pStory)
-{
-//add all the pagelayout in order into the pagelayout list;
-pStory->SortPageLayout();
-pStory->SetCurrentLayout(pPageLayout);
-}
+//add all the pagelayout in order into the pagelayout list;
+pStory->SortPageLayout();
+pStory->SetCurrentLayout(pPageLayout);
}
}
}
@@ -285,20 +285,20 @@ void LwpDocument::RegisterStylesInPara()
rtl::Reference xContent(m_xOwnedFoundry
? dynamic_cast
(m_xOwnedFoundry->GetContentManager().GetContentList().obj().get())
: nullptr);
-if (xContent.is())
+if (!xContent.is())
+return;
+
+rtl::Reference
xStory(dynamic_cast(xContent->GetChildHead().obj(VO_STORY).get()));
+o3tl::sorted_vector aSeen;
+whil
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 320563f857b564e44615e88013f7a53a480beb2b Author: Andrea Gelmini AuthorDate: Tue Apr 7 11:13:35 2020 +0200 Commit: Julien Nabet CommitDate: Tue Apr 7 11:18:12 2020 +0200 Fix typo Change-Id: Iaeafd85b5d1becbafba644bb873dd7f676707cb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91805 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0decc50c00c3..5e468e69f5a8 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1491,7 +1491,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta // active inplace client. In that case we have to ignore the event. // Otherwise we would crash (context menu has been // opened by inplace client and we would deactivate the inplace client, -// the contex menu is closed by VCL asynchronously which in the end +// the context menu is closed by VCL asynchronously which in the end // would work on deleted objects or the context menu has no parent anymore) SfxViewShell* pViewSh = pViewData->GetViewShell(); SfxInPlaceClient* pClient = pViewSh->GetIPClient(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/html
loleaflet/html/loleaflet.html.m4 | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit f3ac1bf297febcfbe8c2e9330bbdab6728b9478a
Author: Jan Holesovsky
AuthorDate: Tue Apr 7 10:24:39 2020 +0200
Commit: Jan Holesovsky
CommitDate: Tue Apr 7 11:05:52 2020 +0200
mobile: Load a device-form-specific branding-*.css too.
Change-Id: Iac94c6993d036a10b3f4764e79f38721482acc87
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91800
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index a2c1a45cf..8f8890209 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -108,6 +108,8 @@ m4_ifelse(IOSAPP,[true],
[])
m4_ifelse(ANDROIDAPP,[true],
[])
+
+m4_dnl Handle localization
m4_ifelse(MOBILEAPP,[true],
[
m4_ifelse(IOSAPP,[true],
@@ -252,17 +254,25 @@ m4_ifelse(MOBILEAPP,[true],
window.tileSize = 256;])
m4_syscmd([cat ]GLOBAL_JS)m4_dnl
-
+
var link = document.createElement('link');
link.setAttribute("rel", "stylesheet");
link.setAttribute("type", "text/css");
-if (window.mode.isMobile())
+var brandingLink = document.createElement('link');
+brandingLink.setAttribute("rel", "stylesheet");
+brandingLink.setAttribute("type", "text/css");
+if (window.mode.isMobile()) {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-mobile.css');]
-else if (window.mode.isTablet())
+[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-mobile.css');]
+} else if (window.mode.isTablet()) {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-tablet.css');]
-else
+[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-tablet.css');]
+} else {
[link.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[device-desktop.css');]
+[brandingLink.setAttribute("href",
']m4_ifelse(MOBILEAPP,[],[%SERVICE_ROOT%/loleaflet/%VERSION%/])[branding-desktop.css');]
+}
document.getElementsByTagName("head")[[0]].appendChild(link);
+document.getElementsByTagName("head")[[0]].appendChild(brandingLink);
m4_ifelse(MOBILEAPP,[true],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-6.2-9'
Tag 'co-6.2-9' created by Andras Timar at 2020-04-07 09:00 + co-6.2-9 Changes since CODE-4.2.1-2-49: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.2-9'
Tag 'co-6.2-9' created by Andras Timar at 2020-04-07 09:00 + co-6.2-9 Changes since CP-Android-iOS-4.2.0-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.2-9'
Tag 'co-6.2-9' created by Andras Timar at 2020-04-07 09:00 + co-6.2-9 Changes since CP-Android-iOS-4.2.0: Andras Timar (1): tdf#130999 fix registration of Greek dictionary --- el_GR/META-INF/manifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/co-6.2-9'
Tag 'co-6.2-9' created by Andras Timar at 2020-04-07 09:00 + co-6.2-9 Changes since co-6.2-2: Pedro Silva (1): [cp] Update CSS for Search button --- help3xsl/default.css | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09c3017758e074fcb9e37a4a22c7f66c9ae38586 Author: Andras Timar AuthorDate: Tue Apr 7 11:00:19 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 11:00:19 2020 +0200 Bump version to 6.2-9 Change-Id: I8b696127e871781204cfb7c62fa461002b81271a diff --git a/configure.ac b/configure.ac index c901cad09e8c..6ee3a993d14d 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([Collabora Office],[6.2.10.8],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.2.10.9],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source
sw/source/core/docnode/node.cxx |2 ++
sw/source/core/text/redlnitr.cxx |3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b6624e578120a117a7ff828a4a0e58fab9d4be6f
Author: Michael Stahl
AuthorDate: Thu Apr 2 18:59:40 2020 +0200
Commit: Michael Stahl
CommitDate: Tue Apr 7 10:50:18 2020 +0200
(related: tdf#130685) sw_redlinehide: fix update of pLastNode/pParaPropsNode
If you Select All, Cut then move the cursor around a bit then paste, then
this happens:
sw/source/core/text/txtfrm.cxx:3461: void
SwTextFrame::CalcAdditionalFirstLineOffset(): Assertion
`pTextNode->IsNumbered(getRootFrame()) == pTextNode->IsNumbered(nullptr)'
failed.
The reason is this borked MergedPara, which really only has 1 node it's
listening on, but pLastNode and pParaPropsNode point to a node that is actually
part of a different MergedPara now.
$6 = {
listener = {
m_rToTell = @0x6c02700,
m_vDepends = std::__debug::vector of length 1, capacity 256 = {{
= {
m_pRegisteredIn = 0x6af5f20
},
}}
},
extents = std::__debug::vector of length 0, capacity 0,
mergedText = "",
pParaPropsNode = 0x6d1c390,
pFirstNode = 0x6af5f20,
pLastNode = 0x6d1c390
}
The reason is that SwContentNode::DelFrames() doesn't update these members
properly; at the time when it's called for the previous pLastNode, the
offending node has Merge::NonFirst set already in the call of
CheckParaRedlineMerge() so it sets the wrong new pLastNode.
Fix this by iterating DelFrames() loop backward.
(regression from sw_redlinehide)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91597
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 520b0e1679d7a97aa3d91cfc95ca647339da7e84)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91524
Reviewed-by: Thorsten Behrens
(cherry picked from commit f8d0f77de20d6adf6f532d13003a96856a98f69b)
Change-Id: I508fd25af385a25ba9ed78d71aa3d1f02a7ac7a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91761
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 56986583b9d5..ff124e45b789 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1370,6 +1370,7 @@ void SwContentNode::DelFrames(SwRootFrame const*const
pLayout)
*static_cast(this), 0, Len());
// pointer should have been updated to a different node
assert(this != pMerged->pParaPropsNode);
+
assert(pMerged->listener.IsListeningTo(pMerged->pParaPropsNode));
assert(GetIndex() <= pMerged->pLastNode->GetIndex());
if (this == pMerged->pLastNode)
{
@@ -1390,6 +1391,7 @@ void SwContentNode::DelFrames(SwRootFrame const*const
pLayout)
}
}
assert(pMerged->pFirstNode->GetIndex() <=
pMerged->pLastNode->GetIndex());
+
assert(pMerged->listener.IsListeningTo(pMerged->pLastNode));
}
// avoid re-parenting mess (ModifyChangedHint)
pMerged->listener.EndListening(this);
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index db13203cb7a6..27321ecebf09 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -274,7 +274,8 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode &
rTextNode,
}
// unfortunately DelFrames() must be done before StartListening too,
// otherwise footnotes cannot be deleted by SwTextFootnote::DelFrames!
-for (auto iter = ++nodes.begin(); iter != nodes.end(); ++iter)
+auto const end(--nodes.rend());
+for (auto iter = nodes.rbegin(); iter != end; ++iter)
{
(**iter).DelFrames(rFrame.getRootFrame());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx | 43
sw/source/core/inc/txtfrm.hxx |2
sw/source/core/layout/frmtool.cxx | 32 +++
sw/source/core/undo/undel.cxx | 25 -
4 files changed, 69 insertions(+), 33 deletions(-)
New commits:
commit 79b30c6354ec3b22050f3cc71a27a6a83105602e
Author: Michael Stahl
AuthorDate: Thu Apr 2 17:18:37 2020 +0200
Commit: Michael Stahl
CommitDate: Tue Apr 7 10:49:54 2020 +0200
tdf#130685 sw_redlinehide: fix copying to position following redline
In DocumentContentOperationsManager::CopyWithFlyInFly(), first
CopyNodes() also creates all layout frames, then SaveRedlEndPosForRestore
fixes the end position of all redlines that were moved by CopyNodes()
(they were moved not by changing their position but by inserting
new nodes before their end position).
Of course this means that the layout frames are created with redlines
that have only a temporary end position, and then things go wrong when
the end positions are adjusted, so add something similar to
SwUndoDelete::UndoImpl() to recreate the frames in CopyWithFlyInFly().
This hit the assert:
sw/source/core/text/redlnitr.cxx:94: std::unique_ptr
sw::CheckParaRedlineMerge(SwTextFrame&, SwTextNode&, sw::FrameMode): Assertion
`pNode != &rTextNode || &pStart->nNode.GetNode() == &rTextNode' failed.
(regression from ... sw_redlinehide)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91596
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 166b5010b402a41b192b1659093a25acf9065fd9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91523
Reviewed-by: Thorsten Behrens
(cherry picked from commit f7aa951014c283bc629eaea14da2ca0d68f99431)
Change-Id: I82e0f5b320cab201e762f58800f83e08f4f01048
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91760
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index e09e04597409..693b965b3b9b 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3319,17 +3320,41 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
assert(!pCopiedPaM || pCopiedPaM->first.End()->nNode == rRg.aEnd);
SwDoc* pDest = rInsPos.GetNode().GetDoc();
+SwNodeIndex aSavePos( rInsPos );
-SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
-
-SwNodeIndex aSavePos( rInsPos, -1 );
-bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
-m_rDoc.GetNodes().CopyNodes( rRg, rInsPos, bMakeNewFrames, true );
-++aSavePos;
-if( bEndIsEqualEndPos )
-const_cast(rRg.aEnd) = aSavePos;
+{
+bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
+--aSavePos;
+SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
-aRedlRest.Restore();
+// insert behind the already copied start node
+m_rDoc.GetNodes().CopyNodes( rRg, rInsPos, false, true );
+aRedlRest.Restore();
+if (bMakeNewFrames) // tdf#130685 only after aRedlRest
+{ // recreate from previous node (could be merged now)
+if (SwTextNode *const pNode = aSavePos.GetNode().GetTextNode())
+{
+sw::RecreateStartTextFrames(*pNode);
+}
+}
+bool const isAtStartOfSection(aSavePos.GetNode().IsStartNode());
+++aSavePos;
+if (bMakeNewFrames)
+{
+// it's possible that CheckParaRedlineMerge() deleted frames
+// on rInsPos so have to include it, but it must not be included
+// if it was the first node in the document so that MakeFrames()
+// will find the existing (wasn't deleted) frame on it
+SwNodeIndex const end(rInsPos,
+(rInsPos.GetNode().IsEndNode() || isAtStartOfSection)
+? 0 : +1);
+::MakeFrames(pDest, aSavePos, end);
+}
+if (bEndIsEqualEndPos)
+{
+const_cast(rRg.aEnd) = aSavePos;
+}
+}
#if OSL_DEBUG_LEVEL > 0
{
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index b1eb8d954f69..21037bb6d754 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -144,6 +144,8 @@ bool IsMarkHidden(SwRootFrame const& rLayout,
::sw::mark::IMark const& rMark);
bool IsMarkHintHidden(SwRootFrame const& rLayout,
SwTextNode const& rNode, SwTextAttrEnd const& rHint);
+void RecreateStartTextFrames(SwTextNode & rNode);
+
} // namespace sw
/// Represents the visualization of a paragraph. Typical upper is an
diff --git
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit f37d4d3b31bad645e3bf12175b35864303489996
Author: Michael Stahl
AuthorDate: Tue Mar 31 17:37:51 2020 +0200
Commit: Michael Stahl
CommitDate: Tue Apr 7 10:49:37 2020 +0200
(related: tdf#130685) sw: fix ~SwIndexReg asserts from ...
... lcl_DeleteRedlines(), if there are redlines immediately consecutive
that get deleted; merge the SwPaM ring in that case which should help.
Change-Id: I07b67413ad6ee52bc81b89facc40202d0ca75e2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91595
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 27aa4b16bf704d0246595750daf57b57ff2577b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91522
Reviewed-by: Thorsten Behrens
(cherry picked from commit c7c157c905b8b70aa3e426a6e4d2ba40963caf1a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91759
Tested-by: Michael Stahl
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index f39ce71378ac..e09e04597409 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -375,6 +375,12 @@ namespace
lcl_SetCpyPos( *pREnd, *pStt, *pCpyStt,
*pDelPam->GetPoint(),
nDelCount );
}
+
+if (pDelPam->GetNext() &&
*pDelPam->GetNext()->End() == *pDelPam->Start())
+{
+*pDelPam->GetNext()->End() = *pDelPam->End();
+pDelPam.reset(pDelPam->GetNext());
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/app android/lib loleaflet/po
android/app/src/main/res/values-bg/strings.xml |2 ++ android/app/src/main/res/values-pt/strings.xml |2 ++ android/app/src/main/res/values-sk/strings.xml |3 +++ android/lib/src/main/res/values-sk/strings.xml |5 + loleaflet/po/help-bg.po| 20 +++- loleaflet/po/help-cs.po| 10 +- loleaflet/po/help-sk.po|6 ++ loleaflet/po/ios-ast.po|8 loleaflet/po/ios-bg.po | 15 --- loleaflet/po/ios-cs.po | 15 --- loleaflet/po/ios-dsb.po| 15 --- loleaflet/po/ios-hsb.po| 15 --- loleaflet/po/ios-nb.po | 15 --- loleaflet/po/ios-sk.po |8 loleaflet/po/ui-ast.po |4 ++-- loleaflet/po/ui-bg.po | 14 +- loleaflet/po/ui-cs.po | 10 -- loleaflet/po/ui-dsb.po |8 +++- loleaflet/po/ui-hsb.po |8 +++- loleaflet/po/ui-sk.po | 14 +- 20 files changed, 92 insertions(+), 105 deletions(-) New commits: commit 67d4f7add64f35e8ac5b310d4893c9d6fc86899c Author: Weblate AuthorDate: Tue Apr 7 10:13:08 2020 +0200 Commit: Andras Timar CommitDate: Tue Apr 7 10:45:49 2020 +0200 update translations LibreOffice Online/loleaflet-ui (Asturian) Currently translated at 36.6% (107 of 292 strings) Change-Id: I064a4cd65d2da5c0868b723491374f5d8fa2010f update translations LibreOffice Online/android-app (Portuguese) Currently translated at 100.0% (102 of 102 strings) Change-Id: If97285f20b6a576be13782b7e6fac1da77106c56 update translations LibreOffice Online/ios (Norwegian Bokmål) Currently translated at 100.0% (5 of 5 strings) Change-Id: I5ae4b60ad2ff62e1fb7ec07e4af62a71c4ca3fae update translations LibreOffice Online/ios (Asturian) Currently translated at 80.0% (4 of 5 strings) Change-Id: I34220c5e4a5070868047c2b446172d0a2143f1c8 update translations LibreOffice Online/ios (Upper Sorbian) Currently translated at 100.0% (5 of 5 strings) Change-Id: Ie7a92fd3deb77f4ae9ff963d5fcbd0188693f001 update translations LibreOffice Online/ios (Lower Sorbian) Currently translated at 100.0% (5 of 5 strings) Change-Id: I0c2c1847badc0f3457fa80a134429cc9b78e2d80 update translations LibreOffice Online/loleaflet-ui (Upper Sorbian) Currently translated at 100.0% (292 of 292 strings) Change-Id: I404d21c68f8748e724ee028c0d8b98d17dda9bd4 update translations LibreOffice Online/loleaflet-ui (Lower Sorbian) Currently translated at 100.0% (292 of 292 strings) Change-Id: I8c71fd434275e608ae6faf089732be64be7fd66e update translations LibreOffice Online/android-app (Bulgarian) Currently translated at 100.0% (102 of 102 strings) Change-Id: I7cb45cf765460a75e9c56d66de2c0ce5c543eb43 update translations LibreOffice Online/ios (Bulgarian) Currently translated at 100.0% (5 of 5 strings) Change-Id: I8f87197b12c07809dd277d87739b8203be2561d1 update translations LibreOffice Online/loleaflet-help (Bulgarian) Currently translated at 100.0% (416 of 416 strings) Change-Id: I3b9e39b0229b8d01ed42012ca40e5b22b832838f update translations LibreOffice Online/loleaflet-ui (Bulgarian) Currently translated at 99.7% (291 of 292 strings) Change-Id: I526e812b6c2012d9b53d15395468d6af7a9c9ef0 update translations LibreOffice Online/android-app (Slovak) Currently translated at 100.0% (102 of 102 strings) Change-Id: I83290565e16c21c9f5c5f0fd6abdf3615c606e05 update translations LibreOffice Online/android-lib (Slovak) Currently translated at 100.0% (12 of 12 strings) Change-Id: I10445623d69f6d9a46b7f24fc6781a488a98bb1b update translations LibreOffice Online/ios (Slovak) Currently translated at 100.0% (5 of 5 strings) Change-Id: Ieb8085e4ac8b2fd09b3de5c716a45d7eee74a5b2 update translations LibreOffice Online/loleaflet-help (Slovak) Currently translated at 98.6% (410 of 416 strings) Change-Id: I93e8cabdc1084e54dc3771d2a9a1553107b28933 update translations LibreOffice Online/loleaflet-ui (Slovak) Currently translated at 100.0% (292 of 292 strings) Change-Id: I5d38a321e0964155ac4636a08b2db8ff80ec0f7e update translations LibreOffice Online/loleaflet-help (Czech) Currently translated at 100.0% (
[Libreoffice-commits] core.git: extras/Package_gallmytheme.mk extras/source
extras/Package_gallmytheme.mk|6 +++--- extras/source/gallery/gallery_mytheme/symbol.sdv |binary extras/source/gallery/gallery_mytheme/symbol.thm |binary 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit d8e91c932dcbc5692661d437e74c51b395a061a2 Author: andreas kainz AuthorDate: Tue Apr 7 08:45:48 2020 +0200 Commit: andreas_kainz CommitDate: Tue Apr 7 10:43:20 2020 +0200 Gallery: change name from icons to symbols Change-Id: I562bd6ce4a53b66aba52c62a0a6130aaf0dd461f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91792 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk index 95c26e02841a..f964bc61d110 100644 --- a/extras/Package_gallmytheme.mk +++ b/extras/Package_gallmytheme.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDE flowchart.sdg \ flowchart.sdv \ flowchart.thm \ - icons.sdg \ - icons.sdv \ - icons.thm \ + symbol.sdg \ + symbol.sdv \ + symbol.thm \ )) diff --git a/extras/source/gallery/gallery_mytheme/icons.sdg b/extras/source/gallery/gallery_mytheme/symbol.sdg similarity index 100% rename from extras/source/gallery/gallery_mytheme/icons.sdg rename to extras/source/gallery/gallery_mytheme/symbol.sdg diff --git a/extras/source/gallery/gallery_mytheme/icons.sdv b/extras/source/gallery/gallery_mytheme/symbol.sdv similarity index 99% rename from extras/source/gallery/gallery_mytheme/icons.sdv rename to extras/source/gallery/gallery_mytheme/symbol.sdv index 6b5f0a7ebcad..b1c52a3a741b 100644 Binary files a/extras/source/gallery/gallery_mytheme/icons.sdv and b/extras/source/gallery/gallery_mytheme/symbol.sdv differ diff --git a/extras/source/gallery/gallery_mytheme/icons.thm b/extras/source/gallery/gallery_mytheme/symbol.thm similarity index 54% rename from extras/source/gallery/gallery_mytheme/icons.thm rename to extras/source/gallery/gallery_mytheme/symbol.thm index 0ffd59539002..3d1644b0d7b9 100644 Binary files a/extras/source/gallery/gallery_mytheme/icons.thm and b/extras/source/gallery/gallery_mytheme/symbol.thm differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 13 commits - i18npool/source jvmfwk/plugins oox/source sc/source sd/qa sd/source sfx2/source svx/source sw/source
i18npool/source/localedata/data/vi_VN.xml | 10 +--
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 12
oox/source/ppt/pptshape.cxx |4 +
sc/source/ui/unoobj/chart2uno.cxx |5 +
sd/qa/unit/data/pptx/tdf131554.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 11
sd/source/ui/animations/CustomAnimationPane.cxx |2
sfx2/source/view/viewprn.cxx|5 +
svx/source/dialog/srchdlg.cxx |2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 42 +---
sw/source/core/docnode/node.cxx |2
sw/source/core/inc/txtfrm.hxx |2
sw/source/core/layout/frmtool.cxx | 32
sw/source/core/layout/paintfrm.cxx |8 +--
sw/source/core/text/redlnitr.cxx|3 -
sw/source/core/text/txtfrm.cxx |2
sw/source/core/undo/undel.cxx | 25 -
17 files changed, 122 insertions(+), 45 deletions(-)
New commits:
commit 3e1f891a9f733f0b0a6d4f16e1455dd015661f7e
Merge: 931fcb444a46 eb40f8ba7d55
Author: Michael Weghorn
AuthorDate: Tue Apr 7 10:29:28 2020 +0200
Commit: Michael Weghorn
CommitDate: Tue Apr 7 10:29:28 2020 +0200
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: Ie9592c8a69a5fd404a95e9ea113784767b797ce2
commit eb40f8ba7d55489bd8bc2f8940dc5829402cded8
Author: Michael Weghorn
AuthorDate: Fri Apr 3 11:54:42 2020 +0200
Commit: Caolán McNamara
CommitDate: Tue Apr 7 10:18:42 2020 +0200
tdf#131849 Handle changed doc print options when printer changed
Previously, the SfxPrinterChangeFlags::OPTIONS flag was
only set for the case that the printer itself was considered
unchanged ('else' case below).
However, this also needs to be done when the printer is
considered to have changed, so the flag is properly
passed in the call to 'SetPrinter' below, to make
sure that changes in document-specific options are
properly propagated.
Change-Id: Id91ebbbf40888e52149b40ac25f188af4be425f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91626
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit 21fc54777d5dedc33d6bfa23b9f1072a6667eebe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91519
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2347f69584c4..8ee3fe18de04 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -542,6 +542,11 @@ void SfxViewShell::SetPrinter_Impl( VclPtr&
pNewPrinter )
if ( (aTempPrtName != aDocPrtName) || (pDocPrinter->IsDefPrinter() !=
pNewPrinter->IsDefPrinter()) )
{
nChangedFlags |=
SfxPrinterChangeFlags::PRINTER|SfxPrinterChangeFlags::JOBSETUP;
+if ( ! (pNewPrinter->GetOptions() == pDocPrinter->GetOptions()) )
+{
+nChangedFlags |= SfxPrinterChangeFlags::OPTIONS;
+}
+
pDocPrinter = pNewPrinter;
}
else
commit f8d0f77de20d6adf6f532d13003a96856a98f69b
Author: Michael Stahl
AuthorDate: Thu Apr 2 18:59:40 2020 +0200
Commit: Thorsten Behrens
CommitDate: Mon Apr 6 14:37:17 2020 +0200
(related: tdf#130685) sw_redlinehide: fix update of pLastNode/pParaPropsNode
If you Select All, Cut then move the cursor around a bit then paste, then
this happens:
sw/source/core/text/txtfrm.cxx:3461: void
SwTextFrame::CalcAdditionalFirstLineOffset(): Assertion
`pTextNode->IsNumbered(getRootFrame()) == pTextNode->IsNumbered(nullptr)'
failed.
The reason is this borked MergedPara, which really only has 1 node it's
listening on, but pLastNode and pParaPropsNode point to a node that is actually
part of a different MergedPara now.
$6 = {
listener = {
m_rToTell = @0x6c02700,
m_vDepends = std::__debug::vector of length 1, capacity 256 = {{
= {
m_pRegisteredIn = 0x6af5f20
},
}}
},
extents = std::__debug::vector of length 0, capacity 0,
mergedText = "",
pParaPropsNode = 0x6d1c390,
pFirstNode = 0x6af5f20,
pLastNode = 0x6d1c390
}
The reason is that SwContentNode::DelFrames() doesn't update these members
properly; at the time when it's called for the previous pLastNode, the
offending node has Merge::NonFirst set already in the call of
CheckParaRedlineMerge() so it sets the wrong new pLastNode.
Fix this by iterating DelFrames() loop backward.
(regression from sw_redlinehide)
Change-Id: I508fd25af385a25ba9ed78d71aa3d1f02a7ac7a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91597
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source
sfx2/source/view/viewprn.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit eb40f8ba7d55489bd8bc2f8940dc5829402cded8
Author: Michael Weghorn
AuthorDate: Fri Apr 3 11:54:42 2020 +0200
Commit: Caolán McNamara
CommitDate: Tue Apr 7 10:18:42 2020 +0200
tdf#131849 Handle changed doc print options when printer changed
Previously, the SfxPrinterChangeFlags::OPTIONS flag was
only set for the case that the printer itself was considered
unchanged ('else' case below).
However, this also needs to be done when the printer is
considered to have changed, so the flag is properly
passed in the call to 'SetPrinter' below, to make
sure that changes in document-specific options are
properly propagated.
Change-Id: Id91ebbbf40888e52149b40ac25f188af4be425f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91626
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit 21fc54777d5dedc33d6bfa23b9f1072a6667eebe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91519
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2347f69584c4..8ee3fe18de04 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -542,6 +542,11 @@ void SfxViewShell::SetPrinter_Impl( VclPtr&
pNewPrinter )
if ( (aTempPrtName != aDocPrtName) || (pDocPrinter->IsDefPrinter() !=
pNewPrinter->IsDefPrinter()) )
{
nChangedFlags |=
SfxPrinterChangeFlags::PRINTER|SfxPrinterChangeFlags::JOBSETUP;
+if ( ! (pNewPrinter->GetOptions() == pDocPrinter->GetOptions()) )
+{
+nChangedFlags |= SfxPrinterChangeFlags::OPTIONS;
+}
+
pDocPrinter = pNewPrinter;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
