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

[jan Iversen]

 bridges/Library_cpp_uno.mk |   18 
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s | 2825 -
 2 files changed, 38 insertions(+), 2805 deletions(-)

New commits:
commit 4c0dec9988e77aaeec152deb9c2fd32173a32814
Author: jan Iversen 
Date:   Fri Feb 16 19:50:22 2018 +0100

iOS, add custom include for codesnippets.S

Change-Id: I285838f6f3e8ec57a63239f71a403809154c47e2

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 6cbbc00bdf2e..11d3ea8808a4 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -27,6 +27,10 @@ bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
 #HACK
+$(eval $(call gb_Library_use_custom_headers,$(gb_CPPU_ENV)_uno,\
+bridges/source/cpp_uno/gcc3_ios \
+))
+
 $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \
$(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S
 
commit 3a91ebb89d05d626a55f7304b6e427c650587bc3
Author: jan Iversen 
Date:   Fri Feb 16 19:46:36 2018 +0100

iOS, readded perl script to generate codesnippets

Change-Id: Ie9f3aa8057e9b50beedf47ff892188cf3b362194

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 51eaa5624788..6cbbc00bdf2e 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -22,11 +22,23 @@ $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,gcc3_uno)) : \
 endif
 
 else ifeq ($(CPUNAME),ARM64)
-
 bridges_SELECTED_BRIDGE := gcc3_ios
 bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
+#HACK
+$(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \
+   $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S
+
+$(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S: \
+   $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl \
+| $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/.dir
+   $(PERL) $< > $@
+
+$(call gb_Library_get_clean_target,$(gb_CPPU_ENV)_uno) :
+   rm -f 
$(WORKDIR)/CustomTarget/bridges/source/cpp_uno/gcc3_ios/codesnippets.S
+
+
 else ifeq ($(CPUNAME),AARCH64)
 
 ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 9c4af3e98318..7461cbccc4e7 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -17,2815 +17,32 @@
 //   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 //
 
-#ifdef __arm64
+#include "codesnippets.S"
 
-.text
-#if defined(__arm) || defined(__arm64)
-
-// Each codeSnippetX function stores into ip (arm64: x15) an address and 
branches to _privateSnippetExecutor
-// The address is that following the branch instruction, containing two 32-bit 
ints:
-// - the function index, which for 32-bit can have the 0x8000 bit set
-//   to indicate that a hidden parameter is used for returning large values
-// - the vtable offset
+#if defined(__arm)
+// ARM support code for LibreOffice C++/UNO bridging
+//
+// Written by Peter Naulls 
+// Modified by Caolan McNamara 
+// Fixed by Michael Casadevall 
+// Modified for iOS by Tor Lillqvist 
 
+.text
 .align 4
 
-codeSnippet__0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 0
-#ifndef __arm64
-codeSnippet_8000_0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 0
-#endif
-codeSnippet__1:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 1
-#ifndef __arm64
-codeSnippet_8000_1:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 1
-#endif
-codeSnippet__2:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 2
-#ifndef __arm64
-codeSnippet_8000_2:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 2
-#endif
-codeSnippet__3:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 3
-#ifndef __arm64
-codeSnippet_8000_3:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 3
-#endif
-codeSnippet_0001_0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x01
-.long 0
-#ifndef __arm64
-codeSnippet_8001_0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetEx

regarding Gsoc 2018 project details

[dashan jot singh]

Sir/Madam,
I'm dashan jot singh studying in 2nd year of B.tech in Information
technology.
I'm interested to know more about your project.
I want to know more about your project, that what actually you expect in
this project and also what specifications you want in this project
please provide details.


thank you

regards,
Dashan jot Singh
National Institute of Technology Karnataka,surathkal
Email-: 16it216.das...@nitk.edu.in
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: regarding Gsoc 2018 project details

[Heiko Tietze]

Hello Dashan,

welcome to the LibreOffice community! We are open for applications [1] from 
students whether you have own ideas or want to implement elaborated proposals 
from our list of project ideas [2].
As our source code is quite complex we require students to prove their coding 
skills first. So please find a couple of non-trivial issues using our keyword 
"easyhack" [3] and start coding. Usually the first hurdle is to setup the 
environment. We have many pages on the wiki with a lot of useful tips [4]. And 
help is always just a click away on IRC [5].

Again, very welcome to LibreOffice,
Heiko (UX mentor)

[1] https://wiki.documentfoundation.org/Development/GSoC
[2] https://wiki.documentfoundation.org/Development/GSoC/Ideas
[3] https://wiki.documentfoundation.org/Development/EasyHacks
[4] https://wiki.documentfoundation.org/Development/GetInvolved
[5] https://kiwiirc.com/nextclient/?settings=plerf5n4d3#libreoffice-dev


On 17.02.2018 09:59, dashan jot singh wrote:
> Sir/Madam,
> I'm dashan jot singh studying in 2nd year of B.tech in Information technology.
> I'm interested to know more about your project.
> I want to know more about your project, that what actually you expect in this 
> project and also what specifications you want in this project
> please provide details.
> 
> 
> thank you
> 
> regards, 
> Dashan jot Singh
> National Institute of Technology Karnataka,surathkal
> Email-: 16it216.das...@nitk.edu.in 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

-- 
Dr. Heiko Tietze
UX designer
Tel. +49 (0)179/1268509



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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

[Damjan Jovanovic]

 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf34497e91c553d6c8d6158630c392d8d4db00f1
Author: Damjan Jovanovic 
Date:   Sat Feb 17 08:22:00 2018 +

If LibreOffice is installed, it's incompatible "unopkg" tool will be in 
$PATH,

causing the build to break in main/instsetoo_native as that tool lacks our
"sync" option. Refer to our own unopkg using its absolute path to avoid this
problem.

Patch by: me

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index e6929192c91f..1c654005bb0f 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -123,7 +123,7 @@ sub register_extensions
 
 if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: 
$unopkgfile not found!", "register_extensions"); }
 
-my $systemcall = $unopkgfile . " sync --verbose" . " 
-env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
+my $systemcall = $programdir . $installer::globals::separator . 
$unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 
|";
 
 $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations

[Andras Timar]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bffc6f745c86124326472b3719c2cb63869ef55
Author: Andras Timar 
Date:   Sat Feb 17 10:49:35 2018 +0100

Updated core
Project: translations  27745d0172265edac7ea74fefc12de23d1037f4d

Updated Slovenian translation

Change-Id: Id4a7ad209552087db157dcdb214d3e81fd0e6b34

diff --git a/translations b/translations
index d9691646f9c4..27745d017226 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d9691646f9c43068799b866ffaa9dd8d9ad77240
+Subproject commit 27745d0172265edac7ea74fefc12de23d1037f4d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0' - source/sl

[Andras Timar]

 source/sl/helpcontent2/source/text/shared/01.po   |4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 
 source/sl/sc/messages.po  |4 
 source/sl/sd/messages.po  |  100 
 source/sl/svx/messages.po | 2071 +-
 source/sl/sw/messages.po  |  108 
 source/sl/wizards/messages.po |  532 +-
 7 files changed, 1439 insertions(+), 1384 deletions(-)

New commits:
commit 27745d0172265edac7ea74fefc12de23d1037f4d
Author: Andras Timar 
Date:   Sat Feb 17 10:49:35 2018 +0100

Updated Slovenian translation

Change-Id: Id4a7ad209552087db157dcdb214d3e81fd0e6b34

diff --git a/source/sl/helpcontent2/source/text/shared/01.po 
b/source/sl/helpcontent2/source/text/shared/01.po
index d690a3e9a62..6c8d6680650 100644
--- a/source/sl/helpcontent2/source/text/shared/01.po
+++ b/source/sl/helpcontent2/source/text/shared/01.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-01-03 08:03+0100\n"
+"POT-Creation-Date: 2018-02-15 22:35+0100\n"
 "PO-Revision-Date: 2018-01-03 10:44+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
index 05a4edf6875..3f8004b0aa7 100644
--- a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-01-03 08:03+0100\n"
+"POT-Creation-Date: 2018-02-15 22:34+0100\n"
 "PO-Revision-Date: 2018-01-03 10:41+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/sc/messages.po b/source/sl/sc/messages.po
index 910b060ce36..9f9d63dc4ae 100644
--- a/source/sl/sc/messages.po
+++ b/source/sl/sc/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-01-03 08:03+0100\n"
+"POT-Creation-Date: 2018-02-15 22:34+0100\n"
 "PO-Revision-Date: 2018-01-03 10:47+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/sd/messages.po b/source/sl/sd/messages.po
index aaea6b2294d..93ed1cedb97 100644
--- a/source/sl/sd/messages.po
+++ b/source/sl/sd/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-01-03 08:03+0100\n"
+"POT-Creation-Date: 2018-02-15 22:34+0100\n"
 "PO-Revision-Date: 2017-12-28 20:19+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
@@ -2700,97 +2700,97 @@ msgctxt "sdviewpage|label1"
 msgid "Display"
 msgstr "Prikaz"
 
-#: sidebarslidebackground.ui:31
+#: sidebarslidebackground.ui:26
 msgctxt "sidebarslidebackground|label2"
 msgid "_Format:"
 msgstr "_Oblika:"
 
-#: sidebarslidebackground.ui:44
+#: sidebarslidebackground.ui:39
 msgctxt "sidebarslidebackground|label3"
 msgid "Background:"
 msgstr "Ozadje:"
 
-#: sidebarslidebackground.ui:57
+#: sidebarslidebackground.ui:52
 msgctxt "sidebarslidebackground|orientation"
 msgid "Landscape"
 msgstr "Ležeče"
 
-#: sidebarslidebackground.ui:58
+#: sidebarslidebackground.ui:53
 msgctxt "sidebarslidebackground|orientation"
 msgid "Portrait"
 msgstr "Pokončno"
 
-#: sidebarslidebackgroun

is it wise to comment on Bug 115625

[krishna]

downloaded test file and screenshots on Bug 115625 using lo viewer master daily 
build

observation: the issue is repro on

tinderbox: buildname: Android-ARM@24-Bytemark-Hosting
tinderbox: tree: MASTER
tinderbox: pull time 2018-02-17 00:05:19
tinderbox: git sha1s
core:05986e7f98ea1c0bd8092500968774ef3f6bcef4

lyf flame 3, android 5.1

my dilemma:

[ 1 ] issue author has expressed concern and set earlier version to 3.6,  i 
assumed it might be inherited from openoffice.

so, dont add comment

[ 2 ] add a comment stating it is repro on lo viewer master daily build.

out of the above two, which one should i choose ?
your suggestions or advice are welcome.

regards,
krishna [ kr1shna ]
--

krishna [ never ever ask about my real name or identity ]

ji-bu-rish: https://github.com/kr1shna-opensource/


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

libreoffice-6.0.1.1 fails to compile with system gpgme-1.9.0

[John Frankish]

Using linux gcc-7.2.0, Libreoffice-6.0.1.1 will compile without errors without 
the configure switch "--with-systemgpgmepp".

With "--with-system-gpgmepp:


1. configure/make looks for headers in include rather than include/gpgme++

2. make fails with:

[CXX] xmlsecurity/source/gpg/CertificateImpl.cxx
[CXX] xmlsecurity/source/gpg/CipherContext.cxx
In file included from 
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:12:0:
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.hxx:36:5:
 error: 'GpgME' does not name a type
 GpgME::Key m_pKey;
 ^
In file included from 
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:12:0:
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.hxx:85:25:
 error: 'GpgME' has not been declared
 void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
 ^
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.hxx:85:39:
 error: expected ',' or '...' before '*' token
 void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
   ^
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.hxx:86:11:
 error: 'GpgME' does not name a type
 const GpgME::Key* getCertificate() const;
   ^
[CXX] xmlsecurity/source/gpg/DigestContext.cxx
[CXX] xmlsecurity/source/gpg/SecurityEnvironment.cxx
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:
 In constructor 'CertificateImpl::CertificateImpl()':
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:30:5:
 error: class 'CertificateImpl' does not have any field named 'm_pKey'
 m_pKey()
 ^~
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:
 In member function 'virtual rtl::OUString CertificateImpl::getIssuerName()':
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:53:34:
 error: 'm_pKey' was not declared in this scope
 const GpgME::UserID userId = m_pKey.userID(0);
  ^~
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:53:34:
 note: suggested alternative: 'ecKey'
 const GpgME::UserID userId = m_pKey.userID(0);
  ^~
  ecKey
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:
 In member function 'virtual com::sun::star::util::DateTime 
CertificateImpl::getNotValidBefore()':
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:83:34:
 error: 'm_pKey' was not declared in this scope
 const GpgME::Subkey subkey = m_pKey.subkey(0);
  ^~
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:83:34:
 note: suggested alternative: 'ecKey'
 const GpgME::Subkey subkey = m_pKey.subkey(0);
  ^~
  ecKey
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:
 In member function 'virtual com::sun::star::util::DateTime 
CertificateImpl::getNotValidAfter()':
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:92:34:
 error: 'm_pKey' was not declared in this scope
 const GpgME::Subkey subkey = m_pKey.subkey(0);
  ^~
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:92:34:
 note: suggested alternative: 'ecKey'
 const GpgME::Subkey subkey = m_pKey.subkey(0);
  ^~
  ecKey
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:
 In member function 'virtual rtl::OUString 
CertificateImpl::getSubjectPublicKeyAlgorithm()':
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:131:34:
 error: 'm_pKey' was not declared in this scope
 const GpgME::Subkey subkey = m_pKey.subkey(0);
  ^~
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:131:34:
 note: suggested alternative: 'ecKey'
 const GpgME::Subkey subkey = m_pKey.subkey(0);
  ^~
  ecKey
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:
 In member function 'virtual rtl::OUString 
CertificateImpl::getSignatureAlgorithm()':
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:145:34:
 error: 'm_pKey' was not declared in this scope
 const GpgME::UserID userId = m_pKey.userID(0);
  ^~
/mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:145:34:
 note: suggested alternative: 'ecKey'
 cons

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-40'

[Stephan Bergmann]

Tag 'cp-5.3-40' created by Andras Timar  at 
2018-02-17 13:09 +

cp-5.3-40

Changes since cp-5.3-39-40:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-40'

[Olivier R]

Tag 'cp-5.3-40' created by Andras Timar  at 
2018-02-17 13:09 +

cp-5.3-40

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-40'

[Andras Timar]

Tag 'cp-5.3-40' created by Andras Timar  at 
2018-02-17 13:09 +

cp-5.3-40

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-40'

[Andras Timar]

Tag 'cp-5.3-40' created by Andras Timar  at 
2018-02-17 13:09 +

cp-5.3-40

Changes since cp-5.3-36-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svx/gridctrl.hxx   |5 +++--
 svx/source/fmcomp/fmgridcl.cxx |1 +
 svx/source/fmcomp/gridctrl.cxx |9 -
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit be4e037b0944fdaec20b6afb05f668b93c1a4a8f
Author: Noel Grandin 
Date:   Mon Feb 5 16:36:04 2018 +0200

loplugin:useuniqueptr in DbGridRow

Change-Id: Ia3d7e2821213fb6e6ab5e13f707b5e07b26127a8
Reviewed-on: https://gerrit.libreoffice.org/49871
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index d3d3c778b5bc..80c2b6aad5ff 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class DbGridControl;
@@ -64,14 +65,14 @@ enum class GridRowStatus
 class DbGridRow : public SvRefBase
 {
 css::uno::Any  m_aBookmark;// Bookmark of the row, can be set
-::std::vector< ::svxform::DataColumn* >
+::std::vector< std::unique_ptr<::svxform::DataColumn> >
 m_aVariants;
 GridRowStatus   m_eStatus;
 boolm_bIsNew;
 // row is no longer valid
 // is removed on the next 
positioning
 public:
-DbGridRow():m_eStatus(GridRowStatus::Clean), m_bIsNew(true) { }
+DbGridRow();
 DbGridRow(CursorWrapper* pCur, bool bPaintCursor);
 void SetState(CursorWrapper* pCur, bool bPaintCursor);
 
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index ba9bef83935d..3ee95dad4b0d 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 7d75fa5a1a0d..07d08e0249a2 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -835,6 +835,9 @@ void 
DbGridControl::NavigationBar::StateChanged(StateChangedType nType)
 }
 }
 
+DbGridRow::DbGridRow():m_eStatus(GridRowStatus::Clean), m_bIsNew(true)
+{}
+
 DbGridRow::DbGridRow(CursorWrapper* pCur, bool bPaintCursor)
   :m_bIsNew(false)
 {
@@ -846,8 +849,7 @@ DbGridRow::DbGridRow(CursorWrapper* pCur, bool bPaintCursor)
 {
 Reference< XPropertySet > xColSet(
 xColumns->getByIndex(i), css::uno::UNO_QUERY);
-DataColumn* pColumn = new DataColumn(xColSet);
-m_aVariants.push_back( pColumn );
+m_aVariants.emplace_back( new DataColumn(xColSet) );
 }
 
 if (pCur->rowDeleted())
@@ -884,9 +886,6 @@ DbGridRow::DbGridRow(CursorWrapper* pCur, bool bPaintCursor)
 
 DbGridRow::~DbGridRow()
 {
-for (DataColumn* p : m_aVariants)
-delete p;
-m_aVariants.clear();
 }
 
 void DbGridRow::SetState(CursorWrapper* pCur, bool bPaintCursor)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/qa/unit/subsequent_filters-test.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 4d712961a2652a6defb7ef23e8985a6971710e37
Author: Kohei Yoshida 
Date:   Fri Feb 16 20:45:59 2018 -0500

Let's also check for the presence of the range names.

Change-Id: Ic61370e495a8647a17eec484f8f32afe4dcc3b94
Reviewed-on: https://gerrit.libreoffice.org/49888
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f93af35a0aab..214062f30ef0 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3605,6 +3605,11 @@ void ScFiltersTest::testNamedExpressionsXLSXML()
 CPPUNIT_ASSERT_EQUAL(55.0, rDoc.GetValue(aPos));
 ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(MyRange2)", nullptr);
 
+const ScRangeData* pRD = 
rDoc.GetRangeName()->findByUpperName("MYRANGE");
+CPPUNIT_ASSERT(pRD);
+pRD = rDoc.GetRangeName()->findByUpperName("MYRANGE2");
+CPPUNIT_ASSERT(pRD);
+
 xDocSh->DoClose();
 }
 
@@ -3625,6 +3630,15 @@ void ScFiltersTest::testNamedExpressionsXLSXML()
 CPPUNIT_ASSERT_EQUAL(74.0, rDoc.GetValue(aPos));
 ASSERT_FORMULA_EQUAL(rDoc, aPos, "SUM(MyRange)", nullptr);
 
+const ScRangeName* pRN = rDoc.GetRangeName(0);
+CPPUNIT_ASSERT(pRN);
+const ScRangeData* pRD = pRN->findByUpperName("MYRANGE");
+CPPUNIT_ASSERT(pRD);
+pRN = rDoc.GetRangeName(1);
+CPPUNIT_ASSERT(pRN);
+pRD = pRN->findByUpperName("MYRANGE");
+CPPUNIT_ASSERT(pRD);
+
 xDocSh->DoClose();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/3.1-rc1'

[Andras Timar]

Tag '3.1-rc1' created by Andras Timar  at 
2018-02-17 13:48 +

3.1-rc1

Changes since CODE-3.0.0.3-48:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/tdf115719.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|7 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   30 --
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   17 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|   16 +++
 writerfilter/source/dmapper/PropertyMap.cxx  |   68 +++
 writerfilter/source/dmapper/PropertyMap.hxx  |4 
 writerfilter/source/dmapper/SettingsTable.cxx|   27 +
 writerfilter/source/dmapper/SettingsTable.hxx|2 
 9 files changed, 142 insertions(+), 29 deletions(-)

New commits:
commit 8ce3110540804112efb530878517ab51147b7c66
Author: Miklos Vajna 
Date:   Wed Feb 14 15:31:35 2018 +0100

tdf#115719 DOCX import: increase paragraph spacing for anchored objects

... like Word 2013 does, when the version string indicates that the new
layout is wanted.

An alternative to this change would be to add a new sw layout
compatibility flag and handle this at a layout level (somewhere in
SwAnchoredObject::GetObjRectWithSpaces()). The downside of that approach
is that once a layout flag is added, it's not preferred to tweak its
behavior, while doing the same at import time is not a problem.

Also it's better to have a flag for something which has clear behavior
in some spec / implementer notes, which is not the case for this
problem. (I've mailed dochelp@microsoft, no answer so far.)

(cherry picked from commit 8b73bafbc18acb4dd8911d2f2de8158d98eb6144)

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

Change-Id: Ibad28d27e4bcbe1991a3be1c686064e18e9ffa4d
Reviewed-on: https://gerrit.libreoffice.org/49803
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf115719.docx 
b/sw/qa/extras/ooxmlexport/data/tdf115719.docx
new file mode 100644
index ..9519a2a14524
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf115719.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 74cb6c7143e8..f5553c5b7d1d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -703,6 +703,13 @@ DECLARE_OOXMLEXPORT_TEST(testGraphicObjectFliph, 
"graphic-object-fliph.docx")
 CPPUNIT_ASSERT(getProperty(getShape(1), "HoriMirroredOnOddPages"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf115719, "tdf115719.docx")
+{
+// This was a single page, instead of pushing the textboxes to the second
+// page.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index db2c4fa4d5c9..0015a90eb39a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -312,34 +312,6 @@ void 
lcl_DecrementHoriOrientPosition(std::vector& rFramePr
 }
 }
 
-sal_Int32 lcl_getWordCompatibilityMode( const css::uno::Sequence< 
css::beans::PropertyValue >& rCompatSettings )
-{
-for ( int i = 0; i < rCompatSettings.getLength(); ++i )
-{
-const css::beans::PropertyValue& rProp = rCompatSettings[i];
-if ( rProp.Name == "compatSetting" )
-{
-css::uno::Sequence< css::beans::PropertyValue > 
aCurrentCompatSettings;
-rProp.Value >>= aCurrentCompatSettings;
-
-OUString sName;
-OUString sUri;
-OUString sVal;
-
-aCurrentCompatSettings[0].Value >>= sName;
-aCurrentCompatSettings[1].Value >>= sUri;
-aCurrentCompatSettings[2].Value >>= sVal;
-
-if ( sName == "compatibilityMode" && sUri == 
"http://schemas.microsoft.com/office/word"; )
-{
-return sVal.toInt32();
-}
-}
-}
-
-return -1; // Word compatibility mode not found
-}
-
 TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo & rInfo, 
std::vector& rFrameProperties)
 {
 // will receive the table style if any
@@ -576,7 +548,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 
 // tdf#106742: since MS Word 2013 (compatibilityMode >= 15), top-level 
tables are handled the same as nested tables;
 // this is also the default behavior in LO when DOCX doesn't define 
"compatibilityMode" option
-sal_Int32 nMode = lcl_getWordCompatibilityMode( 
m_rDMapper_Impl.GetSettingsTable()->GetCompatSettings() );
+sal_Int32 nMode = 
m_rDMapper_Impl.GetSettingsTable()->GetWordCompatibilityMode();
 
 if ( nMode > 0 && nMode <= 14 && rInfo.nNestLevel == 1 )
 {
diff --git a/writerfilter/sourc

[Libreoffice-commits] online.git: Changes to 'distro/collabora/collabora-online-3-1'

[Andras Timar]

New branch 'distro/collabora/collabora-online-3-1' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-6.0.1.1 fails to compile with system gpgme-1.9.0

[Rene Engelhard]

On Fri, Feb 16, 2018 at 05:43:54AM +, John Frankish wrote:
> Using linux gcc-7.2.0, Libreoffice-6.0.1.1 will compile without errors 
> without the configure switch "--with-systemgpgmepp".
> 
> With "--with-system-gpgmepp:

I also use that option (Debian):

Builds fine here. with 1.8.0 and 1.10 and also built fine when Debian
had 1.9.0

With both gcc 6.3 and 7.3 (and also back then with 7.2.x)

Regards,

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

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

[Tor Lillqvist]

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

New commits:
commit c902cbc7dc5294ab721a9aef3a152aa243d00011
Author: Tor Lillqvist 
Date:   Sat Feb 17 17:22:59 2018 +0200

tdf#115283: Avoid bashism

(We do require bash for other parts of the build, though, and have no
plans to change that. But let's make the bug reporter happy here.)

Change-Id: I4bcd3a86fb4e6f95d4eec8557faf359bf5549c03

diff --git a/configure.ac b/configure.ac
index e0cbf939..f18fa31dce5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@ if test "$enable_release_build" = "" -o 
"$enable_release_build" = "no"; then
 fi
 AC_MSG_RESULT([$PRODUCTNAME])
 AC_SUBST(PRODUCTNAME)
-PRODUCTNAME_WITHOUT_SPACES=${PRODUCTNAME// /}
+PRODUCTNAME_WITHOUT_SPACES=$(echo "$PRODUCTNAME" | sed 's/ //g')
 AC_SUBST(PRODUCTNAME_WITHOUT_SPACES)
 
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

New commits:
commit c0cb656936e81288f7536e7d4f245c1f2bc3987f
Author: Caolán McNamara 
Date:   Sat Feb 17 14:37:29 2018 +

ofz#6427 use of uninitialized values

Change-Id: I357f1ef2ccf1c8f3f53effa6b38643523722202c
Reviewed-on: https://gerrit.libreoffice.org/49910
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 83285b922cf7..bad8ba73be43 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -50,7 +50,7 @@ private:
 Animation   aAnimation;
 
 SvStream*   pTIFF;  // the TIFF file that 
should be read
-std::unique_ptr mpBitmap;
+std::vector  maBitmap;
 SizemaBitmapPixelSize;
 std::vector  mvPalette;
 MapMode maBitmapPrefMapMode;
@@ -619,8 +619,8 @@ bool TIFFReader::ReadMap()
 //previous scanline instead of painfully decoding and setting
 //each pixel one by one again
 const int nColorSize = bHasAlphaChannel ? 4 : 3;
-memcpy( mpBitmap.get() + (ny * maBitmapPixelSize.Width()) * 
nColorSize,
-mpBitmap.get() + ((ny-1) * maBitmapPixelSize.Width()) 
* nColorSize,
+memcpy( maBitmap.data() + (ny * maBitmapPixelSize.Width()) * 
nColorSize,
+maBitmap.data() + ((ny-1) * maBitmapPixelSize.Width()) 
* nColorSize,
 maBitmapPixelSize.Width() * nColorSize);
 }
 else
@@ -785,13 +785,13 @@ sal_uInt32 TIFFReader::GetBits( const sal_uInt8 * pSrc, 
sal_uInt32 nBitsPos, sal
 
 void TIFFReader::SetPixel(long nY, long nX, sal_uInt8 cIndex)
 {
-mpBitmap[(maBitmapPixelSize.Width() * nY + nX) * (HasAlphaChannel() ? 4 : 
3)] = cIndex;
+maBitmap[(maBitmapPixelSize.Width() * nY + nX) * (HasAlphaChannel() ? 4 : 
3)] = cIndex;
 nLargestPixelIndex = std::max(nLargestPixelIndex, cIndex);
 }
 
 void TIFFReader::SetPixel(long nY, long nX, Color c)
 {
-auto p = mpBitmap.get() + ((maBitmapPixelSize.Width() * nY + nX) * 
(HasAlphaChannel() ? 4 : 3));
+auto p = maBitmap.data() + ((maBitmapPixelSize.Width() * nY + nX) * 
(HasAlphaChannel() ? 4 : 3));
 *p = c.GetRed();
 p++;
 *p = c.GetGreen();
@@ -807,7 +807,7 @@ void TIFFReader::SetPixel(long nY, long nX, Color c)
 void TIFFReader::SetPixelAlpha(long nY, long nX, sal_uInt8 nAlpha)
 {
 assert(HasAlphaChannel());
-mpBitmap[((maBitmapPixelSize.Width() * nY + nX) * 4) + 3] = nAlpha;
+maBitmap[((maBitmapPixelSize.Width() * nY + nX) * 4) + 3] = nAlpha;
 }
 
 bool TIFFReader::ConvertScanline(sal_Int32 nY)
@@ -1122,7 +1122,6 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 return true;
 }
 
-
 void TIFFReader::MakePalCol()
 {
 if ( nDstBitsPerPixel <= 8 )
@@ -1534,7 +1533,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 if ( bStatus )
 {
 maBitmapPixelSize = Size(nImageWidth, nImageLength);
-mpBitmap.reset(new sal_uInt8[nImageDataSize]);
+maBitmap.resize(nImageDataSize, 0);
 
 if (bStatus && ReadMap())
 {
@@ -1543,10 +1542,12 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 nMaxPos = std::max( pTIFF->Tell(), nMaxPos );
 // convert palette-ized images to 24-bit color
 if (!mvPalette.empty())
-for (long nY = 0; nY < nImageLength; ++nY)
-for (long nX = 0; nX < nImageWidth; ++nX)
+{
+for (sal_Int32 nY = 0; nY < nImageLength; ++nY)
+{
+for (sal_Int32 nX = 0; nX < nImageWidth; ++nX)
 {
-auto p = mpBitmap.get() + 
((maBitmapPixelSize.Width() * nY + nX) * 3);
+auto p = maBitmap.data() + 
((maBitmapPixelSize.Width() * nY + nX) * 3);
 auto c = mvPalette[*p];
 *p = c.GetRed();
 p++;
@@ -1554,13 +1555,15 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 p++;
 *p = c.GetBlue();
 }
+}
+}
 }
 else
 bStatus = false;
 
 if ( bStatus )
 {
-BitmapEx aImage = 
vcl::bitmap::CreateFromData(mpBitmap.get(), nImageWidth, nImageLength,
+   

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

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/insertEnvelope.py   |   55 +++
 sw/qa/uitest/writer_tests/insertPageFooter.py |   75 ++
 2 files changed, 130 insertions(+)

New commits:
commit c221405cb0e5d412e34dab2aabdf037d4b048ce2
Author: Zdeněk Crhonek 
Date:   Thu Jan 18 07:41:37 2018 +0100

uitest - writer insert Page Footer; insert Envelope

Change-Id: Ifd931998607edbb526ec756f80b2bad13f541d63
Reviewed-on: https://gerrit.libreoffice.org/48086
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/insertEnvelope.py 
b/sw/qa/uitest/writer_tests/insertEnvelope.py
new file mode 100644
index ..356dbbb5d7b2
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/insertEnvelope.py
@@ -0,0 +1,55 @@
+# -*- 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 uitest.debug import sleep
+from uitest.path import get_srcdir_url
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+
+#envaddresspage.ui
+
+class WriterInsertEnvelope(UITestCase):
+
+def test_insert_envelope(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope")
+
+xDialog = self.xUITest.getTopFocusWindow()
+
+xAddrTxt= xDialog.getChild("addredit")
+xSenderTxt = xDialog.getChild("senderedit")
+xSenderCheckBox = xDialog.getChild("sender")
+
+xAddrTxt.executeAction("SELECT", mkPropertyValues({"FROM": "1", "TO": 
"200"}))
+xAddrTxt.executeAction("BACKSPACE", tuple())
+xAddrTxt.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xAddrTxt.executeAction("BACKSPACE", tuple())
+xAddrTxt.executeAction("TYPE", mkPropertyValues({"TEXT":"Address"}))
+
+xSenderTxt.executeAction("SELECT", mkPropertyValues({"FROM": "1", 
"TO": "200"}))
+xSenderTxt.executeAction("BACKSPACE", tuple())
+xSenderTxt.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xSenderTxt.executeAction("BACKSPACE", tuple())
+xSenderTxt.executeAction("TYPE", mkPropertyValues({"TEXT":"Sender"}))
+
+xInsBtn = xDialog.getChild("user")
+xInsBtn.executeAction("CLICK", tuple())
+
+self.ui_test.execute_dialog_through_command(".uno:InsertEnvelope")
+xDialog = self.xUITest.getTopFocusWindow()
+xAddrTxt= xDialog.getChild("addredit")
+xSenderTxt = xDialog.getChild("senderedit")
+self.assertEqual(get_state_as_dict(xAddrTxt)["Text"], "Address")
+self.assertEqual(get_state_as_dict(xSenderTxt)["Text"], "Sender")
+
+xcancelBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xcancelBtn)
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/writer_tests/insertPageFooter.py 
b/sw/qa/uitest/writer_tests/insertPageFooter.py
new file mode 100644
index ..fd9b31368d6f
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/insertPageFooter.py
@@ -0,0 +1,75 @@
+# -*- 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 uitest.debug import sleep
+from uitest.path import get_srcdir_url
+
+class WriterInsertPageFooter(UITestCase):
+
+def insert_footer(self):
+document = self.ui_test.get_component()
+
+self.assertEqual(
+document.StyleFamilies.PageStyles.Standard.FooterIsOn, False)
+
+self.xUITest.executeCommand(
+
".uno:InsertPageFooter?PageStyle:string=Default%20Style&On:bool=true")
+
+self.assertEqual(
+document.StyleFamilies.PageStyles.Standard.FooterIsOn, True)
+
+def delete_footer(self):
+document = self.ui_test.get_component()
+
+self.assertEqual(
+document.StyleFamilies.PageStyles.Standard.FooterIsOn, True)
+
+self.ui_test.execute_dialog_through_command(
+
".uno:InsertPageFooter?PageStyle:string=Default%20Style&On:bool=false")
+
+xDialog = self.xUITest.getTopFocusWindow()
+
+xOption = xDialog.getChild("yes")
+xOption.executeAction("CLICK", tuple())
+
+self.assertEqual(
+document.StyleFamilies.PageStyles.Standard.FooterIsOn, False)
+
+def test_footer(self):
+self.ui_test.create_doc_in_start_center("writer")
+
+self.insert_footer()
+
+   

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

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/horizontalLine.py   |   42 +++
 sw/qa/uitest/writer_tests/specialCharacter.py |   93 ++
 2 files changed, 135 insertions(+)

New commits:
commit 1632166329e6c14d885229c358a6c60dd2528244
Author: Zdeněk Crhonek 
Date:   Sun Dec 31 08:49:04 2017 +0100

uitest - writer Insert Horizontal Line

Change-Id: Ia44e18650b72ffe8d8d263f62dc6d5a31d1b0dc3
Reviewed-on: https://gerrit.libreoffice.org/47215
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/horizontalLine.py 
b/sw/qa/uitest/writer_tests/horizontalLine.py
new file mode 100644
index ..7a25d36ee19e
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/horizontalLine.py
@@ -0,0 +1,42 @@
+# -*- 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
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+
+class WriterInsertHorizontalLine(UITestCase):
+
+def test_insert_horizontal_line(self):
+self.ui_test.create_doc_in_start_center("writer")
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+type_text(xWriterEdit, "Test horizontal line") #write the text
+
+
self.xUITest.executeCommand(".uno:StyleApply?Style:string=Horizontal%20Line&FamilyName:string=ParagraphStyles")
 #insert horizontal line
+
+self.ui_test.execute_dialog_through_command(".uno:EditStyle")  #open 
style dialog
+xDialog = self.xUITest.getTopFocusWindow()
+xStyleNametxt = xDialog.getChild("namerw")
+self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal 
Line") #check style name
+xCancBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancBtn)
+
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Redo")
+
+self.ui_test.execute_dialog_through_command(".uno:EditStyle")  #open 
style dialog
+xDialog = self.xUITest.getTopFocusWindow()
+xStyleNametxt = xDialog.getChild("namerw")
+self.assertEqual(get_state_as_dict(xStyleNametxt)["Text"], "Horizontal 
Line")  #check style name
+xCancBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancBtn)
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
commit 7e171db74d134dfd81bf2882592e1740185c6ccd
Author: Zdeněk Crhonek 
Date:   Sun Dec 24 09:05:23 2017 +0100

uitest - writer/ Special character dialog

Change-Id: I6de8570e5a2c1404cbf9c0a11f68373857a8836d
Reviewed-on: https://gerrit.libreoffice.org/47035
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/specialCharacter.py 
b/sw/qa/uitest/writer_tests/specialCharacter.py
new file mode 100644
index ..31226f7368e1
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/specialCharacter.py
@@ -0,0 +1,93 @@
+# -*- 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
+import time
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+from uitest.uihelper.common import select_pos
+
+#specialcharacters.ui
+class specialCharacter(UITestCase):
+
+def test_special_character(self):
+
+self.ui_test.create_doc_in_start_center("writer")
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+document = self.ui_test.get_component()
+
+self.ui_test.execute_dialog_through_command(".uno:InsertSymbol")  
#specialCharacter dialog
+xDialog = self.xUITest.getTopFocusWindow()
+xCharSet = xDialog.getChild("showcharset")  #default charset
+
+xCharSet.executeAction("SELECT", mkPropertyValues({"COLUMN": "1", 
"ROW": "4"}))   #digit 4 selected
+
+xHexText = xDialog.getChild("hexvalue")
+xDecText = xDialog.getChild("decimalvalue")
+
+self.assertEqual(get_state_as_dict(xHexText)["Text"], "34")# check 
the values Hex and decimal
+self.assertEqual(get_state_as_dict(xDecText)["Text"], "52")
+
+xCancelBtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+self.ui_test.execute_dialog_through_command(".uno:InsertSymb

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

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/tdf115088.py |   48 +
 1 file changed, 48 insertions(+)

New commits:
commit 3c9b620efc314050246bef9b7ef9c6daeb482ae1
Author: Zdeněk Crhonek 
Date:   Fri Jan 19 20:38:34 2018 +0100

add uitest for bug tdf#115088

Change-Id: Ic13f399cd489755ce97e026a9259c96c8aceb45e
Reviewed-on: https://gerrit.libreoffice.org/48220
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/tdf115088.py 
b/sw/qa/uitest/writer_tests/tdf115088.py
new file mode 100644
index ..47e99b688540
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/tdf115088.py
@@ -0,0 +1,48 @@
+# -*- 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
+from uitest.uihelper.common import get_state_as_dict, type_text
+import time
+from uitest.debug import sleep
+
+class tdf115088(UITestCase):
+
+   def test_tdf115088(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+type_text(xWriterEdit, "1")
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"RETURN"}))
+type_text(xWriterEdit, "1")
+
+selection = self.xUITest.executeCommand(".uno:SelectAll")  #select 
whole text
+self.xUITest.executeCommand(".uno:Cut")   #cut  text
+type_text(xWriterEdit, "test")
+self.xUITest.executeCommand(".uno:GoLeft")
+self.xUITest.executeCommand(".uno:GoLeft")
+self.xUITest.executeCommand(".uno:GoLeft")
+self.xUITest.executeCommand(".uno:GoLeft")
+self.xUITest.executeCommand(".uno:PasteUnformatted")
+self.assertEqual(document.Text.String[0:2], "1\n")
+
+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: sc/qa

[Zdeněk Crhonek]

 sc/qa/uitest/calc_tests/data/tdf99386.ods |binary
 sc/qa/uitest/calc_tests/tdf99386.py   |   38 ++
 2 files changed, 38 insertions(+)

New commits:
commit d13c5b153b7798ed18062b67c5d4185590b5b22e
Author: Zdeněk Crhonek 
Date:   Sun Jan 28 21:43:40 2018 +0100

uitest for tdf#99386

Change-Id: I1b9d03da4e5dff6149c98057976adc1cdcdb1770
Reviewed-on: https://gerrit.libreoffice.org/48802
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/uitest/calc_tests/data/tdf99386.ods 
b/sc/qa/uitest/calc_tests/data/tdf99386.ods
new file mode 100644
index ..767d0ead49e2
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf99386.ods differ
diff --git a/sc/qa/uitest/calc_tests/tdf99386.py 
b/sc/qa/uitest/calc_tests/tdf99386.py
new file mode 100644
index ..46c77631219e
--- /dev/null
+++ b/sc/qa/uitest/calc_tests/tdf99386.py
@@ -0,0 +1,38 @@
+# -*- 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 uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+from uitest.uihelper.calc import enter_text_to_cell
+from uitest.path import get_srcdir_url
+from libreoffice.calc.document import get_cell_by_position
+import time
+
+def get_url_for_data_file(file_name):
+return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+
+class tdf99386(UITestCase):
+
+def test_td99386_undo_merged_cell_needs_hard_recalculate(self):
+
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf99386.ods"))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWindow = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+xGridWindow.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:B1"})) #select cells
+self.xUITest.executeCommand(".uno:ToggleMergeCells") # merge cells
+self.xUITest.executeCommand(".uno:Undo")
+
+self.assertEqual(get_cell_by_position(document, 0, 1, 1).getString(), 
"This")
+
+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: sw/qa

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/bookmark.py |  139 ++
 1 file changed, 139 insertions(+)

New commits:
commit 1664fe09c66d65094195050d87de8d341bf33549
Author: Zdeněk Crhonek 
Date:   Mon Jan 8 23:42:00 2018 +0100

uitest - writer; test form Bookmark dialog

Change-Id: I4c82c188b16604b808b25ec6710b59fa7310abf4
Reviewed-on: https://gerrit.libreoffice.org/47622
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/bookmark.py 
b/sw/qa/uitest/writer_tests/bookmark.py
new file mode 100644
index ..33f88d594c7a
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/bookmark.py
@@ -0,0 +1,139 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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
+import time
+from uitest.uihelper.common import get_state_as_dict, type_text
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+#test bookmark dialog
+class bookmarkDialog(UITestCase):
+
+def test_bookmark_dialog(self):
+
+self.ui_test.create_doc_in_start_center("writer")
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xInsertBtn = xBookDlg.getChild("insert")
+xInsertBtn.executeAction("CLICK", tuple()) # first bookmark
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xInsertBtn = xBookDlg.getChild("insert")
+xBmk = xBookDlg.getChild("bookmarks")
+self.assertEqual(get_state_as_dict(xBmk)["VisibleCount"], "1")  #check 
for 1st bookmark exist
+xInsertBtn.executeAction("CLICK", tuple())# add 2nd bookmark
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xCloseBtn = xBookDlg.getChild("close")
+xCloseBtn.executeAction("CLICK", tuple())# close
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xBmk = xBookDlg.getChild("bookmarks")
+self.assertEqual(get_state_as_dict(xBmk)["VisibleCount"], "2")   
#check for 2 bookmarks
+xCloseBtn = xBookDlg.getChild("close")
+xCloseBtn.executeAction("CLICK", tuple())# close dialog
+
+#now delete one bookmark
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xBmk = xBookDlg.getChild("bookmarks")
+xSecondListEntry = xBmk.getChild("1") #  select second bookmark
+xSecondListEntry.executeAction("SELECT", tuple())
+xDelBtn = xBookDlg.getChild("delete")
+xDelBtn.executeAction("CLICK", tuple())# delete one bookmark
+xCloseBtn = xBookDlg.getChild("close")
+xCloseBtn.executeAction("CLICK", tuple())# close dialog
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xCloseBtn = xBookDlg.getChild("close")
+xBmk2 = xBookDlg.getChild("bookmarks")
+self.assertEqual(get_state_as_dict(xBmk2)["VisibleCount"], "1")  
#check for 1 bookmark
+xCloseBtn.executeAction("CLICK", tuple())# now we have only 1 
bookmark
+
+self.ui_test.close_doc()
+
+
+
+def test_bookmark_dialog_rename(self):
+self.ui_test.create_doc_in_start_center("writer")
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xInsertBtn = xBookDlg.getChild("insert")
+xInsertBtn.executeAction("CLICK", tuple()) # first bookmark
+
+self.ui_test.execute_dialog_through_command(".uno:InsertBookmark")
+xBookDlg = self.xUITest.getTopFocusWindow()
+xBmk = xBookDlg.getChild("bookmarks")
+xFirstListEntry = xBmk.getChild("0") #  select first bookmark
+xFirstListEntry.executeAction("SELECT", tuple())
+xRenameBtn = xBookDlg.getChild("rename")
+
+def handle_rename_dlg(dialog): #handle rename 
dialog - need special handling
+
+xNewNameTxt=dialog.getChild("entry")
+xNewNameTxt.executeAction("TYPE", 
mkPropertyValues({"TEXT":"newname"}))
+xOKBtn = dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.execute_blocking_action(xRenameBtn.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_rename_dlg) #close rename 
dialog with OK button
+
+xBookDlg = self.xUITest.getTopF

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

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/formatCharacter.py |  300 +++
 1 file changed, 300 insertions(+)

New commits:
commit 67f47a55f13ce41cafe7f0eda12c1030d1f0e7de
Author: Zdeněk Crhonek 
Date:   Mon Jan 22 18:20:18 2018 +0100

uitest - writer Format Character

Change-Id: Ib4e78a19251ece9a24e3b87e5932b25c1002cd83
Reviewed-on: https://gerrit.libreoffice.org/48354
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/formatCharacter.py 
b/sw/qa/uitest/writer_tests/formatCharacter.py
new file mode 100644
index ..6cd06ad96566
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/formatCharacter.py
@@ -0,0 +1,300 @@
+# -*- 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
+from uitest.uihelper.common import get_state_as_dict, type_text
+
+import time
+from uitest.debug import sleep
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
+
+class formatCharacter(UITestCase):
+
+   def test_format_character_tab_font(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.ui_test.execute_dialog_through_command(".uno:FontDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+
+xSizeFont = xDialog.getChild("westsizelb-cjk")
+xSizeFontEast = xDialog.getChild("eastsizelb")
+xSizeFontCTL = xDialog.getChild("ctlsizelb")
+xLangFont = xDialog.getChild("westlanglb-cjk")
+xLangFontEast = xDialog.getChild("eastlanglb")
+xLangFontCTL = xDialog.getChild("ctllanglb")
+
+xSizeFont.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xSizeFont.executeAction("BACKSPACE", tuple())
+xSizeFont.executeAction("TYPE", mkPropertyValues({"TEXT":"18"}))
#set font size 18
+xSizeFontEast.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xSizeFontEast.executeAction("BACKSPACE", tuple())
+xSizeFontEast.executeAction("TYPE", mkPropertyValues({"TEXT":"18"}))   
 #set font size 18
+xSizeFontCTL.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xSizeFontCTL.executeAction("BACKSPACE", tuple())
+xSizeFontCTL.executeAction("TYPE", mkPropertyValues({"TEXT":"18"}))
#set font size 18
+select_pos(xLangFont, "0")
+select_pos(xLangFontEast, "0")
+select_pos(xLangFontCTL, "0")
+xOK = xDialog.getChild("ok")
+xOK.executeAction("CLICK", tuple())
+
+self.ui_test.execute_dialog_through_command(".uno:FontDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xSizeFont = xDialog.getChild("westsizelb-cjk")
+xSizeFontEast = xDialog.getChild("eastsizelb")
+xSizeFontCTL = xDialog.getChild("ctlsizelb")
+xLangFont = xDialog.getChild("westlanglb-cjk")
+xLangFontEast = xDialog.getChild("eastlanglb")
+xLangFontCTL = xDialog.getChild("ctllanglb")
+
+self.assertEqual(get_state_as_dict(xSizeFont)["Text"], "18")
+self.assertEqual(get_state_as_dict(xSizeFontEast)["Text"], "18")
+self.assertEqual(get_state_as_dict(xSizeFontCTL)["Text"], "18") #check 
font size
+self.assertEqual(get_state_as_dict(xLangFont)["Text"], 
"\u202a[None]\u202c")
+self.assertEqual(get_state_as_dict(xLangFontEast)["SelectEntryText"], 
"\u202a[None]\u202c")
+self.assertEqual(get_state_as_dict(xLangFontCTL)["SelectEntryText"], 
"\u202a[None]\u202c")
+
+xCanc = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCanc)
+
+self.ui_test.close_doc()
+
+   def test_format_character_tab_font_effects(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.ui_test.execute_dialog_through_command(".uno:FontDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+
+xEffects = xDialog.getChild("effectslb")
+xRelief = xDialog.getChild("relieflb")
+xBlinking = xDialog.getChild("blinkingcb")
+xHidden = xDialog.getChild("hiddencb")
+xOverline = xDialog.getChild("overlinelb")
+xStrikeout = xDialog.getChild("strikeoutlb")
+xUnderline = xDialo

[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx   |4 
 lotuswordpro/source/filter/lwprowlayout.cxx |5 +
 2 files changed, 9 insertions(+)

New commits:
commit 7a4eaf4a74832621d8ae2525ee93501ed315e590
Author: Caolán McNamara 
Date:   Sat Feb 17 14:47:10 2018 +

ofz: infinite loop

Change-Id: Ie54c22c65ccd962862cade77e3502a264164c2b2
Reviewed-on: https://gerrit.libreoffice.org/49912
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx 
b/lotuswordpro/source/filter/lwprowlayout.cxx
index 8e90b856da45..02d9d221b304 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 
 LwpRowLayout::LwpRowLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
 : LwpVirtualLayout(objHdr, pStrm)
@@ -95,12 +96,16 @@ void LwpRowLayout::SetRowMap()
 LwpObjectID& rCellID= GetChildHead();
 LwpCellLayout * pCellLayout = dynamic_cast(rCellID.obj().get());
 
+std::set aSeen;
 while(pCellLayout)
 {
+aSeen.insert(pCellLayout);
 pCellLayout->SetCellMap();
 
 rCellID = pCellLayout->GetNext();
 pCellLayout = dynamic_cast(rCellID.obj().get());
+if (aSeen.find(pCellLayout) != aSeen.end())
+throw std::runtime_error("loop in conversion");
 }
 }
 /**
commit d265bb1554c185ab9cd5bd63e584165e8b3ae0a1
Author: Caolán McNamara 
Date:   Sat Feb 17 14:50:30 2018 +

ofz: infinite loop

Change-Id: Icbc19a6761a9972d61db45b779dab56361bf6db8
Reviewed-on: https://gerrit.libreoffice.org/49915
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 6bb3c94aedb5..728df2e413b8 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -562,8 +562,10 @@ LwpDocument* LwpDocument::GetLastDivisionWithContents()
 {
 LwpDocument* pDivision = GetLastDivision();
 
+std::set aSeen;
 while (pDivision && pDivision != this)
 {
+aSeen.insert(pDivision);
 LwpDocument* pContentDivision = 
pDivision->GetLastDivisionWithContents();
 if (pContentDivision)
 {
@@ -571,6 +573,8 @@ LwpDocument* LwpDocument::GetLastDivisionWithContents()
 break;
 }
 pDivision = pDivision->GetPreviousDivision();
+if (aSeen.find(pDivision) != aSeen.end())
+throw std::runtime_error("loop in conversion");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sw/qa/uitest/writer_tests/formatBulletsNumbering.py |  298 
 1 file changed, 298 insertions(+)

New commits:
commit e01424a37ff7179435efde1230cbf81d87b2affc
Author: Zdeněk Crhonek 
Date:   Tue Feb 13 22:53:46 2018 +0100

uitest - writer Format-Bullets and numbering

Change-Id: I5efeb41c13dbbaf8c5fffbb00a7503a89434c082
Reviewed-on: https://gerrit.libreoffice.org/49691
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/formatBulletsNumbering.py 
b/sw/qa/uitest/writer_tests/formatBulletsNumbering.py
new file mode 100644
index ..41f43d17eef5
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/formatBulletsNumbering.py
@@ -0,0 +1,298 @@
+# -*- 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
+from uitest.uihelper.common import get_state_as_dict, type_text
+
+import time
+from uitest.debug import sleep
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
+
+class formatBulletsNumbering(UITestCase):
+
+   def test_bullets_and_numbering_dialog_tab_position(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")  
#optionsdialog
+xDialog = self.xUITest.getTopFocusWindow()
+xPages = xDialog.getChild("pages")
+xWriterEntry = xPages.getChild('3') # Writer
+xWriterEntry.executeAction("EXPAND", tuple())
+xWriterGeneralEntry = xWriterEntry.getChild('0')
+xWriterGeneralEntry.executeAction("SELECT", tuple())  #General 
- set milimeters
+xMetric = xDialog.getChild("metric")
+props = {"TEXT": "Millimeter"}
+actionProps = mkPropertyValues(props)
+xMetric.executeAction("SELECT", actionProps)
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+
self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "4")
+xalignedatmf = xDialog.getChild("alignedatmf")
+xnum2alignlb = xDialog.getChild("num2alignlb")
+xatmf = xDialog.getChild("atmf")
+xindentatmf = xDialog.getChild("indentatmf")
+xokbtn = xDialog.getChild("ok")
+
+xalignedatmf.executeAction("UP", tuple())
+props = {"TEXT": "Centered"}
+actionProps = mkPropertyValues(props)
+xnum2alignlb.executeAction("SELECT", actionProps)
+xatmf.executeAction("UP", tuple())
+xindentatmf.executeAction("UP", tuple())
+
+self.ui_test.close_dialog_through_button(xokbtn)
+
+
self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "4")
+xalignedatmf = xDialog.getChild("alignedatmf")
+xnum2alignlb = xDialog.getChild("num2alignlb")
+xatmf = xDialog.getChild("atmf")
+xindentatmf = xDialog.getChild("indentatmf")
+
+self.assertEqual(get_state_as_dict(xalignedatmf)["Text"], "6.5 mm")
+self.assertEqual(get_state_as_dict(xnum2alignlb)["SelectEntryText"], 
"Centered")
+self.assertEqual(get_state_as_dict(xatmf)["Text"], "12.8 mm")
+self.assertEqual(get_state_as_dict(xindentatmf)["Text"], "12.8 mm")
+
+xcancbtn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xcancbtn)
+
+self.ui_test.close_doc()
+
+   def test_bullets_and_numbering_dialog_tab_position2(self):
+self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+
self.ui_test.execute_dialog_through_command(".uno:BulletsAndNumberingDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "4")
+xnumfollowedbylb = xDialog.getChild("numfollowedbylb")
+props = {"TEXT": "Space"}
+actionProps = mkPropertyValues(props)
+xnumfollowedbylb.executeAction("SELECT", actionProps)
+
+xokbtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xokbtn)
+
+
self.ui_test.execute_dialog_through_co

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

[Zdeněk Crhonek]

 sc/qa/uitest/calc_tests/calcSheetDelete.py |  152 +
 1 file changed, 152 insertions(+)

New commits:
commit fd921767d93467c5e1785783b377c539b1fdc3ee
Author: Zdeněk Crhonek 
Date:   Fri Feb 9 20:21:11 2018 +0100

uitest for bugs #tdf114228 #tdf43078 #tdf105105

Change-Id: I4fce7b1f492b6e32d48eb6f7d9c9edb6eba2c56d
Reviewed-on: https://gerrit.libreoffice.org/49518
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/uitest/calc_tests/calcSheetDelete.py 
b/sc/qa/uitest/calc_tests/calcSheetDelete.py
new file mode 100644
index ..93de48292f94
--- /dev/null
+++ b/sc/qa/uitest/calc_tests/calcSheetDelete.py
@@ -0,0 +1,152 @@
+# -*- 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 uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+from uitest.uihelper.calc import enter_text_to_cell
+import time
+
+class calcSheetDelete(UITestCase):
+
+def test_tdf114228_insert_and_delete_sheet(self):
+
+self.ui_test.create_doc_in_start_center("calc")
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWindow = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+xGridWindow.executeAction("SELECT", mkPropertyValues({"CELL": "L12"}))
+nrSheets = document.Sheets.getCount()  #default number
+
+self.ui_test.execute_dialog_through_command(".uno:Insert")  #insert 
sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("ok")
+xOKButton.executeAction("CLICK", tuple())
+
+self.assertEqual(document.Sheets.getCount(), nrSheets + 1)
+
+self.ui_test.execute_dialog_through_command(".uno:Remove")  #delete 
sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("yes")
+xOKButton.executeAction("CLICK", tuple())
+
+self.assertEqual(document.Sheets.getCount(), nrSheets)
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.Sheets.getCount(), nrSheets + 1)
+self.xUITest.executeCommand(".uno:Redo")
+self.assertEqual(document.Sheets.getCount(), nrSheets)
+
+self.ui_test.close_doc()
+
+def test_tdf43078_insert_and_delete_sheet_insert_text(self):
+
+self.ui_test.create_doc_in_start_center("calc")
+document = self.ui_test.get_component()
+
+nrSheets = document.Sheets.getCount()  #default number of sheets
+
+self.ui_test.execute_dialog_through_command(".uno:Insert")  #insert 
sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("ok")
+xOKButton.executeAction("CLICK", tuple())
+
+self.ui_test.execute_dialog_through_command(".uno:Insert")  #insert 
sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("ok")
+xOKButton.executeAction("CLICK", tuple())
+
+self.assertEqual(document.Sheets.getCount(), nrSheets + 2)
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWindow = xCalcDoc.getChild("grid_window")
+enter_text_to_cell(xGridWindow, "B2", "abcd")
+
+self.ui_test.execute_dialog_through_command(".uno:Remove")  #delete 
sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("yes")
+xOKButton.executeAction("CLICK", tuple())
+
+self.assertEqual(document.Sheets.getCount(), nrSheets + 1)
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(document.Sheets.getCount(), nrSheets + 2)
+self.xUITest.executeCommand(".uno:Redo")
+self.assertEqual(document.Sheets.getCount(), nrSheets + 1)
+
+self.ui_test.close_doc()
+
+def test_delete_more_sheets_at_once(self):
+
+self.ui_test.create_doc_in_start_center("calc")
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWindow = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+nrSheets = document.Sheets.getCount()  #default number
+i = 0
+while i < 6:
+self.ui_test.execute_dialog_through_command(".uno:Insert")  
#insert sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("ok")
+xOKButton.executeAction("CLICK", tuple())
+i = i + 1
+self.assertEqual(document.Sheets.getCount(), nrSheets + 6)
+
+i = 0
+while i < 5:
+self.xUITest.executeCommand(".uno:JumpToNextTableSel")  #select 
next sheet
+i = i + 1
+
+self.ui_test.execute_dialog_throug

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

[Johnny_M]

 sw/source/core/txtnode/ndtxt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 965527d76bc233b65795a5203029a65e28773e3b
Author: Johnny_M 
Date:   Sat Feb 17 14:48:49 2018 +0100

Translate German variable names

Akt -> Current in txtnode

Change-Id: I5f8c615c0caf96d51077aba5b27ee68bbe6f3b72
Reviewed-on: https://gerrit.libreoffice.org/49902
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 67c8a8975485..a442be331735 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2034,10 +2034,10 @@ OUString SwTextNode::InsertText( const OUString & rStr, 
const SwIndex & rIdx,
 && (*pEndIdx == pHt->GetStart()) )
 {
 pHt->GetStart() = pHt->GetStart() - nLen;
-const size_t nAktLen = m_pSwpHints->Count();
+const size_t nCurrentLen = m_pSwpHints->Count();
 m_pSwpHints->DeleteAtPos(i);
 InsertHint( pHt/* AUTOSTYLES:, SetAttrMode::NOHINTADJUST*/ 
);
-if ( nAktLen > m_pSwpHints->Count() && i )
+if ( nCurrentLen > m_pSwpHints->Count() && i )
 {
 --i;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sw/source/filter/ascii/ascatr.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 70eedc8d664433d4f101f59bd4782e542836d3f7
Author: Johnny_M 
Date:   Sat Feb 17 14:45:50 2018 +0100

Translate German variable names

Akt -> Current in ascii filter

Change-Id: I05637a65632b15b1ec0e0860bff15651dc25a8c4
Reviewed-on: https://gerrit.libreoffice.org/49899
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/filter/ascii/ascatr.cxx 
b/sw/source/filter/ascii/ascatr.cxx
index 175572133d79..f0b2c1e7dac6 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -47,7 +47,7 @@ class SwASC_AttrIter
 {
 SwASCWriter& rWrt;
 const SwTextNode& rNd;
-sal_Int32 nAktSwPos;
+sal_Int32 nCurrentSwPos;
 
 sal_Int32 SearchNext( sal_Int32 nStartPos );
 
@@ -56,12 +56,12 @@ public:
 
 void NextPos()
 {
-nAktSwPos = SearchNext( nAktSwPos + 1 );
+nCurrentSwPos = SearchNext( nCurrentSwPos + 1 );
 }
 
 sal_Int32 WhereNext() const
 {
-return nAktSwPos;
+return nCurrentSwPos;
 }
 
 bool OutAttr( sal_Int32 nSwPos );
@@ -73,9 +73,9 @@ SwASC_AttrIter::SwASC_AttrIter(
 sal_Int32 nStt )
 : rWrt( rWr )
 , rNd( rTextNd )
-, nAktSwPos( 0 )
+, nCurrentSwPos( 0 )
 {
-nAktSwPos = SearchNext( nStt + 1 );
+nCurrentSwPos = SearchNext( nStt + 1 );
 }
 
 sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 svtools/source/svrtf/svparser.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4c3fc27ee68d9e4581f8131ba8eaa7d0c640cbda
Author: Johnny_M 
Date:   Sat Feb 17 14:21:31 2018 +0100

Translate German variable names

Akt -> Current in svparser

Change-Id: I6c883a7690ca518ea773a08ab093d5db323122f5
Reviewed-on: https://gerrit.libreoffice.org/49901
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/svtools/source/svrtf/svparser.cxx 
b/svtools/source/svrtf/svparser.cxx
index c6d59c08eb04..4ba540ce96d9 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -517,28 +517,28 @@ T SvParser::SkipToken( short nCnt )   // "skip" n 
Tokens backward
 template
 typename SvParser::TokenStackType* SvParser::GetStackPtr( short nCnt )
 {
-sal_uInt8 nAktPos = sal_uInt8(pTokenStackPos - pTokenStack );
+sal_uInt8 nCurrentPos = sal_uInt8(pTokenStackPos - pTokenStack );
 if( nCnt > 0 )
 {
 if( nCnt >= nTokenStackSize )
 nCnt = (nTokenStackSize-1);
-if( nAktPos + nCnt < nTokenStackSize )
-nAktPos = sal::static_int_cast< sal_uInt8 >(nAktPos + nCnt);
+if( nCurrentPos + nCnt < nTokenStackSize )
+nCurrentPos = sal::static_int_cast< sal_uInt8 >(nCurrentPos + 
nCnt);
 else
-nAktPos = sal::static_int_cast< sal_uInt8 >(
-nAktPos + (nCnt - nTokenStackSize));
+nCurrentPos = sal::static_int_cast< sal_uInt8 >(
+nCurrentPos + (nCnt - nTokenStackSize));
 }
 else if( nCnt < 0 )
 {
 if( -nCnt >= nTokenStackSize )
 nCnt = -nTokenStackSize+1;
-if( -nCnt <= nAktPos )
-nAktPos = sal::static_int_cast< sal_uInt8 >(nAktPos + nCnt);
+if( -nCnt <= nCurrentPos )
+nCurrentPos = sal::static_int_cast< sal_uInt8 >(nCurrentPos + 
nCnt);
 else
-nAktPos = sal::static_int_cast< sal_uInt8 >(
-nAktPos + (nCnt + nTokenStackSize));
+nCurrentPos = sal::static_int_cast< sal_uInt8 >(
+nCurrentPos + (nCnt + nTokenStackSize));
 }
-return pTokenStack + nAktPos;
+return pTokenStack + nCurrentPos;
 }
 
 // to read asynchronous from SvStream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sw/source/filter/ww8/ww8graf.cxx |4 ++--
 sw/source/filter/ww8/ww8par2.cxx |8 
 sw/source/filter/ww8/ww8par3.cxx |2 +-
 sw/source/filter/ww8/ww8scan.cxx |   32 
 sw/source/filter/ww8/ww8scan.hxx |   10 +-
 5 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 52dd8686deda517d8e0587aea47f75af29ee53db
Author: Johnny_M 
Date:   Sat Feb 17 13:36:16 2018 +0100

Translate German variable names

Akt -> Current in ww8 (leftovers in function names)

Change-Id: I7ce1df76be01108d0e1f23522b09e20f75ae4ed3
Reviewed-on: https://gerrit.libreoffice.org/49903
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index f628098fbe3d..3b3aea37ca15 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1047,10 +1047,10 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* 
pTextObj,
 {
 while (aSprmIter.GetSprms())
 {
-const sal_uInt8 *const 
pParams(aSprmIter.GetAktParams());
+const sal_uInt8 *const 
pParams(aSprmIter.GetCurrentParams());
 if (nullptr == pParams)
 break;
-sal_uInt16 nAktId = aSprmIter.GetAktId();
+sal_uInt16 nAktId = aSprmIter.GetCurrentId();
 switch( nAktId )
 {
 case 75:
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index d53929288c57..acfb4b1abcb6 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1772,9 +1772,9 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP 
nStartCp) :
 for (int nLoop = 0; nLoop < 2; ++nLoop)
 {
 const sal_uInt8* pParams;
-while (aSprmIter.GetSprms() && nullptr != (pParams = 
aSprmIter.GetAktParams()))
+while (aSprmIter.GetSprms() && nullptr != (pParams = 
aSprmIter.GetCurrentParams()))
 {
-sal_uInt16 nId = aSprmIter.GetAktId();
+sal_uInt16 nId = aSprmIter.GetCurrentId();
 sal_uInt16 nFixedLen = aSprmParser.DistanceToData(nId);
 sal_uInt16 nL = aSprmParser.GetSprmSize(nId, 
aSprmIter.GetSprms(), aSprmIter.GetRemLen());
 sal_uInt16 nLen = nL - nFixedLen;
@@ -3571,9 +3571,9 @@ void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short 
nLen, bool bPap)
 while (const sal_uInt8* pSprm = aSprmIter.GetSprms())
 {
 #ifdef DEBUGSPRMREADER
-fprintf(stderr, "id is %x\n", aIter.GetAktId());
+fprintf(stderr, "id is %x\n", aIter.GetCurrentId());
 #endif
-pIo->ImportSprm(pSprm, aSprmIter.GetRemLen(), aSprmIter.GetAktId());
+pIo->ImportSprm(pSprm, aSprmIter.GetRemLen(), 
aSprmIter.GetCurrentId());
 aSprmIter.advance();
 }
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 515a2aaec72b..019729fb5f7b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -701,7 +701,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, 
std::unique_ptradvance();
 }
 
-WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
+WW8_FC WW8PLCFx_PCD::CurrentPieceStartCp2Fc( WW8_CP nCp )
 {
 WW8_CP nCpStart, nCpEnd;
 void* pData;
 
 if ( !pPcdI->Get(nCpStart, nCpEnd, pData) )
 {
-OSL_ENSURE( false, "AktPieceStartCp2Fc() with false Cp found (1)" );
+OSL_ENSURE( false, "CurrentPieceStartCp2Fc() with false Cp found (1)" 
);
 return WW8_FC_MAX;
 }
 
@@ -1234,7 +1234,7 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
 return nRet;
 }
 
-void WW8PLCFx_PCD::AktPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos,
+void WW8PLCFx_PCD::CurrentPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos,
 const WW8ScannerBase *pSBase )
 {
 //No point going anywhere with this
@@ -1245,13 +1245,13 @@ void WW8PLCFx_PCD::AktPieceFc2Cp( WW8_CP& rStartPos, 
WW8_CP& rEndPos,
 rEndPos = pSBase->WW8Fc2Cp( rEndPos );
 }
 
-WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos )
+WW8_CP WW8PLCFx_PCD::CurrentPieceStartFc2Cp( WW8_FC nStartPos )
 {
 WW8_CP nCpStart, nCpEnd;
 void* pData;
 if ( !pPcdI->Get( nCpStart, nCpEnd, pData ) )
 {
-OSL_ENSURE( false, "AktPieceStartFc2Cp() - error" );
+OSL_ENSURE( false, "CurrentPieceStartFc2Cp() - error" );
 return WW8_CP_MAX;
 }
 bool bIsUnicode = false;
@@ -2772,7 +2772,7 @@ WW8PLCFx_Fc_FKP::WW8Fkp::WW8Fkp(const WW8Fib& rFib, 
SvStream* pSt,
 WW8SprmIter aIter(pSprms, nLen, maSprmParser);
 while (aIter.GetSprms())
 {
-fprintf(stde

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

[Johnny_M]

 svx/source/svdraw/svdopath.cxx |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b62ac98a72e21d49aec4493ace8ba12b7561439d
Author: Johnny_M 
Date:   Sat Feb 17 14:57:38 2018 +0100

Translate German variable names

Akt -> Current in svdopath

Change-Id: I4482d97fcd5891c7c8137432b6defa8d52f2ca0c
Reviewed-on: https://gerrit.libreoffice.org/49900
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index b883abdf1d00..bbaf3450dbbb 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -257,12 +257,12 @@ struct ImpPathCreateUser  : public SdrDragStatUserData
 boolbMixedCreate;
 sal_uInt16  nBezierStartPoint;
 SdrObjKind  eStartKind;
-SdrObjKind  eAktKind;
+SdrObjKind  eCurrentKind;
 
 public:
 ImpPathCreateUser(): nCircRadius(0),nCircStAngle(0),nCircRelAngle(0),
 
bBezier(false),bBezHasCtrl0(false),bCircle(false),bAngleSnap(false),bLine(false),bLine90(false),bRect(false),
-
bMixedCreate(false),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE)
 { }
+
bMixedCreate(false),nBezierStartPoint(0),eStartKind(OBJ_NONE),eCurrentKind(OBJ_NONE)
 { }
 
 void ResetFormFlags() { bBezier=false; bCircle=false; bLine=false; 
bRect=false; }
 bool IsFormFlag() const { return bBezier || bCircle || bLine || bRect; }
@@ -922,7 +922,7 @@ OUString 
ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
 // #i103058# re-add old creation comment mode
 const ImpPathCreateUser* pU = static_cast(rDrag.GetUser());
 const SdrObjKind eKindMerk(meObjectKind);
-mrSdrPathObject.meKind = pU->eAktKind;
+mrSdrPathObject.meKind = pU->eCurrentKind;
 OUString aTmp;
 mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewCreateObj, aTmp);
 aStr = aTmp;
@@ -1248,7 +1248,7 @@ bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& 
rStat)
 }
 std::unique_ptr pU(new ImpPathCreateUser);
 pU->eStartKind=meObjectKind;
-pU->eAktKind=meObjectKind;
+pU->eCurrentKind=meObjectKind;
 rStat.SetUser(std::move(pU));
 return true;
 }
@@ -1263,7 +1263,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& 
rStat)
 sal_uInt16 nIdent;
 SdrInventor nInvent;
 pView->TakeCurrentObj(nIdent,nInvent);
-if (nInvent==SdrInventor::Default && 
pU->eAktKind!=static_cast(nIdent)) {
+if (nInvent==SdrInventor::Default && 
pU->eCurrentKind!=static_cast(nIdent)) {
 SdrObjKind eNewKind=static_cast(nIdent);
 switch (eNewKind) {
 case OBJ_CARC:
@@ -1282,7 +1282,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& 
rStat)
 case OBJ_FREEFILL:
 case OBJ_SPLNLINE:
 case OBJ_SPLNFILL: {
-pU->eAktKind=eNewKind;
+pU->eCurrentKind=eNewKind;
 pU->bMixedCreate=true;
 pU->nBezierStartPoint=rXPoly.GetPointCount();
 if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--;
@@ -1300,9 +1300,9 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& 
rStat)
 if (nActPoint==0) {
 rXPoly[0]=rStat.GetPos0();
 } else nActPoint--;
-bool bFreeHand=IsFreeHand(pU->eAktKind);
+bool bFreeHand=IsFreeHand(pU->eCurrentKind);
 rStat.SetNoSnap(bFreeHand);
-rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT 
&& (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE));
+rStat.SetOrtho8Possible(pU->eCurrentKind!=OBJ_CARC && 
pU->eCurrentKind!=OBJ_RECT && (!pU->bMixedCreate || 
pU->eCurrentKind!=OBJ_LINE));
 rXPoly[nActPoint]=rStat.GetNow();
 if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE && 
rXPoly.GetPointCount()>=1) {
 Point aPt(rStat.GetStart());
@@ -1349,20 +1349,20 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& 
rStat)
 }
 
 pU->ResetFormFlags();
-if (IsBezier(pU->eAktKind)) {
+if (IsBezier(pU->eCurrentKind)) {
 if (nActPoint>=2) {
 
pU->CalcBezier(rXPoly[nActPoint-1],rXPoly[nActPoint],rXPoly[nActPoint-1]-rXPoly[nActPoint-2],rStat.IsMouseDown());
 } else if (pU->bBezHasCtrl0) {
 
pU->CalcBezier(rXPoly[nActPoint-1],rXPoly[nActPoint],pU->aBezControl0-rXPoly[nActPoint-1],rStat.IsMouseDown());
 }
 }
-if (pU->eAktKind==OBJ_CARC && nActPoint>=2) {
+if (pU->eCurrentKind==OBJ_CARC && nActPoint>=2) {
 
pU->CalcCircle(rXPoly[nActPoint-1],rXPoly[nActPoint],rXPoly[nActPoint-1]-rXPoly[nActPoint-2],pView);
 }
-if (pU->eAktKind==OBJ_LINE && nActPoint>=2) {
+if (pU->eCurrentKind==OBJ_LINE && nActPoint>=2) {
 
pU->CalcLine(rXPoly[nActPoint-1],rXPoly[nActPoint],rXPoly[nActPoint-1]-rXPoly[nActPoint-2],pView);
  

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

[Johnny_M]

 sw/source/filter/ww8/ww8par2.cxx |   48 +++
 sw/source/filter/ww8/ww8par2.hxx |   12 -
 2 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 0b8f6d7d1182bddf4d2cccafd798c97de0dc4b24
Author: Johnny_M 
Date:   Sat Feb 17 14:16:41 2018 +0100

Translate German variable names

Akt -> Current in ww8par2

Change-Id: I9ef8c2def230287abe405df894f85240a338c73d
Note: Other occurrences of "Akt" in the affected files will be done 
separately
Reviewed-on: https://gerrit.libreoffice.org/49906
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index acfb4b1abcb6..56f21654bedb 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1700,7 +1700,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP 
nStartCp) :
 m_pTabLine(nullptr),
 m_pTabBoxes(nullptr),
 m_pTabBox(nullptr),
-m_pAktWWCell(nullptr),
+m_pCurrentWWCell(nullptr),
 m_nRows(0),
 m_nDefaultSwCols(0),
 m_nBands(0),
@@ -1714,9 +1714,9 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP 
nStartCp) :
 m_bClaimLineFormat(false),
 m_eOri(text::HoriOrientation::NONE),
 m_bIsBiDi(false),
-m_nAktRow(0),
-m_nAktBandRow(0),
-m_nAktCol(0),
+m_nCurrentRow(0),
+m_nCurrentBandRow(0),
+m_nCurrentCol(0),
 m_nRowsToRepeat(0),
 m_pTable(nullptr),
 m_pParentPos(nullptr),
@@ -2289,7 +2289,7 @@ void WW8TabDesc::CalcDefaults()
 if( m_nDefaultSwCols == 0 )
 m_bOk = false;
 m_pActBand = m_pFirstBand;
-m_nAktBandRow = 0;
+m_nCurrentBandRow = 0;
 OSL_ENSURE( m_pActBand, "pActBand is 0" );
 }
 
@@ -2474,7 +2474,7 @@ void WW8TabDesc::UseSwTable()
 {
 // init global Vars
 m_pTabLines = &m_pTable->GetTabLines();
-m_nAktRow = m_nAktCol = m_nAktBandRow = 0;
+m_nCurrentRow = m_nCurrentCol = m_nCurrentBandRow = 0;
 
 m_pTableNd  = 
const_cast((*m_pTabLines)[0]->GetTabBoxes()[0]->
 GetSttNd()->FindTableNode());
@@ -2492,7 +2492,7 @@ void WW8TabDesc::UseSwTable()
 m_pIo->m_xCtrlStck->SetAttr(*m_pIo->m_pPaM->GetPoint(), 0, false);
 
 // now set the correct PaM and prepare first merger group if any
-SetPamInCell(m_nAktCol, true);
+SetPamInCell(m_nCurrentCol, true);
 aDup.Insert(*m_pIo->m_pPaM->GetPoint());
 
 m_pIo->m_bWasTabRowEnd = false;
@@ -2638,7 +2638,7 @@ void WW8TabDesc::MergeCells()
 void WW8TabDesc::ParkPaM()
 {
 SwTableBox *pTabBox2 = nullptr;
-short nRow = m_nAktRow + 1;
+short nRow = m_nCurrentRow + 1;
 if (nRow < static_cast(m_pTabLines->size()))
 {
 if (SwTableLine *pLine = (*m_pTabLines)[nRow])
@@ -2799,7 +2799,7 @@ bool WW8TabDesc::IsValidCell(short nCol) const
 {
 return (static_cast(nCol) < SAL_N_ELEMENTS(m_pActBand->bExist)) &&
m_pActBand->bExist[nCol] &&
-   static_cast(m_nAktRow) < m_pTabLines->size();
+   static_cast(m_nCurrentRow) < m_pTabLines->size();
 }
 
 bool WW8TabDesc::InFirstParaInCell() const
@@ -2842,7 +2842,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
 
 sal_uInt16 nCol = m_pActBand->transCell(nWwCol);
 
-if (static_cast(m_nAktRow) >= m_pTabLines->size())
+if (static_cast(m_nCurrentRow) >= m_pTabLines->size())
 {
 OSL_ENSURE(false, "Actual row bigger than expected." );
 if (bPam)
@@ -2850,7 +2850,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
 return;
 }
 
-m_pTabLine = (*m_pTabLines)[m_nAktRow];
+m_pTabLine = (*m_pTabLines)[m_nCurrentRow];
 m_pTabBoxes = &m_pTabLine->GetTabBoxes();
 
 if (nCol >= m_pTabBoxes->size())
@@ -2886,7 +2886,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
 }
 if (bPam)
 {
-m_pAktWWCell = &m_pActBand->pTCs[ nWwCol ];
+m_pCurrentWWCell = &m_pActBand->pTCs[ nWwCol ];
 
// The first paragraph in a cell with upper autospacing has upper 
spacing set to 0
 if(m_pIo->m_bParaAutoBefore && m_pIo->m_bFirstPara && 
!m_pIo->m_xWDop->fDontUseHTMLAutoSpacing)
@@ -2944,7 +2944,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
 
 void WW8TabDesc::InsertCells( short nIns )
 {
-m_pTabLine = (*m_pTabLines)[m_nAktRow];
+m_pTabLine = (*m_pTabLines)[m_nCurrentRow];
 m_pTabBoxes = &m_pTabLine->GetTabBoxes();
 m_pTabBox = (*m_pTabBoxes)[0];
 
@@ -3207,7 +3207,7 @@ void WW8TabDesc::TableCellEnd()
 {
 ::SetProgressState(m_pIo->m_nProgress, m_pIo->m_pDocShell);   // Update
 
-EndMiserableHackForUnsupportedDirection(m_nAktCol);
+EndMiserableHackForUnsupportedDirection(m_nCurrentCol);
 
 // new line/row
 if( m_pIo->m_bWasTabRowEnd )
@@ -3222,20 +3222,20 @@ void WW8TabDesc::TableCellEnd()
 m_aNumRuleNames.end());
 }
 
-m_nAktCol = 0;
-m_nAktRow++;
-m_nAktBandRow++;
+m_nCurrentCol = 0;
+  

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

[Johnny_M]

 sw/source/filter/ww8/ww8par.cxx  |6 ++--
 sw/source/filter/ww8/ww8par.hxx  |2 -
 sw/source/filter/ww8/ww8par2.cxx |   26 +-
 sw/source/filter/ww8/ww8par3.cxx |   14 +-
 sw/source/filter/ww8/ww8par5.cxx |2 -
 sw/source/filter/ww8/ww8par6.cxx |   54 +++
 6 files changed, 52 insertions(+), 52 deletions(-)

New commits:
commit 57251bd42e4d5656ec456f9cf612195cb598bc43
Author: Johnny_M 
Date:   Sat Feb 17 13:49:34 2018 +0100

Translate German variable names

m_pAktColl -> m_pCurrentColl in ww8par

Change-Id: I11299bab3c294345cd32d829003b2351192f9bf9
Note: Other occurrences of "Akt" will be done separately
Reviewed-on: https://gerrit.libreoffice.org/49904
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e6a5d3bd6b4a..2d585cdd8624 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1619,7 +1619,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const 
sal_uInt8* pData, short nLen)
 
 const SwFormat * pSty = nullptr;
 sal_uInt16 nTabBase;
-if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // StyleDef
+if (m_pCurrentColl && m_nCurrentColl < m_vColl.size()) // StyleDef
 {
 nTabBase = m_vColl[m_nCurrentColl].m_nBase;
 if (nTabBase < m_vColl.size())  // Based On
@@ -1735,7 +1735,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const 
sal_uInt8* pData, short nLen)
 // text SwWW8ImplReader::Read_Tab is called at the begin and end of
 // the range the attrib affects, and ignoring it would upset the
 // balance
-if (!m_pAktColl) // not importing into a style
+if (!m_pCurrentColl) // not importing into a style
 {
 SvxTabStopItem aOrig = pSty ?
 ItemGet(*pSty, RES_PARATR_TABSTOP) :
@@ -4164,7 +4164,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, 
SotStorage* pStorage,
 , m_pPostProcessAttrsInfo(nullptr)
 , m_aTextNodesHavingFirstLineOfstSet()
 , m_aTextNodesHavingLeftIndentSet()
-, m_pAktColl(nullptr)
+, m_pCurrentColl(nullptr)
 , m_pDfltTextFormatColl(nullptr)
 , m_pStandardFormatColl(nullptr)
 , m_pDrawModel(nullptr)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 9d84a13ec742..6182e324677c 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1217,7 +1217,7 @@ private:
 std::set m_aTextNodesHavingLeftIndentSet; // #i105414#
 
 std::unique_ptr m_xStyles; // pointer to the style reading 
class
-SwFormat* m_pAktColl;// collection to be created now
+SwFormat* m_pCurrentColl;// collection to be created now
 // ( always 0 outside of a Style-Def )
 std::unique_ptr m_xAktItemSet;// character attributes to be 
read in now
 // (always 0 outside of the WW8ListManager Ctor)
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 56f21654bedb..7e896f554579 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -728,7 +728,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const 
sal_uInt8* pData, short
 return;
 
 // StyleDef ?
-if( m_pAktColl )
+if( m_pCurrentColl )
 {
 // only for SwTextFormatColl, not CharFormat
 // WW: 0 = no Numbering
@@ -741,7 +741,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const 
sal_uInt8* pData, short
 {
 m_nSwNumLevel = *pData - 1;
 if (!m_bNoAttrImport)
-
static_cast(m_pAktColl)->AssignToListLevelOfOutlineStyle( 
m_nSwNumLevel );
+
static_cast(m_pCurrentColl)->AssignToListLevelOfOutlineStyle(
 m_nSwNumLevel );
 // For WW-NoNumbering also NO_NUMBERING could be used.
 // ( For normal numberierung NO_NUM has to be used:
 //   NO_NUM : pauses numbering,
@@ -767,7 +767,7 @@ void SwWW8ImplReader::Read_ANLevelNo( sal_uInt16, const 
sal_uInt8* pData, short
 void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, 
short nLen ) // Sprm 12
 {
 SwWW8StyInf * pStyInf = GetStyle(m_nCurrentColl);
-if( !m_pAktColl || nLen <= 0   // only for Styledef
+if( !m_pCurrentColl || nLen <= 0   // only for Styledef
 || (pStyInf && !pStyInf->m_bColl)  // ignore  CharFormat ->
 || ( m_nIniFlags & WW8FL_NO_OUTLINE ) )
 {
@@ -786,7 +786,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const 
sal_uInt8* pData, shor
 && m_nSwNumLevel <= 9 ){  // No Bullets or Numbering
 
 // If NumRuleItems were set, either directly or through inheritance, 
disable them now
-m_pAktColl->SetFormatAttr( SwNumRuleItem(

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

[Bartosz Kosiorek]

 oox/source/export/chartexport.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5b9e76557d2b5c835a5873de1ce530f36ea98d2d
Author: Bartosz Kosiorek 
Date:   Thu Feb 8 14:15:48 2018 +0100

tdf#114139 Don't export Plot Area shape property fot 3D charts

For 2D charts Plot Area equivalent is Chart Wall.
Unfortunately LibreOffice doesn't have Plot Area equivalent for 3D chart.
It means that Plot Area couldn't be displayed and changed for 3D chars in 
LibreOffice.
We cannot write Wall attributes into Plot Area for 3D charts, because Wall 
us used as background wall.

Change-Id: I16d3b326571c1e411a094ec799e20c7aeeb2c1d4
Reviewed-on: https://gerrit.libreoffice.org/49428
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 8e1a05be1ae0..cb4994aa89be 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1156,7 +1156,11 @@ void ChartExport::exportPlotArea( const Reference< 
css::chart::XChartDocument >&
  * eg: Fill and Outline
  */
 Reference< css::chart::X3DDisplay > xWallFloorSupplier( mxDiagram, 
uno::UNO_QUERY );
-if( xWallFloorSupplier.is() )
+// tdf#114139 For 2D charts Plot Area equivalent is Chart Wall.
+// Unfortunately LibreOffice doesn't have Plot Area equivalent for 3D 
charts.
+// It means that Plot Area couldn't be displayed and changed for 3D chars 
in LibreOffice.
+// We cannot write Wall attributes into Plot Area for 3D charts, because 
Wall us used as background wall.
+if( !mbIs3DChart && xWallFloorSupplier.is() )
 {
 Reference< beans::XPropertySet > xWallPropSet( 
xWallFloorSupplier->getWall(), uno::UNO_QUERY );
 if( xWallPropSet.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

improve this weekness in writer

[Nasser Hamidi]

hi dear
I post here because I could not find any suitable place to post this
problem. I am using linux for almost 10 years and still I have to use
windows for some softwares. On of most hurting missing in linux is good
alternative for MSWord. Libreoffice is awesome while I am using
Left-To-Right languages. There is no good solution in writer for RTL
languages (Arabic, Persian, etc). No solution I can found. everything is
blur (some time works and sometime not even in same document).
please please please make it more suitable for RTL languages
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Hey, check out the most unique gemstone on Kickstarter, its amazing...

[Andy Co-founder of MONNARC]

Hi There,
I would like to share with you an interesting project on exclusive Amber gemstone dice that is live on KICKSTARTER. It is time to grab limited quantity Early Birds with 40 percent OFF NOW. It would be grate if you just check our wonderful story here.
Honestly, our dream will come true, if you help us spreading this ancient fortune across the world. Get at least ONE the most unique Baltic Amber dice that might bring you success or even wealth and we hope to make our amazing Amber dice together with you to live on for many years.
Best wishes,Don Co-founder of MONNARCUnsubscribe me from this list
This email has been sent with a free version of Ultramail24.


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

[Libreoffice-commits] core.git: 2 commits - sc/qa

[Kohei Yoshida]

 sc/qa/unit/data/xml/empty-rows.xml |   79 +
 sc/qa/unit/subsequent_filters-test.cxx |   35 ++
 sc/qa/unit/ucalc.cxx   |   16 +++---
 sc/qa/unit/ucalc_formula.cxx   |   20 
 sc/qa/unit/ucalc_sort.cxx  |   52 ++---
 5 files changed, 158 insertions(+), 44 deletions(-)

New commits:
commit cf9e55538375e5c5dea173151f1d0386bd29ad4e
Author: Kohei Yoshida 
Date:   Sat Feb 17 09:29:02 2018 -0500

Use the variant of checkOutput that takes nested std::vector.

That one is *the* future.  We can't remove the old one just yet...

Change-Id: I3c5b1bfee3d2cb8988b68ced5a38d52d641e5881
Reviewed-on: https://gerrit.libreoffice.org/49908
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7651a65a448f..29c16f6e8243 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6028,7 +6028,7 @@ void Test::testFormulaToValue()
 
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][3] = {
+std::vector> aOutputCheck = {
 { "1",  "2", "TRUE" },
 { "2",  "4", "TRUE" },
 { "3",  "6", "TRUE" },
@@ -6037,7 +6037,7 @@ void Test::testFormulaToValue()
 { "6", "12", "TRUE" },
 };
 
-bool bSuccess = checkOutput<3>(m_pDoc, aDataRange, aOutputCheck, 
"Initial value");
+bool bSuccess = checkOutput(m_pDoc, aDataRange, aOutputCheck, "Initial 
value");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -6048,7 +6048,7 @@ void Test::testFormulaToValue()
 
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][3] = {
+std::vector> aOutputCheck = {
 { "1",  "2",  "TRUE" },
 { "2",  "4",  "TRUE" },
 { "3",  "6", "FALSE" },
@@ -6057,7 +6057,7 @@ void Test::testFormulaToValue()
 { "6", "12",  "TRUE" },
 };
 
-bool bSuccess = checkOutput<3>(m_pDoc, aDataRange, aOutputCheck, 
"Converted");
+bool bSuccess = checkOutput(m_pDoc, aDataRange, aOutputCheck, 
"Converted");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -6090,7 +6090,7 @@ void Test::testFormulaToValue()
 
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][3] = {
+std::vector> aOutputCheck = {
 { "1",  "2", "TRUE" },
 { "2",  "4", "TRUE" },
 { "3",  "6", "TRUE" },
@@ -6099,7 +6099,7 @@ void Test::testFormulaToValue()
 { "6", "12", "TRUE" },
 };
 
-bool bSuccess = checkOutput<3>(m_pDoc, aDataRange, aOutputCheck, 
"After undo");
+bool bSuccess = checkOutput(m_pDoc, aDataRange, aOutputCheck, "After 
undo");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -6121,7 +6121,7 @@ void Test::testFormulaToValue()
 pUndoMgr->Redo();
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][3] = {
+std::vector> aOutputCheck = {
 { "1",  "2",  "TRUE" },
 { "2",  "4",  "TRUE" },
 { "3",  "6", "FALSE" },
@@ -6130,7 +6130,7 @@ void Test::testFormulaToValue()
 { "6", "12",  "TRUE" },
 };
 
-bool bSuccess = checkOutput<3>(m_pDoc, aDataRange, aOutputCheck, 
"Converted");
+bool bSuccess = checkOutput(m_pDoc, aDataRange, aOutputCheck, 
"Converted");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index d6764c498e51..a67ef5063dcd 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5683,7 +5683,7 @@ void Test::testFormulaDepTrackingDeleteCol()
 
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][2] = {
+std::vector> aOutputCheck = {
 { "#REF!", "#REF!" },
 { nullptr,  nullptr },
 { "#REF!", "#REF!" },
@@ -5691,7 +5691,7 @@ void Test::testFormulaDepTrackingDeleteCol()
 };
 
 ScRange aCheckRange(0,0,0,1,3,0);
-bool bSuccess = checkOutput<2>(m_pDoc, aCheckRange, aOutputCheck, 
"Check after deleting column A");
+bool bSuccess = checkOutput(m_pDoc, aCheckRange, aOutputCheck, "Check 
after deleting column A");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -5702,7 +5702,7 @@ void Test::testFormulaDepTrackingDeleteCol()
 
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][3] = {
+std::vector> aOutputCheck = {
 { "2", "2", "2" },
 { nullptr,  nullptr, nullptr },
 { "3", "3", "3" },
@@ -5710,7 +5710,7 @@ void Test::testFormulaDepTrack

Re: improve this weekness in writer

[Karim Malhas]

Dear Nasser,

Thank you for reaching out.

I have heard similar requests before from people who use LO to
write primarily in Arabic. My Arabic is not good enough to experience
these problems myself. The process of making LO better in this
regard, probably needs very specific descriptions of all these little
problems.

Would you be able and willing to describe these problems in detail ?

I might be able to assist you, but let's take this discussion off this
list, because it is intended for developers.


Kind Regards,
Karim

On Sat, Feb 17, 2018 at 07:18:28PM +0330, Nasser Hamidi wrote:
> hi dear
> I post here because I could not find any suitable place to post this problem. 
> I
> am using linux for almost 10 years and still I have to use windows for some
> softwares. On of most hurting missing in linux is good alternative for MSWord.
> Libreoffice is awesome while I am using Left-To-Right languages. There is no
> good solution in writer for RTL languages (Arabic, Persian, etc). No solution 
> I
> can found. everything is blur (some time works and sometime not even in same
> document).
> please please please make it more suitable for RTL languages

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


-- 



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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/34497e91c553d6c8d6158630c392d8d4db00f1

[Caolán McNamara]

 bf/34497e91c553d6c8d6158630c392d8d4db00f1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ac56eacbe90f838ae32c1e134b1ad222cd64e43d
Author: Caolán McNamara 
Date:   Sat Feb 17 21:22:31 2018 +

Notes added by 'git notes add'

diff --git a/bf/34497e91c553d6c8d6158630c392d8d4db00f1 
b/bf/34497e91c553d6c8d6158630c392d8d4db00f1
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/bf/34497e91c553d6c8d6158630c392d8d4db00f1
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/qa/unit/helper/qahelper.hxx  |   37 -
 sc/qa/unit/ucalc_pivottable.cxx |  155 
 2 files changed, 78 insertions(+), 114 deletions(-)

New commits:
commit 1c4ab26455f2c94857d49ebb9ed758b03bcf766c
Author: Kohei Yoshida 
Date:   Sat Feb 17 09:48:31 2018 -0500

Now we can remove this old checkOutput() for real.

Change-Id: Ieff91dfd8195f1a5b8267753183e34e154a0c29a
Reviewed-on: https://gerrit.libreoffice.org/49913
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 69f1f7735791..5f40ba84432a 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -147,43 +147,6 @@ SCQAHELPER_DLLPUBLIC bool checkOutput(
 const ScDocument* pDoc, const ScRange& aOutRange,
 const std::vector>& aCheck, const char* pCaption 
);
 
-template
-bool checkOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* 
aOutputCheck[][Size], const char* pCaption)
-{
-bool bResult = true;
-const ScAddress& s = aOutRange.aStart;
-const ScAddress& e = aOutRange.aEnd;
-svl::GridPrinter printer(e.Row() - s.Row() + 1, e.Col() - s.Col() + 1, 
CALC_DEBUG_OUTPUT != 0);
-SCROW nOutRowSize = e.Row() - s.Row() + 1;
-SCCOL nOutColSize = e.Col() - s.Col() + 1;
-for (SCROW nRow = 0; nRow < nOutRowSize; ++nRow)
-{
-for (SCCOL nCol = 0; nCol < nOutColSize; ++nCol)
-{
-OUString aVal = pDoc->GetString(nCol + s.Col(), nRow + s.Row(), 
s.Tab());
-printer.set(nRow, nCol, aVal);
-const char* p = aOutputCheck[nRow][nCol];
-if (p)
-{
-OUString aCheckVal = OUString::createFromAscii(p);
-bool bEqual = aCheckVal == aVal;
-if (!bEqual)
-{
-cout << "Expected: " << aCheckVal << "  Actual: " << aVal 
<< endl;
-bResult = false;
-}
-}
-else if (!aVal.isEmpty())
-{
-cout << "Empty cell expected" << endl;
-bResult = false;
-}
-}
-}
-printer.print(pCaption);
-return bResult;
-}
-
 SCQAHELPER_DLLPUBLIC void clearFormulaCellChangedFlag( ScDocument& rDoc, const 
ScRange& rRange );
 
 /**
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 217b16577ba7..f069e731c77e 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -76,10 +76,11 @@ ScRange insertDPSourceData(ScDocument* pDoc, DPFieldDef 
aFields[], size_t nField
 return aSrcRange;
 }
 
-template
-bool checkDPTableOutput(ScDocument* pDoc, const ScRange& aOutRange, const 
char* aOutputCheck[][Size], const char* pCaption)
+bool checkDPTableOutput(
+ScDocument* pDoc, const ScRange& aOutRange,
+const std::vector>& aOutputCheck, const char* 
pCaption )
 {
-return checkOutput(pDoc, aOutRange, aOutputCheck, pCaption);
+return checkOutput(pDoc, aOutRange, aOutputCheck, pCaption);
 }
 
 ScDPObject* createDPFromSourceDesc(
@@ -235,7 +236,7 @@ void Test::testPivotTable()
 aOutRange = pDPObj->GetOutRange();
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][5] = {
+std::vector> aOutputCheck = {
 { "Sum - Score", "Group", nullptr, nullptr, nullptr },
 { "Name", "A", "B", "C", "Total Result" },
 { "Andy", "30", nullptr, nullptr, "30" },
@@ -247,7 +248,7 @@ void Test::testPivotTable()
 { "Total Result", "50", "57", "23", "130" }
 };
 
-bSuccess = checkDPTableOutput<5>(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output");
+bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be only one data cache.", 
size_t(1), pDPs->GetSheetCaches().size());
@@ -273,7 +274,7 @@ void Test::testPivotTable()
 pDPObj2->Output(aOutRange.aStart);
 {
 // Expected output table content.  0 = empty cell
-const char* aOutputCheck[][5] = {
+std::vector> aOutputCheck = {
 { "Sum - Score", "Group", nullptr, nullptr, nullptr },
 { "Name", "A", "B", "C", "Total Result" },
 { "Andy", "30", nullptr, nullptr, "30" },
@@ -285,7 +286,7 @@ void Test::testPivotTable()
 { "Total Result", "50", "57", "23", "130" }
 };
 
-bSuccess = checkDPTableOutput<5>(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output (from old cache)");
+bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output (from old cache)");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -310,7 +311,7 @@ void Test::testPivotTable()
 
 {
 // Exp

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

[Eike Rathke]

 sc/inc/dbdata.hxx|1 +
 sc/source/ui/docshell/docsh5.cxx |   21 ++---
 2 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 54fac33e16550c1dd95c89362130229ba2b54270
Author: Eike Rathke 
Date:   Thu Feb 15 12:50:40 2018 +0100

Resolves: tdf#115046 don't restore a sheet-local DBData from temporary

And don't clear AutoFilter button flags in the new temporary range.

Change-Id: I273de1e04632ac99c267523b2843665d257fd361
(cherry picked from commit 74d30155c5067271fb98bacbcb895c215e61678d)
Reviewed-on: https://gerrit.libreoffice.org/49810
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 9412f23b7c65..ca1a19f10263 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -122,6 +122,7 @@ public:
 
 const OUString& GetName() const { return aName; }
 const OUString& GetUpperName() const { return aUpper; }
+SCTAB   GetTab() const  { return nTable; }
 voidGetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, 
SCROW& rRow2) const;
 SC_DLLPUBLIC void GetArea(ScRange& rRange) const;
 voidSetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2);
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index d247d39ab25d..4599c2da6065 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -222,8 +222,10 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, 
ScGetDBMode eMode, ScGe
 // other ranges, use the document global temporary anonymous range
 // instead. But, if AutoFilter is to be toggled then do use the
 // sheet-local DB range.
+bool bSheetLocal = true;
 if (eMode != SC_DB_AUTOFILTER && pNoNameData->HasAutoFilter())
 {
+bSheetLocal = false;
 pNoNameData = aDocument.GetAnonymousDBData();
 if (!pNoNameData)
 {
@@ -231,14 +233,24 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, 
ScGetDBMode eMode, ScGe
 nTab, nStartCol, nStartRow, nEndCol, nEndRow, 
true, bHasHeader);
 aDocument.SetAnonymousDBData( pNoNameData);
 }
+// ScDocShell::CancelAutoDBRange() would restore the
+// sheet-local anonymous DBData from pOldAutoDBRange, unset so
+// that won't happen with data of a previous sheet-local
+// DBData.
+delete pOldAutoDBRange;
+pOldAutoDBRange = nullptr;
 }
-
-if ( !pOldAutoDBRange )
+else if (!pOldAutoDBRange)
 {
 // store the old unnamed database range with its settings for 
undo
 // (store at the first change, get the state before all 
changes)
 pOldAutoDBRange = new ScDBData( *pNoNameData );
 }
+else if (pOldAutoDBRange->GetTab() != pNoNameData->GetTab())
+{
+// Different sheet-local unnamed DB range than the previous 
one.
+*pOldAutoDBRange = *pNoNameData;
+}
 
 SCCOL nOldX1;   // take old range 
away cleanly
 SCROW nOldY1;   //! (UNDO ???)
@@ -255,7 +267,10 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, 
ScGetDBMode eMode, ScGe
 nStartCol <= nOldY2 && nOldY1 <= nEndCol)
 bHasHeader = true;
 
-DBAreaDeleted( nOldTab, nOldX1, nOldY1, nOldX2 );
+// Remove AutoFilter button flags only for sheet-local DB range,
+// not if a temporary is used.
+if (bSheetLocal)
+DBAreaDeleted( nOldTab, nOldX1, nOldY1, nOldX2 );
 
 pNoNameData->SetSortParam( ScSortParam() ); // reset 
parameter
 pNoNameData->SetQueryParam( ScQueryParam() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sw/source/ui/fldui/fldfunc.cxx|2 +-
 sw/uiconfig/swriter/ui/fldfuncpage.ui |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2701104d1a08da465daa37ab3bb74e05d2f563c3
Author: Zdeněk Crhonek 
Date:   Tue Feb 6 16:07:40 2018 +0100

rename non-unique id for better UI testing

Change-Id: Id271001411ae34269451008ca54ab5855aae7da5
Reviewed-on: https://gerrit.libreoffice.org/49305
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 6842d030d471..5a7b794aad84 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -48,7 +48,7 @@ SwFieldFuncPage::SwFieldFuncPage(vcl::Window* pParent, const 
SfxItemSet *const p
 get(m_pSelectionLB, "select");
 get(m_pFormatLB, "format");
 get(m_pNameFT, "nameft");
-get(m_pNameED, "name");
+get(m_pNameED, "condFunction");
 get(m_pValueGroup, "valuegroup");
 get(m_pValueFT, "valueft");
 get(m_pValueED, "value");
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui 
b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 3891217eff2b..557b356b8652 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -225,7 +225,7 @@
 0
 Na_me
 True
-name
+condFunction
   
   
 0
@@ -235,7 +235,7 @@
   
 
 
-  
+  
 True
 True
 •
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-6.0.1.1 fails to compile with system gpgme-1.9.0

[Thorsten Behrens]

Hi John,

John Frankish wrote:
> 1. configure/make looks for headers in include rather than include/gpgme++
> 
Distros put things into different places I guess - can you fix
configure.ac and submit a patch?

> 2. make fails with:
> 
> [CXX] xmlsecurity/source/gpg/CertificateImpl.cxx
> [CXX] xmlsecurity/source/gpg/CipherContext.cxx
> In file included from 
> /mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.cxx:12:0:
> /mnt/sdc8/usr/src/libreoffice-6.0.1.1/xmlsecurity/source/gpg/CertificateImpl.hxx:36:5:
>  error: 'GpgME' does not name a type
>  GpgME::Key m_pKey;
>  ^
>
Is that after you've fixed the path lookup? I would expect it to fail
earlier, while trying to include gpgme.h.

Cheers,

-- Thorsten


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

Re: UITest_writerperfect_epubexport hang (only sometimes)

[Markus Mohrhard]

Hey,

On Tue, Jan 23, 2018 at 9:18 AM, Miklos Vajna 
wrote:

> Hi Markus,
>
> I've added UITest_writerperfect_epubexport a while ago, and while I did
> not see it hanging in the recent past, both Noel and Stephan run into
> a hang of it from time to time.
>
> The code is here:
>
> writerperfect/qa/uitest/epubexport/epubexport.py
>
> The backtrace always looks like this:
> self.ui_test.execute_blocking_action() gets an UNO method where invoking
> it opens a dialog and the python method also gets a callback. When the
> hang happens, then it seems the problem is that the Python thread waits
> for the dialog to be closed, but in fact it's already closed, so it
> waits forever joining the python thread.
>

That is not really correct. The dialog is not closed which is actually the
problem. However I have now spend a few days looking at the code and
related code pieces and I have still no idea how this could happen.
If my understanding is not completely wrong there is no race condition in
the UI testing framework. I traced all the calls and could not find a case
where you can click on the ok button and the dialog will not be destroyed
unless the SvpSalInstance::DoReleaseYield never returns. Currently that
would be my best guess.



> I don't think there is anything really special in this test, rather I
> guess the problem happens here more frequently (than elsewhere) because
> normally these dialogs are invoked via UNO commands, where we just
> execute the UNO command, wait for the dialog to appear then work with
> it. (I did not look at the implementation, perhaps in this case there is
> no Python thread involved?)
>

> So I wonder -- do you think it would be possible or would make sense to
> have a way similar to self.xUITest.executeCommand (execute a blocking
> command async), but for UNO methods that open a dialog? I.e. also
> similar to self.ui_test.execute_blocking_action, but without an actual
> callback.
>

Well, the execute_blocking_action method already does that. It will execute
your call in a separate thread and waits with the execution of the handler
code until the event for the dialog has been received. That approach allows
to execute either normal blocking UNO commands or blocking UI actions. I
also spend quite some time now looking for potential race conditions and
could not find one as there is nothing being executed until the dialog
executed event has been received at which point access to the dialog will
work.

If someone can reproduce this case it would be nice to check a few things
in gdb.

The first one would be whether we actually are stuck in
SvpSalInstance::DoReleaseYield or are looping in Dialog::Execute?
The other one would be the value of pSVData->maWinData.mpExecuteDialogs
And the last thing would be whether the dialog is already disposed.


For now I pushed a patch that will let the tests fail instead of being
stuck.

Regards,
Markus

>
> Perhaps that would be a fix for these strange hangs.
>
> Backtraces:
> - python: https://pastebin.ca/3942603
> - native one: https://pastebin.ca/3942628
>
> (From a run that resulted in a hang for Noel.)
>
> Thanks,
>
> Miklos
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Mert Tümer]

 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |1 +
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |4 
++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 77ec366385b31fbbf8b78961fccaa9d0561661de
Author: Mert Tümer 
Date:   Fri Jan 12 15:12:16 2018 +0300

[Pardus] tdf#108446 - Shape is not changed after save

This patch is sponsored by ULAKBIM/PARDUS project.
Signed-off-by: Mert Tümer 

Change-Id: I7ee137b2332f799e4301cc3507df4a7b86af74b9
Reviewed-on: https://gerrit.libreoffice.org/47806
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java 
b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
index e7b80782f0b8..bdf00ff77e2d 100644
--- a/android/source/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
@@ -593,6 +593,7 @@ class LOKitTileProvider implements TileProvider {
 private void setGraphicSelection(int type, PointF documentCoordinate) {
 int x = (int) pixelToTwip(documentCoordinate.x, mDPI);
 int y = (int) pixelToTwip(documentCoordinate.y, mDPI);
+LibreOfficeMainActivity.setDocumentChanged(true);
 mDocument.setGraphicSelection(type, x, y);
 }
 
diff --git 
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java 
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index a7a13c45c9a4..655bb13f42d7 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -116,7 +116,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity implements Settin
 private boolean isKeyboardOpen = false;
 private boolean isFormattingToolbarOpen = false;
 private boolean isSearchToolbarOpen = false;
-private boolean isDocumentChanged = false;
+private static boolean isDocumentChanged = false;
 public boolean isNewDocument = false;
 @Override
 public void onCreate(Bundle savedInstanceState) {
@@ -773,7 +773,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity implements Settin
 return mIsSpreadsheet;
 }
 
-public void setDocumentChanged (boolean changed) {
+public static void setDocumentChanged (boolean changed) {
 isDocumentChanged = changed;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski]

 vcl/source/window/toolbox.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 10496770a6c4ba870787f20a4f0948c30e3d59cd
Author: Jim Raykowski 
Date:   Fri Feb 9 16:50:22 2018 -0900

tdf#115602 keyboard navigation: Skip disabled toolbox items

Change-Id: I793dd301a04435c79a97819497b9d34fa49e298b
Reviewed-on: https://gerrit.libreoffice.org/49697
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index e8031248714f..3bfbe0eff6b3 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4882,7 +4882,8 @@ void ToolBox::ImplChangeHighlight( ImplToolItem const * 
pItem, bool bNoGrabFocus
 // check for keyboard accessible items
 static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped )
 {
-bool bValid = (pItem && pItem->meType == ToolBoxItemType::BUTTON && 
pItem->mbVisible && !ImplIsFixedControl( pItem ));
+bool bValid = (pItem && pItem->meType == ToolBoxItemType::BUTTON && 
pItem->mbVisible && !ImplIsFixedControl( pItem )
+   && pItem->mbEnabled);
 if( bValid && bNotClipped && pItem->IsClipped() )
 bValid = false;
 return bValid;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/inc sw/source xmloff/source

[Armin Le Grand]

 sw/inc/grfatr.hxx  |   10 +++---
 sw/source/core/graphic/grfatr.cxx  |   28 +++-
 xmloff/source/text/XMLTextFrameContext.cxx |8 
 xmloff/source/text/txtparae.cxx|5 +++--
 4 files changed, 45 insertions(+), 6 deletions(-)

New commits:
commit 3369410324fdcc221339685154f3168544c5817d
Author: Armin Le Grand 
Date:   Thu Feb 15 15:41:50 2018 +0100

tdf#115529: Handle rotation for WriterFlyFrames correctly

Change-Id: I5f29b3640eaf24d63c64edfecd6732f336582640
Reviewed-on: https://gerrit.libreoffice.org/49826
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 
Reviewed-on: https://gerrit.libreoffice.org/49853
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index b05c11b4dff9..71496f49f7ea 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -91,14 +91,18 @@ public:
 
 class SwRotationGrf : public SfxUInt16Item
 {
+private:
 Size aUnrotatedSize;
+
+// tdf#15529 check and evtl. correct value, it is in 10th
+// degrees and *has* to be in the range [0 .. 3600[
+sal_Int16 checkAndCorrectValue(sal_Int16 nValue);
+
 public:
 SwRotationGrf()
 : SfxUInt16Item( RES_GRFATR_ROTATION, 0 )
 {}
-SwRotationGrf( sal_Int16 nVal, const Size& rSz )
-: SfxUInt16Item( RES_GRFATR_ROTATION, nVal ), aUnrotatedSize( rSz )
-{}
+SwRotationGrf( sal_Int16 nVal, const Size& rSz );
 
 // pure virtual methods from SfxInt16Item
 virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/sw/source/core/graphic/grfatr.cxx 
b/sw/source/core/graphic/grfatr.cxx
index 545ee807ea0c..ef437d4ad2e7 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -147,6 +147,31 @@ SfxPoolItem* SwCropGrf::Clone( SfxItemPool* ) const
 return new SwCropGrf( *this );
 }
 
+sal_Int16 SwRotationGrf::checkAndCorrectValue(sal_Int16 nValue)
+{
+if(nValue < 0)
+{
+// smaller zero, modulo (will keep negative) and add one range
+DBG_ASSERT(false, "SwRotationGrf: Value is in 10th degree and *has* to 
be in [0 .. 3600[ (!)");
+return 3600 + (nValue % 3600);
+}
+else if (nValue > 3600)
+{
+// bigger range, use modulo
+DBG_ASSERT(false, "SwRotationGrf: Value is in 10th degree and *has* to 
be in [0 .. 3600[ (!)");
+return nValue % 3600;
+}
+
+return nValue;
+}
+
+SwRotationGrf::SwRotationGrf( sal_Int16 nVal, const Size& rSz )
+// tdf#15529 check and evtl. correct value
+:   SfxUInt16Item( RES_GRFATR_ROTATION, checkAndCorrectValue(nVal) ),
+aUnrotatedSize( rSz )
+{
+}
+
 SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const
 {
 return new SwRotationGrf( *this );
@@ -174,7 +199,8 @@ bool SwRotationGrf::PutValue( const uno::Any& rVal, 
sal_uInt8 )
 if (rVal >>= nValue)
 {
 // sal_uInt16 argument needed
-SetValue( (sal_uInt16) nValue );
+// tdf#15529 check and evtl. correct value
+SetValue(static_cast(checkAndCorrectValue(nValue)));
 return true;
 }
 
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx 
b/xmloff/source/text/XMLTextFrameContext.cxx
index a7c806a185c8..118207cd00a4 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1026,6 +1026,14 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
 // to me mirrored using * -1.0, see conversion there)
 const double fRotate(aDecomposedTransform.getRotate() 
* (1800.0/M_PI));
 nRotation = static_cast< sal_Int16 
>(basegfx::fround(fRotate) % 3600);
+
+// tdf#115519 may be negative, with the above modulo 
maximal -3599, so
+// no loop needed here. nRotation is used in 
setPropertyValue("GraphicRotation")
+// and *has* to be in the range [0 .. 3600[
+if(nRotation < 0)
+{
+nRotation += 3600;
+}
 }
 }
 }
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e8fefb009a3a..89351f976236 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3082,13 +3082,14 @@ void XMLTextParagraphExport::_exportTextGraphic(
 // we have a right-handed coordinate system, so need to correct this 
by mirroring
 // the rotation to get the correct transformation. See also case 
XML_TOK_TEXT_FRAME_TRANSFORM
 // in XMLTextFrameContext_Impl::XMLTextFrameContext_Impl and #i78696#
-const double fRotate(static_cast< double >(-nRotation) * 
(M_PI/1800.0));
+const double fRotate(static_cast< double >(-nRotation) * 
(F_PI/1800.0));
 
 // transform to rotation cente

[Libreoffice-commits] core.git: configure.ac solenv/bin sysui/CustomTarget_deb.mk

[Michael Weghorn]

 configure.ac|4 
 solenv/bin/modules/installer/epmfile.pm |   19 ---
 sysui/CustomTarget_deb.mk   |5 ++---
 3 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit bcc5790554f02d65b03eebcc47fb8859fcf44643
Author: Michael Weghorn 
Date:   Mon Feb 12 12:35:47 2018 +0100

tdf#115554:  Use 'fakeroot' to build Debian packages

The command to create Debian packages must be run
as root or faked to be run as root.
The 'fakeroot' makes sure the command is run in an environment
faking root privileges for file manipulation.

This makes sure that file ownerships and permissions inside the
created deb packages are correct.

Using fakeroot instead of the custom "libgetuid" makes it
unnecessary to care about internals of the underlying tools
(like tar) and changes in those by ourselves.

Change-Id: I2cbb203ab84f740377e535c1051c2b879779b164
Reviewed-on: https://gerrit.libreoffice.org/49597
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index f18fa31dce5d..74a0a4e6844b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7296,6 +7296,10 @@ if test "$enable_epm" = "yes"; then
 if test "$DPKG" = "no"; then
 AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
 fi
+AC_PATH_PROG(FAKEROOT, fakeroot, no)
+if test "$FAKEROOT" = "no"; then
+AC_MSG_ERROR([fakeroot needed for deb creation. Install fakeroot.])
+fi
 fi
 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index eabab4cd05ae..bc6a76ccf44d 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -789,17 +789,6 @@ sub set_patch_state
 }
 
 #
-# LD_PRELOAD string for Debian packages
-#
-
-sub get_ld_preload_string
-{
-my $getuidlibrary = $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
-if ( ! -e $getuidlibrary ) { installer::exiter::exit_program("File 
$getuidlibrary does not exist!", "get_ld_preload_string"); }
-return 'LD_PRELOAD=' . $getuidlibrary;
-}
-
-#
 # Calling epm to create the installation sets
 #
 
@@ -818,11 +807,11 @@ sub call_epm
 my $outdirstring = "";
 if ( $installer::globals::epmoutpath ne "" ) { $outdirstring = " 
--output-dir $installer::globals::epmoutpath"; }
 
-# Debian package build needs a LD_PRELOAD for correct rights
+# Debian package build needs to be run with fakeroot for correct 
ownerships/permissions
 
-my $ldpreloadstring = "";
+my $fakerootstring = "";
 
-if ( $installer::globals::debian ) { $ldpreloadstring = 
get_ld_preload_string($includepatharrayref) . " "; }
+if ( $installer::globals::debian ) { $fakerootstring = "fakeroot "; }
 
 my $extraflags = "";
 if ($ENV{'EPM_FLAGS'}) { $extraflags = $ENV{'EPM_FLAGS'}; }
@@ -832,7 +821,7 @@ sub call_epm
 my $verboseflag = "-v";
 if ( ! $installer::globals::quiet ) { $verboseflag = "-v2"; };
 
-my $systemcall = $ldpreloadstring . $epmname . " -f " . $packageformat . " 
" . $extraflags . " " . $localpackagename . " " . $epmlistfilename . 
$outdirstring . " " . $verboseflag . " " . " 2\>\&1 |";
+my $systemcall = $fakerootstring . $epmname . " -f " . $packageformat . " 
" . $extraflags . " " . $localpackagename . " " . $epmlistfilename . 
$outdirstring . " " . $verboseflag . " " . " 2\>\&1 |";
 
 installer::logger::print_message( "... $systemcall ...\n" );
 
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 8a48894177aa..dd75ee913c62 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -60,13 +60,12 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control 
$(call gb_CustomTarget_ge
echo "Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH)" >>$@
du -k -s $(deb_WORKDIR)/$* | $(gb_AWK) -F ' ' '{ printf 
"Installed-Size: %s\n", $$1 ; }' >>$@
 
-$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb:
 $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst 
$(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call 
gb_Library_get_target,getuid)
+$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb:
 $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst 
$(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control
 
chmod -R g-w $(deb_WORKDIR)/$*
chmod a+rx $(deb_WORKDIR)/$*/DEBIAN \
$(deb_WORKDIR)/$*/DEBIAN/pre* $(deb_WORKDIR)/$*/DEBIAN/post

[Libreoffice-commits] core.git: sysui/CustomTarget_deb.mk sysui/CustomTarget_rpm.mk sysui/CustomTarget_solaris.mk

[Michael Weghorn]

 sysui/CustomTarget_deb.mk |2 +-
 sysui/CustomTarget_rpm.mk |2 +-
 sysui/CustomTarget_solaris.mk |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0add6dbacbed852f2b5180e04571f039cbf9dd0b
Author: Michael Weghorn 
Date:   Thu Feb 15 16:37:23 2018 +0100

tdf#115554: Fix ownership in desktop-integration tars

Use fakeroot to call tar when creating the tar.gz archives
holding the desktop-integration parts to have root:root
as owner of the files inside those.

Change-Id: Idcdcb4dd398f330773671266dafb354711b0f093
Reviewed-on: https://gerrit.libreoffice.org/49827
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 

diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index dd75ee913c62..92cda34a3bfe 100644
--- a/sysui/CustomTarget_deb.mk
+++ b/sysui/CustomTarget_deb.mk
@@ -25,7 +25,7 @@ $(foreach product,$(PRODUCTLIST),\
 ))
 
 $(deb_WORKDIR)/%-desktop-integration.tar.gz: 
$(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb
-   $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@
+   fakeroot $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@
 
 $(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm
cat $< | tr -d "\015" | \
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index 8cc56ed80e34..a76b4161e2af 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -54,6 +54,6 @@ $(foreach product,$(PRODUCTLIST),\
 ))
 
 $(rpm_WORKDIR)/%-desktop-integration.tar.gz:
-   $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach 
distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm)
 | gzip > $@
+   fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach 
distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm)
 | gzip > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
index 20072fe0cd7f..42a0a8a90633 100644
--- a/sysui/CustomTarget_solaris.mk
+++ b/sysui/CustomTarget_solaris.mk
@@ -50,6 +50,6 @@ $(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype
 
 $(solaris_WORKDIR)/%-desktop-integration.tar.gz: 
$(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo 
$(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap 
$(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove 
$(solaris_WORKDIR)/%/prototype $(call 
gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
 #  pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f 
$(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all 
VERSION=$(PKGVERSION.$*)
-   $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@
+   fakeroot $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn]

 configure.ac  |   13 ++---
 solenv/bin/modules/installer/download.pm  |   37 +-
 solenv/bin/modules/installer/simplepackage.pm |   10 ++-
 3 files changed, 26 insertions(+), 34 deletions(-)

New commits:
commit 2b266a338718ccd994a4cef05f128eb0c1b9fdc7
Author: Michael Weghorn 
Date:   Tue Feb 13 20:29:10 2018 +0100

tdf#115554:  Create tar archives using 'fakeroot'

'tar' must be run as root or faked to be run as root,
to make sure that file ownerships and permissions inside
the created tar archives are as desired (root:root).

Have fakeroot take care about creating an appropriate
environment rather than using the custom "libgetuid",
to no longer have to care about tar internals by ourselves.

This fixes the problem that file ownerships are incorrect
when tar version >= 1.24 is used for

* tar archives holding all the generated deb/rpm packages
  (created in 'download.pm')
* tar archives created by using the
  '--with-pacakage-format=archive' autogen option
  (created in 'simplepackage.pm')

Change-Id: Id20ccce4d002ff95c75292eda8080ca299eee3a5
Reviewed-on: https://gerrit.libreoffice.org/49682
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 74a0a4e6844b..c40f61b3f1c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4359,6 +4359,15 @@ msi - Windows .msi
 ;;
 esac
 done
+# fakeroot is needed to ensure correct file ownerships/permissions
+# inside deb packages and tar archives created on Linux and Solaris.
+if test "$OS" = "LINUX" || test "$OS" = "SOLARIS"; then
+AC_PATH_PROG(FAKEROOT, fakeroot, no)
+if test "$FAKEROOT" = "no"; then
+AC_MSG_ERROR(
+[--with-package-format='$with_package_format' requires 
fakeroot. Install fakeroot.])
+fi
+fi
 PKGFORMAT="$with_package_format"
 AC_MSG_RESULT([$PKGFORMAT])
 else
@@ -7296,10 +7305,6 @@ if test "$enable_epm" = "yes"; then
 if test "$DPKG" = "no"; then
 AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
 fi
-AC_PATH_PROG(FAKEROOT, fakeroot, no)
-if test "$FAKEROOT" = "no"; then
-AC_MSG_ERROR([fakeroot needed for deb creation. Install fakeroot.])
-fi
 fi
 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index d62680d84ca0..63103816e89f 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -187,17 +187,6 @@ sub call_sum
 }
 
 #
-# Searching for the getuid.so
-#
-
-sub get_path_for_library
-{
-my $getuidlibrary = $ENV{'WORKDIR'} . '/LinkTarget/Library/libgetuid.so';
-if ( ! -e $getuidlibrary ) { installer::exiter::exit_program("File 
$getuidlibrary does not exist!", "get_path_for_library"); }
-return $getuidlibrary;
-}
-
-#
 # Include the tar file into the script
 #
 
@@ -230,12 +219,12 @@ sub include_tar_into_script
 
 sub tar_package
 {
-my ( $installdir, $tarfilename, $getuidlibrary) = @_;
+my ( $installdir, $tarfilename, $usefakeroot) = @_;
 
-my $ldpreloadstring = "";
-if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
+my $fakerootstring = "";
+if ( $usefakeroot ) { $fakerootstring = "fakeroot"; }
 
-my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * > 
$tarfilename";
+my $systemcall = "cd $installdir; $fakerootstring tar -cf - * > 
$tarfilename";
 
 my $returnvalue = system($systemcall);
 
@@ -505,7 +494,7 @@ sub set_download_filename
 
 sub create_tar_gz_file_from_directory
 {
-my ($installdir, $getuidlibrary, $downloaddir, $downloadfilename) = @_;
+my ($installdir, $usefakeroot, $downloaddir, $downloadfilename) = @_;
 
 my $infoline = "";
 
@@ -514,8 +503,8 @@ sub create_tar_gz_file_from_directory
 my $changedir = $installdir;
 installer::pathanalyzer::get_path_from_fullqualifiedname(\$changedir);
 
-my $ldpreloadstring = "";
-if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . 
$getuidlibrary; }
+my $fakerootstring = "";
+if ( $usefakeroot ) { $fakerootstring = "fakeroot"; }
 
 $installer::globals::downloadfileextension = ".tar.gz";
 $installer::globals::downloadfilename = $downloadfilename . 
$installer::globals::downloadfileextension;
@@ -527,7 +516,7 @@ sub create_tar_gz_file_from_directory
 unlink("$installdir/install");
 }
 
-my $systemcall = "cd

CppCheck Report Update

[cppcheck.libreoff...@gmail.com]

A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2018-18-02_03:02:41 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh


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

[Libreoffice-commits] core.git: offapi/com

[Tomaž Vajngerl]

 offapi/com/sun/star/style/PageProperties.idl |  716 +++
 offapi/com/sun/star/text/NumberingRules.idl  |   23 
 2 files changed, 416 insertions(+), 323 deletions(-)

New commits:
commit 1a8e331801d1e5b06150b11fdf7fb66d89ea9e23
Author: Tomaž Vajngerl 
Date:   Sat Feb 17 06:46:20 2018 +0900

make it readable by adding/removing whitespace, no change

Change-Id: Ice60d52c65f2e9071bb37f14a30f2eacbb9a159a
Reviewed-on: https://gerrit.libreoffice.org/49891
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/offapi/com/sun/star/style/PageProperties.idl 
b/offapi/com/sun/star/style/PageProperties.idl
index 7a0cf0e6e11c..7ae84806e1ba 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -38,326 +38,422 @@
  */
 published service PageProperties
 {
-/** contains the background color of the page.
- */
-[property] com::sun::star::util::Color BackColor;
-/**
- */
-//[property] BackGraphic;
-/** contains the URL of the background graphic.
- */
-[property] string BackGraphicURL;
-/** contains the filter name of the background graphic.
- */
-[property] string BackGraphicFilter;
-/** determines the location of the background graphic.
- */
-[property] com::sun::star::style::GraphicLocation BackGraphicLocation;
-/** determines if the background color is transparent.
+/** contains the background color of the page.
+ */
+[property] com::sun::star::util::Color BackColor;
 
-If this property is set to `TRUE`,
-PageStyle::BackColor will not be used.
- */
-[property] boolean BackTransparent;
-/** determines the left margin of the page.
- */
-[property] long LeftMargin;
-/** determines the right margin of the page.
- */
-[property] long RightMargin;
-/** determines the top margin of the page.
- */
-[property] long TopMargin;
-/** determines the bottom margin of the page.
- */
-[property] long BottomMargin;
-/** determines the style of the left border line of the page.
- */
-[property] com::sun::star::table::BorderLine LeftBorder;
-/** determines the style of the right border line of the page.
- */
-[property] com::sun::star::table::BorderLine RightBorder;
-/** determines the style of the top border line of the page.
- */
-[property] com::sun::star::table::BorderLine TopBorder;
-/** determines the style of the bottom border line of the page.
- */
-[property] com::sun::star::table::BorderLine BottomBorder;
-/** determines the left border distance of the page.
- */
-[property] long LeftBorderDistance;
-/** determines the right border distance of the page.
- */
-[property] long RightBorderDistance;
-/** determines the top border distance of the page.
- */
-[property] long TopBorderDistance;
-/** determines the bottom border distance of the page.
- */
-[property] long BottomBorderDistance;
-/** determines the shadow of the page.
- */
-[property] com::sun::star::table::ShadowFormat ShadowFormat;
-/** determines if the page format is landscape.
- */
-[property] boolean IsLandscape;
-/** determines the default numbering type for this page.
- */
-[property] short NumberingType;
-/** determines the layout of the page.
- */
-[property] com::sun::star::style::PageStyleLayout PageStyleLayout;
-/** contains the name of a paper tray of the selected printer.
- */
-[property] string PrinterPaperTray;
-/** determines if the register mode is active on that page.
- */
-[optional, property] boolean RegisterModeActive;
-/** contains the name of the paragraph style that is used as reference of the 
register mode.
- */
-[optional, property] string RegisterParagraphStyle;
-/** contains the paper size of the page.
- */
-[property] com::sun::star::awt::Size Size;
-/** contains the width of the page.
- */
-[property] long Width;
-/** contains the height of the page.
- */
-[property] long Height;
-/** contains the column settings of the page.
- */
-[optional , property] com::sun::star::text::XTextColumns TextColumns;
-/** contains user defined  attributes.
+/**
+ */
+//[property] BackGraphic;
 
-This com::sun::star::container::XNameContainer
-supports the service
-com::sun::star::xml::AttributeContainer.
- */
-[property] com::sun::star::container::XNameContainer UserDefinedAttributes;
+/** contains the URL of the background graphic.
+ */
+[property] string BackGraphicURL;
 
-/** contains the color of the background of the header.
- */
-[property, maybevoid] com::sun::star::util::Color HeaderBackColor;
-/**
- */
-//[property, maybevoid] HeaderBackGraphic;
-/** contains the URL of the background graphic of the header.
- */
-[property, maybevoid] string HeaderBackGraphicURL;
-/** contains the filter name of the background graphic of the header.
- */
-[property, maybevoid] string HeaderBackGraphicFilter;
-/** determines the location of the background graphic of the header.
- */
-[property, maybevoid] com::sun::star::style::GraphicLocation 
HeaderBackGraphicLocation;
-/** contains the left margin o

[Libreoffice-commits] core.git: include/oox

[Tomaž Vajngerl]

 include/oox/export/drawingml.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b1b7928d80efa3c6a99d6ce142fd679d6077d5f
Author: Tomaž Vajngerl 
Date:   Sat Feb 17 08:32:25 2018 +0900

make WriteXGraphicBlipFill declaration same to WriteBlipFill

Change-Id: Ie7947abdf2e8e951c94006aae259ed1d84558b73
Reviewed-on: https://gerrit.libreoffice.org/49892
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 216fe5316a13..d868eb89f365 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -195,7 +195,7 @@ public:
 
 void WriteXGraphicBlipFill(css::uno::Reference 
const & rXPropSet,
css::uno::Reference 
const & rxGraphic,
-   sal_Int32 nXmlNamespace, bool bWriteMode, bool 
bRelPathToMedia);
+   sal_Int32 nXmlNamespace, bool bWriteMode, bool 
bRelPathToMedia = false);
 
 void WritePattFill( const css::uno::Reference< css::beans::XPropertySet >& 
rXPropSet );
 void WritePattFill(const css::uno::Reference& 
rXPropSet,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

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

New commits:
commit 75ab4bed721e1f4dfff22419867303a2f1b38354
Author: Tomaž Vajngerl 
Date:   Sat Feb 17 15:53:37 2018 +0900

remove printf left in the code by accident

Change-Id: Icc5742cc3b4e44ce6f7daa460af16a3c4aba82c8
Reviewed-on: https://gerrit.libreoffice.org/49894
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2d9e6b98afb3..758bfc36ac03 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1380,7 +1380,6 @@ uno::Reference 
SvXMLImport::loadGraphicByURL(OUString const &
 {
 Graphic aGraphic(xGraphic);
 aGraphic.setOriginURL(rAbsoluteURL);
-printf ("URL %s\n", rAbsoluteURL.toUtf8().getStr());
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 include/xmloff/xmlexp.hxx |1 +
 xmloff/source/core/xmlexp.cxx |   17 +
 2 files changed, 18 insertions(+)

New commits:
commit 233a6332500a30ba4bd44d09635ac7cbfe91beb7
Author: Tomaž Vajngerl 
Date:   Sat Feb 17 08:34:48 2018 +0900

GetEmbeddedXGraphicStream to read XGraphic as stream

This is an alternative to GetEmbeddedGraphicObjectStream which
uses URL as parameter and will be removed soon.

Change-Id: I3c7431bdeed0bd4ed3c7f48517a52846d0944ed2
Reviewed-on: https://gerrit.libreoffice.org/49893
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 6024d9f877ca..2d367b433935 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -465,6 +465,7 @@ public:
 
 OUString AddEmbeddedXGraphic(css::uno::Reference 
const & rxGraphic, OUString const & rRequestedName = OUString());
 bool 
AddEmbeddedXGraphicAsBase64(css::uno::Reference const & 
rxGraphic);
+css::uno::Reference 
GetEmbeddedXGraphicStream(css::uno::Reference const & 
rxGraphic);
 
 css::uno::Reference GetEmbeddedGraphicObjectStream(
 const OUString& rGraphicObjectURL);
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 7f5df92e5875..4d3533ae4c09 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1926,6 +1926,23 @@ Reference< XInputStream > 
SvXMLExport::GetEmbeddedGraphicObjectStream( const OUS
 return nullptr;
 }
 
+uno::Reference 
SvXMLExport::GetEmbeddedXGraphicStream(uno::Reference const 
& rxGraphic)
+{
+uno::Reference xInputStream;
+
+if ((getExportFlags() & SvXMLExportFlags::EMBEDDED) && 
mxGraphicResolver.is())
+{
+uno::Reference 
xGraphicStorageHandler(mxGraphicResolver, uno::UNO_QUERY);
+
+if (xGraphicStorageHandler.is())
+{
+xInputStream = 
xGraphicStorageHandler->createInputStream(rxGraphic);
+}
+}
+
+return xInputStream;
+}
+
 bool 
SvXMLExport::AddEmbeddedXGraphicAsBase64(uno::Reference 
const & rxGraphic)
 {
 if ((getExportFlags() & SvXMLExportFlags::EMBEDDED) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits