date:20200212

Re: ESC meeting minutes: 2020-01-30

2020-02-12 Thread Stephan Bergmann


On 11/02/2020 20:51, Eivind Samseth wrote:

Just wanted to ping this issue, as I see the gerrit patch was abandoned?
https://gerrit.libreoffice.org/c/core/+/86216/2


That change is unrelated to 
 "After 
Update to 6.1.4 on macOS fonts are blurred on retina display (xcode 
10)".  (The change just had a somewhat unfortunate commit message, I 
resurrected it now with a hopefully less misleading one, 
 "Drop macOS SDK 10.12 
baseline".)


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

2020-02-12 Thread Miklos Vajna (via logerrit)

 vcl/source/window/event.cxx   |   10 ++
 vcl/source/window/window2.cxx |5 +
 2 files changed, 15 insertions(+)

New commits:
commit d1378b92c6697c09def7b3db8b36c3cf883b55c4
Author: Miklos Vajna 
AuthorDate: Tue Feb 11 21:06:06 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 12 09:10:55 2020 +0100

vcl: fix UB in Window::ImplGetFirstOverlapWindow()

mpWindowImpl can be nullptr here, see online.git's
unit-load-torture test:

vcl/source/window/window2.cxx:882:24: runtime error: member access within 
null pointer of type 'WindowImpl'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior 
vcl/source/window/window2.cxx:882:24 in

Surrouding code already checks for nullptr mpWindowImpl, so fix it directly
where the problem is reported, not a caller.

(Also fix a similar case in Window::ImplCallFocusChangeActivate().)

Change-Id: I34dee0fd49483c428a78fd48b54c00b2f0a26417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 31733682c18f..a31964ecd7fd 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -588,7 +588,17 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* 
pNewOverlapWindow,
 bool bCallActivate = true;
 bool bCallDeactivate = true;
 
+if (!pOldOverlapWindow)
+{
+return;
+}
+
 pOldRealWindow = pOldOverlapWindow->ImplGetWindow();
+if (!pNewOverlapWindow)
+{
+return;
+}
+
 pNewRealWindow = pNewOverlapWindow->ImplGetWindow();
 if ( (pOldRealWindow->GetType() != WindowType::FLOATINGWINDOW) ||
  pOldRealWindow->GetActivateMode() != ActivateModeFlags::NONE )
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 685b77a15666..d8aca4adc5eb 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -879,6 +879,11 @@ vcl::Window* Window::ImplGetBorderWindow() const
 
 vcl::Window* Window::ImplGetFirstOverlapWindow()
 {
+if (!mpWindowImpl)
+{
+return nullptr;
+}
+
 if ( mpWindowImpl->mbOverlapWin )
 return this;
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

2020-02-12 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit a7d1fed24557b203acb5016a98af26f4ef24d27a
Author: Stephan Bergmann 
AuthorDate: Tue Feb 11 15:46:45 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 12 09:11:45 2020 +0100

Hack to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi

...for Linux aarch64, similar to 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 
"Hack
to dynamically adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" for macOS 
x86-64.
But unlike on macOS (which is known to always use libcxxabi), be careful to 
only
execute the hack in builds targeting libcxxabi.

Change-Id: I5417fde425d2d6bac9400592193a9fe5d2bfe175
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88458
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 892bf6e81963..611442a31e31 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -136,6 +136,28 @@ std::type_info * getRtti(typelib_TypeDescription const & 
type) {
 extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
 __cxxabiv1::__cxa_exception * header =
 static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1;
+#if defined _LIBCPPABI_VERSION // detect libc++abi
+// The libcxxabi commit
+// 
+// "[libcxxabi] Align unwindHeader on a double-word boundary" towards
+// LLVM 5.0 changed the size of __cxa_exception by adding
+//
+//   __attribute__((aligned))
+//
+// to the final member unwindHeader, on x86-64 effectively adding a hole of
+// size 8 in front of that member (changing its offset from 88 to 96,
+// sizeof(__cxa_exception) from 120 to 128, and alignof(__cxa_exception)
+// from 8 to 16); a hack to dynamically determine whether we run against a
+// new libcxxabi is to look at the exceptionDestructor member, which must
+// point to this function (the use of __cxa_exception in fillUnoException 
is
+// unaffected, as it only accesses members towards the start of the struct,
+// through a pointer known to actually point at the start):
+if (header->exceptionDestructor != &deleteException) {
+header = reinterpret_cast<__cxa_exception const *>(
+reinterpret_cast(header) - 8);
+assert(header->exceptionDestructor == &deleteException);
+}
+#endif
 OUString unoName(toUnoName(header->exceptionType->name()));
 typelib_TypeDescription * td = 0;
 typelib_typedescription_getByName(&td, unoName.pData);
___
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' - vcl/source

2020-02-12 Thread Stephan Bergmann (via logerrit)

 vcl/source/control/edit.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit d84eaea950f276e7ba0d155cdbed056bcc815255
Author: Stephan Bergmann 
AuthorDate: Tue Feb 11 10:31:18 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 12 09:13:02 2020 +0100

tdf#130555: Prevent negative aSelection.Min()

...which would violate the the preconditions of the later call to 
maText.remove.

When BreakIteratorImpl::previousWord
(i18npool/source/breakiterator/breakiteratorImpl.cxx) is called to e.g. move
back over a single space at the start of the text, at least for an en-US 
locale
it will fall through to the call to BreakIterator_Unicode::previousWord
(i18npool/source/breakiterator/breakiterator_unicode.cxx) at the bottom of 
the
function.  That in turn calls icu::BreakIterator::preceding, which is 
documented
(workdir/UnpackedTarball/icu/source/common/unicode/brkiter.h) to return
icu::BreakIterator::DONE (i.e., -1, see
workdir/UnpackedTarball/icu/source/common/unicode/brkiter.h) in that case, 
which
causes BreakIterator_Unicode::previousWord to return a Boundary with 
startPos ==
endPos == -1.

The documentation of UNO method css.i18n.XBreakIterator::previousWord
(offapi/com/sun/star/i18n/XBreakIterator.idl) is silent about the expected
return value in such a case.  But lets assume that returning such a [-1..-1]
Boundary is as intended, and locally address this case in Edit::ImplDelete,
making aSelection start at the start of the text.

Change-Id: I40e17ba602088e72aa6962cb41dd8e1cdf6e2561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88431
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit e8f26dc13b65b1a05d948d9c95110c86315e8f20)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88402

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d76b4464ffcf..8cb0a06594fa 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -61,6 +61,7 @@
 
 #include 
 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -687,10 +688,14 @@ void Edit::ImplDelete( const Selection& rSelection, 
sal_uInt8 nDirection, sal_uI
 {
 i18n::Boundary aBoundary = xBI->getWordBoundary( 
maText.toString(), aSelection.Min(),
 GetSettings().GetLanguageTag().getLocale(), 
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
-if ( aBoundary.startPos == aSelection.Min() )
+auto startPos = aBoundary.startPos;
+if ( startPos == aSelection.Min() )
+{
 aBoundary = xBI->previousWord( maText.toString(), 
aSelection.Min(),
 GetSettings().GetLanguageTag().getLocale(), 
i18n::WordType::ANYWORD_IGNOREWHITESPACES );
-aSelection.Min() = aBoundary.startPos;
+startPos = std::max(aBoundary.startPos, sal_Int32(0));
+}
+aSelection.Min() = startPos;
 }
 else if ( nMode == EDIT_DELMODE_RESTOFCONTENT )
{
___
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' - sc/source

2020-02-12 Thread Muhammet Kara (via logerrit)

 sc/source/ui/view/tabvwsh2.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit a2122424ff711cd25e0cec177068bafe99284b9a
Author: Muhammet Kara 
AuthorDate: Wed Feb 12 05:42:11 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Feb 12 09:12:59 2020 +0100

mobile: Center inserted shapes on visible area

Change-Id: I366ef5d01ee3afb072b1f67d24015c889a41f4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88507
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index b21fdd31fd0c..8bc3bbfe1d1e 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -325,6 +326,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 
 // calc position and size
 bool bLOKIsActive = comphelper::LibreOfficeKit::isActive();
+bool bIsMobile = 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 Point aInsertPos;
 if(!bLOKIsActive)
 {
@@ -333,6 +335,16 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
 aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
 }
+else if (bIsMobile)
+{
+aInsertPos = GetViewData().getLOKVisibleArea().Center();
+
+aInsertPos.setX(sc::TwipsToHMM(aInsertPos.X()));
+aInsertPos.setY(sc::TwipsToHMM(aInsertPos.Y()));
+
+aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
+aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
+}
 else
 {
 aInsertPos = GetInsertPos();
___
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' - sc/source

2020-02-12 Thread Muhammet Kara (via logerrit)

 sc/source/ui/inc/viewdata.hxx  |5 +
 sc/source/ui/unoobj/docuno.cxx |3 +++
 2 files changed, 8 insertions(+)

New commits:
commit 539505e5af68297813a3a00f5f42715bde3eae5e
Author: Muhammet Kara 
AuthorDate: Wed Feb 12 05:39:07 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Feb 12 09:12:27 2020 +0100

Store and retrieve client visible area on ScViewData

So that core will be aware of the visible area on the client
side, and act accordingly when needed.

Change-Id: Ieca9b23deb36f3e713704304672dd7037154e904
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88506
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 14ec8584b86f..bf7350c46ae5 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -331,6 +331,7 @@ private:
 boolbGrowing;
 
 longm_nLOKPageUpDownOffset;
+tools::RectanglemaLOKVisibleArea;///< The visible area in the 
LibreOfficeKit client.
 
 DECL_DLLPRIVATE_LINK( EditEngineHdl, EditStatus&, void );
 
@@ -551,6 +552,10 @@ public:
 void ForcePageUpDownOffset(long nTwips) { m_nLOKPageUpDownOffset = nTwips; 
}
 long GetPageUpDownOffset() { return m_nLOKPageUpDownOffset; }
 
+/// The visible area in the client (set by setClientVisibleArea).
+const tools::Rectangle getLOKVisibleArea() const { return 
maLOKVisibleArea; }
+void setLOKVisibleArea(const tools::Rectangle& rArea) { maLOKVisibleArea = 
rArea; }
+
 voidKillEditView();
 voidResetEditView();
 voidSetEditEngine( ScSplitPos eWhich,
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index abee12a7def1..89fa194c4770 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -966,6 +966,9 @@ void ScModelObj::setClientVisibleArea(const 
tools::Rectangle& rRectangle)
 
 // set the PgUp/PgDown offset
 pViewData->ForcePageUpDownOffset(rRectangle.GetHeight());
+
+// Store the visible area so that we can use at places like shape insertion
+pViewData->setLOKVisibleArea(rRectangle);
 }
 
 void ScModelObj::setOutlineState(bool bColumn, int nLevel, int nIndex, bool 
bHidden)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: antivirusDetection.vbs configure.ac

2020-02-12 Thread Michel Thomas (via logerrit)

 antivirusDetection.vbs |   30 ++
 configure.ac   |   40 ++--
 2 files changed, 40 insertions(+), 30 deletions(-)

New commits:
commit 8d8f62852a64bd2fcae47a9499406d9167aebf83
Author: Michel Thomas 
AuthorDate: Tue Feb 11 21:34:57 2020 +0530
Commit: Mike Kaganski 
CommitDate: Wed Feb 12 09:14:03 2020 +0100

tdf#84553 Correctly handle failures while getting a WMI Object.

The output before this patch : checking for active Antivirus software... 
C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\antivirusDetection.vbs(1,
 1) (null): 0x8004100E

found

The link for which is : 
https://ci.libreoffice.org/job/gerrit_windows/57035/consoleFull

Change-Id: I714442739a8daf132e95b9f6a750aa7abab3561e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88465
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/antivirusDetection.vbs b/antivirusDetection.vbs
index a4e76731f0b6..ad22e267343d 100755
--- a/antivirusDetection.vbs
+++ b/antivirusDetection.vbs
@@ -1,19 +1,25 @@
+On Error Resume Next
 Set objWMIService = 
GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\SecurityCenter2")
-Set installedAntiviruses = objWMIService.ExecQuery("Select * from 
AntivirusProduct")
+If objWMIService is Nothing Then
+Wscript.StdOut.Write "NULL"
+Else
+Set installedAntiviruses = objWMIService.ExecQuery("Select * from 
AntivirusProduct")
 'Iterates through all the antivirus software,retrieved by the WMI 
query,present on the system and prints only the ones that are active
 'this is done by checking the 12th bit of the productState property of the 
antivirus
 'if 12th bit is on then it means that the antivirus is in active state
 'if 12th bit is off then it is inactive.
 'see http://neophob.com/2010/03/wmi-query-windows-securitycenter2/
-count=0
-list=""
-For Each antivirus in installedAntiviruses
-If  antivirus.productState And &h01000 Then 'checking the state of the 
12th bit of productState property of the antivirus
-count=count+1
-list=list & VBNewLine & VBtab & "*" & antivirus.displayName
+count=0
+list=""
+For Each antivirus in installedAntiviruses
+If  antivirus.productState And &h01000 Then 'checking the state of the 
12th bit of productState property of the antivirus
+count=count+1
+list=list & VBNewLine & VBtab & "*" & antivirus.displayName
+End if
+Next
+If count = 0 Then
+Wscript.StdOut.Write "NOT_FOUND"
+Else
+Wscript.Echo list
 End if
-Next
-If count = 0 Then
- Wscript.StdOut.Write "NOT_FOUND"
-Else Wscript.Echo list
-End if
+End if
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 615c9f2df8ee..4713f269ccbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12980,24 +12980,28 @@ dnl 
===
 if test $_os = WINNT ; then
 AC_MSG_CHECKING([for active Antivirus software])
 ANTIVIRUS_LIST=`cscript.exe //Nologo $SRC_ROOT/antivirusDetection.vbs`
-if [ [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ]; then
-AC_MSG_RESULT([found])
-
EICAR_STRING='X5O!P%@AP@<:@4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*'
-echo $EICAR_STRING > $SRC_ROOT/eicar
-EICAR_TEMP_FILE_CONTENTS=`cat $SRC_ROOT/eicar`
-rm $SRC_ROOT/eicar
-if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then
-AC_MSG_ERROR([Exclude the build and source directories associated 
with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST])
-fi
-echo $EICAR_STRING > $BUILDDIR/eicar
-EICAR_TEMP_FILE_CONTENTS=`cat $BUILDDIR/eicar`
-rm $BUILDDIR/eicar
-if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then
-AC_MSG_ERROR([Exclude the build and source directories associated 
with LibreOffice in the following Antivirus software: $ANTIVIRUS_LIST])
-fi
-add_warning "To speed up builds and avoid failures in unit tests, it 
is highly recommended that you exclude the build and source directories 
associated with LibreOffice in the following Antivirus software: 
$ANTIVIRUS_LIST"
-else
-AC_MSG_RESULT([not found])
+if [ [ "$ANTIVIRUS_LIST" != "NULL" ] ]; then
+if [ [ "$ANTIVIRUS_LIST" != "NOT_FOUND" ] ]; then
+AC_MSG_RESULT([found])
+
EICAR_STRING='X5O!P%@AP@<:@4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*'
+echo $EICAR_STRING > $SRC_ROOT/eicar
+EICAR_TEMP_FILE_CONTENTS=`cat $SRC_ROOT/eicar`
+rm $SRC_ROOT/eicar
+if [ [ "$EICAR_STRING" != "$EICAR_TEMP_FILE_CONTENTS" ] ]; then
+AC_MSG_ERROR([Exclude the build and source directories 
associated with LibreOffice in the following Antivirus software: 
$ANTIVIRUS_LIST])
+fi
+echo $EICAR_STRING

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

2020-02-12 Thread Muhammet Kara (via logerrit)

 sc/source/ui/view/tabvwsh2.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit c72da1dca660f2bd8b15f1d97f44302de3a5f03b
Author: Muhammet Kara 
AuthorDate: Wed Feb 12 05:49:11 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Feb 12 09:13:59 2020 +0100

lok: Center shape on insert also for Desktop view

Change-Id: I85c3fe3d0166eb42f46f2aa65d0319e582b851af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88508
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 8bc3bbfe1d1e..04b44768da17 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -326,7 +325,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 
 // calc position and size
 bool bLOKIsActive = comphelper::LibreOfficeKit::isActive();
-bool bIsMobile = 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 Point aInsertPos;
 if(!bLOKIsActive)
 {
@@ -335,7 +333,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
 aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
 }
-else if (bIsMobile)
+else
 {
 aInsertPos = GetViewData().getLOKVisibleArea().Center();
 
@@ -345,10 +343,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
 aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
 }
-else
-{
-aInsertPos = GetInsertPos();
-}
 
 tools::Rectangle aNewObjectRectangle(aInsertPos, 
Size(nDefaultObjectSizeWidth, nDefaultObjectSizeHeight));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: XML Schema Definition (XSD) for documentsignatures.xml

2020-02-12 Thread Miklos Vajna

Hi Steve,

On Tue, Feb 11, 2020 at 08:12:43PM +0100, Steve Martin 
 wrote:
> In the file documentsignatures.xml the attribute xmlns defines a default
> namespace for the elements  and . There is
> neither a reference by the attribute xmlns:xsi to the XML Schema Instance
> (XSI) namespace "http://www.w3.org/2001/XMLSchema-instance"; nor a reference
> by the attribute xsi:schemaLocation to the XML schema file
> xmldsig-core-schema.xsd. As a result, the entire content of the
> documentsignatures.xml file should not be validated under any scheme. Is
> that correct?

Probably not, given that there is a
schema/odf1.2/OpenDocument-v1.X-os-dsig-schema.rng schema for that file
in the ODF spec. Are you interested in fixing this yourself, i.e. do you
need code pointers where to look?

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/inc vcl/qt5

2020-02-12 Thread Michael Weghorn (via logerrit)

 vcl/inc/qt5/Qt5Menu.hxx |   16 
 vcl/qt5/Qt5Menu.cxx |   34 --
 2 files changed, 48 insertions(+), 2 deletions(-)

New commits:
commit 1e0b16f8695498e4eea7c2208aabf7e7664ce749
Author: Michael Weghorn 
AuthorDate: Wed Feb 12 08:07:42 2020 +0100
Commit: Michael Weghorn 
CommitDate: Wed Feb 12 09:18:21 2020 +0100

tdf#128921 tdf#130341 tdf#122053 qt5: Native PopupMenus

This implements native PopupMenus for the qt5 VCL plugin,
which not only gives them the native look and feel, but also
makes context menus faster (tdf#128921), accessible (e.g. to the
Orca screen reader, tdf#122053), and makes them work for a case
in Base's relationship dialog where entries in the non-native context
menu were not selectable/clickable (tdf#130341).

For now, this always shows the popup menu at cursor position, which
can be changed by taking the Rectangle passed to
'Qt5Menu::ShowNativePopupMenu' into account if there should be any
need.

Change-Id: Ie52cbc682acacb92716ff51e8bf7f1ab07d34cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88512
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index efcfb8eeb81c..2e5434f4db74 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -24,6 +24,17 @@ class QMenuBar;
 class Qt5MenuItem;
 class Qt5Frame;
 
+/*
+ * Qt5Menu can represent
+ * (1) the top-level menu of a menubar, in which case 'mbMenuBar' is true and
+ * 'mpQMenuBar' refers to the corresponding QMenuBar
+ * (2) another kind of menu (like a PopupMenu), in which case the 
corresponding QMenu
+ * object is instantiated and owned by this Qt5Menu (held in 
'mpOwnedQMenu').
+ * (3) a "submenu" in an existing menu (like (1)), in which case the 
corresponding
+ * QMenu object is owned by the corresponding Qt5MenuItem.
+ *
+ * For (2) and (3), member 'mpQMenu' points to the corresponding QMenu object.
+ */
 class Qt5Menu : public QObject, public SalMenu
 {
 Q_OBJECT
@@ -34,6 +45,9 @@ private:
 Qt5Frame* mpFrame;
 bool mbMenuBar;
 QMenuBar* mpQMenuBar;
+// self-created QMenu that this Qt5Menu represents, if applicable (s. 
comment for class)
+std::unique_ptr mpOwnedQMenu;
+// pointer to QMenu owned by the corresponding Qt5MenuItem or self (-> 
mpOwnedQMenu)
 QMenu* mpQMenu;
 QPushButton* mpCloseButton;
 QMetaObject::Connection maCloseButtonConnection;
@@ -58,6 +72,8 @@ public:
 virtual void SetFrame(const SalFrame* pFrame) override;
 const Qt5Frame* GetFrame() const;
 virtual void ShowMenuBar(bool bVisible) override;
+virtual bool ShowNativePopupMenu(FloatingWindow* pWin, const 
tools::Rectangle& rRect,
+ FloatWinPopupFlags nFlags) override;
 Qt5Menu* GetTopLevel();
 virtual void SetItemBits(unsigned nPos, MenuItemBits nBits) override;
 virtual void CheckItem(unsigned nPos, bool bCheck) override;
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index b2e752faedaa..98615247035a 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -24,6 +24,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 Qt5Menu::Qt5Menu(bool bMenuBar)
 : mpVCLMenu(nullptr)
 , mpParentSalMenu(nullptr)
@@ -77,8 +80,15 @@ void Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 [pSalMenuItem] { slotMenuAboutToHide(pSalMenuItem); });
 }
 }
-else if (mpQMenu)
+else
 {
+if (!mpQMenu)
+{
+// no QMenu set, instantiate own one
+mpOwnedQMenu.reset(new QMenu);
+mpQMenu = mpOwnedQMenu.get();
+}
+
 if (pSalMenuItem->mpSubMenu)
 {
 // submenu
@@ -148,7 +158,9 @@ void Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 
 UpdateActionGroupItem(pSalMenuItem);
 
-
pAction->setShortcut(toQString(nAccelKey.GetName(GetFrame()->GetWindow(;
+const Qt5Frame* pFrame = GetFrame();
+if (pFrame)
+
pAction->setShortcut(toQString(nAccelKey.GetName(pFrame->GetWindow(;
 
 connect(pAction, &QAction::triggered, this,
 [pSalMenuItem] { slotMenuTriggered(pSalMenuItem); });
@@ -442,6 +454,11 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar)
 Qt5MenuItem* pSalMenuItem = GetItemAtPos(nItem);
 InsertMenuItem(pSalMenuItem, nItem);
 SetItemImage(nItem, pSalMenuItem, pSalMenuItem->maImage);
+const bool bShowDisabled
+= bool(pMenuBar->GetMenuFlags() & 
MenuFlags::AlwaysShowDisabledEntries)
+  || !bool(pMenuBar->GetMenuFlags() & 
MenuFlags::HideDisabledEntries);
+const bool bVisible = bShowDisabled || 
mpVCLMenu->IsItemEnabled(pSalMenuItem->mnId);
+pSalMenuItem->getAction()->setVisible(bVisible);

[Libreoffice-commits] core.git: cui/source

2020-02-12 Thread Shubham Goyal (via logerrit)

 cui/source/dialogs/iconcdlg.cxx |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit f61e5e85c6bc3337eabfe3b9b69c4c1a3abf08e7
Author: Shubham Goyal <22shub...@gmail.com>
AuthorDate: Sun Jan 26 13:25:38 2020 +0530
Commit: Stephan Bergmann 
CommitDate: Wed Feb 12 09:19:46 2020 +0100

tdf#43157 Clean up DBG_ASSERT

Change-Id: Ie41f91f873d7cada5e738d758ad6b677adcee989
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87428
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 7f36bd8ddc85..fdeb3a36b780 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -121,7 +122,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ResetHdl, weld::Button&, void)
 ResetPageImpl ();
 
 IconChoicePageData* pData = GetPageData ( msCurrentPageId );
-DBG_ASSERT( pData, "ID not known" );
+assert( pData && "ID not known " );
 
 pData->xPage->Reset( *pSet );
 }
@@ -133,22 +134,20 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ResetHdl, weld::Button&, 
void)
 \**/
 void SvxHpLinkDlg::ActivatePageImpl()
 {
-DBG_ASSERT( !maPageList.empty(), "no Pages registered" );
+assert( !maPageList.empty() && "no Pages registered " );
 IconChoicePageData* pData = GetPageData ( msCurrentPageId );
-DBG_ASSERT( pData, "ID not known" );
-if ( pData )
-{
-if ( pData->bRefresh )
-{
-pData->xPage->Reset( *pSet );
-pData->bRefresh = false;
-}
+assert( pData && "ID not known " );
 
-if ( pExampleSet )
-pData->xPage->ActivatePage( *pExampleSet );
-m_xDialog->set_help_id(pData->xPage->GetHelpId());
+if ( pData->bRefresh )
+{
+pData->xPage->Reset( *pSet );
+pData->bRefresh = false;
 }
 
+if ( pExampleSet )
+pData->xPage->ActivatePage( *pExampleSet );
+m_xDialog->set_help_id(pData->xPage->GetHelpId());
+
 m_xResetBtn->show();
 }
 
@@ -216,7 +215,7 @@ void SvxHpLinkDlg::ResetPageImpl ()
 {
 IconChoicePageData *pData = GetPageData ( msCurrentPageId );
 
-DBG_ASSERT( pData, "ID not known" );
+assert( pData && "ID not known " );
 
 pData->xPage->Reset( *pSet );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ESC meeting minutes: 2020-01-30

2020-02-12 Thread Tor Lillqvist

>
>
>
> In a nutshell, you need to build with macOS SDK 10.13, as SDK 10.14 and
> 10.15 produce blurry results
>


But that sounds just like a silly workaround. Does anybody have any insight
in what the actual thing going on here is?

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sd/qa

2020-02-12 Thread Xisco Fauli (via logerrit)

 sd/qa/uitest/impress_tests/tdf130440.py |   45 
 1 file changed, 45 insertions(+)

New commits:
commit 718f540fb63af27c1336f89213444e9af753b8a9
Author: Xisco Fauli 
AuthorDate: Tue Feb 11 11:37:05 2020 +0100
Commit: Xisco Faulí 
CommitDate: Wed Feb 12 10:00:13 2020 +0100

tdf#130440: Add UItest

Change-Id: I7621e0576dedcc759f44e9662a3926d238d952d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88437
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sd/qa/uitest/impress_tests/tdf130440.py 
b/sd/qa/uitest/impress_tests/tdf130440.py
new file mode 100644
index ..f290d9c5d400
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf130440.py
@@ -0,0 +1,45 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf129346(UITestCase):
+
+   def test_run(self):
+self.ui_test.create_doc_in_start_center("impress")
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+document = self.ui_test.get_component()
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 1)
+self.xUITest.executeCommand(".uno:DuplicatePage")
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
+
+xDoc = self.xUITest.getTopFocusWindow()
+xEdit = xDoc.getChild("impress_win")
+xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))
+
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 1)
+self.xUITest.executeCommand(".uno:Redo")
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
+self.xUITest.executeCommand(".uno:Redo")
+
+xDoc = self.xUITest.getTopFocusWindow()
+xEdit = xDoc.getChild("impress_win")
+xEdit.executeAction("TYPE", mkPropertyValues({"TEXT":"test"}))
+
+#Without the accompanying fix in place, it would fail with 
AssertionError: 2 != 1
+self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source chart2/source desktop/source editeng/source filter/source hwpfilter/source i18npool/source oox/source sal/qa sc/source sdext/source sd/source svtools/sourc

2020-02-12 Thread Noel Grandin (via logerrit)

 basic/source/classes/sbunoobj.cxx  |6 -
 basic/source/runtime/methods.cxx   |2 
 basic/source/sbx/sbxscan.cxx   |8 --
 chart2/source/controller/dialogs/tp_AxisPositions.cxx  |4 -
 desktop/source/deployment/manager/dp_manager.cxx   |2 
 desktop/source/lib/init.cxx|1 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx|2 
 filter/source/graphicfilter/ipict/ipict.cxx|7 -
 hwpfilter/source/hgzip.cxx |3 
 i18npool/source/nativenumber/nativenumbersupplier.cxx  |6 -
 oox/source/export/shapes.cxx   |4 -
 sal/qa/osl/file/osl_File.cxx   |2 
 sc/source/core/data/column2.cxx|2 
 sc/source/core/data/drwlayer.cxx   |4 -
 sc/source/core/data/fillinfo.cxx   |   37 
--
 sc/source/core/tool/address.cxx|4 -
 sc/source/core/tool/compiler.cxx   |5 -
 sc/source/core/tool/interpr4.cxx   |2 
 sc/source/ui/docshell/impex.cxx|4 -
 sc/source/ui/miscdlgs/crnrdlg.cxx  |4 -
 sc/source/ui/unoobj/docuno.cxx |1 
 sc/source/ui/view/formatsh.cxx |   24 
++
 sc/source/ui/view/output2.cxx  |6 -
 sd/source/filter/eppt/epptso.cxx   |   12 ---
 sd/source/ui/view/drviews1.cxx |5 -
 sdext/source/pdfimport/filterdet.cxx   |   15 +---
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |4 -
 svtools/source/svrtf/parrtf.cxx|4 -
 svtools/source/table/tablecontrol_impl.cxx |   12 +--
 svx/source/accessibility/AccessibleFrameSelector.cxx   |3 
 svx/source/dialog/svxruler.cxx |2 
 svx/source/svdraw/svdview.cxx  |1 
 sw/source/core/doc/tblrwcl.cxx |1 
 sw/source/core/edit/ednumber.cxx   |   10 +-
 sw/source/core/fields/authfld.cxx  |9 --
 sw/source/core/frmedt/feshview.cxx |8 --
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |2 
 sw/source/core/text/wrong.cxx  |2 
 sw/source/filter/ww8/wrtw8nds.cxx  |6 -
 sw/source/uibase/ribbar/inputwin.cxx   |2 
 sw/source/uibase/shells/listsh.cxx |3 
 toolkit/source/awt/vclxtoolkit.cxx |3 
 tools/source/stream/strmunx.cxx|4 -
 ucb/source/cacher/cachedcontentresultset.cxx   |2 
 ucb/source/ucp/ftp/ftpdirp.cxx |2 
 vcl/qt5/Qt5Widget.cxx  |6 -
 vcl/source/app/svapp.cxx   |5 -
 vcl/source/fontsubset/cff.cxx  |2 
 vcl/source/fontsubset/sft.cxx  |2 
 vcl/source/gdi/bitmapex.cxx|2 
 vcl/source/outdev/outdevstate.cxx  |1 
 vcl/source/treelist/svimpbox.cxx   |3 
 vcl/source/window/printdlg.cxx |4 -
 vcl/unx/generic/app/i18n_xkb.cxx   |6 -
 vcl/unx/generic/print/common_gfx.cxx   |4 -
 xmlsecurity/source/dialogs/certificatechooser.cxx  |4 -
 56 files changed, 86 insertions(+), 205 deletions(-)

New commits:
commit f147b160aef1735d34c488353a7d4b875788a7e1
Author: Noel Grandin 
AuthorDate: Tue Feb 11 15:56:21 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 12 10:31:25 2020 +0100

clang-analyzer-deadcode.DeadStores

Change-Id: Ifa384933569b27d0d08eb479bb95b799163ae386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88450
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index ab3d5e54be40..4ba943acaf05 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -466

[Libreoffice-commits] core.git: configure.ac

2020-02-12 Thread Mike Kaganski (via logerrit)

 configure.ac |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 6fbe751aeed93153da8fc6c2da99d345b4659737
Author: Mike Kaganski 
AuthorDate: Sat Jan 4 14:24:02 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 12 10:52:53 2020 +0100

Drop macOS SDK 10.12 baseline

...which appears to no longer work due to incompatible changes incorporated 
in
LO code already.  sberg says: "The first issue I encountered when building
against the 10.12 SDK is 'fpicker/source/aqua/ControlHelper.hxx:119:78: 
error:
use of undeclared identifier 'NSControlStateValueOn''."

Change-Id: Ib762dd8eaa355925b9a81fb41b550c49bfcf53da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86216
Reviewed-by: Tor Lillqvist 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 4713f269ccbf..60f8d25611cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2803,7 +2803,7 @@ if test $_os = Darwin; then
 # higher than or equal to the minimum required should be found.
 
 AC_MSG_CHECKING([what macOS SDK to use])
-for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13 10.12}; do
+for _macosx_sdk in ${with_macosx_sdk-10.15 10.14 10.13}; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 with_macosx_sdk="${_macosx_sdk}"
@@ -2823,9 +2823,6 @@ if test $_os = Darwin; then
 AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH])
 
 case $with_macosx_sdk in
-10.12)
-MACOSX_SDK_VERSION=101200
-;;
 10.13)
 MACOSX_SDK_VERSION=101300
 ;;
@@ -2836,7 +2833,7 @@ if test $_os = Darwin; then
 MACOSX_SDK_VERSION=101500
 ;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.12--15])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.13--15])
 ;;
 esac
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"

2020-02-12 Thread himajin100000


Hi,

On 2020-02-12 18:50, Christian Lohmaier wrote:

 You didn't specify what commit you were trying to build, but I assume

it is fixed already with the push of translations yesterday, which
corresponds to 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=b995cd09a79e69b44d6765b00c1e4a3741db6f08

in core repository.

Thank you for the answer. I will try some other day to see if the 
warning has gone.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/bin

2020-02-12 Thread Miklos Vajna (via logerrit)

 solenv/bin/native-code.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit be10debe0ec7873bdc56977d0b9934c6eb165b9e
Author: Miklos Vajna 
AuthorDate: Wed Feb 12 11:00:15 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 12 11:11:55 2020 +0100

solenv: remove no longer needed OptionalBox widget factory

Not needed since commit 2d0944ab7a94ea0d5cd5f66c4895a0c99d9a3593
(Resolves: tdf#130513 sfxlo-OptionalBox isn't in sfx, 2020-02-08).

Fixes this Android build error:

/tmp/native-code-7aaa80.o:native-code.cxx:custom_widgets: error: undefined 
reference to 'makeOptionalBox'

Change-Id: Ib03c9516963e6b14c57ecfca9c7f78132dea2059
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88514
Reviewed-by: Miklos Vajna 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 57fa4b2e1895..032eb59a576c 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -506,7 +506,6 @@ custom_widgets = [
 'EmojiView',
 'IndexBox',
 'ManagedMenuButton',
-'OptionalBox',
 'PriorityHBox',
 'PriorityMergedHBox',
 'PropertyControl',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"

2020-02-12 Thread Christian Lohmaier

Hi *,

On Wed, Feb 12, 2020 at 7:22 AM himajin10  wrote:
>
> When I tried to build LibreOffice using --with-lang="ja de",
> I encountered the following warnings.
>
> warning: failed to load external entity
> "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"
> warning: failed to load external entity

That's a rather recent addition, and template updates for translations
and corresponding translation entries for that file were not submitted
to the translations repo until yesterday.

You didn't specify what commit you were trying to build, but I assume
it is fixed already with the push of translations yesterday, which
corresponds to 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=b995cd09a79e69b44d6765b00c1e4a3741db6f08
in core repository.

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loleaflet/src

2020-02-12 Thread Dennis Francis (via logerrit)

 loleaflet/src/control/Control.ContextMenu.js |   27 +--
 loleaflet/src/unocommands.js |5 +
 2 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit 5460aa108c10f044a20863b5fe82efa921a51291
Author: Dennis Francis 
AuthorDate: Tue Feb 11 15:34:41 2020 +0530
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:18:40 2020 +0100

Add 'Delete' to context menu on non-text selection

The context menu items are obtained from core. Add a 'Delete'
entry to the context-menu json data just after 'Paste' only if
the selection is graphic and online is in Mobile mode.

Change-Id: Ie5810038bbca5d8ace01b236508b2dd4d31ca2a7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88510
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.ContextMenu.js 
b/loleaflet/src/control/Control.ContextMenu.js
index 83a57730c..9912729ce 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -20,7 +20,7 @@ L.Control.ContextMenu = L.Control.extend({
 * in following list is just for reference and ease of 
locating uno command
 * from context menu structure.
 */
-   general: ['Cut', 'Copy', 'Paste',
+   general: ['Cut', 'Copy', 'Paste', 'Delete',
  'NumberingStart', 
'ContinueNumbering', 'IncrementLevel', 'DecrementLevel',
  'OpenHyperlinkOnCursor', 
'CopyHyperlinkLocation', 'RemoveHyperlink',
  'AnchorMenu', 'SetAnchorToPage', 
'SetAnchorToPara', 'SetAnchorAtChar',
@@ -104,6 +104,8 @@ L.Control.ContextMenu = L.Control.extend({
this._onClosePopup();
}
 
+   this._amendContextMenuData(obj);
+
var contextMenu = this._createContextMenuStructure(obj);
var spellingContextMenu = false;
for (var menuItem in contextMenu) {
@@ -154,6 +156,27 @@ L.Control.ContextMenu = L.Control.extend({
}
},
 
+   _amendContextMenuData: function(obj) {
+
+   // Add a 'delete' entry for mobile when selection is 
ole/image/shape
+   if (this._map._clip && this._map._clip._selectionType === 
'complex' &&
+   window.mode.isMobile()) {
+
+   var insertIndex = -1;
+   obj.menu.forEach(function(item, index) {
+   if (item.command === '.uno:Paste') {
+   insertIndex = index + 1;
+   }
+   });
+
+   if (insertIndex != -1) {
+   obj.menu.splice(insertIndex, 0,
+   { text: _('Delete'), type: 'command', 
command: '.uno:Delete', enabled: true });
+   }
+   }
+
+   },
+
_createContextMenuStructure: function(obj) {
var docType = this._map.getDocType();
var contextMenu = {};
@@ -205,7 +228,7 @@ L.Control.ContextMenu = L.Control.extend({
item.command = '.uno:HideNote';
}
 
-   if (hasParam || commandName === 'None' || 
commandName === 'FontDialogForParagraph') {
+   if (hasParam || commandName === 'None' || 
commandName === 'FontDialogForParagraph' || commandName === 'Delete') {
itemName = 
window.removeAccessKey(item.text);
itemName = itemName.replace(' ', 
'\u00a0');
} else {
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 08335e9f1..82a07e0a9 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -57,6 +57,7 @@ var unoCommandsArray = {
DefaultBullet:{global:{context:_('Toggle Bulleted 
List'),menu:_('~Bulleted List'),},},
DefaultNumbering:{global:{context:_('Toggle Numbered 
List'),menu:_('~Numbered List'),},},
DelBreakMenu:{spreadsheet:{menu:_('Delete Page ~Break'),},},
+   Delete:{global:{menu:_('Delete 
C~ontents...'),},spreadsheet:{context:_('Cl~ear Contents...'),menu:_('Cle~ar 
Cells...'),},},
DeleteAllNotes:{global:{menu:_('Delete All 
Comments'),},spreadsheet:{menu:_('Delete All Comments'),},},
DeleteAuthor:{global:{menu:_('Delete All Comments by This Author'),},},
DeleteAxis:{global:{menu:_('Delete Axis'),},},
@@ -117,7 +118,6 @@ var unoCommandsArray = {
FormatYErrorBars:{global:{menu:_('Format Y Error Bars...'),},},
FormattingMarkMenu:{global:{menu:_('Formatting Mark'),},},
FullScreen:{global:{

[Libreoffice-commits] online.git: loleaflet/po

2020-02-12 Thread Andras Timar (via logerrit)

 loleaflet/po/templates/ios.pot|2 
 loleaflet/po/templates/loleaflet-help.pot | 1096 +++---
 loleaflet/po/templates/loleaflet-ui.pot   |  272 +++
 3 files changed, 693 insertions(+), 677 deletions(-)

New commits:
commit b9917890b12aec2d42fc128761b31bbed20b48c8
Author: Andras Timar 
AuthorDate: Wed Feb 12 11:05:00 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:18:58 2020 +0100

loleaflet: updated pot files

Change-Id: I0c2d249677575a034552a114096665668b0c9429
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88515
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/po/templates/ios.pot b/loleaflet/po/templates/ios.pot
index b366301b2..c13ea4ee0 100644
--- a/loleaflet/po/templates/ios.pot
+++ b/loleaflet/po/templates/ios.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-13 12:22+0200\n"
+"POT-Creation-Date: 2020-02-12 11:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index 27cb3aba3..cbd6ade2d 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-15 17:50+0200\n"
+"POT-Creation-Date: 2020-02-12 11:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -12,1046 +12,1046 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 2.4.0\n"
 
-#: html/loleaflet-help.html%2Bdiv.h1:16-5
+#: html/loleaflet-help.html%2Bdiv.h1:19-5
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.h2:18-9
+#: html/loleaflet-help.html%2Bdiv.div.h2:21-9
 msgid "General Keyboard Shortcuts"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:20-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:23-18
 msgid "Undo"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:20-49
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:23-49
 msgid "Ctrl + Z"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:21-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:24-18
 msgid "Redo"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:21-49
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:24-49
 msgid "Ctrl + Y"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:22-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:25-18
 msgid "Cut"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:22-48
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:25-48
 msgid "Ctrl + X"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:23-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:26-18
 msgid "Paste as unformatted text"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:23-70
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:26-70
 msgid "Ctrl + Alt + Shift + V"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:24-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:27-18
 msgid "Print (Download as PDF)"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:24-68
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:27-68
 msgid "Ctrl + P"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:25-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:28-18
 msgid "Display the Keyboard shortcuts help"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:25-80
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:28-80
 msgid "Ctrl + Shift + ?"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.h2:29-9
-#: html/loleaflet-help.html%2Bdiv.div.h2:151-9
+#: html/loleaflet-help.html%2Bdiv.div.h2:32-9
+#: html/loleaflet-help.html%2Bdiv.div.h2:154-9
 msgid "Text formatting"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-18
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:128-18
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:153-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:34-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:131-18
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:156-18
 msgid "Bold"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-49
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:128-49
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:153-49
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:34-49
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:131-49
+#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:156-49
 msgid "Ctrl + B"
 msgstr ""
 
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:32-18
-#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:129-18
-#: html/loleaflet-hel

[Libreoffice-commits] online.git: loolwsd.xml.in

2020-02-12 Thread Andras Timar (via logerrit)

 loolwsd.xml.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e24eda5d6460895d2d1e3c15d602debc8f7d7a5d
Author: Andras Timar 
AuthorDate: Tue Feb 11 13:09:07 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:20:01 2020 +0100

tdf#129928 add a comment

Change-Id: I3e9714445b815d71113450827dd72bcf0ba5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88441
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index d71119105..69ab6e934 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -71,6 +71,8 @@
 
 
 
+  
   all
   any
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/lib loleaflet/po

2020-02-12 Thread Weblate (via logerrit)

 android/lib/src/main/res/values-bg/strings.xml  |1 
 android/lib/src/main/res/values-dsb/strings.xml |1 
 android/lib/src/main/res/values-eu/strings.xml  |1 
 android/lib/src/main/res/values-hsb/strings.xml |1 
 loleaflet/po/help-ca.po |   14 ++--
 loleaflet/po/help-gl.po |   84 
 6 files changed, 53 insertions(+), 49 deletions(-)

New commits:
commit fefc477f3b0c9fe9b5c614d590236ae9db6dbe78
Author: Weblate 
AuthorDate: Wed Feb 12 11:19:00 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:21:00 2020 +0100

update translations

LibreOffice Online/android-lib (Bulgarian)
Currently translated at 100.0% (7 of 7 strings)

Change-Id: I00530286bf66db4b7907b6f6bf08693622a6d7fd

update translations

LibreOffice Online/android-lib (Lower Sorbian)
Currently translated at 100.0% (7 of 7 strings)

Change-Id: I57645233bd8763b1fb53b4d038a1d9cd433b52d5

update translations

LibreOffice Online/android-lib (Basque)
Currently translated at 100.0% (7 of 7 strings)

Change-Id: Idbb54d4b1759c459a69ef84a9a264e366e697520

update translations

LibreOffice Online/android-lib (Upper Sorbian)
Currently translated at 100.0% (7 of 7 strings)

Change-Id: Ie9b822558edbec57ef62f8886910f129e1fe0f65

update translations

LibreOffice Online/loleaflet-help (Galician)
Currently translated at 71.9% (299 of 416 strings)

Change-Id: I2a807adbc4dcff0aead5014e7e4aec0f98ba3a49

update translations

LibreOffice Online/loleaflet-help (Galician)
Currently translated at 68.5% (285 of 416 strings)

Change-Id: I79ac0f5567550ec4d249ccaa4a28e679d64e

update translations

LibreOffice Online/loleaflet-help (Galician)
Currently translated at 66.6% (277 of 416 strings)

Change-Id: Ia9515c1195813b68f834fa72f3c02c9849ba3f1e

update translations

LibreOffice Online/loleaflet-help (Catalan)
Currently translated at 69.7% (290 of 416 strings)

Change-Id: I3ca0aeeb7bf3c55133df1f8836cce51038289a10
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88436
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/android/lib/src/main/res/values-bg/strings.xml 
b/android/lib/src/main/res/values-bg/strings.xml
index 42a2cd1b0..d081bf624 100644
--- a/android/lib/src/main/res/values-bg/strings.xml
+++ b/android/lib/src/main/res/values-bg/strings.xml
@@ -6,4 +6,5 @@
 Неуспешно определяне на файла за 
зареждане
 Изисква се разрешение за 
съхранение
 Този файл е само за четене, 
записването е изключено.
+Записване...
 
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-dsb/strings.xml 
b/android/lib/src/main/res/values-dsb/strings.xml
index a5d8e1b60..675222b26 100644
--- a/android/lib/src/main/res/values-dsb/strings.xml
+++ b/android/lib/src/main/res/values-dsb/strings.xml
@@ -6,4 +6,5 @@
 Njejo se raźiło, dataju zwěsćiś, 
kótaraž ma se zacytaś.
 Pšawo za składowanje jo 
trěbne.
 Toś ta dataja dajo se janož 
cytaś, składowanje jo znjemóžnjone.
+Składujo se...
 
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-eu/strings.xml 
b/android/lib/src/main/res/values-eu/strings.xml
index f489aadeb..af6925c6d 100644
--- a/android/lib/src/main/res/values-eu/strings.xml
+++ b/android/lib/src/main/res/values-eu/strings.xml
@@ -6,4 +6,5 @@
 Huts egin du kargatu behar den 
fitxategia zehazteak
 Biltegiratze-baimena behar 
da
 Fitxategia irakurtzeko soilik da, 
gordetzea desgaituta dago.
+Gordetzen...
 
\ No newline at end of file
diff --git a/android/lib/src/main/res/values-hsb/strings.xml 
b/android/lib/src/main/res/values-hsb/strings.xml
index 865ff1e77..fae5dccb1 100644
--- a/android/lib/src/main/res/values-hsb/strings.xml
+++ b/android/lib/src/main/res/values-hsb/strings.xml
@@ -6,4 +6,5 @@
 Njeje so poradźiło, dataju zwěsćić, 
kotraž ma so začitać.
 Prawo za składowanje je 
trěbne.
 Tuta dataja da so jenož čitać, 
składowanje je znjemóžnjene.
+Składuje so...
 
\ No newline at end of file
diff --git a/loleaflet/po/help-ca.po b/loleaflet/po/help-ca.po
index 8b628fd6f..03321a92c 100644
--- a/loleaflet/po/help-ca.po
+++ b/loleaflet/po/help-ca.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-12-15 17:50+0200\n"
-"PO-Revision-Date: 2020-02-10 11:01+\n"
+"PO-Revision-Date: 2020-02-11 10:13+\n"
 "Last-Translator: Adolfo Jayme Barrientos \n"
 "Language-Team: Catalan 
\n"
 "Language: ca\n"
@@ -1752,7 +1752,7 @@ msgstr ""
 
 #: html/loleaflet-help.html%2Bdiv.div.h4:548-5
 msgid "How can I copy the formatting of existing cells to new ones?"
-msgstr ""
+msgstr "Com pot copiar la format

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - vcl/source

2020-02-12 Thread Stephan Bergmann (via logerrit)

 vcl/source/control/edit.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 9407bd3c08d4bab5a9a39aac9bd1639def31281d
Author: Stephan Bergmann 
AuthorDate: Tue Feb 11 10:31:18 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 12 11:31:09 2020 +0100

tdf#130555: Prevent negative aSelection.Min()

...which would violate the the preconditions of the later call to 
maText.remove.

When BreakIteratorImpl::previousWord
(i18npool/source/breakiterator/breakiteratorImpl.cxx) is called to e.g. move
back over a single space at the start of the text, at least for an en-US 
locale
it will fall through to the call to BreakIterator_Unicode::previousWord
(i18npool/source/breakiterator/breakiterator_unicode.cxx) at the bottom of 
the
function.  That in turn calls icu::BreakIterator::preceding, which is 
documented
(workdir/UnpackedTarball/icu/source/common/unicode/brkiter.h) to return
icu::BreakIterator::DONE (i.e., -1, see
workdir/UnpackedTarball/icu/source/common/unicode/brkiter.h) in that case, 
which
causes BreakIterator_Unicode::previousWord to return a Boundary with 
startPos ==
endPos == -1.

The documentation of UNO method css.i18n.XBreakIterator::previousWord
(offapi/com/sun/star/i18n/XBreakIterator.idl) is silent about the expected
return value in such a case.  But lets assume that returning such a [-1..-1]
Boundary is as intended, and locally address this case in Edit::ImplDelete,
making aSelection start at the start of the text.

Change-Id: I40e17ba602088e72aa6962cb41dd8e1cdf6e2561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88431
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit e8f26dc13b65b1a05d948d9c95110c86315e8f20)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88402
(cherry picked from commit d84eaea950f276e7ba0d155cdbed056bcc815255)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88490
Reviewed-by: Xisco Faulí 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d76b4464ffcf..8cb0a06594fa 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -61,6 +61,7 @@
 
 #include 
 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -687,10 +688,14 @@ void Edit::ImplDelete( const Selection& rSelection, 
sal_uInt8 nDirection, sal_uI
 {
 i18n::Boundary aBoundary = xBI->getWordBoundary( 
maText.toString(), aSelection.Min(),
 GetSettings().GetLanguageTag().getLocale(), 
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
-if ( aBoundary.startPos == aSelection.Min() )
+auto startPos = aBoundary.startPos;
+if ( startPos == aSelection.Min() )
+{
 aBoundary = xBI->previousWord( maText.toString(), 
aSelection.Min(),
 GetSettings().GetLanguageTag().getLocale(), 
i18n::WordType::ANYWORD_IGNOREWHITESPACES );
-aSelection.Min() = aBoundary.startPos;
+startPos = std::max(aBoundary.startPos, sal_Int32(0));
+}
+aSelection.Min() = startPos;
 }
 else if ( nMode == EDIT_DELMODE_RESTOFCONTENT )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source

2020-02-12 Thread Stephan Bergmann (via logerrit)

 vcl/source/control/edit.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6aee963e87836eceee4c65ab55aa8e8e270d7559
Author: Stephan Bergmann 
AuthorDate: Tue Feb 11 10:31:18 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 12 11:31:29 2020 +0100

tdf#130555: Prevent negative aSelection.Min()

...which would violate the the preconditions of the later call to 
maText.remove.

When BreakIteratorImpl::previousWord
(i18npool/source/breakiterator/breakiteratorImpl.cxx) is called to e.g. move
back over a single space at the start of the text, at least for an en-US 
locale
it will fall through to the call to BreakIterator_Unicode::previousWord
(i18npool/source/breakiterator/breakiterator_unicode.cxx) at the bottom of 
the
function.  That in turn calls icu::BreakIterator::preceding, which is 
documented
(workdir/UnpackedTarball/icu/source/common/unicode/brkiter.h) to return
icu::BreakIterator::DONE (i.e., -1, see
workdir/UnpackedTarball/icu/source/common/unicode/brkiter.h) in that case, 
which
causes BreakIterator_Unicode::previousWord to return a Boundary with 
startPos ==
endPos == -1.

The documentation of UNO method css.i18n.XBreakIterator::previousWord
(offapi/com/sun/star/i18n/XBreakIterator.idl) is silent about the expected
return value in such a case.  But lets assume that returning such a [-1..-1]
Boundary is as intended, and locally address this case in Edit::ImplDelete,
making aSelection start at the start of the text.

Change-Id: I40e17ba602088e72aa6962cb41dd8e1cdf6e2561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88431
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit e8f26dc13b65b1a05d948d9c95110c86315e8f20)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88403
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d38d85a986c1..8ef8778ee132 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -68,6 +68,7 @@
 
 #include 
 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -697,10 +698,14 @@ void Edit::ImplDelete( const Selection& rSelection, 
sal_uInt8 nDirection, sal_uI
 {
 i18n::Boundary aBoundary = xBI->getWordBoundary( 
maText.toString(), aSelection.Min(),
 GetSettings().GetLanguageTag().getLocale(), 
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true );
-if ( aBoundary.startPos == aSelection.Min() )
+auto startPos = aBoundary.startPos;
+if ( startPos == aSelection.Min() )
+{
 aBoundary = xBI->previousWord( maText.toString(), 
aSelection.Min(),
 GetSettings().GetLanguageTag().getLocale(), 
i18n::WordType::ANYWORD_IGNOREWHITESPACES );
-aSelection.Min() = aBoundary.startPos;
+startPos = std::max(aBoundary.startPos, sal_Int32(0));
+}
+aSelection.Min() = startPos;
 }
 else if ( nMode == EDIT_DELMODE_RESTOFCONTENT )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sw/source

2020-02-12 Thread Muhammet Kara (via logerrit)

 desktop/source/lib/init.cxx  |3 ++-
 sw/source/uibase/uiview/viewstat.cxx |   14 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 97988a0705b95b6bf6d32f38c66e954d3012ec38
Author: Muhammet Kara 
AuthorDate: Sat Jan 25 04:10:38 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:43:35 2020 +0100

lok: Add LOK_CALLBACK_STATE_CHANGED for uno:Orientation

Change-Id: Iab3aaf742bdb9fc4b9c5875fee7d769fa0581eeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87370
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88451
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ed3bc77c2667..90989c45df96 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2654,7 +2654,8 @@ static void doc_iniUnoCommands ()
 OUString(".uno:OnlineAutoFormat"),
 OUString(".uno:InsertSymbol"),
 OUString(".uno:EditRegion"),
-OUString(".uno:ThesaurusDialog")
+OUString(".uno:ThesaurusDialog"),
+OUString(".uno:Orientation")
 };
 
 util::URL aCommandURL;
diff --git a/sw/source/uibase/uiview/viewstat.cxx 
b/sw/source/uibase/uiview/viewstat.cxx
index ca90d62f1528..caa3bd34a6a2 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -187,6 +187,20 @@ void SwView::GetState(SfxItemSet &rSet)
 }
 
 ::PageDescToItemSet( rDesc, rSet);
+
+if (nWhich == SID_ATTR_PAGE_ORIENTATION && 
comphelper::LibreOfficeKit::isActive())
+{
+OString aPayload = ".uno:Orientation=";
+if (rDesc.GetLandscape())
+{
+aPayload += "IsLandscape";
+}
+else
+{
+aPayload += "IsPortrait";
+}
+libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED, 
aPayload.getStr());
+}
 }
 break;
 case RES_BACKGROUND:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source

2020-02-12 Thread Xisco Fauli (via logerrit)

 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e2aa8de67c3bf0cc09160b256c825fb586947ce6
Author: Xisco Fauli 
AuthorDate: Tue Feb 11 12:11:32 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 12 11:49:12 2020 +0100

tdf#130440 only select first page if no other page is selected

Found while implementing the UItest.
See https://gerrit.libreoffice.org/c/core/+/88437
it asserts on line 34 AssertionError: 2 != 1 as the first and
second slides are selected

Change-Id: I249dc0ac6faa55f0f15deedb848beabbc64aeed4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88439
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 
(cherry picked from commit 7ed602a3b8c0ffe922b4f082cd4cdaa5a8f0d64c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88405
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index e146ee0a960c..81403c7bc1d8 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -130,7 +130,7 @@ void SelectionObserver::EndObservation()
 bool bSuccess = 
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
 // tdf#129346 nothing currently selected, select something, if possible
 // but (tdf#129346) only if setting focus to current page failed
-if (!bSuccess && rSelector.GetPageCount())
+if (!bSuccess && rSelector.GetPageCount() && 
rSelector.GetSelectedPageCount() == 0)
 rSelector.SelectPage(0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2020-02-12 Thread Muhammet Kara (via logerrit)

 sc/source/ui/inc/viewdata.hxx  |5 +
 sc/source/ui/unoobj/docuno.cxx |3 +++
 2 files changed, 8 insertions(+)

New commits:
commit 7e199ce239dca603a0bf8aae1ff03b778e8273a0
Author: Muhammet Kara 
AuthorDate: Wed Feb 12 05:39:07 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:53:16 2020 +0100

Store and retrieve client visible area on ScViewData

So that core will be aware of the visible area on the client
side, and act accordingly when needed.

Change-Id: Ieca9b23deb36f3e713704304672dd7037154e904
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88487
Reviewed-by: Muhammet Kara 
Reviewed-by: Andras Timar 
Tested-by: Jenkins

diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index c691d2816814..e5833dec5d32 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -333,6 +333,7 @@ private:
 boolbGrowing;
 
 longm_nLOKPageUpDownOffset;
+tools::RectanglemaLOKVisibleArea;///< The visible area in the 
LibreOfficeKit client.
 
 DECL_DLLPRIVATE_LINK( EditEngineHdl, EditStatus&, void );
 
@@ -554,6 +555,10 @@ public:
 void ForcePageUpDownOffset(long nTwips) { m_nLOKPageUpDownOffset = nTwips; 
}
 long GetPageUpDownOffset() const { return m_nLOKPageUpDownOffset; }
 
+/// The visible area in the client (set by setClientVisibleArea).
+const tools::Rectangle& getLOKVisibleArea() const { return 
maLOKVisibleArea; }
+void setLOKVisibleArea(const tools::Rectangle& rArea) { maLOKVisibleArea = 
rArea; }
+
 voidKillEditView();
 voidResetEditView();
 voidSetEditEngine( ScSplitPos eWhich,
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 8195d4e8f3ec..475cf5573aea 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -961,6 +961,9 @@ void ScModelObj::setClientVisibleArea(const 
tools::Rectangle& rRectangle)
 
 // set the PgUp/PgDown offset
 pViewData->ForcePageUpDownOffset(rRectangle.GetHeight());
+
+// Store the visible area so that we can use at places like shape insertion
+pViewData->setLOKVisibleArea(rRectangle);
 }
 
 void ScModelObj::setOutlineState(bool bColumn, int nLevel, int nIndex, bool 
bHidden)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2020-02-12 Thread Jan Holesovsky (via logerrit)

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ed3d1f3e1368f81e928cc1ecc4c127a3d540d96e
Author: Jan Holesovsky 
AuthorDate: Tue Feb 11 23:55:52 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 11:56:36 2020 +0100

If asked to do so, enable icecream even in the 'build' part of configure.

Otherwise it is used only in the 'host' part of the cross-compile build.

Change-Id: Ifb8d88e18c131e3019a4f3168afc1b743f3cc8e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88486
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index 60f8d25611cd..631a4a9709f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4791,6 +4791,7 @@ if test "$cross_compiling" = "yes"; then
 --disable-gtk3 \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
+--enable-icecream="$enable_icecream" \
 --with-parallelism="$with_parallelism" \
 --without-doxygen \
 --without-java \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/inc canvas/IwyuFilter_canvas.yaml canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas.mk ca

2020-02-12 Thread Noel Grandin (via logerrit)

 canvas/IwyuFilter_canvas.yaml |8 +++
 canvas/Library_cairocanvas.mk |5 +
 canvas/Library_canvasfactory.mk   |5 +
 canvas/Library_canvastools.mk |5 +
 canvas/Library_directx9canvas.mk  |5 +
 canvas/Library_gdipluscanvas.mk   |5 +
 canvas/Library_oglcanvas.mk   |5 +
 canvas/Library_simplecanvas.mk|5 +
 canvas/Library_vclcanvas.mk   |5 +
 canvas/StaticLibrary_directxcanvas.mk |5 +
 canvas/inc/base/basemutexhelper.hxx   |5 -
 canvas/inc/base/bitmapcanvasbase.hxx  |7 --
 canvas/inc/base/bufferedgraphicdevicebase.hxx |7 --
 canvas/inc/base/cachedprimitivebase.hxx   |5 -
 canvas/inc/base/canvasbase.hxx|7 --
 canvas/inc/base/canvascustomspritebase.hxx|4 -
 canvas/inc/base/canvascustomspritehelper.hxx  |7 --
 canvas/inc/base/disambiguationhelper.hxx  |5 -
 canvas/inc/base/graphicdevicebase.hxx |   11 +---
 canvas/inc/base/integerbitmapbase.hxx |7 --
 canvas/inc/base/sprite.hxx|5 -
 canvas/inc/base/spritecanvasbase.hxx  |   11 +---
 canvas/inc/base/spritesurface.hxx |7 --
 canvas/inc/parametricpolypolygon.hxx  |5 -
 canvas/inc/propertysethelper.hxx  |5 -
 canvas/inc/rendering/irendermodule.hxx|5 -
 canvas/inc/rendering/isurface.hxx |5 -
 canvas/inc/rendering/isurfaceproxy.hxx|5 -
 canvas/inc/rendering/isurfaceproxymanager.hxx |5 -
 canvas/inc/spriteredrawmanager.hxx|7 --
 canvas/inc/vclwrapper.hxx |5 -
 canvas/inc/verifyinput.hxx|5 -
 canvas/source/cairo/cairo_cachedbitmap.hxx|2 
 canvas/source/cairo/cairo_canvas.hxx  |8 +--
 canvas/source/cairo/cairo_canvasbitmap.hxx|6 +-
 canvas/source/cairo/cairo_canvascustomsprite.hxx  |4 -
 canvas/source/cairo/cairo_canvasfont.hxx  |2 
 canvas/source/cairo/cairo_canvashelper.cxx|2 
 canvas/source/cairo/cairo_canvashelper_text.cxx   |2 
 canvas/source/cairo/cairo_sprite.hxx  |2 
 canvas/source/cairo/cairo_spritecanvas.hxx|8 +--
 canvas/source/cairo/cairo_spritecanvashelper.hxx  |2 
 canvas/source/cairo/cairo_spritehelper.hxx|2 
 canvas/source/directx/dx_9rm.cxx  |6 +-
 canvas/source/directx/dx_canvas.hxx   |   10 +--
 canvas/source/directx/dx_canvasbitmap.hxx |6 +-
 canvas/source/directx/dx_canvascustomsprite.hxx   |4 -
 canvas/source/directx/dx_canvashelper_texturefill.cxx |2 
 canvas/source/directx/dx_devicehelper.hxx |2 
 canvas/source/directx/dx_impltools.cxx|2 
 canvas/source/directx/dx_rendermodule.hxx |2 
 canvas/source/directx/dx_sprite.hxx   |2 
 canvas/source/directx/dx_spritecanvas.hxx |8 +--
 canvas/source/directx/dx_spritecanvashelper.hxx   |6 +-
 canvas/source/directx/dx_spritedevicehelper.hxx   |2 
 canvas/source/directx/dx_spritehelper.hxx |2 
 canvas/source/directx/dx_surfacebitmap.cxx|2 
 canvas/source/directx/dx_surfacebitmap.hxx|4 -
 canvas/source/opengl/ogl_canvasbitmap.hxx |6 +-
 canvas/source/opengl/ogl_canvascustomsprite.cxx   |2 
 canvas/source/opengl/ogl_canvascustomsprite.hxx   |2 
 canvas/source/opengl/ogl_spritecanvas.hxx |6 +-
 canvas/source/tools/cachedprimitivebase.cxx   |2 
 canvas/source/tools/canvascustomspritehelper.cxx  |2 
 canvas/source/tools/page.hxx  |6 +-
 canvas/source/tools/pagemanager.hxx   |2 
 canvas/source/tools/parametricpolypolygon.cxx |2 
 canvas/source/tools/propertysethelper.cxx |2 
 canvas/source/tools/spriteredrawmanager.cxx   |2 
 canvas/source/tools/surface.hxx   |2 
 canvas/source/tools/surfaceproxy.hxx  |4 -
 canvas/source/tools/surfaceproxymanager.cxx   |4 -
 canvas/source/tools/verifyinput.cxx   |2 
 canvas/source/vcl/bitmapbackbuffer.hxx|2 
 canvas/source/vcl/cachedbitmap.hxx|2 
 canvas/source/vcl/canvas.hxx  |8 +--
 canvas/source/vcl/canvasbitmap.hxx|6 +-
 canvas/source/vcl/canvascustomsprite.hxx  |6 +-

[Libreoffice-commits] core.git: solenv/gbuild

2020-02-12 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit c50e3f57d9098c7c7058c464e572cf7e70e3808d
Author: Noel Grandin 
AuthorDate: Wed Feb 12 08:17:54 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 12 12:40:42 2020 +0100

add some more libs to libmerged

Change-Id: I14ec1c6015c8a71fabca90ca3dec52965915a63f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88511
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 03a64792d191..89c37ff9fc8d 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -10,20 +10,25 @@
 # we link all object files from these libraries into one, merged library
 MERGE_LIBRARY_LIST := \
avmedia \
+   $(if $(filter WNT,$(OS)),avmediawin) \
$(call gb_Helper_optional,SCRIPTING, \
basctl \
+   basprov \
) \
basegfx \
+   canvasfactory \
canvastools \
comphelper \
configmgr \
cppcanvas \
$(call gb_Helper_optional,BREAKPAD,crashreport) \
+   ctl \
dbtools \
deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(USING_X11),desktop_detector) \
+   $(if $(filter WNT,$(OS)),directx9canvas) \
drawinglayer \
editeng \
filterconfig \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

crashtesting

2020-02-12 Thread Caolán McNamara

because the crashtesting machine has been a bit flaky recently I ran a
reduced set of documents which failed in the last working run in order
to get some results. Those results are available at:

https://dev-builds.libreoffice.org/crashtest/f61e5e85c6bc3337eabfe3b9b69c4c1a3abf08e7

There are quite a few asserts of e.g.

core/xmloff/source/core/xmlictxt.cxx:37:
SvXMLImportContext::SvXMLImportContext(SvXMLImport&, sal_uInt16, const
rtl::OUString&): Assertion `!rLName.isEmpty()' failed.

on docs like ooo13415-35.sxc 
https://bz.apache.org/ooo/attachment.cgi?id=12694 which I guess are
from some fastparser work.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerfilter/source

2020-02-12 Thread László Németh (via logerrit)

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   38 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|8 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|   10 +++
 4 files changed, 58 insertions(+)

New commits:
commit c90b6a208d867a00252ad58d8eeab2fd12516157
Author: László Németh 
AuthorDate: Tue Feb 4 12:54:34 2020 +0100
Commit: László Németh 
CommitDate: Wed Feb 12 12:53:24 2020 +0100

Revert "revert obsolete writerfilter hacks for tdf#119054 and tdf#128752"

This reverts commit 749fd6508504cf3b2e3822eca52a67fa36d75fb8.

Change-Id: Iad4cd836e2908e2c21e70013f88af213b3a1822d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88142
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 6a546f60e6a0..e753852985a7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -863,6 +863,9 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 // Remove properties from style/row that aren't allowed in 
cells
 pAllCellProps->Erase( PROP_HEADER_ROW_COUNT );
 pAllCellProps->Erase( PROP_TBL_HEADER );
+// Remove paragraph properties from style/row that paragraph 
style can overwrite
+pAllCellProps->Erase( PROP_PARA_BOTTOM_MARGIN );
+pAllCellProps->Erase( PROP_PARA_LINE_SPACING );
 
 // Then add the cell properties
 pAllCellProps->InsertProps(*aCellIterator);
@@ -1061,6 +1064,36 @@ css::uno::Sequence 
DomainMapperTableHandler::endTabl
 return aRowProperties;
 }
 
+// table style has got bigger precedence than docDefault style,
+// but lower precedence than the paragraph styles and direct paragraph 
formatting
+void DomainMapperTableHandler::ApplyParaProperty(css::beans::PropertyValues 
aTableProperties, PropertyIds eId)
+{
+OUString sPropertyName = getPropertyName(eId);
+auto pTableProp = std::find_if(aTableProperties.begin(), 
aTableProperties.end(),
+[&](const beans::PropertyValue& rProp) { return rProp.Name == 
sPropertyName; });
+if (pTableProp != aTableProperties.end())
+{
+uno::Any aValue = pTableProp->Value;
+for (const auto& rParaProp : m_rDMapper_Impl.m_aParagraphsToEndTable)
+{
+// there is no direct paragraph formatting
+if (!rParaProp.m_pPropertyMap->isSet(eId))
+{
+OUString sParaStyleName;
+rParaProp.m_rPropertySet->getPropertyValue("ParaStyleName") 
>>= sParaStyleName;
+StyleSheetEntryPtr pEntry = 
m_rDMapper_Impl.GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(sParaStyleName);
+uno::Any aMargin = 
m_rDMapper_Impl.GetPropertyFromStyleSheet(eId, pEntry, true, true);
+uno::Any aMarginDocDefault = 
m_rDMapper_Impl.GetPropertyFromStyleSheet(eId, nullptr, true, true);
+// use table style only when 1) both values are empty (no 
docDefault and paragraph style definitions) or
+// 2) both non-empty values are equal (docDefault paragraph 
properties are copied to the base paragraph style during import)
+// TODO check the case, when two parent styles modify the 
docDefault and the last one set back the docDefault value
+if (aMargin == aMarginDocDefault)
+rParaProp.m_rPropertySet->setPropertyValue(sPropertyName, 
aValue);
+}
+}
+}
+}
+
 void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool 
bTableStartsAtCellStart)
 {
 #ifdef DBG_UTIL
@@ -1158,6 +1191,10 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel, bool bTab
 }
 }
 }
+
+// OOXML table style may container paragraph properties, apply 
these now.
+ApplyParaProperty(aTableInfo.aTableProperties, 
PROP_PARA_BOTTOM_MARGIN);
+ApplyParaProperty(aTableInfo.aTableProperties, 
PROP_PARA_LINE_SPACING);
 }
 }
 catch ( const lang::IllegalArgumentException & )
@@ -1235,6 +1272,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel, bool bTab
 m_aCellProperties.clear();
 m_aRowProperties.clear();
 m_bHadFootOrEndnote = false;
+m_rDMapper_Impl.m_aParagraphsToEndTable.clear();
 
 #ifdef DBG_UTIL
 TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 41b6339506f9..16d2a0cc37cc 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hx

[Libreoffice-commits] core.git: sw/qa sw/source

2020-02-12 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |3 
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx  |4 
 sw/source/core/unocore/unotbl.cxx  |  129 +++--
 3 files changed, 23 insertions(+), 113 deletions(-)

New commits:
commit a9ba8e57a41c5ddf3597272bddab30e51fb3fd38
Author: László Németh 
AuthorDate: Tue Feb 4 15:12:45 2020 +0100
Commit: László Németh 
CommitDate: Wed Feb 12 12:54:09 2020 +0100

Revert "tdf#118947 sw tablestyle: manually scan parents for ::SET"

Except its unit test.

This reverts commit 6bced3c6a1bf8d4652dd6ba75e41b128ce1bfc5c.

Change-Id: I525edd59b9d4d522048b272575285f13675413e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88456
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 27c66c141357..550255d54e8a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -325,6 +325,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak4, 
"tdf123636_newlinePage
 assertXPath(pDump, "/root/page[2]/body/txt[1]/Text", 0);
 }
 
+// disabled temporarily, next commit enables it again
+#if 0
 DECLARE_OOXMLEXPORT_TEST(testTdf118947_tableStyle, "tdf118947_tableStyle.docx")
 {
 uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
@@ -352,6 +354,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf118947_tableStyle, 
"tdf118947_tableStyle.docx")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Table style sets 0 right margin", 
sal_Int32(0), getProperty(xPara, "ParaRightMargin"));
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table sets 2.5 line-spacing", 
sal_Int16(250), getProperty(xPara, 
"ParaLineSpacing").Height, 1);
 }
+#endif
 
 DECLARE_OOXMLEXPORT_TEST(tdf123912_protectedForm, 
"tdf123912_protectedForm.odt")
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index f72306fdea1b..e473e0c66826 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -542,8 +542,10 @@ DECLARE_OOXMLEXPORT_TEST(testTableStylerPrSz, 
"table-style-rPr-sz.docx")
 uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
 uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
 uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-
+// disabled temporarily, next commit enables it again
+#if 0
 CPPUNIT_ASSERT_EQUAL(20.f, getProperty(getRun(xPara, 1), 
"CharHeight"));
+#endif
 //CPPUNIT_ASSERT_EQUAL(awt::FontUnderline::SINGLE, 
getProperty(getRun(xPara, 1), "CharUnderline"));
 //CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(getRun(xPara, 1), "CharWeight"));
 //CPPUNIT_ASSERT_EQUAL(awt::FontSlant_ITALIC, 
getProperty(getRun(xPara, 1), "CharPosture"));
diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 2053b7502c02..79cb240426dd 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -105,6 +105,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using ::editeng::SvxBorderLine;
@@ -971,67 +972,6 @@ uno::Reference< beans::XPropertySetInfo >  
SwXCell::getPropertySetInfo()
 return xRef;
 }
 
-// If the current property matches the previous parent's property (i.e. no 
reason for it to be set),
-// then it may be a ::DEFAULT value, even if it is marked as ::SET
-static bool lcl_mayBeDefault( const sal_uInt16 nWhich, sal_uInt8 nMemberId,
-   const SfxPoolItem* pPrevItem, const SfxPoolItem& 
rCurrItem,
-   const bool bDirect )
-{
-bool bMayBeDefault = false;
-// These are the paragraph/character pairs that I found running unit tests.
-// UNFORTUNATELY there is no way to see if a property has multiple members.
-// Since valid members can be nMemberId == 0, we can't do something like 
"if (nMemberId & ~CONVERT_TWIPS) != 0"
-// Perhaps the full list can be found in editeng/memberids.h???
-switch ( nWhich )
-{
-case RES_BOX:
-case RES_UL_SPACE:
-case RES_LR_SPACE:
-case RES_CHRATR_ESCAPEMENT:
-case RES_CHRATR_FONT:
-case RES_CHRATR_CJK_FONT:
-case RES_CHRATR_CTL_FONT:
-case RES_CHRATR_FONTSIZE:
-case RES_CHRATR_CJK_FONTSIZE:
-case RES_CHRATR_CTL_FONTSIZE:
-case RES_CHRATR_WEIGHT:
-case RES_CHRATR_CJK_WEIGHT:
-case RES_CHRATR_CTL_WEIGHT:
-case RES_CHRATR_LANGUAGE:
-case RES_CHRATR_CJK_LANGUAGE:
-case RES_CHRATR_CTL_LANGUAGE:
-case RES_CHRATR_POSTURE:
-case RES_CHRATR_CJK_POSTURE:
-case RES_CHRATR_CTL_POSTURE:
-case RES_PARATR_ADJUST:
-{
-// These properties are paired up, containing multiple properties 
in one nWhich.
-// If one is ::SET, they all report ::SET, even if only

[Libreoffice-commits] core.git: sw/source

2020-02-12 Thread László Németh (via logerrit)

 sw/source/core/unocore/unotbl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 362437b58a1c64be5c6c7a4a6e7a0c16d2eb65a4
Author: László Németh 
AuthorDate: Tue Feb 4 15:08:14 2020 +0100
Commit: László Németh 
CommitDate: Wed Feb 12 12:53:42 2020 +0100

Revert "related tdf#118947 sw tablestyle: no need to avoid numbered para"

This reverts commit 6ed87cc5a4f755f360951550cac836e8967fc6bf.

Change-Id: Idd56da3056b60a60228875c644d57099b3d2520f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88455
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 9a1ff2987786..2053b7502c02 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1091,7 +1091,8 @@ void SwXCell::setPropertyValue(const OUString& 
rPropertyName, const uno::Any& aV
 }
 
 bool bSet = false;
-SwFormat* pFormatColl = pNd->GetFormatColl();
+// HACK: don't check styles if numbering/bullets are 
turned on. Table-styles don't override numbering formatting
+SwFormat* pFormatColl = pNd->GetNumRule() ? nullptr : 
pNd->GetFormatColl();
 // Manually walk through the parent properties in order to 
avoid the default properties.
 // Table-styles don't override paragraph-style formatting.
 //TODO: ?except for fontsize/justification if 
compat:overrideTableStyleFontSizeAndJustification?
___
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' - sd/source

2020-02-12 Thread Xisco Fauli (via logerrit)

 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10dac1012b065e5e37ebb42f13d7fbdbda376786
Author: Xisco Fauli 
AuthorDate: Tue Feb 11 12:11:32 2020 +0100
Commit: Xisco Faulí 
CommitDate: Wed Feb 12 12:57:36 2020 +0100

tdf#130440 only select first page if no other page is selected

Found while implementing the UItest.
See https://gerrit.libreoffice.org/c/core/+/88437
it asserts on line 34 AssertionError: 2 != 1 as the first and
second slides are selected

Change-Id: I249dc0ac6faa55f0f15deedb848beabbc64aeed4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88439
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 
(cherry picked from commit 7ed602a3b8c0ffe922b4f082cd4cdaa5a8f0d64c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88404
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index 9eaa7b50c8a2..4dc2ac08d387 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -126,7 +126,7 @@ void SelectionObserver::EndObservation()
 bool bSuccess = 
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
 // tdf#129346 nothing currently selected, select something, if possible
 // but (tdf#129346) only if setting focus to current page failed
-if (!bSuccess && rSelector.GetPageCount())
+if (!bSuccess && rSelector.GetPageCount() && 
rSelector.GetSelectedPageCount() == 0)
 rSelector.SelectPage(0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx sw/qa sw/source

2020-02-12 Thread Caolán McNamara (via logerrit)

 include/svx/sdtacitm.hxx|2 +-
 sw/qa/core/data/html/pass/ofz20455.html |binary
 sw/source/filter/html/htmlcss1.cxx  |   18 +-
 sw/source/filter/html/swcss1.hxx|5 -
 sw/source/filter/html/swhtml.cxx|2 +-
 sw/source/filter/html/swhtml.hxx|2 ++
 6 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 086e43148059a7ebc6caa416fa82bb60fd2cc92f
Author: Caolán McNamara 
AuthorDate: Mon Feb 3 12:06:23 2020 +
Commit: Michael Stahl 
CommitDate: Wed Feb 12 13:07:39 2020 +0100

ofz#20455 sw: HTML import: fix invalid table in footer

The obvious problem was that a bookmark failed to be copied to the
correct node, it was created on a SwStartNode, which failed in
makeMark() and caused a null-pointer.

The target position was off by 1 node because there was a spurious
StartNode/EndNode pair directly below the table:

[  41]   0x5b13430  TableNode ,
[  42]0x5b1d010 StartNode ,
[  43] 0x5b12a50StartNode ,
[  44]  0x5b135f0TextNode "",

This was created by a special case in SwTableNode::MakeCopy() because
.GetTabSortBoxes().size() == 1.

But the table had actually quite a bunch more cells in the nodes-array,
just they were not yet in the SwTable.

In an exciting twist of events, it turns out the table was copied while
it was not yet finished parsing: the problem was that in the middle of
the table, some CSS set some page attributes, and this caused a
first-page page style to be created in SwCSS1Parser::ParseStyleSheet(),
by copying the master page style.

Unfortunately the table was in the , so it was
copied in this incomplete and inconsistent state.

It might be possible to get rid of the special case in
SwTableNode::MakeCopy() by restricting the special case skipping of
StartNodes at the start in SwNodes::CopyNodes() a bit so that StartNodes
whose EndNodes are copied aren't skipped; at least that's the most
reasonable explanation for the special case.

But for now just fix the HTML import.

Additionally, only on MacOSX, using libc++, this triggered an assert:
  Assertion failed: (!pImpl->mpStaticDefaults || typeid(rItem) == 
typeid(GetDefaultItem(nWhich))), function PutImpl, file 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/svl/source/items/itempool.cxx,
 line 611.

Probably because SdrTextAniCountItem is not marked DLLPUBLIC.

Change-Id: Ia167265e7540eea649801eaac2b89f9e18b685cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87859
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx
index c8bf4b773efa..820aee926503 100644
--- a/include/svx/sdtacitm.hxx
+++ b/include/svx/sdtacitm.hxx
@@ -23,7 +23,7 @@
 #include 
 
 // Number of loops. 0=infinite.
-class SdrTextAniCountItem final : public SfxUInt16Item {
+class SAL_DLLPUBLIC_RTTI SdrTextAniCountItem final : public SfxUInt16Item {
 public:
 SdrTextAniCountItem(sal_uInt16 nVal=0): 
SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
 
diff --git a/sw/qa/core/data/html/pass/ofz20455.html 
b/sw/qa/core/data/html/pass/ofz20455.html
new file mode 100644
index ..6e5ca0aa7e85
Binary files /dev/null and b/sw/qa/core/data/html/pass/ofz20455.html differ
diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index ca28eac168b5..c90c4e73307a 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -87,11 +87,13 @@ void SwCSS1Parser::ChgPageDesc( const SwPageDesc *pPageDesc,
 m_pDoc->ChgPageDesc( pos, rNewPageDesc );
 }
 
-SwCSS1Parser::SwCSS1Parser( SwDoc *pD, const sal_uInt32 aFHeights[7], const 
OUString& rBaseURL, bool bNewDoc ) :
-SvxCSS1Parser( pD->GetAttrPool(), rBaseURL,
-   aItemIds, SAL_N_ELEMENTS(aItemIds)),
-m_pDoc( pD ),
-m_nDropCapCnt( 0 ),
+SwCSS1Parser::SwCSS1Parser(SwDoc *const pDoc, SwHTMLParser const& rParser,
+const sal_uInt32 aFHeights[7], const OUString& rBaseURL, bool const 
bNewDoc)
+: SvxCSS1Parser(pDoc->GetAttrPool(), rBaseURL,
+   aItemIds, SAL_N_ELEMENTS(aItemIds))
+, m_pDoc( pDoc )
+, m_rHTMLParser(rParser)
+, m_nDropCapCnt( 0 ),
 m_bIsNewDoc( bNewDoc ),
 m_bBodyBGColorSet( false ),
 m_bBodyBackgroundSet( false ),
@@ -1341,6 +1343,12 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 
nPoolId, bool bCreate )
 const SwPageDesc *pPageDesc = FindPageDesc(m_pDoc, nPoolId);
 if( !pPageDesc && bCreate )
 {
+if (m_rHTMLParser.IsReadingHeaderOrFooter())
+{   // (there should be only one definition of header/footer in HTML)
+SAL_WARN("sw.html", "no creating PageDesc while reading 
header/footer");
+return nullptr;
+}
+

[Libreoffice-commits] core.git: sw/source

2020-02-12 Thread Michael Stahl (via logerrit)

 sw/source/core/table/swnewtable.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1b4f6c81de2af3b165594654966bcd5b62dc6081
Author: Michael Stahl 
AuthorDate: Tue Feb 11 18:44:28 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Feb 12 13:08:02 2020 +0100

ofz#20455 sw: add some checks in SwTable::CheckConsistency()

Check consistency of number of boxes in SwTable and nodes.

Change-Id: I617f99282b900b17a65ecd18fdd8e8f8860896db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88471
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/table/swnewtable.cxx 
b/sw/source/core/table/swnewtable.cxx
index 78d0525e553c..fb5f7cb5b9a3 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2111,6 +2111,8 @@ void SwTable::CheckConsistency() const
 SwTwips nLineWidth = 0;
 std::list< RowSpanCheck > aRowSpanCells;
 std::list< RowSpanCheck >::iterator aIter = aRowSpanCells.end();
+SwNodeIndex index(*GetTableNode());
+++index;
 for( size_t nCurrLine = 0; nCurrLine < nLineCount; ++nCurrLine )
 {
 SwTwips nWidth = 0;
@@ -2121,7 +2123,11 @@ void SwTable::CheckConsistency() const
 for( size_t nCurrCol = 0; nCurrCol < nColCount; ++nCurrCol )
 {
 SwTableBox* pBox = pLine->GetTabBoxes()[nCurrCol];
-SAL_WARN_IF( !pBox, "sw.core", "Missing Table Box" );
+assert(pBox);
+SAL_WARN_IF(GetTableNode()->EndOfSectionIndex() <= 
index.GetIndex(), "sw.core", "Box not in table nodes");
+SAL_WARN_IF(!index.GetNode().IsStartNode(), "sw.core", "No box 
start node");
+index = *index.GetNode().EndOfSectionNode();
+++index;
 SwTwips nNewWidth = 
pBox->GetFrameFormat()->GetFrameSize().GetWidth() + nWidth;
 long nRowSp = pBox->getRowSpan();
 if( nRowSp < 0 )
@@ -2170,6 +2176,7 @@ void SwTable::CheckConsistency() const
 }
 bool bEmpty = aRowSpanCells.empty();
 SAL_WARN_IF( !bEmpty, "sw.core", "Open row span detected" );
+SAL_WARN_IF(GetTableNode()->EndOfSectionNode() != &index.GetNode(), 
"sw.core", "table end node not found");
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx solenv/clang-format svx/inc svx/qa svx/source

2020-02-12 Thread Noel Grandin (via logerrit)

 solenv/clang-format/blacklist|   68 +--
 svx/inc/AffineMatrixItem.hxx |6 
 svx/inc/CommonStylePreviewRenderer.hxx   |6 
 svx/inc/DescriptionGenerator.hxx |6 
 svx/inc/XPropertyTable.hxx   |5 
 svx/inc/colrctrl.hxx |5 
 svx/inc/dbcharsethelper.hxx  |7 -
 svx/inc/extrud3d.hxx |5 
 svx/inc/pch/precompiled_svx.hxx  |2 
 svx/inc/pch/precompiled_svxcore.hxx  |   12 -
 svx/inc/polygn3d.hxx |5 
 svx/inc/sdgcoitm.hxx |5 
 svx/inc/sdginitm.hxx |6 
 svx/inc/sdgtritm.hxx |5 
 svx/inc/sdr/attribute/sdrfilltextattribute.hxx   |2 
 svx/inc/sdr/attribute/sdrformtextattribute.hxx   |5 
 svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx |7 -
 svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx |7 -
 svx/inc/sdr/attribute/sdrshadowtextattribute.hxx |7 -
 svx/inc/sdr/attribute/sdrtextattribute.hxx   |5 
 svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx|5 
 svx/inc/sdr/contact/viewcontactofe3d.hxx |5 
 svx/inc/sdr/contact/viewcontactofe3dcube.hxx |2 
 svx/inc/sdr/contact/viewcontactofe3dextrude.hxx  |4 
 svx/inc/sdr/contact/viewcontactofe3dlathe.hxx|2 
 svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx  |4 
 svx/inc/sdr/contact/viewcontactofe3dsphere.hxx   |2 
 svx/inc/sdr/contact/viewcontactofgraphic.hxx |2 
 svx/inc/sdr/contact/viewcontactofpageobj.hxx |5 
 svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx   |2 
 svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx  |2 
 svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx  |2 
 svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx   |2 
 svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx   |2 
 svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx  |2 
 svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx  |2 
 svx/inc/sdr/contact/viewcontactofsdrrectobj.hxx  |7 -
 svx/inc/sdr/contact/viewcontactoftextobj.hxx |5 
 svx/inc/sdr/contact/viewobjectcontactofpageobj.hxx   |4 
 svx/inc/sdr/overlay/overlayobjectcell.hxx|5 
 svx/inc/sdr/overlay/overlaytriangle.hxx  |5 
 svx/inc/sdr/primitive2d/sdrattributecreator.hxx  |5 
 svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx  |2 
 svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx|6 
 svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx   |2 
 svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx   |2 
 svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx   |2 
 svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx  |2 
 svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx   |2 
 svx/inc/sxfiitm.hxx  |5 
 svx/inc/sxmfsitm.hxx |5 
 svx/inc/sxmsitm.hxx  |2 
 svx/inc/sxreaitm.hxx |2 
 svx/inc/sxreoitm.hxx |2 
 svx/inc/sxsiitm.hxx  |7 -
 svx/inc/textchain.hxx|5 
 svx/inc/textchaincursor.hxx  |7 -
 svx/inc/textchainflow.hxx|7 -
 svx/inc/xftshtit.hxx |5 
 svx/qa/unit/svdraw.cxx   |2 
 svx/source/accessibility/AccessibleControlShape.cxx  |2 
 svx/source/accessibility/DescriptionGenerator.cxx|2 
 svx/source/customshapes/EnhancedCustomShape3d.cxx|4 
 svx/source/dialog/connctrl.cxx   |2 
 svx/source/dialog/dlgctl3d.cxx   |2 
 svx/source/dialog/dlgctrl.cxx|2 
 svx/source/dialog/txencbox.cxx   |2 
 svx/sour

Re: crashtesting

2020-02-12 Thread Noel Grandin




fixes at
  https://gerrit.libreoffice.org/c/core/+/88523
and
  https://gerrit.libreoffice.org/c/core/+/88524
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - sw/qa writerfilter/source

2020-02-12 Thread Caolán McNamara (via logerrit)

 sw/qa/core/data/rtf/fail/forcepoint-4.rtf | 1779 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 
 2 files changed, 1783 insertions(+), 1 deletion(-)

New commits:
commit 526f5ef73aad1d4e8d91b9c31aaa97b8215d1ee9
Author: Caolán McNamara 
AuthorDate: Thu Mar 8 21:25:28 2018 +
Commit: Miklos Vajna 
CommitDate: Wed Feb 12 13:19:46 2020 +0100

forcepoint #21 pop on empty stack

Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

(cherry picked from commit 3686a3fc1b2eaee53b1ab32f33455b2b37aa8c6e)

Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx

Change-Id: I25b1c6361fb0a3ae6b01f2be870c9e1b49bf5b84

diff --git a/sw/qa/core/data/rtf/fail/forcepoint-4.rtf 
b/sw/qa/core/data/rtf/fail/forcepoint-4.rtf
new file mode 100755
index ..ccd04d451b10
--- /dev/null
+++ b/sw/qa/core/data/rtf/fail/forcepoint-4.rtf
@@ -0,0 +1,1779 @@
+{\rtf1\ansi \deff4\deflang1033{\fonttbl{\f0\froman\fcharset0\fprq2 Tms 
Rmn;}{\f1\froman\fcharset2\fprq2 Symbol;}{\f2\fswiss\fcharset0\fprq2 
Helv{\*\falt Arial};}{\f3\fmodern\fcharset0\fprq1 Courier;}
+{\f4\froman\fcharset0\fprq2 Times New Roman;}{\f5\fswiss\fcharset0\fprq2 
Arial;}{\f6\froman\fcharset0\fprq2 MS Serif;}{\f7\fswiss\fcharset0\fprq2 MS 
Sans Serif;}{\f8\froman\fcharset0\fprq2 Times;}{\f9\fswiss\fcharset0\fprq2 
Helvetica;}
+{\f10\fswiss\fcharset0\fprq2 System;}{\f11\fmodern\fcharset0\fprq1 Courier 
New;}{\f12\froman\fcharset0\fprq2 New York;}{\f13\fswiss\fcharset0\fprq2 
Geneva;}{\f14\fnil\fcharset2\fprq2 Marlett;}{\f15\fnil\fcharset2\fprq2 
Wingdings;}
+{\f16\fswiss\fcharset0\fprq2 Arial Narrow;}{\f17\fswiss\fcharset0\fprq2 Arial 
Black;}{\f18\froman\fcharset0\fprq2 Book Antiqua;}{\f19\froman\fcharset0\fprq2 
Bookman Old Style;}{\f20\froman\fcharset0\fprq2 Century Schoolbook;}
+{\f21\fnil\fcharset2\fprq2 Monotype Sorts;}{\f22\fswiss\fcharset0\fprq2 
Haettenschweiler;}{\f23\froman\fcharset0\fprq2 
Garamond;}{\f24\fmodern\fcharset2\fprq1 MS 
LineDraw;}{\f25\fswiss\fcharset0\fprq2 Helvetica-Narrow;}
+{\f26\froman\fcharset255\fprq2 Roman;}{\f27\fscript\fcharset255\fprq2 
Script;}{\f28\fmodern\fcharset255\fprq2 Modern;}{\f29\fswiss\fcharset0\fprq1 MS 
Dialog;}{\f30\froman\fcharset0\fprq2 Bookman{\*\falt Bookman Old Style};}
+{\f31\fnil\fcharset0\fprq0 Times New Roman Monotype{\*\falt Times New 
Roman};}{\f32\fnil\fcharset0\fprq0 Stone Sans{\*\falt Times New 
Roman};}{\f33\froman\fcharset0\fprq2 Palatino;}{\f34\fnil\fcharset0\fprq0 Arial 
Monotype;}}{\colortbl;\red0\green0\blue0;
+\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
+\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\widctlpar
 \f4\fs20 \snext0 Normal;}{\s1\sb240\sa60\keepn\widctlpar{\*\pn 
\pnlvl1\pndec\pnprev1\pnstart1\pnsp144 {\pntxta .}}\b\f5\fs28\kerning28 
+\sbasedon0\snext0 heading 
1,H1;}{\s2\sb380\sa160\sl-320\slmult0\keepn\nowidctlpar\tqr\tx432\tx864{\*\pn 
\pnlvl2\pndec\pnprev1\pnstart1\pnsp144 }\b\f9\fs28\cf1 \sbasedon15\snext0 
heading 2,H2;}{\s3\sb280\sa140\sl-280\slmult0
+\keepn\nowidctlpar\tqr\tx432\tx864{\*\pn 
\pnlvl3\pndec\pnprev1\pnstart1\pnsp144 {\pntxtb .}}\b\f9\cf1\kerning28 
\sbasedon2\snext16 heading 3,H3;}{\s4\sb120\sa80\keep\keepn\widctlpar{\*\pn 
\pnlvl4\pndec\pnprev1\pnstart1\pnsp144 {\pntxtb .}}
+\b\i\f9\fs20\kerning28 \sbasedon0\snext16 heading 
4,H4;}{\s5\sb240\sa60\widctlpar{\*\pn \pnlvl5\pndec\pnprev1\pnstart1\pnsp144 
{\pntxtb .}}\f5\fs22 \sbasedon0\snext0 heading 
5,H5;}{\s6\sb240\sa60\widctlpar{\*\pn \pnlvl6\pndec\pnprev1\pnstart1\pnsp144 
+{\pntxtb .}}\i\f5\fs22 \sbasedon0\snext0 heading 
6,H6;}{\s7\sb240\sa60\widctlpar{\*\pn \pnlvl7\pndec\pnprev1\pnstart1\pnsp144 
{\pntxtb .}}\f5\fs20 \sbasedon0\snext0 heading 
7;}{\s8\sb240\sa60\widctlpar{\*\pn \pnlvl8\pndec\pnprev1\pnstart1\pnsp144 
+{\pntxtb .}}\i\f5\fs20 \sbasedon0\snext0 heading 
8;}{\s9\sb240\sa60\widctlpar{\*\pn \pnlvl9\pndec\pnprev1\pnstart1\pnsp144 
{\pntxtb .}}\i\f5\fs18 \sbasedon0\snext0 heading 9;}{\*\cs10 \additive Default 
Paragraph Font;}{\s15\li864\sb100\sl-260\slmult0
+\nowidctlpar \f8\fs20\cf1 \snext15 T1.Text1;}{\s16\sa120\widctlpar \f4\fs20 
\sbasedon0\snext16 Body 
Text;}{\s17\fi-288\li1655\sb100\sa100\sl-260\slmult0\keepn\nowidctlpar\tx1655 
\f8\fs20\cf1 \snext17 A.A+List;}{
+\s18\fi-288\li1655\sb100\sa100\sl-260\slmult0\nowidctlpar\tx1655\tx1958 
\f8\fs20\cf1 \snext18 
A.AList;}{\s19\li1655\sb100\sa100\sl-260\slmult0\keepn\nowidctlpar\tx1655 
\f31\fs20\cf1 \snext19 A.AList_nonum;}{\s20\qc\nowidctlpar \f8\fs4\cf1 \snext20 
+anchorhldr;}{\s21\fi-792\li2015\sb100\sa100\sl-260\slmult0\nowidctlpar\tx2015 
\f8\fs20\cf1 \snext21 
b1.Bul_list;}{\s22\fi-289\li1224\sb100\sa100\sl-260\slmult0\nowidctlpar\tx1224\tldot\tx3685
 \f8\fs20\cf1 \

[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests

2020-02-12 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/mobile/calc_focus_spec.js |   30 +++
 cypress_test/integration_tests/mobile/focus_spec.js  |6 +--
 2 files changed, 33 insertions(+), 3 deletions(-)

New commits:
commit 8f4143dd74ab7b89ced3318d106a9e454696e049
Author: Tamás Zolnai 
AuthorDate: Wed Feb 12 12:56:41 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Feb 12 13:26:33 2020 +0100

cypress: mobile: Update shape related focus test.

One tap on a shape does not move the focus on the document
since this commit:
9fcd4d37778d9580cc7b425787c3a8c1d9e756dd

Change-Id: I5d176be7c5dd8296c642c41b8d1e2fcf5945ab27
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88521
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/focus_spec.js 
b/cypress_test/integration_tests/mobile/focus_spec.js
index badb1e0ad..e1acd82af 100644
--- a/cypress_test/integration_tests/mobile/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/focus_spec.js
@@ -186,9 +186,9 @@ describe('Focus tests', function() {
.click(posX, posY);
});
 
-   // Document grabs the focus
-   cy.document().its('activeElement.className')
-   .should('be.eq', 'clipboard');
+   // No focus on the document
+   cy.document().its('activeElement.tagName')
+   .should('be.eq', 'BODY');
 
// Double tap on the shape
cy.get('.leaflet-pane.leaflet-overlay-pane svg')
commit aa9d676cd927147ae938198ff1590c144ab59ab6
Author: Tamás Zolnai 
AuthorDate: Wed Feb 12 12:41:05 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Feb 12 13:26:22 2020 +0100

cypress: mobile: Test focus on second tap in Calc.

Change-Id: I1ce1b45f17f1d75c4bc7c1a6a63dfd05f2803612
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88520
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/calc_focus_spec.js 
b/cypress_test/integration_tests/mobile/calc_focus_spec.js
index 17a66a079..a9c0a2970 100644
--- a/cypress_test/integration_tests/mobile/calc_focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc_focus_spec.js
@@ -40,4 +40,34 @@ describe('Calc focus tests', function() {
cy.document().its('activeElement.tagName')
.should('be.eq', 'BODY');
});
+
+   it('Focus on second tap.', function() {
+   // Click on edit button
+   cy.get('#mobile-edit-button').click();
+
+   cy.get('#tb_actionbar_item_mobile_wizard')
+   .should('not.have.class', 'disabled');
+
+   // Body has the focus -> can't type in the document
+   cy.document().its('activeElement.tagName')
+   .should('be.eq', 'BODY');
+
+   // One tap on a cell -> no document focus
+   cy.get('#document-container')
+   .click();
+
+   cy.get('.leaflet-marker-icon.spreadsheet-cell-resize-marker');
+
+   // No focus
+   cy.document().its('activeElement.tagName')
+   .should('be.eq', 'BODY');
+
+   // Second tap on the same cell
+   cy.get('#document-container')
+   .click();
+
+   // Document has the focus
+   cy.document().its('activeElement.className')
+   .should('be.eq', 'clipboard');
+   });
 });
___
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

2020-02-12 Thread Pedro Pinto Silva (via logerrit)

 loleaflet/css/mobilewizard.css|   12 +++-
 loleaflet/images/lc_toggleorientation.svg |1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 45d053d9d18f482e4552872da99175b469ea10fb
Author: Pedro Pinto Silva 
AuthorDate: Wed Feb 12 13:26:35 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Wed Feb 12 13:29:33 2020 +0100

Mobile: Hamburger menu: add missing toggle icon and also add default 
background when there is no image (top level)

Change-Id: I894bb25a9198a74bf1fa43d6c958e23878e0a0fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88525
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 943c17c70..551428829 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -316,7 +316,17 @@
.sub-menu-title {
padding-left: 42px;
}
-
+   .sub-menu-title::before {
+   width: 22px;
+   height: 22px;
+   content: ' ';
+   display: block;
+   position: absolute;
+   left: 4%;
+   margin: 0px 4px;
+   background-color: #eee;
+   border-radius: 20px;
+   }
.sub-menu-arrow {
-webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
diff --git a/loleaflet/images/lc_toggleorientation.svg 
b/loleaflet/images/lc_toggleorientation.svg
new file mode 100644
index 0..8427a05e9
--- /dev/null
+++ b/loleaflet/images/lc_toggleorientation.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2020-02-12 Thread Pedro Pinto Silva (via logerrit)

 loleaflet/src/control/Control.MobileWizard.js |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e71972bef1495c5299130caa12bc82f33349fa0c
Author: Pedro Pinto Silva 
AuthorDate: Wed Feb 12 13:46:54 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Wed Feb 12 13:48:51 2020 +0100

Mobile: MobileWizard: swipe/scroll indicator: Avoid showing indicator when 
in prsence of window.mobileMenuWizard

Change-Id: I2430f8c3732d42b24abc7d2e9b83d71659260573
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88529
Tested-by: Pedro Pinto da Silva 
Reviewed-by: Pedro Pinto da Silva 

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 1cc8dc2b7..8c90f86f7 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -60,8 +60,7 @@ L.Control.MobileWizard = L.Control.extend({
var docType = this._map.getDocType();
//console.log('ContentsLength: ' + ContentsLength + ' | 
docType: ' + docType + '$(#mobile-wizard-content).scrollTop();'  + 
'this._isTabMode: ' + this._isTabMode + ' | _tabs: ' + this._tabs);
var maxScrolled = 52;
-   if (ContentsLength > 5 || this._tabs) {
-   console.log('INDICATOR');
+   if ((ContentsLength > 5 || this._tabs) && 
!window.mobileMenuWizard) {
$('#mobile-wizard-content').append('');
}
if (docType == 'spreadsheet')
___
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

2020-02-12 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf129575-directAfter.docx  |binary
 sw/qa/extras/ooxmlexport/data/tdf129575-directBefore.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf129575-docDefault.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf129575-styleAfter.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx|3 
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx |6 -
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   65 +++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx  |   79 +-
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx  |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   19 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 
 writerfilter/source/dmapper/PropertyIds.cxx   |5 
 writerfilter/source/dmapper/PropertyIds.hxx   |2 
 writerfilter/source/dmapper/PropertyMap.cxx   |   28 
 writerfilter/source/dmapper/PropertyMap.hxx   |   19 +++
 writerfilter/source/dmapper/StyleSheetTable.cxx   |   17 +--
 writerfilter/source/dmapper/StyleSheetTable.hxx   |1 
 17 files changed, 203 insertions(+), 45 deletions(-)

New commits:
commit f15d67442972c5f69c71925a6bfa5aa1a39d54eb
Author: László Németh 
AuthorDate: Tue Feb 4 19:31:41 2020 +0100
Commit: László Németh 
CommitDate: Wed Feb 12 14:16:30 2020 +0100

tdf#129575 DOCX import: fix table style preference

handling by recognizing docDefault properties
instead of default-value based heuristics.

Change-Id: I3bab9d85d77d0e5f1c357121b1caf02cbe4899c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88457
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf129575-directAfter.docx 
b/sw/qa/extras/ooxmlexport/data/tdf129575-directAfter.docx
new file mode 100644
index ..c9856b02857b
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf129575-directAfter.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf129575-directBefore.docx 
b/sw/qa/extras/ooxmlexport/data/tdf129575-directBefore.docx
new file mode 100644
index ..5e75ef1be5d2
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf129575-directBefore.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf129575-docDefault.docx 
b/sw/qa/extras/ooxmlexport/data/tdf129575-docDefault.docx
new file mode 100644
index ..d7cdf2ec4308
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf129575-docDefault.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf129575-styleAfter.docx 
b/sw/qa/extras/ooxmlexport/data/tdf129575-styleAfter.docx
new file mode 100644
index ..97439011ff55
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf129575-styleAfter.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 550255d54e8a..27c66c141357 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -325,8 +325,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123636_newlinePageBreak4, 
"tdf123636_newlinePage
 assertXPath(pDump, "/root/page[2]/body/txt[1]/Text", 0);
 }
 
-// disabled temporarily, next commit enables it again
-#if 0
 DECLARE_OOXMLEXPORT_TEST(testTdf118947_tableStyle, "tdf118947_tableStyle.docx")
 {
 uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
@@ -354,7 +352,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf118947_tableStyle, 
"tdf118947_tableStyle.docx")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Table style sets 0 right margin", 
sal_Int32(0), getProperty(xPara, "ParaRightMargin"));
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table sets 2.5 line-spacing", 
sal_Int16(250), getProperty(xPara, 
"ParaLineSpacing").Height, 1);
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(tdf123912_protectedForm, 
"tdf123912_protectedForm.odt")
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 3b5726dceb28..45bcc9ac5f27 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -459,9 +459,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128752, 
"tdf128752.docx")
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf119054, "tdf119054.docx")
 {
 xmlDocPtr pXmlDoc = parseExport();
-// Don't overwrite before and after spacing of Heading2 by table style
-assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "before");
-assertXPathNoAttribute(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "after");
+// Overwrite applied table style with before and after spacing of Heading2
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "before", 
"0");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:s

[Libreoffice-commits] core.git: Changes to 'feature/cib_contract3753'

2020-02-12 Thread Serge Krot (via logerrit)

New branch 'feature/cib_contract3753' available with the following commits:
commit c449fa2ddc09a12937c042b30c1ff09a8c2bd441
Author: Serge Krot 
Date:   Tue Feb 11 16:04:26 2020 +0100

tdf#130610 docx export: handle bold as toggle properties

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx

Change-Id: I4c60b7eab6430a64ea1c8bcf40d0036d0b38516f

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source sfx2/source svx/sdi sw/source

2020-02-12 Thread Dennis Francis (via logerrit)

 desktop/source/lib/init.cxx   |5 -
 sfx2/source/control/unoctitm.cxx  |5 -
 svx/sdi/svx.sdi   |   12 ++--
 sw/source/uibase/shells/frmsh.cxx |   23 +++
 4 files changed, 37 insertions(+), 8 deletions(-)

New commits:
commit da076834794a1fa00c51ffeb09ee3f724001dc89
Author: Dennis Francis 
AuthorDate: Thu Feb 6 12:23:21 2020 +0530
Commit: Andras Timar 
CommitDate: Wed Feb 12 14:24:52 2020 +0100

Allow boolean valued statechange messages for...

object align commands :

ObjectAlignLeft [SID_OBJECT_ALIGN_LEFT]
ObjectAlignRight [SID_OBJECT_ALIGN_RIGHT]
AlignCenter [SID_OBJECT_ALIGN_CENTER]

What is pending is to set correct align state items for Impress in
DrawViewShell::GetMenuStateSel(). For doing that we need to store
the object align state somewhere when we execute SID_OBJECT_ALIGN_*
in DrawViewShell::FuTemporary().

For Writer the align state information was already available in
frame-format-manager object.

Change-Id: I86fcf59cfc66af98097611277201ecaa3b8c22cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88077
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88452
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 90989c45df96..34b6155975c5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2655,7 +2655,10 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertSymbol"),
 OUString(".uno:EditRegion"),
 OUString(".uno:ThesaurusDialog"),
-OUString(".uno:Orientation")
+OUString(".uno:Orientation"),
+OUString(".uno:ObjectAlignLeft"),
+OUString(".uno:ObjectAlignRight"),
+OUString(".uno:AlignCenter")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 28276ddf3df7..1eac0a9c7964 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1006,7 +1006,10 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
 aEvent.FeatureURL.Path == "AlignLeft" ||
 aEvent.FeatureURL.Path == "AlignHorizontalCenter" ||
 aEvent.FeatureURL.Path == "AlignRight" ||
-aEvent.FeatureURL.Path == "DocumentRepair")
+aEvent.FeatureURL.Path == "DocumentRepair" ||
+aEvent.FeatureURL.Path == "ObjectAlignLeft" ||
+aEvent.FeatureURL.Path == "ObjectAlignRight" ||
+aEvent.FeatureURL.Path == "AlignCenter")
 {
 bool bTemp = false;
 aEvent.State >>= bTemp;
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 2567e08906b0..d8a8af6c71e6 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -106,10 +106,10 @@ SfxBoolItem Polygon SID_DRAW_POLYGON
 GroupId = SfxGroupId::Drawing;
 ]
 
-SfxVoidItem AlignCenter SID_OBJECT_ALIGN_CENTER
+SfxBoolItem AlignCenter SID_OBJECT_ALIGN_CENTER
 ()
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -142,10 +142,10 @@ SfxVoidItem AlignDown SID_OBJECT_ALIGN_DOWN
 ]
 
 
-SfxVoidItem ObjectAlignLeft SID_OBJECT_ALIGN_LEFT
+SfxBoolItem ObjectAlignLeft SID_OBJECT_ALIGN_LEFT
 ()
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -197,10 +197,10 @@ SfxVoidItem AlignMiddle SID_OBJECT_ALIGN_MIDDLE
 ]
 
 
-SfxVoidItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT
+SfxBoolItem ObjectAlignRight SID_OBJECT_ALIGN_RIGHT
 ()
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
diff --git a/sw/source/uibase/shells/frmsh.cxx 
b/sw/source/uibase/shells/frmsh.cxx
index 3f139e81f0cc..61ab59bfc00e 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -793,7 +793,30 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
  bProtect ||
  ((nWhich == FN_FRAME_ALIGN_HORZ_CENTER  || nWhich == 
SID_OBJECT_ALIGN_CENTER) &&
   bHtmlMode ))
+{
 rSet.DisableItem( nWhich );
+}
+else
+{
+sal_Int16 nHoriOrient = -1;
+switch(nWhich)
+{
+case SID_OBJECT_ALIGN_LEFT:
+nHoriOrient = text::HoriOrientation::LEFT;
+break;
+case SID_OBJECT_ALIGN_CENTER:
+nHoriOrient = text::HoriOrientation::CENTER;
+break;
+case SID_OBJECT_ALIGN_RIGHT:
+

[Libreoffice-commits] core.git: sw/source

2020-02-12 Thread Dennis Francis (via logerrit)

 sw/source/uibase/shells/drwbassh.cxx |   53 +--
 1 file changed, 44 insertions(+), 9 deletions(-)

New commits:
commit f5f39903f44f131c6d583ae056412dadee265d10
Author: Dennis Francis 
AuthorDate: Fri Feb 7 12:49:59 2020 +0530
Commit: Andras Timar 
CommitDate: Wed Feb 12 14:25:17 2020 +0100

Get the align states of draw-shapes in...

SwDrawBaseShell::GetState() so that the align buttons are informed
(in core desktop and online via statechange messages)

Change-Id: Ic69fb03bc98f39b1a6a389d50d3d6404fefd7f29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88159
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88453
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/uibase/shells/drwbassh.cxx 
b/sw/source/uibase/shells/drwbassh.cxx
index cb44b8955e31..18fce24f2c94 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -691,18 +691,53 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
 case SID_OBJECT_ALIGN_MIDDLE:
 case SID_OBJECT_ALIGN_DOWN:
 case SID_OBJECT_ALIGN:
-if ( !rSh.IsAlignPossible() || bProtected )
-rSet.DisableItem( nWhich );
-else if ( rSh.GetAnchorId() == RndStdIds::FLY_AS_CHAR )
 {
+bool bDisableThis = false;
+bool bDisableHoriz = false;
+bool bHoriz = (nWhich == SID_OBJECT_ALIGN_LEFT || nWhich 
== SID_OBJECT_ALIGN_CENTER ||
+nWhich == SID_OBJECT_ALIGN_RIGHT);
 const SdrMarkList& rMarkList = 
pSdrView->GetMarkedObjectList();
-//if only one object is selected it can only be vertically
-// aligned because it is character bound
-if( rMarkList.GetMarkCount() == 1 )
+if ( !rSh.IsAlignPossible() || bProtected )
+{
+bDisableThis = true;
+rSet.DisableItem( nWhich );
+}
+else if ( rSh.GetAnchorId() == RndStdIds::FLY_AS_CHAR )
 {
-rSet.DisableItem(SID_OBJECT_ALIGN_LEFT);
-rSet.DisableItem(SID_OBJECT_ALIGN_CENTER);
-rSet.DisableItem(SID_OBJECT_ALIGN_RIGHT);
+//if only one object is selected it can only be 
vertically
+// aligned because it is character bound
+if( rMarkList.GetMarkCount() == 1 )
+{
+bDisableHoriz = true;
+rSet.DisableItem(SID_OBJECT_ALIGN_LEFT);
+rSet.DisableItem(SID_OBJECT_ALIGN_CENTER);
+rSet.DisableItem(SID_OBJECT_ALIGN_RIGHT);
+}
+}
+
+if (bHoriz && !bDisableThis && !bDisableHoriz &&
+rMarkList.GetMarkCount() == 1)
+{
+sal_Int16 nHoriOrient = -1;
+switch(nWhich)
+{
+case SID_OBJECT_ALIGN_LEFT:
+nHoriOrient = text::HoriOrientation::LEFT;
+break;
+case SID_OBJECT_ALIGN_CENTER:
+nHoriOrient = text::HoriOrientation::CENTER;
+break;
+case SID_OBJECT_ALIGN_RIGHT:
+nHoriOrient = text::HoriOrientation::RIGHT;
+break;
+default:
+break;
+}
+
+SdrObject* pObj = 
rMarkList.GetMark(0)->GetMarkedSdrObj();
+SwFrameFormat* pFrameFormat = FindFrameFormat(pObj);
+SwFormatHoriOrient 
aHOrient(pFrameFormat->GetFormatAttr(RES_HORI_ORIENT));
+rSet.Put(SfxBoolItem(nWhich, aHOrient.GetHoriOrient() 
== nHoriOrient));
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2020-02-12 Thread Jan Holesovsky (via logerrit)

 sc/source/ui/app/inputwin.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 16fb30a16d1a8470605487097c854671dee62830
Author: Jan Holesovsky 
AuthorDate: Tue Feb 11 21:41:12 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 14:33:41 2020 +0100

android: Don't show the multiline toggle in the formula input bar on phones.

The interaction there currently distorts the view and occupies too much
space anyway.

Change-Id: I093432dcfc223e4ea8b0f5a3cc45368f90c3cc0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88477
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88481
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2017ca88959f..8117330bf114 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -727,7 +728,9 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, 
ScTabViewShell* pViewSh)
 maButton->Enable();
 maButton->SetSymbol(SymbolType::SPIN_DOWN);
 maButton->SetQuickHelpText(ScResId(SCSTR_QHELP_EXPAND_FORMULA));
-maButton->Show();
+// disable the multiline toggle on the mobile phones
+if (!comphelper::LibreOfficeKit::isActive() || 
!comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+maButton->Show();
 }
 
 ScInputBarGroup::~ScInputBarGroup()
@@ -777,7 +780,8 @@ void ScInputBarGroup::Resize()
 
aSize.setHeight(maTextWndGroup->GetPixelHeightForLines(maTextWndGroup->GetNumLines()));
 SetSizePixel(aSize);
 
-aSize.setWidth(aSize.Width() - maButton->GetSizePixel().Width() - 
BUTTON_OFFSET);
+long nButtonWidth = maButton->IsVisible()? 
maButton->GetSizePixel().Width() + BUTTON_OFFSET: 0;
+aSize.setWidth(aSize.Width() - nButtonWidth);
 maTextWndGroup->SetSizePixel(aSize);
 maTextWndGroup->Resize();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

2020-02-12 Thread Henry Castro (via logerrit)

 svx/source/svdraw/svdmrkv.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0373e37748259c80f22aa40757ee33ad71e64968
Author: Henry Castro 
AuthorDate: Tue Feb 4 15:05:09 2020 -0400
Commit: Andras Timar 
CommitDate: Wed Feb 12 14:59:04 2020 +0100

lok: add "type" information when a graphic is selected

Change-Id: I67a36d3aabbc197d9ac8f6ca4509dafd6f2620f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87991
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index acba9103244a..edb1ee867792 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -844,9 +844,10 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
 
 OStringBuffer aExtraInfo;
 
-aExtraInfo.append("{ \"id\": \"");
+aExtraInfo.append("{\"id\":\"");
 
aExtraInfo.append(OString::number(reinterpret_cast(pO)));
-aExtraInfo.append("\"");
+aExtraInfo.append("\",\"type\":");
+aExtraInfo.append(OString::number(pO->GetObjIdentifier()));
 
 if (bWriterGraphic)
 {
@@ -978,7 +979,7 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
 }
 }
 }
-aExtraInfo.append(" }");
+aExtraInfo.append("}");
 
 sSelectionText = aSelection.toString() +
 ", " + OString::number(nRotAngle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app

2020-02-12 Thread Michael Meeks (via logerrit)

 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 1fd62785c3ccbd58a71d835d12fb54c96fd8de74
Author: Michael Meeks 
AuthorDate: Wed Feb 12 13:55:32 2020 +
Commit: Mert Tümer 
CommitDate: Wed Feb 12 15:06:03 2020 +0100

android: remove obsolete drawLayout animation.

Fixes crash on pressing 'new document'

Change-Id: Ibc1aecbb2e4efb5920da564fa21cf754bf69cfa3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88539
Tested-by: Mert Tümer 
Reviewed-by: Mert Tümer 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 10fc735af..b40c3120f 100644
--- 
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ 
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -159,10 +159,8 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 private boolean isFabMenuOpen = false;
 private FloatingActionButton editFAB;
 private FloatingActionButton writerFAB;
-private FloatingActionButton drawFAB;
 private FloatingActionButton impressFAB;
 private FloatingActionButton calcFAB;
-private LinearLayout drawLayout;
 private LinearLayout writerLayout;
 private LinearLayout impressLayout;
 private LinearLayout calcLayout;
@@ -333,13 +331,11 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 
 private void expandFabMenu() {
 
ViewCompat.animate(editFAB).rotation(45.0F).withLayer().setDuration(300).setInterpolator(new
 OvershootInterpolator(10.0F)).start();
-drawLayout.startAnimation(fabOpenAnimation);
 impressLayout.startAnimation(fabOpenAnimation);
 writerLayout.startAnimation(fabOpenAnimation);
 calcLayout.startAnimation(fabOpenAnimation);
 writerFAB.setClickable(true);
 impressFAB.setClickable(true);
-drawFAB.setClickable(true);
 calcFAB.setClickable(true);
 isFabMenuOpen = true;
 }
@@ -348,11 +344,9 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 
ViewCompat.animate(editFAB).rotation(0.0F).withLayer().setDuration(300).setInterpolator(new
 OvershootInterpolator(10.0F)).start();
 writerLayout.startAnimation(fabCloseAnimation);
 impressLayout.startAnimation(fabCloseAnimation);
-drawLayout.startAnimation(fabCloseAnimation);
 calcLayout.startAnimation(fabCloseAnimation);
 writerFAB.setClickable(false);
 impressFAB.setClickable(false);
-drawFAB.setClickable(false);
 calcFAB.setClickable(false);
 isFabMenuOpen = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/lib loleaflet/po

2020-02-12 Thread Weblate (via logerrit)

 android/lib/src/main/res/values-cy/strings.xml |1 
 android/lib/src/main/res/values-eo/strings.xml |1 
 android/lib/src/main/res/values-es/strings.xml |1 
 android/lib/src/main/res/values-pt-rBR/strings.xml |5 +-
 loleaflet/po/ui-ast.po |4 -
 loleaflet/po/ui-bg.po  |   14 ++
 loleaflet/po/ui-ca.po  |   14 ++
 loleaflet/po/ui-cy.po  |   14 ++
 loleaflet/po/ui-de.po  |   43 +
 loleaflet/po/ui-dsb.po |   16 +++
 loleaflet/po/ui-en_GB.po   |   14 ++
 loleaflet/po/ui-es.po  |   18 +++-
 loleaflet/po/ui-eu.po  |   14 ++
 loleaflet/po/ui-hsb.po |   14 ++
 loleaflet/po/ui-hu.po  |   14 ++
 loleaflet/po/ui-pt_BR.po   |   20 -
 16 files changed, 94 insertions(+), 113 deletions(-)

New commits:
commit 32d55a6ca83801bea29b7de9b28adf54f3957a73
Author: Weblate 
AuthorDate: Wed Feb 12 15:09:46 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 15:15:22 2020 +0100

update translations

LibreOffice Online/loleaflet-ui (English (United Kingdom))
Currently translated at 100.0% (287 of 287 strings)

Change-Id: If872e0bae5b538c042a6246e139ff92b51771cfb

update translations

LibreOffice Online/loleaflet-ui (Upper Sorbian)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: I1ad3b4226f4cb9ce113a4a11e496d8b1a70c6363

update translations

LibreOffice Online/loleaflet-ui (Lower Sorbian)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: Ia519636dd33ff504fec3b78145c6b42b8e673e00

update translations

LibreOffice Online/android-lib (Welsh)
Currently translated at 100.0% (7 of 7 strings)

Change-Id: Ie9e72c41ffa386255ba35edfa5ecfed9b6cc6c3a

update translations

LibreOffice Online/android-lib (Esperanto)
Currently translated at 28.6% (2 of 7 strings)

Change-Id: I65360f5fc7f6425aab93dcdf7628b5317eea3f4a

update translations

LibreOffice Online/android-lib (Portuguese (Brazil))
Currently translated at 100.0% (7 of 7 strings)

Change-Id: If87ad3131762c217cc0a51988305d22029c3a2fd

update translations

LibreOffice Online/android-lib (Spanish)
Currently translated at 100.0% (7 of 7 strings)

Change-Id: I16079ade29da13c8194f47c0bde7e7620cf9b133

update translations

LibreOffice Online/loleaflet-ui (Portuguese (Brazil))
Currently translated at 100.0% (287 of 287 strings)

Change-Id: I3afb970ab5e682b9a5cedf90170506ece4f3ef1d

update translations

LibreOffice Online/loleaflet-ui (Basque)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: I899178b428f813f64660a03d3767afec4930598d

update translations

LibreOffice Online/loleaflet-ui (Spanish)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: Iba756ea0887e0ae01ef38049e41bfa12ddff08be

update translations

LibreOffice Online/loleaflet-ui (Spanish)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: I21686dc43e08dfdb9a0b45dfe30577ad749c37c4

update translations

LibreOffice Online/loleaflet-ui (German)
Currently translated at 91.6% (263 of 287 strings)

Change-Id: Ibd68c1320bb9a746800a50f4744eea79c89891d1

update translations

LibreOffice Online/loleaflet-ui (Welsh)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: I14dfa3a452d0c4d3e8f9406f02841fe1a505c921

update translations

LibreOffice Online/loleaflet-ui (Catalan)
Currently translated at 98.3% (282 of 287 strings)

Change-Id: Ib4de84246aa0fe8c9ceb6e2386910c58e4364eba

update translations

LibreOffice Online/loleaflet-ui (Bulgarian)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: Ib7ad2706e29d04ed0a8d50e4ba43d3dc78b86585

update translations

LibreOffice Online/loleaflet-ui (Asturian)
Currently translated at 34.8% (100 of 287 strings)

Change-Id: I8d2ebfc31d2ac706ff64602d984bd438b3cec39d

update translations

LibreOffice Online/loleaflet-ui (Hungarian)
Currently translated at 100.0% (287 of 287 strings)

Change-Id: Ieb0d3d4adf1abb2e2bd20b9ddc6f203657d7d3cb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88518
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/android/lib/src/main/res/values-cy/strings.xml 
b/android/lib/src/main/res/values-cy/strings.xml
index aea767027..883766563 100644
--- a/android/lib/src/main/res/values-

Re: warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"

2020-02-12 Thread julien2412

Hello,

In the same way, we also got:
I/O warning : failed to load external entity
"C:/BLP/core/workdir/HelpTranslatePartTarget/fr/helpcontent2/source/text/swriter/01/addsignatureline.xhp"
I/O warning : failed to load external entity
"C:/BLP/core/workdir/HelpTranslatePartTarget/fr/helpcontent2/source/text/swriter/01/signsignatureline.xhp"

(I updated my local repo just 4 hours ago + used "make clean")

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: xmloff/source

2020-02-12 Thread Noel Grandin (via logerrit)

 xmloff/source/core/xmlictxt.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b54e6db754f67c4a216c0f6d9b4a8d6315b1df16
Author: Noel Grandin 
AuthorDate: Wed Feb 12 14:06:25 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 12 15:34:49 2020 +0100

crashtesting: remove assert in SvXMLImportContext::SvXMLImportContext

which came from
commit 813118bfbb453f812be9e1a30f84908b4e0bfb51
Date:   Fri Dec 20 14:34:56 2019 +0200
add checks to optional fields in SvXMLImportContext
but it turns out various places abuse this field and pass stuff that is
not a element name, including empty strings

Change-Id: I33cfc7e44e0aafe0fdb084482a199d5cffde6a76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88523
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index d3647f1faa44..c80158d02c96 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -34,7 +34,6 @@ SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, 
sal_uInt16 nPrfx,
 , maLocalName(rLName)
 , mbPrefixAndLocalNameFilledIn(true)
 {
-assert(!rLName.isEmpty());
 }
 
 SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: warning: failed to load external entity "C:/build/workdir/HelpTranslatePartTarget/ja/helpcontent2/source/text/shared/00/kbd_shortcuts.xhp"

2020-02-12 Thread Olivier Hallot

Specifically to these help files, they were moved from /swriter/ to
/shared/ in the tree because the signature line is now available to
spreadsheets.

Translation should use the memory, since contents is mostly unchanged.

Olivier
Em 12/02/2020 11:04, julien2412 escreveu:
> Hello,
> 
> In the same way, we also got:
> I/O warning : failed to load external entity
> "C:/BLP/core/workdir/HelpTranslatePartTarget/fr/helpcontent2/source/text/swriter/01/addsignatureline.xhp"
> I/O warning : failed to load external entity
> "C:/BLP/core/workdir/HelpTranslatePartTarget/fr/helpcontent2/source/text/swriter/01/signsignatureline.xhp"
> 
> (I updated my local repo just 4 hours ago + used "make clean")
> 
> Julien
> 
> 
> 
> --
> Sent from: 
> http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

-- 
Olivier Hallot
LibreOffice Documentation Coordinator
Comunidade LibreOffice
Rio de Janeiro - Brasil - Local Time: UTC-03:00
http://tdf.io/joinus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Bugzilla: tweaking Antispam plugin

2020-02-12 Thread Xisco Fauli

Hello,

Due to the number of spam comments we have recently got in Bugzilla,
I've tweaked the Antispam plugin to ban any user, except those in the
admin or contributor groups, who writes a comment containing a URL to a
CLOSED bug.

Thus, if you find a RESOLVED bug being constantly attacked by spammers,
you just need to change it to CLOSED and it will no longer be attacked.

OTOH, if the issue is still OPEN, just let me know and I'll add it to a
blacklist that blocks comments containing a URL from users not being in
the contributor nor the admin groups.

Regards

-- 
Xisco Faulí
LibreOffice QA Team
IRC: x1sc0


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bridges/source

2020-02-12 Thread Stephan Bergmann (via logerrit)

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6dd94a4dd8f0b842cd62ec872ede17c8077be98c
Author: Stephan Bergmann 
AuthorDate: Wed Feb 12 12:47:04 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Feb 12 16:20:15 2020 +0100

Blind fix for Linux aarch64 with libcxxabi

...after untested a7d1fed24557b203acb5016a98af26f4ef24d27a "Hack to 
dynamically
adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" had been submitted

Change-Id: I68694645825ddebb249a90d9af9b8ba04c0bdbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx 
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 611442a31e31..4a5a1d1b662d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -153,8 +153,8 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void 
* exception) {
 // unaffected, as it only accesses members towards the start of the struct,
 // through a pointer known to actually point at the start):
 if (header->exceptionDestructor != &deleteException) {
-header = reinterpret_cast<__cxa_exception const *>(
-reinterpret_cast(header) - 8);
+header = reinterpret_cast<__cxxabiv1::__cxa_exception *>(
+reinterpret_cast(header) - 8);
 assert(header->exceptionDestructor == &deleteException);
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - .gitreview wsd/LOOLWSD.cpp

2020-02-12 Thread Miklos Vajna (via logerrit)

 .gitreview  |2 +-
 wsd/LOOLWSD.cpp |4 
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fbe3458aa492df7786eaefeb5e782e2d894d9613
Author: Miklos Vajna 
AuthorDate: Wed Jan 22 08:52:55 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Feb 12 16:27:26 2020 +0100

Fix an UB in the DocumentBroker dtor

The problem is that both the DocBrokers map and the instance returned by
Admin::instance() are static, so there it's not safe to assume that by
the time the DocumentBroker dtor runs, the static Admin instance is
still alive. Still, the DocumentBroker dtor calls Admin::instance().

Fix this by clearing the DocBrokers map in LOOLWSD::cleanup(), which is
used exactly to destroy statics in a controlled order.

Sanitizers output was:

wsd/DocumentBroker.cpp:497:23: runtime error: member call on address 
0x024a5ba0 which does not point to an object of type 'Admin'
0x024a5ba0: note: object is of type 'SocketPoll'
 00 00 00 00  50 21 45 01 00 00 00 00  b8 5b 4a 02 00 00 00 00  05 00 00 00 
00 00 00 00  61 64 6d 69
  ^~~
  vptr for 'SocketPoll'
#0 0xa10af3 in DocumentBroker::~DocumentBroker() 
wsd/DocumentBroker.cpp:497:23
...
#17 0x7fa27622ddc9 in exit (/lib64/libc.so.6+0x38dc9)
#18 0x7fa276215f90 in __libc_start_main (/lib64/libc.so.6+0x20f90)
#19 0x670189 in _start 
/home/abuild/rpmbuild/BUILD/glibc-2.26/csu/../sysdeps/x86_64/start.S:120

SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior 
wsd/DocumentBroker.cpp:497:23 in

(Seen during make check CPPUNIT_TEST_NAME="unit-each-view".)

Conflicts:
wsd/LOOLWSD.cpp

Change-Id: I02ad44deb9de06d9973216428c640248ea2512ce
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87178
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/.gitreview b/.gitreview
index 489239f60..402f38775 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=online
 defaultremote=logerrit
-defaultbranch=distro/collabora/collabora-online-4
+defaultbranch=distro/collabora/collabora-online-4-0
 
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 97b774cd0..44d43ae35 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3392,6 +3392,10 @@ void LOOLWSD::cleanup()
 }
 #endif
 #endif
+
+// Delete these while the static Admin instance is still alive.
+std::lock_guard docBrokersLock(DocBrokersMutex);
+DocBrokers.clear();
 }
 
 int LOOLWSD::main(const std::vector& /*args*/)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.hpp

2020-02-12 Thread Gabriel Masei (via logerrit)

 wsd/DocumentBroker.hpp |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 3046c5748bb54b16738aa5a7ee5e90b9420d68ac
Author: Gabriel Masei 
AuthorDate: Tue Feb 11 17:51:20 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Feb 12 16:28:10 2020 +0100

Fix removal of kit procs when they are blocked

Change-Id: Ifa2a2a56a305e33bb07ad622fce14f0e8b3e83eb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88464
Reviewed-by: Michael Meeks 
Tested-by: Andras Timar 

diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 890e89e38..8b2b42551 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -119,14 +119,23 @@ public:
 
 // Shutdown the socket.
 if (_ws)
+{
 _ws->shutdown();
+// If socket was shutdown and buffers cleared then there's no
+// reason to keep the object. This is crucial for 
DocumentBroker
+// to be considered as not alive and associated kit process
+// terminated in cleanupDocBrokers. Otherwise if kit process
+// hangs then the asociated DocumentBroker object won't be
+// removed and kit process won't be forcefully terminated. This
+// is in conjunction with not clearing _pid data member which
+// is needed later in call to terminate().
+_ws.reset();
+}
 }
 catch (const std::exception& ex)
 {
 LOG_ERR("Error while closing child process: " << ex.what());
 }
-
-_pid = -1;
 }
 
 /// Kill or abandon the child.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source include/vcl sfx2/source svx/source sw/source vcl/source vcl/unx

2020-02-12 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/IDEComboBox.cxx  |2 +-
 include/vcl/combobox.hxx|   13 +++--
 include/vcl/weld.hxx|6 +++---
 sfx2/source/inet/inettbc.cxx|2 +-
 svx/source/tbxctrls/tbunocontroller.cxx |2 +-
 sw/source/uibase/ribbar/workctrl.cxx|2 +-
 vcl/source/app/salvtables.cxx   |   17 +
 vcl/source/control/combobox.cxx |   19 ---
 vcl/unx/gtk3/gtk3gtkinst.cxx|4 ++--
 9 files changed, 45 insertions(+), 22 deletions(-)

New commits:
commit 18dd0254a38ca91d0d325aaecc4227724c035d87
Author: Caolán McNamara 
AuthorDate: Tue Feb 11 19:53:55 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 12 16:46:49 2020 +0100

cypress: mobile: Font size combobox is broken on core/master.

a) for vcl version, listen to modify and select, instead of just modify so
we can get the artificial select via uiobject that the mobile makes use of.
(and disregard the modify which we know will lead to select so we get just
one event in that case)

b) default to assuming something has been picked "directly" unless we
know otherwise.

ideally the result is that

https://cgit.freedesktop.org/libreoffice/online/commit/?id=08d6c3fdf9bac4ad8318151ab1402690eb950f52
isn't needed

Change-Id: Ibbf33eab88dabd55d0c329aa00c8adaf001a4f50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88476
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/source/basicide/IDEComboBox.cxx 
b/basctl/source/basicide/IDEComboBox.cxx
index 5279861365d1..b748577e9c63 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -300,7 +300,7 @@ IMPL_LINK_NOARG(LibBox, FocusOutHdl, weld::Widget&, void)
 
 void LibBox::Select()
 {
-if (m_xWidget->changed_by_menu())
+if (m_xWidget->changed_by_direct_pick())
 {
 if (!mbIgnoreSelect)
 NotifyIDE();
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index f2f96dca1b37..aae2ce719624 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -152,8 +152,17 @@ public:
 voidSetNoSelection();
 tools::Rectangle   GetBoundingRectangle( sal_Int32  nItem ) const;
 
-// determine if Select was called due to something selected from the menu
-boolIsModifyByMenu() const;
+// determine if Select was called due to typing or cursoring in the
+// combobox, as opposed to something selected from the menu or via some
+// other route.  e.g. the toolbar fontsize combobox wants to immediately
+// change size only if something is picked from the combobox menu, other
+// changes don't auto-apply until the user presses return
+boolIsModifyByKeyboard() const;
+
+// determine if Edit::Modify was called due to the ComboBox changing the 
edit area
+// itself
+boolIsSyntheticModify() const;
+
 
 /** checks whether a certain point lies within the bounds of
 a list item and returns the item as well as the character position
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index a98563a9680f..0c9e4af7e893 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -654,12 +654,12 @@ public:
to the user selecting a different item from the list or while typing
into the entry of a combo box with an entry.
 
-   Use changed_by_menu() to discover whether an item was actually selected
-   from the menu.
+   Use changed_by_direct_pick() to discover whether an item was actually 
explicitly
+   selected, e.g. from the menu.
  */
 void connect_changed(const Link& rLink) { m_aChangeHdl = 
rLink; }
 
-virtual bool changed_by_menu() const = 0;
+virtual bool changed_by_direct_pick() const = 0;
 
 virtual void connect_popup_toggled(const Link& rLink)
 {
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index ee5adc326ee3..3193100c5f7c 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -207,7 +207,7 @@ IMPL_LINK(SfxURLToolBoxControl_Impl, SelectHdl, 
weld::ComboBox&, rComboBox, void
 SvtURLBox* pURLBox = GetURLBox();
 OUString aName( pURLBox->GetURL() );
 
-if (rComboBox.changed_by_menu() && !aName.isEmpty())
+if (rComboBox.changed_by_direct_pick() && !aName.isEmpty())
 OpenURL( aName );
 }
 
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx 
b/svx/source/tbxctrls/tbunocontroller.cxx
index 22e78a397a79..e7a937ed79a9 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -175,7 +175,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl()
 
 IMPL_LINK(SvxFontSizeBox_Impl, SelectHdl, weld::ComboBox&, rCombo, void)
 {
-if (rCombo.changed_by_menu()) // only when picked from the list
+if (rCombo.changed_by_direct_pick()) // only when picked

[Libreoffice-commits] core.git: basctl/source

2020-02-12 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/bastype2.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c5d2c4cac83fb013052b490e212b79dc51605cd8
Author: Caolán McNamara 
AuthorDate: Wed Feb 12 12:29:30 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 12 17:05:39 2020 +0100

we always want to expand/collapse on double click

Change-Id: Idf5496b44f5e2d5782d99317029aa0e9cb99e8d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88527
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 673a3daeabe9..378700bb5325 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -1501,6 +1501,11 @@ IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, 
weld::TreeView&, bool)
 bool bValidIter = m_xControl->get_cursor(m_xIter.get());
 if (!bValidIter)
 return true;
+if (!m_xControl->get_row_expanded(*m_xIter))
+m_xControl->expand_row(*m_xIter);
+else
+m_xControl->collapse_row(*m_xIter);
+
 EntryDescriptor aDesc = GetEntryDescriptor(m_xIter.get());
 switch (aDesc.GetType())
 {
@@ -1518,15 +1523,10 @@ IMPL_LINK_NOARG(SbTreeListBox, OpenCurrentHdl, 
weld::TreeView&, bool)
 SID_BASICIDE_SHOWSBX, SfxCallMode::SYNCHRON,
 { &aSbxItem }
 );
-return true;
 }
 break;
 
 default:
-if (!m_xControl->get_row_expanded(*m_xIter))
-m_xControl->expand_row(*m_xIter);
-else
-m_xControl->collapse_row(*m_xIter);
 break;
 }
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2020-02-12 Thread Noel Grandin (via logerrit)

 solenv/gbuild/extensions/pre_MergedLibsList.mk |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 5b1a757993862042b673954735ecd4379b3f1c32
Author: Noel Grandin 
AuthorDate: Wed Feb 12 14:06:53 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Feb 12 17:26:12 2020 +0100

add some more libs to libmerged

Change-Id: I2d3c3d64f1fb1d3635bdde761f6502ba05221f95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88522
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 89c37ff9fc8d..a654adc68b44 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -31,11 +31,20 @@ MERGE_LIBRARY_LIST := \
$(if $(filter WNT,$(OS)),directx9canvas) \
drawinglayer \
editeng \
+   emfio \
+   $(if $(filter WNT,$(OS)),emser) \
+   evtatt \
filterconfig \
+   for \
+   forui \
+   fps_office \
+   frm \
fsstorage \
fwe \
fwi \
fwk \
+   fwl \
+   $(if $(filter WNT,$(OS)),gdipluscanvas) \
$(call gb_Helper_optional,DESKTOP,helplinker) \
i18npool \
i18nutil \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source

2020-02-12 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/bastype2.cxx |   14 --
 basctl/source/basicide/bastype3.cxx |9 +
 basctl/source/inc/bastype2.hxx  |1 +
 3 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit d81489fe40f93925296d8cf5b49e74607ab833cf
Author: Caolán McNamara 
AuthorDate: Tue Feb 11 15:53:17 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 12 17:28:50 2020 +0100

only freeze/thaw if we have to

because gtk will relayout and things jump around confusingly
and unnecessarily

Change-Id: I817e803f8ad7e523e5855326fc097f8798ddb679
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 378700bb5325..642b5c7adaea 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -851,6 +851,7 @@ 
SbTreeListBox::SbTreeListBox(std::unique_ptr xControl, weld::Win
 : m_xControl(std::move(xControl))
 , m_xIter(m_xControl->make_iterator())
 , m_pTopLevel(pTopLevel)
+, m_bFreezeOnFirstAddRemove(false)
 , m_aNotifier(*this)
 {
 m_xControl->connect_row_activated(LINK(this, SbTreeListBox, 
OpenCurrentHdl));
@@ -880,7 +881,6 @@ void SbTreeListBox::ScanEntry( const ScriptDocument& 
rDocument, LibraryLocation
 // can be called multiple times for updating!
 
 // actually test if basic's in the tree already?!
-m_xControl->freeze();
 // level 1: BasicManager (application, document, ...)
 bool bDocumentRootEntry = FindRootEntry(rDocument, eLocation, *m_xIter);
 if (bDocumentRootEntry && m_xControl->get_row_expanded(*m_xIter))
@@ -891,7 +891,6 @@ void SbTreeListBox::ScanEntry( const ScriptDocument& 
rDocument, LibraryLocation
 OUString aImage(GetRootEntryBitmaps(rDocument));
 AddEntry(aRootName, aImage, nullptr, true, 
std::make_unique(rDocument, eLocation));
 }
-m_xControl->thaw();
 }
 
 void SbTreeListBox::ImpCreateLibEntries(const weld::TreeIter& rIter, const 
ScriptDocument& rDocument, LibraryLocation eLocation)
@@ -1259,6 +1258,12 @@ void SbTreeListBox::UpdateEntries()
 // Removes the entry from the tree.
 void SbTreeListBox::RemoveEntry(const weld::TreeIter& rIter)
 {
+if (m_bFreezeOnFirstAddRemove)
+{
+m_xControl->freeze();
+m_bFreezeOnFirstAddRemove = false;
+}
+
 // removing the associated user data
 Entry* pBasicEntry = 
reinterpret_cast(m_xControl->get_id(rIter).toInt64());
 delete pBasicEntry;
@@ -1329,6 +1334,11 @@ void SbTreeListBox::AddEntry(
 std::unique_ptr&& rUserData,
 weld::TreeIter* pRet)
 {
+if (m_bFreezeOnFirstAddRemove)
+{
+m_xControl->freeze();
+m_bFreezeOnFirstAddRemove= false;
+}
 OUString 
sId(OUString::number(reinterpret_cast(rUserData.release(;
 m_xControl->insert(pParent, -1, &rText, &sId, nullptr, nullptr, &rImage, 
bChildrenOnDemand, pRet);
 }
diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index fec708b6f7f0..93fb1525d473 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -246,6 +246,10 @@ void TreeListBox::ScanAllEntries()
 
 void SbTreeListBox::ScanAllEntries()
 {
+// instead of always freezing, freeze on the first add/remove, which keeps 
gtk
+// from relayouting the tree if its not necessary
+m_bFreezeOnFirstAddRemove = true;
+
 ScanEntry( ScriptDocument::getApplicationScriptDocument(), 
LIBRARY_LOCATION_USER );
 ScanEntry( ScriptDocument::getApplicationScriptDocument(), 
LIBRARY_LOCATION_SHARE );
 
@@ -255,6 +259,11 @@ void SbTreeListBox::ScanAllEntries()
 if ( doc.isAlive() )
 ScanEntry(doc, LIBRARY_LOCATION_DOCUMENT);
 }
+
+if (!m_bFreezeOnFirstAddRemove)
+m_xControl->thaw(); // m_bFreezeOnFirstAddRemove was changed, so 
control was frozen
+else
+m_bFreezeOnFirstAddRemove = false;
 }
 
 SbxVariable* SbTreeListBox::FindVariable(const weld::TreeIter* pEntry)
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index 720d3156ac00..5e22375bd0e9 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -245,6 +245,7 @@ private:
 std::unique_ptr m_xControl;
 std::unique_ptr m_xIter;
 weld::Window* m_pTopLevel;
+bool m_bFreezeOnFirstAddRemove;
 BrowseMode nMode;
 DocumentEventNotifier m_aNotifier;
 voidSetEntryBitmaps(const weld::TreeIter& rIter, const 
OUString& rImage);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nutil/source

2020-02-12 Thread Alex Henrie (via logerrit)

 i18nutil/source/utility/casefolding_data.h |   43 +
 1 file changed, 43 insertions(+)

New commits:
commit 1ff2bf54e920f1bc85ca14778639eb4b9652a910
Author: Alex Henrie 
AuthorDate: Mon Feb 10 19:49:03 2020 -0700
Commit: Eike Rathke 
CommitDate: Wed Feb 12 17:33:39 2020 +0100

Add case table for Medefaidrin

Change-Id: I7325311a4a0957b1a43c36d04cbefde2ea7461eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88420
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18nutil/source/utility/casefolding_data.h 
b/i18nutil/source/utility/casefolding_data.h
index 24edd6970870..af68518ab53e 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -60,6 +60,16 @@ static const sal_Int8 CaseMappingIndex[] = {
   -1,   -1,   -1,   -1, 0x0e,   -1,   -1,   -1, // 10800 - 10fff
   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 11000 - 117ff
 0x0f,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 11800 - 11fff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 12000 - 127ff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 12800 - 12fff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 13000 - 137ff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 13800 - 13fff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 14000 - 147ff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 14800 - 14fff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 15000 - 157ff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 15800 - 15fff
+  -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, // 16000 - 167ff
+  -1,   -1,   -1,   -1,   -1,   -1, 0x10,   -1, // 16800 - 16fff
 };
 
 
@@ -591,6 +601,39 @@ static const Value CaseMappingValue[] = {
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 118e8 - 118ef
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 118f0 - 118f7
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 118f8 - 118ff
+
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e00 - 16e07
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e08 - 16e0f
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e10 - 16e17
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e18 - 16e1f
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e20 - 16e27
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e28 - 16e2f
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e30 - 16e37
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e38 - 16e3f
+{0x6a, 0xDE60}, {0x6a, 0xDE61}, {0x6a, 0xDE62}, {0x6a, 0xDE63}, {0x6a, 
0xDE64}, {0x6a, 0xDE65}, {0x6a, 0xDE66}, {0x6a, 0xDE67}, // 16e40 - 16e47
+{0x6a, 0xDE68}, {0x6a, 0xDE69}, {0x6a, 0xDE6A}, {0x6a, 0xDE6B}, {0x6a, 
0xDE6C}, {0x6a, 0xDE6D}, {0x6a, 0xDE6E}, {0x6a, 0xDE6F}, // 16e48 - 16e4f
+{0x6a, 0xDE70}, {0x6a, 0xDE71}, {0x6a, 0xDE72}, {0x6a, 0xDE73}, {0x6a, 
0xDE74}, {0x6a, 0xDE75}, {0x6a, 0xDE76}, {0x6a, 0xDE77}, // 16e50 - 16e57
+{0x6a, 0xDE78}, {0x6a, 0xDE79}, {0x6a, 0xDE7A}, {0x6a, 0xDE7B}, {0x6a, 
0xDE7C}, {0x6a, 0xDE7D}, {0x6a, 0xDE7E}, {0x6a, 0xDE7F}, // 16e58 - 16e5f
+{0x15, 0xDE40}, {0x15, 0xDE41}, {0x15, 0xDE42}, {0x15, 0xDE43}, {0x15, 
0xDE44}, {0x15, 0xDE45}, {0x15, 0xDE46}, {0x15, 0xDE47}, // 16e60 - 16e67
+{0x15, 0xDE48}, {0x15, 0xDE49}, {0x15, 0xDE4A}, {0x15, 0xDE4B}, {0x15, 
0xDE4C}, {0x15, 0xDE4D}, {0x15, 0xDE4E}, {0x15, 0xDE4F}, // 16e68 - 16e6f
+{0x15, 0xDE50}, {0x15, 0xDE51}, {0x15, 0xDE52}, {0x15, 0xDE53}, {0x15, 
0xDE54}, {0x15, 0xDE55}, {0x15, 0xDE56}, {0x15, 0xDE57}, // 16e70 - 16e77
+{0x15, 0xDE58}, {0x15, 0xDE59}, {0x15, 0xDE5A}, {0x15, 0xDE5B}, {0x15, 
0xDE5C}, {0x15, 0xDE5D}, {0x15, 0xDE5E}, {0x15, 0xDE5F}, // 16e78 - 16e7f
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e80 - 16e87
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 16e88 - 16e8f
+{0x00, 0

[Libreoffice-commits] core.git: sc/source

2020-02-12 Thread Noel Grandin (via logerrit)

 sc/source/ui/docshell/docfunc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 607be34d37ecba57e570aecd1978b79d1d3ad32c
Author: Noel Grandin 
AuthorDate: Wed Feb 12 14:10:27 2020 +0200
Commit: Caolán McNamara 
CommitDate: Wed Feb 12 17:35:16 2020 +0100

crashtesting: convert assert to SAL_WARN_IF

Change-Id: I70a9922960dee978be05218ebf16a8186c3bc0c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88524
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index c9becf98ae4d..733ba53d2f6d 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1370,7 +1370,7 @@ ScPostIt* ScDocFunc::ImportNote( const ScAddress& rPos, 
const OUString& rNoteTex
 ScDocument& rDoc = rDocShell.GetDocument();
 
 std::unique_ptr pOldNote = rDoc.ReleaseNote( rPos );
-assert(!pOldNote && "imported data has >1 notes on same cell?");
+SAL_WARN_IF(pOldNote, "sc.ui", "imported data has >1 notes on same cell? 
at pos " << rPos);
 
 // create new note
 ScPostIt* pNewNote = ScNoteUtil::CreateNoteFromString( rDoc, rPos, 
rNoteText, false, true, /*nNoteId*/0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source

2020-02-12 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/bastype2.cxx |  688 
 basctl/source/basicide/bastype3.cxx |  302 ---
 basctl/source/basicide/moduldlg.cxx |1 
 basctl/source/basicide/moduldlg.hxx |1 
 basctl/source/inc/bastype2.hxx  |   67 ---
 5 files changed, 2 insertions(+), 1057 deletions(-)

New commits:
commit 4a72d6f474b105cdaa7a570b1f199475cc64bb14
Author: Caolán McNamara 
AuthorDate: Tue Feb 11 13:50:50 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 12 17:55:27 2020 +0100

drop newly unused TreeListBox

Change-Id: Iea157bb472ee409a1a15b9f6c9cfe0adc21d1a03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88449
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 642b5c7adaea..a0bff5610898 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -159,694 +159,6 @@ EntryDescriptor::EntryDescriptor (
 OSL_ENSURE( m_aDocument.isValid(), "EntryDescriptor::EntryDescriptor: 
invalid document!" );
 }
 
-TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle)
-: SvTreeListBox(pParent, nStyle)
-, m_aNotifier( *this )
-{
-SetNodeDefaultImages();
-SetSelectionMode( SelectionMode::Single );
-}
-
-TreeListBox::~TreeListBox ()
-{
-disposeOnce();
-}
-
-void TreeListBox::dispose()
-{
-m_aNotifier.dispose();
-
-// destroy user data
-SvTreeListEntry* pEntry = First();
-while ( pEntry )
-{
-delete static_cast( pEntry->GetUserData() );
-pEntry->SetUserData( nullptr );
-pEntry = Next( pEntry );
-}
-SvTreeListBox::dispose();
-}
-
-void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation 
eLocation )
-{
-OSL_ENSURE( rDocument.isAlive(), "TreeListBox::ScanEntry: illegal 
document!" );
-if ( !rDocument.isAlive() )
-return;
-
-// can be called multiple times for updating!
-
-// actually test if basic's in the tree already?!
-SetUpdateMode(false);
-
-// level 1: BasicManager (application, document, ...)
-SvTreeListEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation 
);
-if ( pDocumentRootEntry && IsExpanded( pDocumentRootEntry ) )
-ImpCreateLibEntries( pDocumentRootEntry, rDocument, eLocation );
-if ( !pDocumentRootEntry )
-{
-OUString aRootName( GetRootEntryName( rDocument, eLocation ) );
-Image aImage;
-GetRootEntryBitmaps( rDocument, aImage );
-AddEntry(
-aRootName,
-aImage,
-nullptr, true, std::make_unique(rDocument, 
eLocation));
-}
-
-SetUpdateMode(true);
-}
-
-void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, 
const ScriptDocument& rDocument, LibraryLocation eLocation )
-{
-// get a sorted list of library names
-Sequence< OUString > aLibNames( rDocument.getLibraryNames() );
-sal_Int32 nLibCount = aLibNames.getLength();
-const OUString* pLibNames = aLibNames.getConstArray();
-
-for ( sal_Int32 i = 0 ; i < nLibCount ; i++ )
-{
-OUString aLibName = pLibNames[ i ];
-
-if ( eLocation == rDocument.getLibraryLocation( aLibName ) )
-{
-// check, if the module library is loaded
-bool bModLibLoaded = false;
-Reference< script::XLibraryContainer > xModLibContainer( 
rDocument.getLibraryContainer( E_SCRIPTS ) );
-if ( xModLibContainer.is() && xModLibContainer->hasByName( 
aLibName ) && xModLibContainer->isLibraryLoaded( aLibName ) )
-bModLibLoaded = true;
-
-// check, if the dialog library is loaded
-bool bDlgLibLoaded = false;
-Reference< script::XLibraryContainer > xDlgLibContainer( 
rDocument.getLibraryContainer( E_DIALOGS ) );
-if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aLibName ) && xDlgLibContainer->isLibraryLoaded( aLibName ) )
-bDlgLibLoaded = true;
-
-bool bLoaded = bModLibLoaded || bDlgLibLoaded;
-
-// if only one of the libraries is loaded, load also the other
-if ( bLoaded )
-{
-if ( xModLibContainer.is() && xModLibContainer->hasByName( 
aLibName ) && !xModLibContainer->isLibraryLoaded( aLibName ) )
-xModLibContainer->loadLibrary( aLibName );
-
-if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( 
aLibName ) && !xDlgLibContainer->isLibraryLoaded( aLibName ) )
-xDlgLibContainer->loadLibrary( aLibName );
-}
-
-// create tree list box entry
-OUString sId = bLoaded ? OUStringLiteral(RID_BMP_MODLIB) : 
OUStringLiteral(RID_BMP_MODLIBNOTLOADED);
-SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, 
aLibName, OBJ_TYPE_LIBRARY );
-if ( pLibRootEntry )
-{
-

[Libreoffice-commits] core.git: basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk

2020-02-12 Thread Caolán McNamara (via logerrit)

 basctl/UIConfig_basicide.mk |1 
 basctl/source/basicide/ObjectCatalog.cxx|   93 ++--
 basctl/source/basicide/bastypes.cxx |6 +
 basctl/source/inc/ObjectCatalog.hxx |   17 ++--
 basctl/source/inc/bastypes.hxx  |1 
 basctl/uiconfig/basicide/ui/basicmacrodialog.ui |2 
 basctl/uiconfig/basicide/ui/dockingorganizer.ui |   81 
 7 files changed, 122 insertions(+), 79 deletions(-)

New commits:
commit 1ac2c003a237af28132d34946f76b57652e20a47
Author: Caolán McNamara 
AuthorDate: Tue Feb 11 12:15:00 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Feb 12 17:55:12 2020 +0100

weld ObjectCatalog

Change-Id: I1979c6f8f5705360aa0df8cb7aeaeca00cd66ce9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88448
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 874c1cff4e9c..c87e39c77001 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/defaultlanguage \
basctl/uiconfig/basicide/ui/deletelangdialog \
basctl/uiconfig/basicide/ui/dialogpage \
+   basctl/uiconfig/basicide/ui/dockingorganizer \
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/importlibdialog \
diff --git a/basctl/source/basicide/ObjectCatalog.cxx 
b/basctl/source/basicide/ObjectCatalog.cxx
index 0a32d327f860..3c06ddb5201e 100644
--- a/basctl/source/basicide/ObjectCatalog.cxx
+++ b/basctl/source/basicide/ObjectCatalog.cxx
@@ -24,40 +24,35 @@
 #include 
 
 #include 
+#include 
+#include 
 
 namespace basctl
 {
 ObjectCatalog::ObjectCatalog(vcl::Window* pParent)
-: DockingWindow(pParent)
-, aTitle(VclPtr::Create(this))
-, aTree(VclPtr::Create(this, WB_TABSTOP))
+: DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
 {
+m_xVclContentArea = VclPtr::Create(this);
+m_xVclContentArea->Show();
+m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea,
+   
"modules/BasicIDE/ui/dockingorganizer.ui"));
+m_xContainer = m_xBuilder->weld_container("DockingOrganizer");
+
+m_xTitle = m_xBuilder->weld_label("title");
+m_xTree.reset(new SbTreeListBox(m_xBuilder->weld_tree_view("libraries"), 
GetFrameWeld()));
+
 SetHelpId("basctl:FloatingWindow:RID_BASICIDE_OBJCAT");
 SetText(IDEResId(RID_BASICIDE_OBJCAT));
 
 // title
-aTitle->SetText(IDEResId(RID_BASICIDE_OBJCAT));
-aTitle->SetStyle(WB_CENTER);
+m_xTitle->set_label(IDEResId(RID_BASICIDE_OBJCAT));
 
 // tree list
-aTree->Hide();
-aTree->SetStyle(WB_BORDER | WB_TABSTOP | WB_HSCROLL | WB_HASLINES | 
WB_HASLINESATROOT
-| WB_HASBUTTONS | WB_HASBUTTONSATROOT);
-aTree->SetAccessibleName(IDEResId(RID_STR_TLB_MACROS));
-aTree->SetHelpId(HID_BASICIDE_OBJECTCAT);
-aTree->ScanAllEntries();
-aTree->GrabFocus();
-
-{
-// centered after AppWin:
-Window const& rParent = *GetParent();
-Point aPos = rParent.OutputToScreenPixel(Point(0, 0));
-Size const aParentSize = rParent.GetSizePixel();
-Size const aSize = GetSizePixel();
-aPos.AdjustX((aParentSize.Width() - aSize.Width()) / 2);
-aPos.AdjustY((aParentSize.Height() - aSize.Height()) / 2);
-SetPosPixel(aPos);
-}
+weld::TreeView& rWidget = m_xTree->get_widget();
+
+rWidget.set_help_id(HID_BASICIDE_OBJECTCAT);
+m_xTree->ScanAllEntries();
+rWidget.grab_focus();
 
 // make object catalog keyboard accessible
 GetParent()->GetSystemWindow()->GetTaskPaneList()->AddWindow(this);
@@ -69,60 +64,22 @@ void ObjectCatalog::dispose()
 {
 if (!IsDisposed())
 GetParent()->GetSystemWindow()->GetTaskPaneList()->RemoveWindow(this);
-aTitle.disposeAndClear();
-aTree.disposeAndClear();
+m_xTitle.reset();
+m_xTree.reset();
+m_xContainer.reset();
+m_xBuilder.reset();
+m_xVclContentArea.disposeAndClear();
 DockingWindow::dispose();
 }
 
-// Resize() -- called by Window
-void ObjectCatalog::Resize()
-{
-// arranging the controls
-ArrangeWindows();
-}
-
 // ToggleFloatingMode() -- called by DockingWindow when IsFloatingMode() 
changes
 void ObjectCatalog::ToggleFloatingMode()
 {
 // base class version
 DockingWindow::ToggleFloatingMode();
-// rearranging the controls (title)
-ArrangeWindows();
-}
-
-// ArrangeWindows() -- arranges the controls to the size of the ObjectCatalog
-void ObjectCatalog::ArrangeWindows()
-{
-if (!aTitle || !aTree)
-return;
 
-Size const aSize = GetOutputSizePixel();
 bool const bFloating = IsFloatingMode();
-
-// title
-// (showing only if no

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

2020-02-12 Thread Mike Kaganski (via logerrit)

 sc/source/ui/view/tabview.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 2c9dc34b332b6cb4c121e85989e4e8e2ab822ea5
Author: Mike Kaganski 
AuthorDate: Sat Jan 18 12:01:24 2020 +0300
Commit: Eike Rathke 
CommitDate: Wed Feb 12 17:58:15 2020 +0100

tdf#130054: consider all row/col bars in ScTabView::EnableRefInput

Left col bar and bottom row bar were ignored - apparently overlooked
at least since commit 9ae5a91f7955e44d3b24a3f7741f9bca02ac7f24.

Change-Id: I5c2386b0aa1fdbb42f352c0b654e268dc62c7e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87007
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit bda31b1a95b284749cd5e4d9596aab8e1aa93714)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87022
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index ec52581dad23..53e03e61de07 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2245,18 +2245,15 @@ void ScTabView::EnableRefInput(bool bFlag)
 
 if(pTabControl!=nullptr) pTabControl->EnableInput(bFlag);
 
-if(pGridWin[SC_SPLIT_BOTTOMLEFT]!=nullptr)
-pGridWin[SC_SPLIT_BOTTOMLEFT]->EnableInput(bFlag,false);
-if(pGridWin[SC_SPLIT_BOTTOMRIGHT]!=nullptr)
-pGridWin[SC_SPLIT_BOTTOMRIGHT]->EnableInput(bFlag,false);
-if(pGridWin[SC_SPLIT_TOPLEFT]!=nullptr)
-pGridWin[SC_SPLIT_TOPLEFT]->EnableInput(bFlag,false);
-if(pGridWin[SC_SPLIT_TOPRIGHT]!=nullptr)
-pGridWin[SC_SPLIT_TOPRIGHT]->EnableInput(bFlag,false);
-if(pColBar[SC_SPLIT_RIGHT]!=nullptr)
-pColBar[SC_SPLIT_RIGHT]->EnableInput(bFlag,false);
-if(pRowBar[SC_SPLIT_TOP]!=nullptr)
-pRowBar[SC_SPLIT_TOP]->EnableInput(bFlag,false);
+for (auto& p : pGridWin)
+if (p)
+p->EnableInput(bFlag, false);
+for (auto& p : pColBar)
+if (p)
+p->EnableInput(bFlag, false);
+for (auto& p : pRowBar)
+if (p)
+p->EnableInput(bFlag, false);
 }
 
 bool ScTabView::ContinueOnlineSpelling()
___
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

2020-02-12 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/mobile/apply_font_spec.js |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit f93e3a4edab8fde70f2ad9b0070c2d31ab2a0023
Author: Tamás Zolnai 
AuthorDate: Wed Feb 12 17:05:26 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Feb 12 19:14:10 2020 +0100

cypress: mobile: font size combobox works now with core/master.

Fixed in:
18dd0254a38ca91d0d325aaecc4227724c035d87

Change-Id: I1e74d8f031cd5bfe1c74ab06693b2c39e97cc866
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88551
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/apply_font_spec.js 
b/cypress_test/integration_tests/mobile/apply_font_spec.js
index 687319615..52dd9fc0f 100644
--- a/cypress_test/integration_tests/mobile/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/apply_font_spec.js
@@ -1,4 +1,4 @@
-/* global describe it cy beforeEach require afterEach Cypress*/
+/* global describe it cy beforeEach require afterEach*/
 
 var helper = require('../common/helper');
 
@@ -49,12 +49,6 @@ describe('Apply font changes.', function() {
});
 
it('Apply font size.', function() {
-   // TODO: font size HTML item is not a combobox anymore.
-   // The ID changes from fontsizecombobox to fontsize.
-   // and applying font size does not affect the selected text.
-   if (Cypress.env('LO_CORE_VERSION') === 'master')
-   return;
-
// Change font size
cy.get('#fontsizecombobox')
.click();
___
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/data cypress_test/integration_tests cypress_test/README

2020-02-12 Thread Tamás Zolnai (via logerrit)

 cypress_test/README
 |   12 +-
 cypress_test/integration_tests/common/helper.js
 |   42 +++---
 cypress_test/integration_tests/mobile/calc/calc_focus_spec.js  
 |   22 ++---
 cypress_test/integration_tests/mobile/impress/impress_focus_spec.js
 |4 
 cypress_test/integration_tests/mobile/writer/apply_font_spec.js
 |4 
 
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js 
|4 
 cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js
 |4 
 cypress_test/integration_tests/mobile/writer/focus_spec.js 
 |4 
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js  
 |4 
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
 |4 
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
 |4 
 cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js   
 |4 
 cypress_test/integration_tests/mobile/writer/styles_spec.js
 |4 
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js  
 |6 -
 cypress_test/integration_tests/mobile/writer/toolbar_spec.js   
 |4 
 15 files changed, 74 insertions(+), 52 deletions(-)

New commits:
commit 5d41b930e6467a98b1749d92bff7a8a58f29470e
Author: Tamás Zolnai 
AuthorDate: Wed Feb 12 18:01:47 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Feb 12 19:14:42 2020 +0100

cypress: mobile: Organize tests based on component.

Change-Id: I49f6e76b219e4c55add05b5a8489e51c518625ab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88553
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/README b/cypress_test/README
index 79d236a47..11a05cd32 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -35,13 +35,17 @@ To run all mobile tests:
 
 make check-mobile
 
-To run one specific test suit of desktop tests:
+To run one specific test suit of desktop tests,
+use spec argument with a relative path to
+cypress_test/data/desktop/:
 
 make check-desktop spec=example_desktop_test_spec.js
 
-To run one specific test suit of mobile tests:
+To run one specific test suit of mobile tests,
+use spec argument with a relative path to
+cypress_test/data/mobile/:
 
-make check-mobile spec=toolbar_spec.js
+make check-mobile spec=writer/toolbar_spec.js
 
 
 Running one specific test
@@ -60,7 +64,7 @@ inside apply_font_spec.js file, you need to add it.only():
 
 Then run the test suit with:
 
-make check-mobile spec=apply_font_spec.js
+make check-mobile spec=writer/apply_font_spec.js
 
 Or open the file in the interactive test runner.
 
diff --git a/cypress_test/data/mobile/empty.ods 
b/cypress_test/data/mobile/calc/empty.ods
similarity index 100%
rename from cypress_test/data/mobile/empty.ods
rename to cypress_test/data/mobile/calc/empty.ods
diff --git a/cypress_test/data/mobile/empty.odp 
b/cypress_test/data/mobile/impress/empty.odp
similarity index 100%
rename from cypress_test/data/mobile/empty.odp
rename to cypress_test/data/mobile/impress/empty.odp
diff --git a/cypress_test/data/mobile/empty.odt 
b/cypress_test/data/mobile/writer/empty.odt
similarity index 100%
rename from cypress_test/data/mobile/empty.odt
rename to cypress_test/data/mobile/writer/empty.odt
diff --git a/cypress_test/data/mobile/simple.odt 
b/cypress_test/data/mobile/writer/simple.odt
similarity index 100%
rename from cypress_test/data/mobile/simple.odt
rename to cypress_test/data/mobile/writer/simple.odt
diff --git a/cypress_test/data/mobile/table.odt 
b/cypress_test/data/mobile/writer/table.odt
similarity index 100%
rename from cypress_test/data/mobile/table.odt
rename to cypress_test/data/mobile/writer/table.odt
diff --git a/cypress_test/data/mobile/table_with_text.odt 
b/cypress_test/data/mobile/writer/table_with_text.odt
similarity index 100%
rename from cypress_test/data/mobile/table_with_text.odt
rename to cypress_test/data/mobile/writer/table_with_text.odt
diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index c881d60df..04df7db71 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -1,22 +1,40 @@
 /* global cy Cypress expect*/
 
-function loadTestDoc(fileName, mobile) {
+function loadTestDoc(fileName, subFolder, mobile) {
// Get a clean test document
-   cy.task('copyFile', {
-   sourceDir: Cypress.env('DATA_FOLDER'),
-   destDir: Cypress.env('WORKDIR'),
-   fileName: fileName,
-   });
+   if (subFolder === undefined) {
+   cy.task('copyFile', {
+   sourceDir: Cypress.env('DATA_FOLDER'),
+   destDir: Cypress.

[Libreoffice-commits] core.git: basctl/source

2020-02-12 Thread Andrea Gelmini (via logerrit)

 basctl/source/basicide/bastype3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88d54208f14a1a3941df0a9bc3097ccff2a43368
Author: Andrea Gelmini 
AuthorDate: Wed Feb 12 19:15:13 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Feb 12 19:56:13 2020 +0100

Fix typo

Change-Id: I2b0fe68cf5346a6788bbd63242eadf872d58a87e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88556
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index 19ca594a213b..d54d635db981 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -128,7 +128,7 @@ IMPL_LINK(SbTreeListBox, RequestingChildrenHdl, const 
weld::TreeIter&, rEntry, b
 void SbTreeListBox::ScanAllEntries()
 {
 // instead of always freezing, freeze on the first add/remove, which keeps 
gtk
-// from relayouting the tree if its not necessary
+// from relayouting the tree if it's not necessary
 m_bFreezeOnFirstAddRemove = true;
 
 ScanEntry( ScriptDocument::getApplicationScriptDocument(), 
LIBRARY_LOCATION_USER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2020-02-12 Thread Pranam Lashkari (via logerrit)

 loleaflet/src/map/handler/Map.TouchGesture.js |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit a867a1b79cf78282e2fce12a5ad02d5cb17f3641
Author: Pranam Lashkari 
AuthorDate: Wed Feb 12 05:43:10 2020 +0530
Commit: Henry Castro 
CommitDate: Wed Feb 12 20:00:30 2020 +0100

Tile loading enabled while autoscrolling

if scrolled too fast tiles could not load until auto scrolling stops
and user had to wait for approx 2 sec and wait for tile to load

follow up for: https://gerrit.libreoffice.org/c/online/+/88072

Change-Id: I09541f5400288398ac7680c6d96e224e2ad6ef66
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88485
Tested-by: Henry Castro 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 72f6c4166..0d972d58a 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -635,7 +635,14 @@ L.Map.TouchGesture = L.Handler.extend({
this._map.dragging._draggable._startPoint = 
this._startSwipePoint;
this._map.dragging._draggable._startPos = this._newPos;
this._newPos._add(delta);
+
this._map.dragging._draggable._onMove(e);
+
+   // Updates the tiles
+   clearInterval(this._map._docLayer._tilesPreFetcher);
+   this._map._docLayer._preFetchBorder = null;
+   this._map._docLayer._preFetchTiles();
+
this.autoscrollAnimReq = 
L.Util.requestAnimFrame(this._autoscroll, this, true);
}
else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

How to build only changed files

2020-02-12 Thread mohamed sameh

Hello, I have a question. if I change one or more files and want to run
'make' to check that the project still builds, do I have to run a complete
build everytime which takes a lot of time or is there a way to only build
the affected files only ?
Thanks
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to build only changed files

2020-02-12 Thread Ilmari Lauhakangas


mohamed sameh kirjoitti 12.2.2020 klo 21.46:
Hello, I have a question. if I change one or more files and want to run 
'make' to check that the project still builds, do I have to run a 
complete build everytime which takes a lot of time or is there a way to 
only build the affected files only ?


Make is smart enough that it will only compile what it needs to. Try it out.

Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: How to build only changed files

2020-02-12 Thread Regina Henschel


Hi,

mohamed sameh schrieb am 12-Feb-20 um 20:46:
Hello, I have a question. if I change one or more files and want to run 
'make' to check that the project still builds, do I have to run a 
complete build everytime which takes a lot of time or is there a way to 
only build the affected files only ?

Thanks



If your change is only inside one module, you can use .build, 
e.g.


make svx.build

or in case of Windows

/opt/lo/bin/make svx.build



That is only while developing. When you think you are finished, then you 
need a complete build to be sure, that no unit tests are broken.




Find more about it on

https://wiki.documentfoundation.org/Development/GenericBuildingHints



Kind regards

Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

2020-02-12 Thread Ashod Nakashian (via logerrit)

 vcl/source/window/cursor.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c70d31a274b9e7b47dbf6622c84a7a3431360b9e
Author: Ashod Nakashian 
AuthorDate: Sun Feb 2 14:37:38 2020 -0500
Commit: Andras Timar 
CommitDate: Wed Feb 12 21:27:09 2020 +0100

vcl: avoid accessing null member on unloading views

Change-Id: If4e416c7257c861b9e13352b3329d9719b159e61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87830
Reviewed-by: Michael Meeks 
Tested-by: Aron Budea 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88538
Tested-by: Jenkins

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 3b55bea61690..340fbb77d985 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -201,8 +201,9 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool 
bRestore )
 // show the cursor, if there is an active window and the cursor
 // has been selected in this window
 pWindow = Application::GetFocusWindow();
-if ( !pWindow || !pWindow->mpWindowImpl || 
(pWindow->mpWindowImpl->mpCursor != this) || pWindow->mpWindowImpl->mbInPaint
-|| !pWindow->mpWindowImpl->mpFrameData->mbHasFocus )
+if (!pWindow || !pWindow->mpWindowImpl || 
(pWindow->mpWindowImpl->mpCursor != this)
+|| pWindow->mpWindowImpl->mbInPaint
+|| !pWindow->mpWindowImpl->mpFrameData->mbHasFocus)
 pWindow = nullptr;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2020-02-12 Thread Dennis Francis (via logerrit)

 sw/source/uibase/dochdl/swdtflvr.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7155d0011ecde39c9ea27ef19d475686d80574ee
Author: Dennis Francis 
AuthorDate: Fri Feb 7 12:08:21 2020 +0530
Commit: Andras Timar 
CommitDate: Wed Feb 12 21:27:58 2020 +0100

Classify shape(s) selections as 'complex'...

in isComplex() of XTransferable2 implementation SwTransferable.
This method is used by online via doc_getSelectionType() to determine the
type of selection. In writer this method used to classify shape objects as
non-complex which translates to 'text' in online, so if a shape is selected
in online, the js code there would treat it as text. This is problematic
when you want to send the correct align uno commands based on selection 
type.
So returning true in isComplex() for writer would correctly treat the shape
selections as 'complex' in online Writer.

Change-Id: I09fcd9e4fab48aa0d7e7d04c88bae9e1281a1b0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88158
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit c7178a12e6e57e3d85cecd09e9c0373ececbb33f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88495
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index a0230ef3630a..6dbb5c50046b 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -455,6 +455,9 @@ sal_Bool SAL_CALL SwTransferable::isComplex()
 }
 }
 
+if (m_pWrtShell->GetSelectionType() == SelectionType::DrawObject)
+return true; // Complex
+
 // Simple
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/qa writerfilter/source

2020-02-12 Thread Miklos Vajna (via logerrit)

 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|4 +-
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx|4 +-
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |4 --
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |2 -
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |2 -
 writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx|   17 
++
 writerfilter/qa/cppunittests/dmapper/data/inline-anchored-zorder.docx |binary
 writerfilter/source/dmapper/GraphicImport.cxx |   11 
+-
 8 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 99847d6b3005c5444ed5a46ca578c0e40149d77c
Author: Miklos Vajna 
AuthorDate: Wed Feb 12 15:02:18 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Feb 12 21:34:28 2020 +0100

DOCX import: fix ZOrder of inline vs anchored shapes

Shapes which are anchored but are not in the background should be always
on top of as-char anchored shapes in OOXML terms. Writer supports a
custom ZOrder even for as-char shapes, so make sure that they are
always behind anchored shapes.

To avoid unnecessary work, make sure that when there are multiple inline
shapes, we don't pointlessly reorder them (the old vs new style of the
sorting controls exactly this, what happens when two shapes have the
same ZOrder, and all inline shapes have a 0 ZOrder).

Adapt a few tests that used ZOrder indexes to access shapes, but the
intention was to just refer to a shape: fix the index and migrate to
shape names where possible.

Change-Id: I670e4dc2acbd2a0c6d47fe964cb5e3f2300e6848
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88540
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index dca06548b815..6d11c3c12590 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -482,11 +482,11 @@ DECLARE_OOXMLEXPORT_TEST(testStrict, "strict.docx")
 getParagraphOfText(1, xHeaderText, "This is a header.");
 
 // Picture was missing.
-uno::Reference xServiceInfo(getShape(1), 
uno::UNO_QUERY);
+uno::Reference xServiceInfo(getShapeByName("Picture 
2"), uno::UNO_QUERY);
 
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextGraphicObject"));
 
 // SmartArt was missing.
-xServiceInfo.set(getShape(2), uno::UNO_QUERY);
+xServiceInfo.set(getShape(1), uno::UNO_QUERY);
 
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"));
 
 // Chart was missing.
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 27c66c141357..c3a8c4948397 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -484,10 +484,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119201, "tdf119201.docx")
 auto xShape(getShape(1));
 CPPUNIT_ASSERT_MESSAGE("First shape should be visible.", 
getProperty(xShape, "Visible"));
 CPPUNIT_ASSERT_MESSAGE("First shape should be printable.", 
getProperty(xShape, "Printable"));
-xShape = getShape(2);
+xShape = getShapeByName("Rectangle 1");
 CPPUNIT_ASSERT_MESSAGE("Second shape should not be visible.", 
!getProperty(xShape, "Visible"));
 CPPUNIT_ASSERT_MESSAGE("Second shape should not be printable.", 
!getProperty(xShape, "Printable"));
-xShape = getShape(3);
+xShape = getShapeByName("Oval 2");
 CPPUNIT_ASSERT_MESSAGE("Third shape should be visible.", 
getProperty(xShape, "Visible"));
 CPPUNIT_ASSERT_MESSAGE("Third shape should be printable.", 
getProperty(xShape, "Printable"));
 }
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 05466e36b70f..998d7cd5b2d8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -998,9 +998,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf102466, "tdf102466.docx")
 
 // check content of the first page
 {
-uno::Reference 
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
-uno::Reference xIndexAccess = 
xDrawPageSupplier->getDrawPage();
-uno::Reference 
xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xFrame(getShapeByName("Marco1"), 
uno::UNO_QUERY);
 
 // no border
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xFrame, 
"LineWidth"));
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 344b493dae4b..e057f4e1c856 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -564,7 +564,7 @@ DECLARE_OOXMLEXPORT_TEST(test76317, "test76317.docx")
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(fdo76591, "fdo76591

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/headless

2020-02-12 Thread Armin Le Grand (via logerrit)

 vcl/headless/svpgdi.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 548a28b213e680a6ffd4c3822e97131a64311956
Author: Armin Le Grand 
AuthorDate: Sat Feb 8 12:14:09 2020 +0100
Commit: Armin Le Grand 
CommitDate: Wed Feb 12 21:38:28 2020 +0100

tdf#130478 add direct dash paint in cairo

Make use of mentioned task's 1st commit now
and implement direct dashing for cairo. All
the data is now available (that was the work),
make use of it.
Keeping a local static bool to control it, so
later if needed can be switched on/off e.g
using some global var/setting.
Cairo will now do buffering of complex polygon
data in cairo path data (from some compexity
on and timer/mem-controlled), but not dismantle
to own, stroked data.
With bDoDirectCairoStroke disabled, the dis-
mantled data will be buffered - more mem, but
should also help - at least it gets reused
now that it is possible to keep it at the
original geometry (incoming polygon) at all

Change-Id: Ic08f659d7ccbedc910ec678b1509ee1a7f3f2112
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88262
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88557
Tested-by: Jenkins CollaboraOffice 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 8dcdcc5df44c..bcfde817b604 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1305,7 +1305,16 @@ bool SvpSalGraphics::drawPolyLine(
 const double fDotDashLength(nullptr != pStroke ? 
std::accumulate(pStroke->begin(), pStroke->end(), 0.0) : 0.0);
 const bool bStrokeUsed(0.0 != fDotDashLength);
 
-if(pSystemDependentData_CairoPath)
+// MM01 decide if to stroke direcly
+static bool bDoDirectCairoStroke(true);
+
+// MM01 activate to stroke direcly
+if(bDoDirectCairoStroke && bStrokeUsed)
+{
+cairo_set_dash(cr, pStroke->data(), pStroke->size(), 0.0);
+}
+
+if(!bDoDirectCairoStroke && pSystemDependentData_CairoPath)
 {
 // MM01 - check on stroke change. Used against not used, or if both 
used,
 // equal or different?
@@ -1347,7 +1356,7 @@ bool SvpSalGraphics::drawPolyLine(
 // MM01 need to do line dashing as fallback stuff here now
 basegfx::B2DPolyPolygon aPolyPolygonLine;
 
-if(bStrokeUsed)
+if(!bDoDirectCairoStroke && bStrokeUsed)
 {
 // apply LineStyle
 basegfx::utils::applyLineDashing(
@@ -1359,7 +1368,7 @@ bool SvpSalGraphics::drawPolyLine(
 }
 else
 {
-// no line dashing, just copy
+// no line dashing or direct stroke, just copy
 aPolyPolygonLine.append(rPolyLine);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/lib

2020-02-12 Thread Jan Holesovsky (via logerrit)

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |6 
++
 1 file changed, 6 insertions(+)

New commits:
commit 9497681bd98d5cfc70a914e8e79e00a527813cdd
Author: Jan Holesovsky 
AuthorDate: Wed Feb 12 21:49:17 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Wed Feb 12 21:52:55 2020 +0100

android: Avoid a WebView-related error in the log.

Namely "WebView.destroy() called while WebView is still attached to window".

Change-Id: I6963a553ac05af6426ffe3c054bdcff28a725e3b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88571
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index a964ad392..90021f1c6 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -35,6 +35,7 @@ import android.provider.DocumentsContract;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
@@ -460,6 +461,11 @@ public class LOActivity extends AppCompatActivity {
 super.onDestroy();
 Log.i(TAG, "onDestroy() - we know we are leaving the document");
 nativeLooper.quit();
+
+// Remove the webview from the hierarchy & destroy
+final ViewGroup viewGroup = (ViewGroup) mWebView.getParent();
+if (viewGroup != null)
+viewGroup.removeView(mWebView);
 mWebView.destroy();
 
 // Most probably the native part has already got a 'BYE' from
___
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' - include/svx sw/qa sw/source

2020-02-12 Thread Caolán McNamara (via logerrit)

 include/svx/sdtacitm.hxx|2 +-
 sw/qa/core/data/html/pass/ofz20455.html |binary
 sw/source/filter/html/htmlcss1.cxx  |   18 +-
 sw/source/filter/html/swcss1.hxx|5 -
 sw/source/filter/html/swhtml.cxx|2 +-
 sw/source/filter/html/swhtml.hxx|2 ++
 6 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit c9605cc66bcc655f3d7c8f3264efa691de42aed5
Author: Caolán McNamara 
AuthorDate: Mon Feb 3 12:06:23 2020 +
Commit: Thorsten Behrens 
CommitDate: Wed Feb 12 22:23:02 2020 +0100

ofz#20455 sw: HTML import: fix invalid table in footer

The obvious problem was that a bookmark failed to be copied to the
correct node, it was created on a SwStartNode, which failed in
makeMark() and caused a null-pointer.

The target position was off by 1 node because there was a spurious
StartNode/EndNode pair directly below the table:

[  41]   0x5b13430  TableNode ,
[  42]0x5b1d010 StartNode ,
[  43] 0x5b12a50StartNode ,
[  44]  0x5b135f0TextNode "",

This was created by a special case in SwTableNode::MakeCopy() because
.GetTabSortBoxes().size() == 1.

But the table had actually quite a bunch more cells in the nodes-array,
just they were not yet in the SwTable.

In an exciting twist of events, it turns out the table was copied while
it was not yet finished parsing: the problem was that in the middle of
the table, some CSS set some page attributes, and this caused a
first-page page style to be created in SwCSS1Parser::ParseStyleSheet(),
by copying the master page style.

Unfortunately the table was in the , so it was
copied in this incomplete and inconsistent state.

It might be possible to get rid of the special case in
SwTableNode::MakeCopy() by restricting the special case skipping of
StartNodes at the start in SwNodes::CopyNodes() a bit so that StartNodes
whose EndNodes are copied aren't skipped; at least that's the most
reasonable explanation for the special case.

But for now just fix the HTML import.

Additionally, only on MacOSX, using libc++, this triggered an assert:
  Assertion failed: (!pImpl->mpStaticDefaults || typeid(rItem) == 
typeid(GetDefaultItem(nWhich))), function PutImpl, file 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/svl/source/items/itempool.cxx,
 line 611.

Probably because SdrTextAniCountItem is not marked DLLPUBLIC.

Change-Id: Ia167265e7540eea649801eaac2b89f9e18b685cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87859
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 086e43148059a7ebc6caa416fa82bb60fd2cc92f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88494
Reviewed-by: Thorsten Behrens 

diff --git a/include/svx/sdtacitm.hxx b/include/svx/sdtacitm.hxx
index bf145c8b6b6c..f34e5589ed53 100644
--- a/include/svx/sdtacitm.hxx
+++ b/include/svx/sdtacitm.hxx
@@ -23,7 +23,7 @@
 #include 
 
 // Number of loops. 0=infinite.
-class SdrTextAniCountItem final : public SfxUInt16Item {
+class SAL_DLLPUBLIC_RTTI SdrTextAniCountItem final : public SfxUInt16Item {
 public:
 SdrTextAniCountItem(sal_uInt16 nVal=0): 
SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {}
 
diff --git a/sw/qa/core/data/html/pass/ofz20455.html 
b/sw/qa/core/data/html/pass/ofz20455.html
new file mode 100644
index ..6e5ca0aa7e85
Binary files /dev/null and b/sw/qa/core/data/html/pass/ofz20455.html differ
diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index e7a1827543a6..4f8d8bbe7d03 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -90,11 +90,13 @@ void SwCSS1Parser::ChgPageDesc( const SwPageDesc *pPageDesc,
 m_pDoc->ChgPageDesc( pos, rNewPageDesc );
 }
 
-SwCSS1Parser::SwCSS1Parser( SwDoc *pD, const sal_uInt32 aFHeights[7], const 
OUString& rBaseURL, bool bNewDoc ) :
-SvxCSS1Parser( pD->GetAttrPool(), rBaseURL,
-   aItemIds, SAL_N_ELEMENTS(aItemIds)),
-m_pDoc( pD ),
-m_nDropCapCnt( 0 ),
+SwCSS1Parser::SwCSS1Parser(SwDoc *const pDoc, SwHTMLParser const& rParser,
+const sal_uInt32 aFHeights[7], const OUString& rBaseURL, bool const 
bNewDoc)
+: SvxCSS1Parser(pDoc->GetAttrPool(), rBaseURL,
+   aItemIds, SAL_N_ELEMENTS(aItemIds))
+, m_pDoc( pDoc )
+, m_rHTMLParser(rParser)
+, m_nDropCapCnt( 0 ),
 m_bIsNewDoc( bNewDoc ),
 m_bBodyBGColorSet( false ),
 m_bBodyBackgroundSet( false ),
@@ -1344,6 +1346,12 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 
nPoolId, bool bCreate )
 const SwPageDesc *pPageDesc = FindPageDesc(m_pDoc, nPoolId);
 if( !pPageDesc && bCreate )
 {
+if (m_rHTMLParser.IsReadingHeaderOrFooter())
+{   // (there should be on

[Libreoffice-commits] core.git: sw/qa sw/source

2020-02-12 Thread Serge Krot (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf130610_bold_in_2_styles.ott |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   29 
 sw/source/filter/ww8/wrtw8nds.cxx|   65 +++
 sw/source/filter/ww8/wrtww8.hxx  |2 
 4 files changed, 96 insertions(+)

New commits:
commit 0c6ef9ba325fc37f325a2848e013852d2780a5ca
Author: Serge Krot 
AuthorDate: Tue Feb 11 16:04:26 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Feb 12 22:24:19 2020 +0100

tdf#130610 docx export: handle bold as toggle properties

Change-Id: I4c60b7eab6430a64ea1c8bcf40d0036d0b38516f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88460
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sw/qa/extras/ooxmlexport/data/tdf130610_bold_in_2_styles.ott 
b/sw/qa/extras/ooxmlexport/data/tdf130610_bold_in_2_styles.ott
new file mode 100755
index ..35937d9a8aa3
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf130610_bold_in_2_styles.ott differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 3bdae52c4d65..9fce4ad0e091 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -107,6 +108,34 @@ DECLARE_OOXMLEXPORT_TEST(testTdf87569d, 
"tdf87569_drawingml.docx")
  text::RelOrientation::FRAME, nValue);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf130610, "tdf130610_bold_in_2_styles.ott")
+{
+// check character properties
+{
+uno::Reference xStyle(
+getStyles("CharacterStyles")->getByName("WollMuxRoemischeZiffer"),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Bold", awt::FontWeight::BOLD, 
getProperty(xStyle, "CharWeight"));
+}
+
+// check paragraph properties
+{
+uno::Reference xStyle(
+getStyles("ParagraphStyles")->getByName("WollMuxVerfuegungspunkt"),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Bold", awt::FontWeight::BOLD, 
getProperty(xStyle, "CharWeight"));
+}
+
+// check inline text properties
+{
+xmlDocPtr pXmlDoc =parseExport("word/document.xml");
+if (pXmlDoc)
+{
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:rPr/w:b");
+}
+}
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
 {
 // tdf#120315 cells of the second column weren't vertically merged
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index d06072c6de5a..70a855efc7ed 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -466,6 +467,12 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool 
bWriteCombChars)
 if ( pCharFormatItem )
 ClearOverridesFromSet( *pCharFormatItem, aExportSet );
 
+// check toggle properties in DOCX output
+{
+SvxWeightItem aBoldProperty(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
+handleToggleProperty(aExportSet, pCharFormatItem, RES_CHRATR_WEIGHT, 
&aBoldProperty);
+}
+
 // tdf#113790: AutoFormat style overwrites char style, so remove all
 // elements from CHARFMT grab bag which are set in AUTOFMT grab bag
 if (const SfxGrabBagItem *pAutoFmtGrabBag = dynamic_cast(pGrabBag))
@@ -528,6 +535,64 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool 
bWriteCombChars)
 m_rExport.AttrOutput().OutputItem( *pGrabBag );
 }
 
+// Toggle Properties
+//
+// If the value of the toggle property appears at multiple levels of the style 
hierarchy (17.7.2), their
+// effective values shall be combined as follows:
+//
+// value_{effective} = val_{table} XOR val_{paragraph} XOR val_{character}
+//
+// If the value specified by the document defaults is true, the effective 
value is true.
+// Otherwise, the values are combined by a Boolean XOR as follows:
+// i.e., the effective value to be applied to the content shall be true if its 
effective value is true for
+// an odd number of levels of the style hierarchy.
+//
+// To prevent such logic inside output, it is required to write inline w:b 
token on content level.
+void SwWW8AttrIter::handleToggleProperty(SfxItemSet& rExportSet, const 
SwFormatCharFormat* pCharFormatItem,
+sal_uInt16 nWhich, const SfxPoolItem* pValue)
+{
+if (!rExportSet.HasItem(nWhich) && pValue)
+{
+bool hasPropertyInCharStyle = false;
+bool hasPropertyInParaStyle = false;
+
+// get bold flag from specified character style
+if (pCharFormatItem)
+{
+if (const SwCharFormat* pCharFormat = 
pCharFormatItem->GetCharFormat())
+{
+const SfxPoolItem* pItem = nullptr;
+if (pCharFormat->

[Libreoffice-commits] core.git: svx/source

2020-02-12 Thread Xisco Faulí (via logerrit)

 svx/source/svdraw/svdxcgv.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 09e6824bc868990095233825c415556399dd0652
Author: Xisco Faulí 
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Feb 12 22:28:22 2020 +0100

tdf#130614: Revert "tdf#125520 Fix OLE objects drag&drop with 'Insert as 
Copy'"

This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 827b0720b69d..f55e964a6223 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr 
SdrExchangeView::CreateMarkedObjModel() const
 
 if(nullptr == pNewObj)
 {
-// not cloned yet
-if (pObj->GetObjIdentifier() == OBJ_OLE2)
-{
-// tdf#125520
-pNewObj = 
pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-}
-else
-{
-// use default way
-pNewObj = pObj->CloneSdrObject(*pNewModel);
-}
+// not cloned yet, use default way
+pNewObj = pObj->CloneSdrObject(*pNewModel);
 }
 
 if(pNewObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Makefile.am test/httpwstest.cpp

2020-02-12 Thread Tamás Zolnai (via logerrit)

 Makefile.am |2 +-
 test/httpwstest.cpp |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4fc7bc76dbe9ad4845cdeb5377e57c212cfb5acd
Author: Tamás Zolnai 
AuthorDate: Wed Feb 12 19:17:13 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Wed Feb 12 22:46:34 2020 +0100

tests: Change the order of cypress-test and other tests.

So we can see how stable the cypress tests are. Now other unit
tests under tests folder are failing randomly, so it's hard to
monitor the cypress tests.

Enable one unstable unit test, which was disabled for the same
reason.

Change-Id: Ib1646de1647c9a2bdb769bbb6b92a5794dd7a598
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88559
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/Makefile.am b/Makefile.am
index c6d417185..d064de9c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ endif
 
 else
 
-SUBDIRS = . test loleaflet cypress_test
+SUBDIRS = . loleaflet cypress_test test
 
 export ENABLE_DEBUG
 
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 4a2ea298b..3f90fabca 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -41,8 +41,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 
 CPPUNIT_TEST(testSaveOnDisconnect);
 CPPUNIT_TEST(testSavePassiveOnDisconnect);
-// This test is failing
-//CPPUNIT_TEST(testReloadWhileDisconnecting);
+CPPUNIT_TEST(testReloadWhileDisconnecting);
 CPPUNIT_TEST(testInactiveClient);
 CPPUNIT_TEST(testViewInfoMsg);
 CPPUNIT_TEST(testUndoConflict);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.hpp

2020-02-12 Thread Michael Meeks (via logerrit)

 wsd/DocumentBroker.hpp |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit faee2bdb24bcc77b879e5b9329889209c113f4a1
Author: Michael Meeks 
AuthorDate: Thu Feb 13 00:23:43 2020 +
Commit: Michael Meeks 
CommitDate: Thu Feb 13 00:33:05 2020 +

Revert "Fix removal of kit procs when they are blocked"

This reverts commit 3046c5748bb54b16738aa5a7ee5e90b9420d68ac.

This breaks mobile apps for now. Apparently the 'close'
forces a different ordering than expected on the Child.

diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 8b2b42551..890e89e38 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -119,23 +119,14 @@ public:
 
 // Shutdown the socket.
 if (_ws)
-{
 _ws->shutdown();
-// If socket was shutdown and buffers cleared then there's no
-// reason to keep the object. This is crucial for 
DocumentBroker
-// to be considered as not alive and associated kit process
-// terminated in cleanupDocBrokers. Otherwise if kit process
-// hangs then the asociated DocumentBroker object won't be
-// removed and kit process won't be forcefully terminated. This
-// is in conjunction with not clearing _pid data member which
-// is needed later in call to terminate().
-_ws.reset();
-}
 }
 catch (const std::exception& ex)
 {
 LOG_ERR("Error while closing child process: " << ex.what());
 }
+
+_pid = -1;
 }
 
 /// Kill or abandon the child.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 9 commits - comphelper/Library_comphelper.mk comphelper/source configmgr/README.vars configmgr/source configure.ac desktop/source ex

2020-02-12 Thread Samuel Mehrbrodt (via logerrit)

Rebased ref, commits from common ancestor:
commit 47578e07235673d6b05cf1b71602dcddc51d60d2
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 23 14:05:33 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 13 02:12:09 2020 +0100

Release 6.2.9.2

Change-Id: I881936cd6d8192e392420f58070def4834d60ec3

diff --git a/configure.ac b/configure.ac
index a6c7f84e13e9..6d962c3acddf 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.1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.9.2],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit a1a15546c2c0df4d0ae202eb3628a522b5cdd133
Author: Mike Kaganski 
AuthorDate: Thu Jan 23 12:56:00 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Feb 13 02:12:09 2020 +0100

Logger should be initialized with local context

... otherwise its output will go to connected soffice, and will not
reach the unopkg console, e.g. trying to execute

unopkg add wrong_extension_name

while an instance of soffice is running.

Change-Id: Ic0b0c48f9b3e8be084e0fdd1838cb0614da6817e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87248
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 5fe5c3a3f485f925a327cdc7b95c8691f6078608)

diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index e7f7c0c26938..72c5ff315b4b 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -313,13 +313,13 @@ extern "C" int unopkg_main()
 
 // Initialize logging. This will log errors to the console and
 // also to file if the --log-file parameter was provided.
-logger.reset(new comphelper::EventLogger(xComponentContext, "unopkg"));
+logger.reset(new comphelper::EventLogger(xLocalComponentContext, 
"unopkg"));
 const Reference xLogger(logger->getLogger());
 xLogger->setLevel(LogLevel::WARNING);
-Reference 
xLogFormatter(SimpleTextFormatter::create(xComponentContext));
+Reference 
xLogFormatter(SimpleTextFormatter::create(xLocalComponentContext));
 Sequence < beans::NamedValue > aSeq { { "Formatter", 
Any(xLogFormatter) } };
 
-
xConsoleHandler.set(ConsoleHandler::createWithSettings(xComponentContext, 
aSeq));
+
xConsoleHandler.set(ConsoleHandler::createWithSettings(xLocalComponentContext, 
aSeq));
 xLogger->addLogHandler(xConsoleHandler);
 xConsoleHandler->setLevel(LogLevel::WARNING);
 xLogger->setLevel(LogLevel::WARNING);
@@ -328,7 +328,7 @@ extern "C" int unopkg_main()
 if (!logFile.isEmpty())
 {
 Sequence < beans::NamedValue > aSeq2 { { "Formatter", 
Any(xLogFormatter) }, {"FileURL", Any(logFile)} };
-
xFileHandler.set(css::logging::FileHandler::createWithSettings(xComponentContext,
 aSeq2));
+
xFileHandler.set(css::logging::FileHandler::createWithSettings(xLocalComponentContext,
 aSeq2));
 xFileHandler->setLevel(LogLevel::WARNING);
 xLogger->addLogHandler(xFileHandler);
 }
commit b3d2369fbc3e173e2ce1ed89a87d136da6fe4236
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 20 11:12:12 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 13 02:12:09 2020 +0100

tdf#129917 Use temp user profile when installing shared extensions

Change-Id: I62dd163758e6348a62fc8a0b25150a62f282de90

diff --git a/configmgr/README.vars b/configmgr/README.vars
new file mode 100644
index ..d4ebae297e1b
--- /dev/null
+++ b/configmgr/README.vars
@@ -0,0 +1,3 @@
+Environment variables in configmgr:
+
+LO_NO_REGISTRYMODIFICATIONS - Don't write registrymodifications.xcu
diff --git a/configmgr/source/writemodfile.cxx 
b/configmgr/source/writemodfile.cxx
index b3592bb1a8af..e6f76b582985 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -563,6 +564,9 @@ void writeValueContent(TempFile &handle, 
o3tl::u16string_view value) {
 void writeModFile(
 Components & components, OUString const & url, Data const & data)
 {
+OUString sTokenOut;
+if (rtl::Bootstrap::get("LO_NO_REGISTRYMODIFICATIONS", sTokenOut))
+return;
 sal_Int32 i = url.lastIndexOf('/');
 assert(i != -1);
 OUString dir(url.copy(0, i));
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 045ee94ec7ef..e7f7c0c26938 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -31,6 +31,7 @@
 #include

[Libreoffice-commits] online.git: loleaflet/src

2020-02-12 Thread Michael Meeks (via logerrit)

 loleaflet/src/layer/tile/ImpressTileLayer.js |1 +
 loleaflet/src/layer/tile/TileLayer.js|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2adc32fab52944da935a226269c67dbf98654319
Author: Michael Meeks 
AuthorDate: Thu Feb 13 02:55:50 2020 +
Commit: Ashod Nakashian 
CommitDate: Thu Feb 13 04:48:44 2020 +0100

impress: cleanup preview invalidator & avoid null this._map on close.

Change-Id: I96f9cb217c6a479dfee91dc471ab442cd2d014ae
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88576
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js 
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 568796e47..3938a973a 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -279,6 +279,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
 
onRemove: function (map) {
map.off('updatemaxbounds', this._onUpdateMaxBounds, this);
+   clearTimeout(this._previewInvalidator);
},
 
onAnnotationCancel: function () {
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 46bd3c0a7..7be34c242 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -3161,7 +3161,7 @@ L.TileLayer = L.GridLayer.extend({
},
 
_invalidatePreviews: function () {
-   if (this._map._docPreviews && this._previewInvalidations.length 
> 0) {
+   if (this._map && this._map._docPreviews && 
this._previewInvalidations.length > 0) {
var toInvalidate = {};
for (var i = 0; i < this._previewInvalidations.length; 
i++) {
var invalidBounds = 
this._previewInvalidations[i];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2020-02-12 Thread Michael Meeks (via logerrit)

 loleaflet/src/layer/tile/GridLayer.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1bc10345432aa1858867228ecb57b46c1ccbde1c
Author: Michael Meeks 
AuthorDate: Thu Feb 13 04:25:36 2020 +
Commit: Ashod Nakashian 
CommitDate: Thu Feb 13 06:07:14 2020 +0100

Avoid exception dragging during shutdown.

Really TileLayer.js should have a clean on remove that dis-connects
from drag, resize etc. but it doesn't yet.

Change-Id: Ia2c2268875187a2f1115b7d357fd56ab825bb77f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88578
Reviewed-by: Michael Meeks 
Tested-by: Ashod Nakashian 

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index a69741462..9a9d7f004 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -446,6 +446,7 @@ L.GridLayer = L.Layer.extend({
},
 
_updateScrollOffset: function () {
+   if (!this._map) return;
var centerPixel = this._map.project(this._map.getCenter());
var newScrollPos = 
centerPixel.subtract(this._map.getSize().divideBy(2));
var x = Math.round(newScrollPos.x < 0 ? 0 : newScrollPos.x);
___
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

2020-02-12 Thread Jan Holesovsky (via logerrit)

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 302ddf9f9ccca2e1583d09e2588e9c9c9d30b976
Author: Jan Holesovsky 
AuthorDate: Tue Feb 11 23:55:52 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Feb 13 06:53:00 2020 +0100

If asked to do so, enable icecream even in the 'build' part of configure.

Otherwise it is used only in the 'host' part of the cross-compile build.

Change-Id: Ifb8d88e18c131e3019a4f3168afc1b743f3cc8e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88483
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index 0d00032d3210..e0a3bca717fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4597,6 +4597,7 @@ if test "$cross_compiling" = "yes"; then
 --disable-gtk3 \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
+--enable-icecream="$enable_icecream" \
 --with-parallelism="$with_parallelism" \
 --without-doxygen \
 --without-java \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2020-02-12 Thread Muhammet Kara (via logerrit)

 sc/source/ui/view/tabvwsh2.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 7a27ac1060fcf8a6bbf9e03ad1457633dcd1ad06
Author: Muhammet Kara 
AuthorDate: Wed Feb 12 05:42:11 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Feb 13 06:56:01 2020 +0100

mobile: Center inserted shapes on visible area

Change-Id: I366ef5d01ee3afb072b1f67d24015c889a41f4b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88488
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 117edd72493d..da77a4278655 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -320,6 +321,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 
 // calc position and size
 bool bLOKIsActive = comphelper::LibreOfficeKit::isActive();
+bool bIsMobile = 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 Point aInsertPos;
 if(!bLOKIsActive)
 {
@@ -328,6 +330,16 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
 aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
 }
+else if (bIsMobile)
+{
+aInsertPos = GetViewData().getLOKVisibleArea().Center();
+
+aInsertPos.setX(sc::TwipsToHMM(aInsertPos.X()));
+aInsertPos.setY(sc::TwipsToHMM(aInsertPos.Y()));
+
+aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
+aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
+}
 else
 {
 aInsertPos = GetInsertPos();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source

2020-02-12 Thread Andreas Heinisch (via logerrit)

 basctl/source/basicide/baside2.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit d75781dcd619a747b17b6c897ba44dc6ff8b5c7e
Author: Andreas Heinisch 
AuthorDate: Wed Feb 12 22:48:45 2020 +0100
Commit: Noel Grandin 
CommitDate: Thu Feb 13 07:20:20 2020 +0100

tdf#57307 - Expand word boundaries to include connector punctuations

Include connector punctuations when adding a variable to the watch
window using "Enable Watch (F7)" in order to add the correct variable name.

Change-Id: Idaf7699dde3f4147d603c6aea4b2381e2af497a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88575
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 5d3bb561b275..85db57dfbfdd 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -695,14 +695,11 @@ void ModulWindow::BasicAddWatch()
 bool bAdd = true;
 if ( !GetEditView()->HasSelection() )
 {
-TextPaM aWordStart;
-OUString aWord = GetEditEngine()->GetWord( 
GetEditView()->GetSelection().GetEnd(), &aWordStart );
+// tdf#57307 - expand selection to include connector punctuations
+TextSelection aSel;
+OUString aWord = GetEditEngine()->GetWord( 
GetEditView()->GetSelection().GetEnd(), &aSel.GetStart(), &aSel.GetEnd() );
 if ( !aWord.isEmpty() )
-{
-TextSelection aSel( aWordStart );
-aSel.GetEnd().GetIndex() += aWord.getLength();
 GetEditView()->SetSelection( aSel );
-}
 else
 bAdd = false;
 }
___
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' - svx/source

2020-02-12 Thread Xisco Faulí (via logerrit)

 svx/source/svdraw/svdxcgv.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f
Author: Xisco Faulí 
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit: Xisco Faulí 
CommitDate: Thu Feb 13 07:41:21 2020 +0100

tdf#130614: Revert "tdf#125520 Fix OLE objects drag&drop with 'Insert as 
Copy'"

This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 09e6824bc868990095233825c415556399dd0652)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88500
Reviewed-by: Xisco Faulí 

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f18d536b7bf2..8fcd742ec71f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr 
SdrExchangeView::CreateMarkedObjModel() const
 
 if(nullptr == pNewObj)
 {
-// not cloned yet
-if (pObj->GetObjIdentifier() == OBJ_OLE2)
-{
-// tdf#125520
-pNewObj = 
pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-}
-else
-{
-// use default way
-pNewObj = pObj->CloneSdrObject(*pNewModel);
-}
+// not cloned yet, use default way
+pNewObj = pObj->CloneSdrObject(*pNewModel);
 }
 
 if(pNewObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

2020-02-12 Thread Michael Meeks (via logerrit)

 loleaflet/src/control/Control.ContextMenu.js |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 6543ad21bbeeb23bf96f67a50edceef7053b914d
Author: Michael Meeks 
AuthorDate: Thu Feb 13 04:47:38 2020 +
Commit: Andras Timar 
CommitDate: Thu Feb 13 07:57:18 2020 +0100

mobile: Delete insertion - use graphic selection rather than clip.

The clipboard population is asynchronous and might come too late.
Was missing the Delete item on Android.

Change-Id: I05515f151c8d730e2aa1cb61eceacd0c3b90c455
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88579
Reviewed-by: Ashod Nakashian 
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/src/control/Control.ContextMenu.js 
b/loleaflet/src/control/Control.ContextMenu.js
index 9912729ce..9bc7a23c2 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -157,11 +157,8 @@ L.Control.ContextMenu = L.Control.extend({
},
 
_amendContextMenuData: function(obj) {
-
-   // Add a 'delete' entry for mobile when selection is 
ole/image/shape
-   if (this._map._clip && this._map._clip._selectionType === 
'complex' &&
-   window.mode.isMobile()) {
-
+   // Add a 'delete' entry for mobile for graphic selection.
+   if (this._map._docLayer.hasGraphicSelection() && 
window.mode.isMobile()) {
var insertIndex = -1;
obj.menu.forEach(function(item, index) {
if (item.command === '.uno:Paste') {
@@ -174,7 +171,6 @@ L.Control.ContextMenu = L.Control.extend({
{ text: _('Delete'), type: 'command', 
command: '.uno:Delete', enabled: true });
}
}
-
},
 
_createContextMenuStructure: function(obj) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

2020-02-12 Thread Stephan Bergmann (via logerrit)

 compilerplugins/clang/returnconstant.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 379d6e1dbe74a13dfe8d007e64cecdd1260c93ef
Author: Stephan Bergmann 
AuthorDate: Wed Feb 12 17:04:44 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 13 08:14:08 2020 +0100

aImmediateMacro is unused

...ever since fdc50b0a1b9741c5610a2b6c793c8fcdf5573c76 "new
loplugin:returnconstant"

Change-Id: Ib7f8760a95112aa31e1dd2ae15229c42e5fee812
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88547
Reviewed-by: Noel Grandin 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/compilerplugins/clang/returnconstant.cxx 
b/compilerplugins/clang/returnconstant.cxx
index e33a35664e62..c2c0442bf63d 100644
--- a/compilerplugins/clang/returnconstant.cxx
+++ b/compilerplugins/clang/returnconstant.cxx
@@ -118,14 +118,12 @@ bool ReturnConstant::TraverseCXXMethodDecl(CXXMethodDecl* 
functionDecl)
 return true;
 
 // ignore LINK macro stuff
-std::string aImmediateMacro = "";
 if 
(compiler.getSourceManager().isMacroBodyExpansion(compat::getBeginLoc(functionDecl))
 || 
compiler.getSourceManager().isMacroArgExpansion(compat::getBeginLoc(functionDecl)))
 {
 StringRef name{ 
Lexer::getImmediateMacroName(compat::getBeginLoc(functionDecl),
  
compiler.getSourceManager(),
  compiler.getLangOpts()) };
-aImmediateMacro = name.str();
 if (name.find("IMPL_LINK") != StringRef::npos
 || name.find("IMPL_STATIC_LINK") != StringRef::npos
 || name.find("DECL_LINK") != StringRef::npos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Blurry display on Retina macOS computers

2020-02-12 Thread Eivind Samseth

> On 12 Feb 2020, at 09:23, Tor Lillqvist  wrote:
> 
> In a nutshell, you need to build with macOS SDK 10.13, as SDK 10.14 and 10.15 
> produce blurry results
> 
> But that sounds just like a silly workaround. Does anybody have any insight 
> in what the actual thing going on here is?
> 
> --tml

That may be true - but it would be an effective bandaid before a proper fix is 
found (we’re now up to 18 dupes and 64 in CC on the bug…)

Thorsten Wagner found the bandaid, and Emmeran Seehuber tried looking into the 
underlying issue

Taking the liberty to include them on CC here in case they have further input, 
Emmeran asked for more pointers to look into it

Best,
Eivind

From https://bugs.documentfoundation.org/show_bug.cgi?id=122218#c145
I also tried to look into it. (master on MacOS 10.15.2 with SDK 10.15)

AquaSalGraphics::CheckContext(): The backingScaleFactor of the window is 
correct (2.0 for Retina) and so is the size of the CGLayer used as draw buffer 
for the window (i.e. twice the window width x height). That looks all fine.

For me it seems something gets into a broken state in the CGContextRef while 
painting the document content. Because not only the text but also all lines are 
blurred. 

This is just guessing, but maybe a scale with a factor other than 2 or 
something like this? It would have to be something affected at compile time, 
i.e. a constant of the SDK headers which changed between SDK 10.12 and 10.13. 
Or a helper function in a SDK library.

The strange thing is, the print preview of Calc looks fine, i.e. not blurry, 
everything sharp. The print preview of Writer on the other side is blurry. I 
have this effect both with my master build and the official 6.3.4.2 build.

So the print preview of Calc does something different than the rest, because it 
seems the CGContextRef is not getting in this bogus blurry state. 

Any idea how to investigate this future? (I'm new to the LibreOffice code base; 
Pointers are welcome)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

94 matches

Mail list logo