[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/04090003.xhp |   18 --
 source/text/swriter/01/04090005.xhp |2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 93ee2d0f1ea9432d1bae5e7f69adc61ac169fb06
Author: Seth Chaiklin 
AuthorDate: Tue Oct 27 02:59:03 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Tue Oct 27 02:13:17 2020 +0100

rename German ID

hinweis --> "referencehelp"
in swriter/01/04090003 and embedded in swriter/01/04090005

Change-Id: I81706d0cdf420aab69ccf4ad02a187f71faaf0ab
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104832
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/swriter/01/04090003.xhp 
b/source/text/swriter/01/04090003.xhp
index 55086fd10..86fd7b462 100644
--- a/source/text/swriter/01/04090003.xhp
+++ b/source/text/swriter/01/04090003.xhp
@@ -1,6 +1,5 @@
 
 
-
 
 
-
 
 
 Functions
@@ -28,7 +26,7 @@
 
 
 
-Functions
+Functions
 
 
 Sets additional function parameters for fields. The type of 
parameter depends on the field type that you select.
@@ -122,25 +120,25 @@
 
 For function 
fields, the format field is only used for fields of the type placeholder. Here, 
the format determines the object for which the placeholder stands.
 
-Condition
+Condition
 For fields linked to a condition, enter 
the criteria here.
 
 
 
-Then, 
Else
+Then, Else
 Enter the text to display when the condition is met in the Then 
box, and the text to display when the condition is not met in the 
Else box.
 You can also 
insert database fields in the Then and Else boxes 
using the format "databasename.tablename.fieldname".
 If the table or the 
field name does not exist in a database, nothing is inserted.
 If you include the 
quotes in "databasename.tablename.fieldname", the expression is inserted as 
text.
-
-Reference
+
+Reference
 Type the text 
that you want to display in the field. If you are inserting a placeholder 
field, type the text that you want to display as a help tip when you rest the 
mouse pointer over the field. 
 
-FormatUFI: see spec "Macro Selector..."
+FormatUFI: see spec "Macro 
Selector..."
 Select the 
macro that you want to run when the field is clicked.
-Macro 
name
+Macro name
 Displays the 
name of the selected macro.
-Placeholder
+Placeholder
 Type the text 
that you want to appear in the placeholder field.
 Hidden 
text
 Type the text 
that you want to hide if a condition is met.
diff --git a/source/text/swriter/01/04090005.xhp 
b/source/text/swriter/01/04090005.xhp
index 9f5aa9283..46355655b 100644
--- a/source/text/swriter/01/04090005.xhp
+++ b/source/text/swriter/01/04090005.xhp
@@ -151,7 +151,7 @@
 This option is only 
available if the "DDE field" field type is selected.
 Formula
 This option is 
only available if the "Insert Formula" field type is selected.
-
+
 
 This option is only 
available if the "Set page variable" field type is selected.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 892caad9a48f68aba5e4962ea5b7bd90a0f1ce9d
Author: Seth Chaiklin 
AuthorDate: Tue Oct 27 03:13:17 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Oct 27 02:13:17 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 93ee2d0f1ea9432d1bae5e7f69adc61ac169fb06
  - rename German ID

hinweis --> "referencehelp"
in swriter/01/04090003 and embedded in swriter/01/04090005

Change-Id: I81706d0cdf420aab69ccf4ad02a187f71faaf0ab
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104832
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index f551d6b2ddcb..93ee2d0f1ea9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f551d6b2ddcb319c162c7789ae65de4274b8d5d1
+Subproject commit 93ee2d0f1ea9432d1bae5e7f69adc61ac169fb06
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

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

New commits:
commit 352840a49be8626448f7823a6bae207e65171e52
Author: Eike Rathke 
AuthorDate: Mon Oct 26 22:02:26 2020 +0100
Commit: Eike Rathke 
CommitDate: Tue Oct 27 01:47:59 2020 +0100

Resolves: tdf#137617 Use document address convention to create names

... from selection.

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

diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 617937cf2231..d98e2773b97d 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5222,7 +5222,8 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
 if (aName.isEmpty())
 return;
 
-OUString aContent(ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format(rDoc, 
ScRefFlags::RANGE_ABS_3D));
+OUString aContent( ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format(
+rDoc, ScRefFlags::RANGE_ABS_3D, ScAddress::Details( 
rDoc.GetAddressConvention(), nPosY, nPosX)));
 
 bool bInsert = false;
 ScRangeData* pOld = 
rList.findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Michel Le Bihan license statement

[Michel Le Bihan]

All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

Michel Le Bihan

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

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

[Xisco Fauli (via logerrit)]

 0 files changed

New commits:
commit f27c4ec5c864395f4cdaec32d7e95ff24e4f43c8
Author: Xisco Fauli 
AuthorDate: Mon Oct 26 20:05:24 2020 +0100
Commit: Xisco Fauli 
CommitDate: Tue Oct 27 00:32:58 2020 +0100

uitest: sw: forgot to move this file

Change-Id: I429e6ff82cb28bea0c700a7d382509a524aad57d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104827
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/uitest/writer_tests1/pageDialog.py 
b/sw/qa/uitest/writer_tests3/pageDialog.py
similarity index 100%
rename from uitest/writer_tests1/pageDialog.py
rename to sw/qa/uitest/writer_tests3/pageDialog.py
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   21 
 uitest/writer_tests3/tdf104649.py   |   37 
 2 files changed, 21 insertions(+), 37 deletions(-)

New commits:
commit 879f847d9d6ef5a165f660c55f2070f4b207512b
Author: Xisco Fauli 
AuthorDate: Mon Oct 26 15:40:15 2020 +0100
Commit: Xisco Fauli 
CommitDate: Tue Oct 27 00:32:14 2020 +0100

tdf#104649: move UItest to CppunitTest

Change-Id: I950432390e65dfabb4562a61b6091b085b9f5d0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104813
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/uitest/writer_tests/data/tdf104649.docx 
b/sw/qa/extras/uiwriter/data3/tdf104649.docx
similarity index 100%
rename from uitest/writer_tests/data/tdf104649.docx
rename to sw/qa/extras/uiwriter/data3/tdf104649.docx
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 5fed2bfc4496..a19ceff4c6b2 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1043,6 +1043,27 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132944)
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf104649)
+{
+load(DATA_DIRECTORY, "tdf104649.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Delete", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134931)
 {
 load(DATA_DIRECTORY, "tdf134931.odt");
diff --git a/uitest/writer_tests3/tdf104649.py 
b/uitest/writer_tests3/tdf104649.py
deleted file mode 100644
index f6541feee5a4..
--- a/uitest/writer_tests3/tdf104649.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# 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 org.libreoffice.unotest
-import pathlib
-
-def get_url_for_data_file(file_name):
-return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-
-class tdf104649(UITestCase):
-
-def test_delete_and_undo(self):
-
-writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf104649.docx"))
-
-document = self.ui_test.get_component()
-
-self.assertEqual(document.Text.String[0:4], "Test")
-
-selection = self.xUITest.executeCommand(".uno:SelectAll")
-
-self.xUITest.executeCommand(".uno:Delete")
-
-self.assertEqual(document.Text.String, "")
-
-self.xUITest.executeCommand(".uno:Undo")
-
-self.assertEqual(document.Text.String[0:4], "Test")
-
-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: Branch 'libreoffice-7-0' - cui/source cui/uiconfig

[Luboš Luňák (via logerrit)]

 cui/source/options/optgdlg.cxx |   40 
 cui/source/options/optgdlg.hxx |2 --
 cui/uiconfig/ui/optviewpage.ui |   23 +++
 3 files changed, 3 insertions(+), 62 deletions(-)

New commits:
commit b4e5a0e06d50853f057c1a192f4ee6bd5ee90fe0
Author: Luboš Luňák 
AuthorDate: Fri Oct 16 12:22:38 2020 +0200
Commit: Caolán McNamara 
CommitDate: Mon Oct 26 22:11:35 2020 +0100

remove ui for 'forceskia' AKA 'ignore skia denylist' (tdf#137159)

I originally copy&pasted this from the OpenGL code, but now that I
think of it, having an easy checkbox to make LO use drivers that LO
decides are faulty is a bad idea. There's still the expert
configuration if somebody insists (and if they're not expert
enough to find the expert setting then they better not mess with it),
but this is asking for unnecessary trouble.
This also solves the problem that the UI option is misleading. As
the description in Common.xcs says, "This one forces the use of Skia
even if the denylist would block the driver.", so the option is
independent of the 'enable skia' option, but the UI didn't make it
appear so.

Change-Id: I74bf3574f16899405272dbb3aec54580a5e3f0bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104425
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit fea1d3a487faef85b2b7aa8a87075f81ea22af76)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104506
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b9122d3d00e2..1972354ccd3f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -108,7 +108,6 @@ class SkiaCfg
 {
 private:
 bool mbUseSkia;
-bool mbForceSkia;
 bool mbForceSkiaRaster;
 bool mbModified;
 
@@ -117,11 +116,9 @@ public:
 ~SkiaCfg();
 
 bool useSkia() const;
-bool forceSkia() const;
 bool forceSkiaRaster() const;
 
 void setUseSkia(bool bSkia);
-void setForceSkia(bool bSkia);
 void setForceSkiaRaster(bool bSkia);
 
 void reset();
@@ -136,7 +133,6 @@ SkiaCfg::SkiaCfg():
 void SkiaCfg::reset()
 {
 mbUseSkia = officecfg::Office::Common::VCL::UseSkia::get();
-mbForceSkia = officecfg::Office::Common::VCL::ForceSkia::get();
 mbForceSkiaRaster = officecfg::Office::Common::VCL::ForceSkiaRaster::get();
 mbModified = false;
 }
@@ -151,8 +147,6 @@ SkiaCfg::~SkiaCfg()
 std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
 if (!officecfg::Office::Common::VCL::UseSkia::isReadOnly())
 officecfg::Office::Common::VCL::UseSkia::set(mbUseSkia, batch);
-if (!officecfg::Office::Common::VCL::ForceSkia::isReadOnly())
-officecfg::Office::Common::VCL::ForceSkia::set(mbForceSkia, batch);
 if (!officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly())
 
officecfg::Office::Common::VCL::ForceSkiaRaster::set(mbForceSkiaRaster, batch);
 batch->commit();
@@ -167,11 +161,6 @@ bool SkiaCfg::useSkia() const
 return mbUseSkia;
 }
 
-bool SkiaCfg::forceSkia() const
-{
-return mbForceSkia;
-}
-
 bool SkiaCfg::forceSkiaRaster() const
 {
 return mbForceSkiaRaster;
@@ -186,15 +175,6 @@ void SkiaCfg::setUseSkia(bool bSkia)
 }
 }
 
-void SkiaCfg::setForceSkia(bool bSkia)
-{
-if (mbForceSkia != bSkia)
-{
-mbForceSkia = bSkia;
-mbModified = true;
-}
-}
-
 void SkiaCfg::setForceSkiaRaster(bool bSkia)
 {
 if (mbForceSkiaRaster != bSkia)
@@ -696,7 +676,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xUseHardwareAccell(m_xBuilder->weld_check_button("useaccel"))
 , m_xUseAntiAliase(m_xBuilder->weld_check_button("useaa"))
 , m_xUseSkia(m_xBuilder->weld_check_button("useskia"))
-, m_xForceSkia(m_xBuilder->weld_check_button("forceskia"))
 , m_xForceSkiaRaster(m_xBuilder->weld_check_button("forceskiaraster"))
 , m_xSkiaStatusEnabled(m_xBuilder->weld_label("skiaenabled"))
 , m_xSkiaStatusDisabled(m_xBuilder->weld_label("skiadisabled"))
@@ -706,7 +685,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 if (Application::GetToolkitName() == "gtk3")
 {
 m_xUseSkia->hide();
-m_xForceSkia->hide();
 m_xForceSkiaRaster->hide();
 m_xSkiaStatusEnabled->hide();
 m_xSkiaStatusDisabled->hide();
@@ -718,7 +696,6 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 // For now Skia is used mainly on Windows, hide the controls everywhere 
else.
 // It can also be used on Linux, but only with the rarely used 'gen' 
backend.
 m_xUseSkia->hide();
-m_xForceSkia->hide();
 m_xForceSkiaRaster->hide();
 m_xSkiaStatusEnabled->hide();
 m_xSkiaStatusDisabled->hide();
@@ -726,7 +703,6 @@ OfaViewTabPage::OfaViewTabPage(weld

Re: Crash test update

[Caolán McNamara]

On Fri, 2020-10-23 at 12:22 +, crashtest wrote:
> New crashtest update available at 
> https://dev-builds.libreoffice.org/crashtest/3907368ded845ac41926013b3d25550a1266f8b0/

FWIW there's a bunch of .docbook import asserts in here that seem to
have started at

commit 2b946d245eaf4bd40a0091aa5508315fc37c81a0
Date:   Mon Oct 19 09:36:04 2020 +0200

XmlFilterAdaptor: use the fastparser API when possible

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

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

[Caolán McNamara (via logerrit)]

 svtools/source/misc/langhelp.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c575569f203c9dd5746ad227d636afb8df953ba1
Author: Caolán McNamara 
AuthorDate: Sun Oct 25 20:39:50 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Oct 26 21:41:23 2020 +0100

rhbz#1891326 suggest package install of the most appropiate pt langpack

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

diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index e64a3b869076..acaf2c6e24f3 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -139,6 +139,8 @@ OUString getInstalledLocaleForSystemUILanguage(const 
css::uno::Sequencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License dialog in .msi installer

[Andras Timar]

Hi Jakub,

OK, things like this can break accidentally, because usually we do not use
license files.
Where do you have the license_en-US.rtf? I think it should be
under readlicense_oo/license/ and possibly it should be delivered under
instdir/. Ultimately you can add more debug code to the installer maker
script and log what it tries to read.

Best regards,
Andras Timar

On Mon, Oct 26, 2020 at 7:21 PM Jakub Kościelak 
wrote:

> Andras,
>
> thanks for Your reply, but...
> Please read again, as I wrote I have license files and have always added
> them. This stopped working in version 6.3.
>
> License file name is "license_lang.rtf" i.e. license_en-US.rtf,
> license_pl.rtf, license_de.rtf etc..
>
> All the languages I have used with "--with-lang" option in configure.
>
> Regards,
> Jakub Kościelak
>
> W dniu 26.10.2020 o 17:22, Andras Timar pisze:
>
> Hi,
>
> What license would you like to display here? By default there is
> no license_en-US.rtf in the source code, if you want one, you have to add
> it.
>
> Regards,
> Andras Timar
>
>
> On Mon, Oct 26, 2020 at 5:00 PM Jakub Kościelak 
> wrote:
>
>>
>>
>>
>> --- Treść przekazanej wiadomości ---
>> Temat: License dialog in .msi installer
>> Data: Sun, 18 Oct 2020 16:45:51 +0200
>> Nadawca: Jakub Kościelak 
>> 
>> Adresat: libreoffice@lists.freedesktop.org
>>
>> Hi Devs,
>>
>> when I set up the option HIDELICENSEDIALOG 0 ,
>>
>> in C:\6472\instsetoo_native\util\openoffice.lst
>>
>> and when I builds the installer, I have an error:
>>
>> *
>> ERROR: ERROR: Could not find license_en-US.rtf! at
>> C:/6472/solenv/bin/modules/installer/windows/idtglobal.pm line 820.
>> *
>>
>> Of course, I copied the license files to the directory
>> C:\6472\readlicense_oo\license\
>>
>> Unfortunately, the error message does not provide any useful information.
>>
>>
>> Maybe the license source directory has changed ?
>>
>>
>> Last time working with version 6.2.x.x.,
>>
>> not working in 6.3 and 6.4.
>>
>> I attach the log file.
>>
>>
>> Can I have some tips?
>>
>>
>> Best regards
>> Jakub Kościelak
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>
> ___
> LibreOffice mailing 
> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit f91b7c2ec4fa6b94a05ffeaada2f9b294b6aad94
Author: Seth Chaiklin 
AuthorDate: Mon Oct 26 22:08:01 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 26 21:08:01 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to f551d6b2ddcb319c162c7789ae65de4274b8d5d1
  - tdf#131206 improve explanation of Insert Document (Field) (wip)

  - moved  about HTML export of date and time down to Format
  section
  - add initials for Author Type, and a sys-dependent advice about
  how to update that field.
  - remove table about Select items for Page Type, because it is
  mentioned already in Table, plus it is part of auswahl section,
  which is embedded into DocInformation (04090004.xhp), which does
  not insert any "pages" in that dialog tab.
  - add "select list" to the tip about double-clicking
  - update ,
  - update to: , in main page for Fields
  - eliminate German id: dokument-->document in 04091.xhp

Change-Id: I72803af2a9f38d8fd1e5ef45b3751934888d8a88
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104687
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 78da740de220..f551d6b2ddcb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 78da740de2209037f3a4d3fc94eaa3f0f1b525f4
+Subproject commit f551d6b2ddcb319c162c7789ae65de4274b8d5d1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/0409.xhp |   16 ---
 source/text/swriter/01/04090001.xhp |   50 +---
 2 files changed, 14 insertions(+), 52 deletions(-)

New commits:
commit f551d6b2ddcb319c162c7789ae65de4274b8d5d1
Author: Seth Chaiklin 
AuthorDate: Sun Oct 25 01:46:36 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Mon Oct 26 21:08:01 2020 +0100

tdf#131206 improve explanation of Insert Document (Field) (wip)

  - moved  about HTML export of date and time down to Format
  section
  - add initials for Author Type, and a sys-dependent advice about
  how to update that field.
  - remove table about Select items for Page Type, because it is
  mentioned already in Table, plus it is part of auswahl section,
  which is embedded into DocInformation (04090004.xhp), which does
  not insert any "pages" in that dialog tab.
  - add "select list" to the tip about double-clicking
  - update ,
  - update to: , in main page for Fields
  - eliminate German id: dokument-->document in 04091.xhp

Change-Id: I72803af2a9f38d8fd1e5ef45b3751934888d8a88
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104687
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/0409.xhp 
b/source/text/swriter/01/0409.xhp
index 4a619f994..fc0ba1c15 100644
--- a/source/text/swriter/01/0409.xhp
+++ b/source/text/swriter/01/0409.xhp
@@ -1,7 +1,5 @@
 
-
-
-
+
 
 
-
-   
 
 
 Fields
@@ -31,20 +27,20 @@
 
 
 
-Fields
-Inserts a field at the 
current cursor position. The dialog lists all available fields. 
-
+Fields
+Inserts a field at the 
current cursor position. The dialog lists all available 
fields.
 
   
 
 
-
+
 
 
 
 
 
-Insert
+
+Insert
 Inserts the selected field at the current cursor 
position in the document. To close the dialog, click the Close 
button.
 Closes 
the dialog.
 
diff --git a/source/text/swriter/01/04090001.xhp 
b/source/text/swriter/01/04090001.xhp
index c24739be3..4a83021f3 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
@@ -38,7 +38,7 @@
 
 
 
-For the HTML export and import of 
date and time fields, special $[officename] formats are 
used.
+
 
 
 
@@ -61,7 +61,8 @@
   Author
 
 
-  Inserts the name of the current user. 
+  Name 
or initials of current user (as entered in %PRODUCTNAME - 
Preferences
+Tools - 
Options - $[officename] - User Data).
 
   
   
@@ -77,7 +78,7 @@
   Date
 
 
-  Inserts the current date. You can insert the date as a fixed 
field - Date (fixed) - that does not change, or as 
a dynamic field - Date - that it is updated 
automatically. To manually update the Date field, 
press F9.
+  Inserts the current date. You can insert the date as a fixed 
field - Date (fixed) - that does not change, or as 
a dynamic field - Date - that it is updated automatically. 
To manually update the Date field, press 
F9.
 
   
   
@@ -140,7 +141,6 @@
   
 
 
-
 
 The following fields can only be 
inserted if the corresponding field type is selected in the Type 
list.
 
@@ -150,42 +150,7 @@
 
 Selecton "Document" and 
"DocInformation" tab page this is called "Select", on the other tab pages 
"Selection"
 Lists the available fields for 
the field type selected in the Type list. To insert a field, click 
the field, and then click Insert.
-To quickly insert a field from the 
list, double-click the field.
-
-
-  
-
-  Fields
-
-
-  Function
-
-  
-  
-
-  Page 
Number
-
-
-  Inserts the current page number.
-
-  
-  
-
-  Previous page
-
-
-  Inserts the page number of the previous page in the 
document.
-
-  
-  
-
-  Next 
page 
-
-
-  Inserts the page number of the next page in the 
document.
-
-  
-
+To quickly insert a field from the 
Select list, double-click the field.
 
 In the 
Format, click the numbering format that you want to 
use.
 If you want, 
you can enter an Offset for the displayed page number. With an 
Offset value of 1, the field will display a number that is 1 more 
than the current page number, but only if a page with that number exists. On 
the last page of the document, this same field will be empty.
@@ -198,7 +163,7 @@
 Click the format that you want 
to apply to the selected field, or click "Additional formats" to define a 
custom format.
 
 When you click "Additional formats", the Number 
Format dialog opens, where you can define a custom format. 

-If you choose 
"Chapter number without separator" for a chapter field, the separators that are 
specified for chapter number in Tools - Chapter numbering 
are not displayed.
+If you choose 
"Chapter number without separator" for a chapter field, the separators that are 
specified for chapter number in Tools - Chapter 
numbering are not displ

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

[Thorsten Behrens (via logerrit)]

 extras/source/autocorr/lang/de/DocumentList.xml |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0f73a6268d32050fb4da2ca510aabfd0cbda3bbb
Author: Thorsten Behrens 
AuthorDate: Mon Oct 26 17:32:34 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Oct 26 20:54:19 2020 +0100

tdf#131510 fix German autocorrect list for 'daß'

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

diff --git a/extras/source/autocorr/lang/de/DocumentList.xml 
b/extras/source/autocorr/lang/de/DocumentList.xml
index 7cf483cb1404..e93742484c86 100644
--- a/extras/source/autocorr/lang/de/DocumentList.xml
+++ b/extras/source/autocorr/lang/de/DocumentList.xml
@@ -66,7 +66,9 @@
   
   
   
-  
+  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx |   18 ++---
 writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx   |binary
 writerfilter/source/dmapper/DomainMapper.cxx   |   12 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   15 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |4 ++
 writerfilter/source/dmapper/PropertyMap.cxx|6 +++-
 6 files changed, 48 insertions(+), 7 deletions(-)

New commits:
commit 32c322e9d037b29ded2297b400a2c596c042f1fa
Author: Miklos Vajna 
AuthorDate: Mon Oct 26 17:52:42 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Oct 26 20:30:50 2020 +0100

DOCX import, altChunk: fix missing page break

Somewhat similar to copy&paste, the altChunk mechanism drops styles from
the inner document by default. A surprising consequence of that is
sections in the inner document have the default page size. This leads to
a page break when the content of the outer document ends and the content
of the inner document starts.

Fix the importer to support this:

1) Ignore the page size and number in DomainMapper::lcl_attribute().

2) Pass the start of the current section to the sub-importer, so that it
can insert the starting page break at the right place.

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

diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
index 16b9bfa5023b..0ea06a41bf31 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -135,16 +135,28 @@ CPPUNIT_TEST_FIXTURE(Test, testAltChunk)
   
uno::UNO_QUERY);
 uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
 uno::Reference xPara;
+uno::Reference xParaProps;
 xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Outer para 1"), xPara->getString());
+xParaProps.set(xPara, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("outer, before sect break"), 
xPara->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("Standard"),
+ 
xParaProps->getPropertyValue("PageStyleName").get());
 xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Outer para 2"), xPara->getString());
+xParaProps.set(xPara, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("outer, after sect break"), 
xPara->getString());
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: Converted1
+// - Actual  : Standard
+// i.e. the page break between the first and the second paragraph was 
missing.
+CPPUNIT_ASSERT_EQUAL(OUString("Converted1"),
+ 
xParaProps->getPropertyValue("PageStyleName").get());
 
 // Without the accompanying fix in place, this test would have failed with 
a
 // container.NoSuchElementException, as the document had only 2 
paragraphs, all the "inner"
 // content was lost.
 xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Inner para 1"), xPara->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("inner doc, first para"), 
xPara->getString());
 }
 }
 
diff --git a/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx 
b/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx
index 3348cfd0c04c..40d071ff40a6 100644
Binary files a/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx and 
b/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 938b1f41a106..b489115d4980 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1065,7 +1065,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 m_pImpl->m_oBackgroundColor = nIntValue;
 break;
 case NS_ooxml::LN_CT_PageNumber_start:
-if (pSectionContext != nullptr)
+if (pSectionContext != nullptr && !m_pImpl->IsAltChunk())
 pSectionContext->SetPageNumber(nIntValue);
 break;
 case NS_ooxml::LN_CT_PageNumber_fmt:
@@ -2138,9 +2138,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
 if(pSectionContext)
 {
-pSectionContext->Insert( PROP_HEIGHT, uno::makeAny( CT_PageSz.h ) 
);
+if (!m_pImpl->IsAltChunk())
+{
+pSectionContext->Insert(PROP_HEIGHT, 
uno::makeAny(CT_PageSz.h));
+   

[Libreoffice-commits] core.git: sw/qa uitest/Module_uitest.mk uitest/UITest_writer_demo1.mk uitest/UITest_writer_demo2.mk uitest/UITest_writer_demo3.mk uitest/UITest_writer_demo4.mk uitest/UITest_writ

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests4/start.py |   27 ---
 uitest/Module_uitest.mk |8 
 uitest/UITest_writer_demo1.mk   |   20 
 uitest/UITest_writer_demo2.mk   |   20 
 uitest/UITest_writer_demo3.mk   |   20 
 uitest/UITest_writer_demo4.mk   |   20 
 uitest/UITest_writer_demo5.mk   |   20 
 uitest/UITest_writer_demo6.mk   |   20 
 uitest/UITest_writer_demo7.mk   |   20 
 uitest/UITest_writer_demo8.mk   |   20 
 10 files changed, 195 deletions(-)

New commits:
commit 5711858e00f542f1770d7ff3c035e8a2fdb72266
Author: Xisco Fauli 
AuthorDate: Mon Oct 26 16:07:20 2020 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 26 19:51:23 2020 +0100

uitest: move all writer tests to sw/qa/uitest

remove a few duplicated ones

Change-Id: I25b031c8fe11ae28f55978f8a25528c307a908e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104814
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/uitest/writer_tests/data/3pages.odt b/sw/qa/uitest/data/3pages.odt
similarity index 100%
rename from uitest/writer_tests/data/3pages.odt
rename to sw/qa/uitest/data/3pages.odt
diff --git a/uitest/writer_tests4/insertTableDialog.py 
b/sw/qa/uitest/table/insertTableDialog.py
similarity index 100%
rename from uitest/writer_tests4/insertTableDialog.py
rename to sw/qa/uitest/table/insertTableDialog.py
diff --git a/uitest/writer_tests7/autoredactDialog.py 
b/sw/qa/uitest/writer_tests3/autoredactDialog.py
similarity index 100%
rename from uitest/writer_tests7/autoredactDialog.py
rename to sw/qa/uitest/writer_tests3/autoredactDialog.py
diff --git a/uitest/writer_tests8/customizeDialog.py 
b/sw/qa/uitest/writer_tests3/customizeDialog.py
similarity index 100%
rename from uitest/writer_tests8/customizeDialog.py
rename to sw/qa/uitest/writer_tests3/customizeDialog.py
diff --git a/uitest/writer_tests7/goToPage.py 
b/sw/qa/uitest/writer_tests3/goToPage.py
similarity index 100%
rename from uitest/writer_tests7/goToPage.py
rename to sw/qa/uitest/writer_tests3/goToPage.py
diff --git a/uitest/writer_tests8/tdf79236.py 
b/sw/qa/uitest/writer_tests3/tdf79236.py
similarity index 100%
rename from uitest/writer_tests8/tdf79236.py
rename to sw/qa/uitest/writer_tests3/tdf79236.py
diff --git a/uitest/writer_tests6/insertBreakDialog.py 
b/sw/qa/uitest/writer_tests4/insertBreakDialog.py
similarity index 100%
rename from uitest/writer_tests6/insertBreakDialog.py
rename to sw/qa/uitest/writer_tests4/insertBreakDialog.py
diff --git a/uitest/writer_tests6/insertPageHeader.py 
b/sw/qa/uitest/writer_tests4/insertPageHeader.py
similarity index 100%
rename from uitest/writer_tests6/insertPageHeader.py
rename to sw/qa/uitest/writer_tests4/insertPageHeader.py
diff --git a/uitest/writer_tests5/spellDialog.py 
b/sw/qa/uitest/writer_tests4/spellDialog.py
similarity index 100%
rename from uitest/writer_tests5/spellDialog.py
rename to sw/qa/uitest/writer_tests4/spellDialog.py
diff --git a/uitest/writer_tests4/start.py b/sw/qa/uitest/writer_tests4/start.py
similarity index 64%
rename from uitest/writer_tests4/start.py
rename to sw/qa/uitest/writer_tests4/start.py
index 5851e8eff7c9..c514d39d8c52 100644
--- a/uitest/writer_tests4/start.py
+++ b/sw/qa/uitest/writer_tests4/start.py
@@ -10,8 +10,6 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict, type_text
 
-import time
-
 class SimpleWriterTest(UITestCase):
 
 def test_start_writer(self):
@@ -26,17 +24,6 @@ class SimpleWriterTest(UITestCase):
 
 self.ui_test.close_doc()
 
-def test_type_text(self):
-
-self.ui_test.create_doc_in_start_center("writer")
-
-xWriterDoc = self.xUITest.getTopFocusWindow()
-xWriterEdit = xWriterDoc.getChild("writer_edit")
-
-type_text(xWriterEdit, "This is my first writer text written through 
the UI testing")
-
-self.ui_test.close_doc()
-
 def test_goto_first_page(self):
 
 self.ui_test.create_doc_in_start_center("writer")
@@ -53,18 +40,4 @@ class SimpleWriterTest(UITestCase):
 
 self.ui_test.close_doc()
 
-
-def test_select_text(self):
-
-self.ui_test.create_doc_in_start_center("writer")
-
-xWriterDoc = self.xUITest.getTopFocusWindow()
-xWriterEdit = xWriterDoc.getChild("writer_edit")
-
-type_text(xWriterEdit, "This is my first writer text written through 
the UI testing")
-
-xWriterEdit.executeAction("SELECT", mkPropertyValues({"START_POS": 
"0", "END_POS": "4"}))
-
-self.ui_test.close_doc()
-
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/uitest/writer_tests2/tdf92611.py 
b/sw/qa/uitest/writer_tests4/tdf92611.py
similarity index 100%
rename from uitest/writer_tests2/tdf92611.py
rename t

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

[Mark Hung (via logerrit)]

 sw/source/core/text/portxt.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b8dd7d02a072c80961838b00c9e8cbdbddc9ce08
Author: Mark Hung 
AuthorDate: Fri Oct 2 11:24:31 2020 +0800
Commit: Xisco Fauli 
CommitDate: Mon Oct 26 19:29:49 2020 +0100

tdf#130314 space counting for input field.

1. Input field should be counted like other fields,
   with its content expanded with GetExpText().

2. Use only GetLen() instead of rInf.GetLen() in
   SwTextInputFieldPortion::GetExpText() because
   when justifying the text, rInf.GetLen() isn't
   always updated corresponding to rInf.GetIdx().

   ( Check SwTextAdjuster::CalcNewBlock() for ref.)

Change-Id: I6a41275295607887c476fdd3f8e5a90c936c9d31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103782
Tested-by: Jenkins
Reviewed-by: Mark Hung 
Signed-off-by: Xisco Fauli 

This commit also contains the following commit:

tdf#130314 fix incorrect logic in last commit

Previous commit ( ac76f9e8ad8b ) contains a logical
mistake. Change && to || there.

Change-Id: Id982ce6f22b0022316b564029f813da9072b71e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104089
Tested-by: Jenkins
Reviewed-by: Mark Hung 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104806

diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 84bbee847d72..65d6a58f3dc2 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -583,7 +583,7 @@ TextFrameIndex SwTextPortion::GetSpaceCnt(const 
SwTextSizeInfo &rInf,
 return TextFrameIndex(0);
 }
 
-if ( InExpGrp() )
+if ( InExpGrp() || PortionType::InputField == GetWhichPor() )
 {
 if( !IsBlankPortion() && !InNumberGrp() && !IsCombinedPortion() )
 {
@@ -620,7 +620,7 @@ long SwTextPortion::CalcSpacing( long nSpaceAdd, const 
SwTextSizeInfo &rInf ) co
 return 0;
 }
 
-if ( InExpGrp() )
+if ( InExpGrp() || PortionType::InputField == GetWhichPor() )
 {
 if( !IsBlankPortion() && !InNumberGrp() && !IsCombinedPortion() )
 {
@@ -717,13 +717,13 @@ void SwTextInputFieldPortion::Paint( const 
SwTextPaintInfo &rInf ) const
 bool SwTextInputFieldPortion::GetExpText( const SwTextSizeInfo &rInf, OUString 
&rText ) const
 {
 sal_Int32 nIdx(rInf.GetIdx());
-sal_Int32 nLen(rInf.GetLen());
+sal_Int32 nLen(GetLen());
 if ( rInf.GetChar( rInf.GetIdx() ) == CH_TXT_ATR_INPUTFIELDSTART )
 {
 ++nIdx;
 --nLen;
 }
-if (rInf.GetChar(rInf.GetIdx() + rInf.GetLen() - TextFrameIndex(1)) == 
CH_TXT_ATR_INPUTFIELDEND)
+if (rInf.GetChar(rInf.GetIdx() + GetLen() - TextFrameIndex(1)) == 
CH_TXT_ATR_INPUTFIELDEND)
 {
 --nLen;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/odfexport/data/tdf130314.docx |binary
 sw/qa/extras/odfexport/odfexport.cxx   |6 ++
 2 files changed, 6 insertions(+)

New commits:
commit 8f362f1bc5ceca9bde282b5db98282b1ab132309
Author: Xisco Fauli 
AuthorDate: Mon Oct 26 13:41:16 2020 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 26 19:27:58 2020 +0100

tdf#130314: sw_odfexport: Add unittest

Change-Id: Ie099be1e8eb9a27463886ba62d14e7d0e8cf7296
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104810
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/odfexport/data/tdf130314.docx 
b/sw/qa/extras/odfexport/data/tdf130314.docx
new file mode 100644
index ..592ffbf5b3b4
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf130314.docx differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 08166b3c2ccb..6c1f2d6ccff8 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -226,6 +226,12 @@ DECLARE_ODFEXPORT_TEST(testTdf43569, 
"tdf43569_conditionalfield.doc")
 CPPUNIT_ASSERT(xFields->hasMoreElements());
 }
 
+DECLARE_ODFEXPORT_TEST(testTdf130314, "tdf130314.docx")
+{
+// Without the fix in place, this test would have hung
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getShapes());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License dialog in .msi installer

[Jakub Kościelak]

Andras,

thanks for Your reply, but...

Please read again, as I wrote I have license files and have always added 
them. This stopped working in version 6.3.


License file name is "license_lang.rtf" i.e. license_en-US.rtf, 
license_pl.rtf, license_de.rtf etc..


All the languages I have used with "--with-lang" option in configure.


Regards,
Jakub Kościelak

W dniu 26.10.2020 o 17:22, Andras Timar pisze:

Hi,

What license would you like to display here? By default there is 
no license_en-US.rtf in the source code, if you want one, you have to 
add it.


Regards,
Andras Timar


On Mon, Oct 26, 2020 at 5:00 PM Jakub Kościelak 
mailto:k...@openoffice.com.pl>> wrote:





--- Treść przekazanej wiadomości ---
Temat:  License dialog in .msi installer
Data:   Sun, 18 Oct 2020 16:45:51 +0200
Nadawca:Jakub Kościelak 

Adresat:libreoffice@lists.freedesktop.org




Hi Devs,

when I set up the option HIDELICENSEDIALOG 0 ,

in C:\6472\instsetoo_native\util\openoffice.lst

and when I builds the installer, I have an error:

*
ERROR: ERROR: Could not find license_en-US.rtf! at
C:/6472/solenv/bin/modules/installer/windows/idtglobal.pm
 line 820.
*

Of course, I copied the license files to the directory
C:\6472\readlicense_oo\license\

Unfortunately, the error message does not provide any useful
information.


Maybe the license source directory has changed ?


Last time working with version 6.2.x.x.,

not working in 6.3 and 6.4.

I attach the log file.


Can I have some tips?


Best regards

Jakub Kościelak
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org

https://lists.freedesktop.org/mailman/listinfo/libreoffice



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

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/fly.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f63afb95b5c2d80d33a35820ef1d9abd9e70d3ca
Author: Michael Stahl 
AuthorDate: Mon Oct 26 16:17:04 2020 +0100
Commit: Michael Stahl 
CommitDate: Mon Oct 26 18:50:19 2020 +0100

tdf#131679 sw: follow-up: Unmark before SetSelection()

Backporting this to 6.4, it crashes in CppunitTest_desktop_lib because
some sidebar is loaded from SwView::AttrChangedNotify()/SelectShell()
and that ends up calling SwView::StateTabWin() about 40 stack frames
later and this calls SwFEShell::GetAnyCurRect() which gets the still
selected fly but its page frame is null.

So make sure shells don't see the deleted fly.

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

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 1122809daa05..d44af82f1eac 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -412,6 +412,7 @@ void SwFlyFrame::FinitDrawObj()
 if (SwFEShell *const pFEShell = 
dynamic_cast(&rCurrentShell))
 {   // tdf#131679 move any cursor out of fly
 SwFlyFrame const*const pOldSelFly = 
::GetFlyFromMarked(nullptr,  pFEShell);
+rCurrentShell.Imp()->GetDrawView()->UnmarkAll();
 if (pOldSelFly)
 {
 SwPosition const 
pos(ResolveFlyAnchor(*pOldSelFly->GetFormat()));
@@ -421,7 +422,10 @@ void SwFlyFrame::FinitDrawObj()
 // does, but that would access layout a bit much...
 }
 }
-rCurrentShell.Imp()->GetDrawView()->UnmarkAll();
+else
+{
+rCurrentShell.Imp()->GetDrawView()->UnmarkAll();
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regényi Balázs (via logerrit)]

 include/oox/vml/vmlshape.hxx  |5 +
 oox/source/vml/vmlshape.cxx   |   35 
--
 sw/qa/extras/ooxmlexport/data/tdf97517_testVmlLineShapeMirroredX.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   15 

 4 files changed, 49 insertions(+), 6 deletions(-)

New commits:
commit ed943c6afeb33b9fee0ef530df7db592aa152a73
Author: Regényi Balázs 
AuthorDate: Thu Oct 22 13:36:25 2020 +0200
Commit: László Németh 
CommitDate: Mon Oct 26 18:22:18 2020 +0100

tdf#97517 DOCX VML shape import: fix missing vertical mirroring

The MirroredX property is set (in the CustomShapeGeometry property), but
it is not supported for the LineShape by UNO, so we have to make the
mirroring during importing.

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

diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 119f711a4538..7703b311c757 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -360,6 +360,11 @@ class LineShape final : public SimpleShape
 {
 public:
 explicitLineShape( Drawing& rDrawing );
+virtual css::uno::Reference< css::drawing::XShape >
+implConvertAndInsert(
+const css::uno::Reference< css::drawing::XShapes 
>& rxShapes,
+const css::awt::Rectangle& rShapeRect ) const 
override;
+
 
 private:
 /** Returns the absolute shape rectangle. */
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d70a9563e106..54f1fcec5ae6 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1004,11 +1004,39 @@ Reference< XShape > 
PolyLineShape::implConvertAndInsert( const Reference< XShape
 return xShape;
 }
 
+namespace
+{
+void doMirrorX(SdrObject* pShape)
+{
+Point aCenter(pShape->GetSnapRect().Center());
+Point aPoint2(aCenter);
+aPoint2.setY(aPoint2.getY() + 1);
+pShape->NbcMirror(aCenter, aPoint2);
+}
+}
+
 LineShape::LineShape(Drawing& rDrawing)
 : SimpleShape(rDrawing, "com.sun.star.drawing.LineShape")
 {
 }
 
+Reference LineShape::implConvertAndInsert(const Reference& 
rxShapes, const awt::Rectangle& rShapeRect) const
+{
+Reference xShape = SimpleShape::implConvertAndInsert(rxShapes, 
rShapeRect);
+// Handle vertical flip.
+// tdf#97517 The MirroredX property (in the CustomShapeGeometry property) 
is not supported for
+// the LineShape by UNO, so we have to make the mirroring here
+if (!maTypeModel.maFlip.isEmpty())
+{
+if (SdrObject* pShape = GetSdrObjectFromXShape(xShape))
+{
+if (maTypeModel.maFlip.startsWith("x"))
+doMirrorX(pShape);
+}
+}
+return xShape;
+}
+
 awt::Rectangle LineShape::getAbsRectangle() const
 {
 const GraphicHelper& rGraphicHelper = 
mrDrawing.getFilter().getGraphicHelper();
@@ -1150,12 +1178,7 @@ Reference< XShape > BezierShape::implConvertAndInsert( 
const Reference< XShapes
 if (SdrObject* pShape = GetSdrObjectFromXShape(xShape))
 {
 if (maTypeModel.maFlip.startsWith("x"))
-{
-Point aCenter(pShape->GetSnapRect().Center());
-Point aPoint2(aCenter);
-aPoint2.setY(aPoint2.getY() + 1);
-pShape->NbcMirror(aCenter, aPoint2);
-}
+doMirrorX(pShape);
 if (maTypeModel.maFlip.endsWith("y"))
 {
 Point aCenter(pShape->GetSnapRect().Center());
diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf97517_testVmlLineShapeMirroredX.docx 
b/sw/qa/extras/ooxmlexport/data/tdf97517_testVmlLineShapeMirroredX.docx
new file mode 100644
index ..75e9d8573bb3
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf97517_testVmlLineShapeMirroredX.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 3ac228db6cca..8fa7391abcc7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -40,6 +41,8 @@
 #include 
 #include 
 
+using namespace com::sun::star;
+
 char const DATA_DIRECTORY[] = "/sw/qa/extras/ooxmlexport/data/";
 
 class Test : public SwModelTestBase
@@ -1284,6 +1287,18 @@ DECLARE_OOXMLEXPORT_TEST(testVmlShapeTextWordWrap, 
"tdf97618_testVmlShapeTextWor
 assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "width", "2500");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testVmlLineShapeMirroredX, 
"tdf97517_testVmlLineShapeMirroredX.docx")
+{
+// tdf#97517 The "flip:x" was not handled for VML line shapes.
+xmlDocUniquePtr pXmlDoc =

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf137593.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |9 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 41e230e81b50235b5b86f883ef424a8ba5b42288
Author: László Németh 
AuthorDate: Mon Oct 26 15:31:30 2020 +0100
Commit: László Németh 
CommitDate: Mon Oct 26 18:17:45 2020 +0100

tdf#137593 DOCX import: fix para top margin in cells with shapes

and text boxes. Auto top margin value of the first table cell
paragraph is zero. Paragraphs of shapes and text boxes
anchored to this cell paragraph don't matter here, so keep
m_bFirstParagraphInCell=true in shapes and text box paragraphs
to avoid extra top margin of the anchoring point.

Regression from commit 5c6bce38a01b21403a603acd3148cf3bbb4c685f
(tdf#104354 DOCX import: fix paragraph auto spacing in tables).

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf137593.docx 
b/sw/qa/extras/ooxmlexport/data/tdf137593.docx
new file mode 100644
index ..8b63fd39a8f2
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf137593.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index e5fd69650911..1ff3ccf8ec3e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1543,6 +1543,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104354_2, 
"tdf104354-2.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(getParagraphOfText(1, xCell5->getText()), 
"ParaBottomMargin"));
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf137593, "tdf137593.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+
+// zero auto spacing, if the first paragraph contains text boxes
+// This was 280.
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl[1]/w:tr/w:tc/w:p[1]/w:pPr/w:spacing", "before", "0");
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf115557, "tdf115557.docx")
 {
 // A chart anchored to a footnote multiplied during import
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fe1ab5c99b91..d37a6c68fb05 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2076,7 +2076,8 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
 m_bParaHadField = false;
 
 // don't overwrite m_bFirstParagraphInCell in table separator nodes
-if (m_nTableDepth > 0 && m_nTableDepth == m_nTableCellDepth)
+// and in text boxes anchored to the first paragraph of table cells
+if (m_nTableDepth > 0 && m_nTableDepth == m_nTableCellDepth && 
!IsInShape())
 m_bFirstParagraphInCell = false;
 
 m_bParaAutoBefore = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 7988adf2bd250a32885d67306c73e07caa910778
Author: Tamás Zolnai 
AuthorDate: Mon Oct 26 14:36:44 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Oct 26 17:56:42 2020 +0100

lok: Send form field events to the correct view.

Change-Id: I00b40052774602eccd8e4a7d460cedcb36bbd0d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104811
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index fd339f583ee1..f1271c692c21 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -708,7 +708,7 @@ namespace sw::mark
 void DropDownFieldmark::SendLOKMessage(const OString& sAction)
 {
 const SfxViewShell* pViewShell = SfxViewShell::Current();
-if (pViewShell && pViewShell->isLOKMobilePhone())
+if (!pViewShell || pViewShell->isLOKMobilePhone())
 {
   return;
 }
@@ -766,7 +766,7 @@ namespace sw::mark
 }
 if (sPayload.toString() != m_sLastSentLOKMsg) {
 m_sLastSentLOKMsg = sPayload.toString();
-
pEditWin->GetView().GetWrtShell().GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_FORM_FIELD_BUTTON,
 m_sLastSentLOKMsg.getStr());
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_FORM_FIELD_BUTTON, 
m_sLastSentLOKMsg.getStr());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 include/editeng/svxrtf.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b0d350707fedcf04b43978182b6a8e03d3a4693
Author: Mike Kaganski 
AuthorDate: Mon Oct 26 19:45:08 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Oct 26 17:48:02 2020 +0100

Fix build with --disable-pch: missing include

...after 39ae9d29be0b4308b6e6ab7ee52c3fe6d6dc7d0c

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

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 5457cf9765ae..faff107c1496 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -27,6 +27,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: License dialog in .msi installer

[Andras Timar]

Hi,

What license would you like to display here? By default there is
no license_en-US.rtf in the source code, if you want one, you have to add
it.

Regards,
Andras Timar


On Mon, Oct 26, 2020 at 5:00 PM Jakub Kościelak 
wrote:

>
>
>
> --- Treść przekazanej wiadomości ---
> Temat: License dialog in .msi installer
> Data: Sun, 18 Oct 2020 16:45:51 +0200
> Nadawca: Jakub Kościelak  
> Adresat: libreoffice@lists.freedesktop.org
>
> Hi Devs,
>
> when I set up the option HIDELICENSEDIALOG 0 ,
>
> in C:\6472\instsetoo_native\util\openoffice.lst
>
> and when I builds the installer, I have an error:
>
> *
> ERROR: ERROR: Could not find license_en-US.rtf! at
> C:/6472/solenv/bin/modules/installer/windows/idtglobal.pm line 820.
> *
>
> Of course, I copied the license files to the directory
> C:\6472\readlicense_oo\license\
>
> Unfortunately, the error message does not provide any useful information.
>
>
> Maybe the license source directory has changed ?
>
>
> Last time working with version 6.2.x.x.,
>
> not working in 6.3 and 6.4.
>
> I attach the log file.
>
>
> Can I have some tips?
>
>
> Best regards
> Jakub Kościelak
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 5117dc8d657729e36e363c7adc9b60a895509437
Author: Tamás Zolnai 
AuthorDate: Mon Oct 26 14:36:44 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Oct 26 16:54:14 2020 +0100

lok: Send form field events to the correct view.

Change-Id: I00b40052774602eccd8e4a7d460cedcb36bbd0d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104812
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index e12cd66dadc1..097e2dea6bd2 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -671,7 +671,7 @@ namespace sw { namespace mark
 void DropDownFieldmark::SendLOKMessage(const OString& sAction)
 {
 const SfxViewShell* pViewShell = SfxViewShell::Current();
-if (pViewShell && pViewShell->isLOKMobilePhone())
+if (!pViewShell || pViewShell->isLOKMobilePhone())
 {
   return;
 }
@@ -729,7 +729,7 @@ namespace sw { namespace mark
 }
 if (sPayload.toString() != m_sLastSentLOKMsg) {
 m_sLastSentLOKMsg = sPayload.toString();
-
pEditWin->GetView().GetWrtShell().GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_FORM_FIELD_BUTTON,
 m_sLastSentLOKMsg.getStr());
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_FORM_FIELD_BUTTON, 
m_sLastSentLOKMsg.getStr());
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sw/source/core/access/accpara.cxx   |8 
 sw/source/core/doc/notxtfrm.cxx |4 ++--
 sw/source/core/inc/frame.hxx|3 ++-
 sw/source/core/inc/swfont.hxx   |9 +
 sw/source/core/layout/paintfrm.cxx  |   24 
 sw/source/core/text/atrstck.cxx |2 +-
 sw/source/core/text/inftxt.cxx  |   10 +-
 sw/source/core/text/redlnitr.cxx|2 +-
 sw/source/core/text/txtftn.cxx  |2 +-
 sw/source/core/txtnode/fntcache.cxx |   14 --
 sw/source/core/txtnode/swfont.cxx   |   14 +++---
 11 files changed, 48 insertions(+), 44 deletions(-)

New commits:
commit 799d158790cfe14edb93c4225a446cd804c82f80
Author: Noel 
AuthorDate: Mon Oct 26 11:39:26 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 26 16:49:02 2020 +0100

std::unique_ptr -> std::optional

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

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 4f60b2b9dff0..8e3bf82bb749 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -808,16 +808,16 @@ static bool lcl_GetBackgroundColor( Color & rColor,
  SwCursorShell* pCursorSh )
 {
 const SvxBrushItem* pBackgrdBrush = nullptr;
-const Color* pSectionTOXColor = nullptr;
+std::optional xSectionTOXColor;
 SwRect aDummyRect;
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
 if ( pFrame &&
- pFrame->GetBackgroundBrush( aFillAttributes, pBackgrdBrush, 
pSectionTOXColor, aDummyRect, false, /*bConsiderTextBox=*/false ) )
+ pFrame->GetBackgroundBrush( aFillAttributes, pBackgrdBrush, 
xSectionTOXColor, aDummyRect, false, /*bConsiderTextBox=*/false ) )
 {
-if ( pSectionTOXColor )
+if ( xSectionTOXColor )
 {
-rColor = *pSectionTOXColor;
+rColor = *xSectionTOXColor;
 return true;
 }
 else
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index f51bc19bc9c0..2fcf84602d62 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -187,11 +187,11 @@ static void lcl_ClearArea( const SwFrame &rFrame,
 return;
 
 const SvxBrushItem *pItem;
-const Color *pCol;
+std::optional xCol;
 SwRect aOrigRect;
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFillAttributes;
 
-if ( rFrame.GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigRect, 
false, /*bConsiderTextBox=*/false ) )
+if ( rFrame.GetBackgroundBrush( aFillAttributes, pItem, xCol, aOrigRect, 
false, /*bConsiderTextBox=*/false ) )
 {
 SwRegionRects const region(rPtArea);
 basegfx::utils::B2DClipState aClipState;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 27622be75dbb..1c099696c504 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -33,6 +33,7 @@
 #include 
 
 #include 
+#include 
 
 namespace drawinglayer::processor2d { class BaseProcessor2D; }
 
@@ -571,7 +572,7 @@ public:
 bool GetBackgroundBrush(
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr& 
rFillAttributes,
 const SvxBrushItem*& rpBrush,
-const Color*& rpColor,
+std::optional& rxColor,
 SwRect &rOrigRect,
 bool bLowerMode,
 bool bConsiderTextBox ) const;
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index f58a65ac9455..d1c5d7841369 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SfxItemSet;
 class SwAttrSet;
@@ -133,8 +134,8 @@ class SwFont
 // CTL == Complex text layout ( Hebrew, Arabic )
 o3tl::enumarray   m_aSub; // Latin-, CJK- and 
CTL-font
 
-std::unique_ptr
-m_pBackColor; // background color (i.e. at character 
styles)
+std::optional
+mxBackColor; // background color (i.e. at character styles)
 Color   m_aHighlightColor;   // highlight color
 Color   m_aUnderColor;// color of the underlining
 Color   m_aOverColor; // color of the overlining
@@ -186,8 +187,8 @@ public:
 // gets a font cache id via SwFntAccess
 void AllocFontCacheId( SwViewShell const *pSh, SwFontScript nWhich );
 // set background color
-void SetBackColor( Color* pNewColor );
-const Color* GetBackColor() const{ return m_pBackColor.get(); }
+void SetBackColor( std::optional xNewColor );
+const std::optional& GetBackColor() const{ return mxBackColor; }
 void SetHighlightColor( const Color& aNewColor );
 const Color& GetHighlightColor() const { return m_aHighlightColor; }
 
diff --git a/sw/source/core/layout/paintfrm.

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

[Noel (via logerrit)]

 svx/source/dialog/fntctrl.cxx |   35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

New commits:
commit 6ef775c6c9971e5cab868d7db870afb75eb2a510
Author: Noel 
AuthorDate: Mon Oct 26 10:33:46 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 26 16:48:42 2020 +0100

std::unique_ptr -> std::optional

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

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 146d5220e2d9..4d86e4974f51 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -32,6 +32,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -150,10 +151,10 @@ class FontPrevWin_Impl
 SvxFont maCTLFont;
 OUString maText;
 OUString maScriptText;
-std::unique_ptr mpColor;
-std::unique_ptr mpBackColor;
-std::unique_ptr mpTextLineColor;
-std::unique_ptr mpOverlineColor;
+std::optional mxColor;
+std::optional mxBackColor;
+std::optional mxTextLineColor;
+std::optional mxOverlineColor;
 tools::Long mnAscent;
 sal_Unicode mcStartBracket;
 sal_Unicode mcEndBracket;
@@ -585,31 +586,31 @@ void SvxFontPrevWindow::SetFont( const SvxFont& 
rNormalOutFont, const SvxFont& r
 
 void SvxFontPrevWindow::SetColor(const Color &rColor)
 {
-pImpl->mpColor.reset(new Color(rColor));
+pImpl->mxColor = rColor;
 Invalidate();
 }
 
 void SvxFontPrevWindow::ResetColor()
 {
-pImpl->mpColor.reset();
+pImpl->mxColor.reset();
 Invalidate();
 }
 
 void SvxFontPrevWindow::SetBackColor(const Color &rColor)
 {
-pImpl->mpBackColor.reset(new Color(rColor));
+pImpl->mxBackColor = rColor;
 Invalidate();
 }
 
 void SvxFontPrevWindow::SetTextLineColor(const Color &rColor)
 {
-pImpl->mpTextLineColor.reset(new Color(rColor));
+pImpl->mxTextLineColor = rColor;
 Invalidate();
 }
 
 void SvxFontPrevWindow::SetOverlineColor(const Color &rColor)
 {
-pImpl->mpOverlineColor.reset(new Color(rColor));
+pImpl->mxOverlineColor = rColor;
 Invalidate();
 }
 
@@ -708,37 +709,37 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::R
 if (nY + pImpl->mnAscent > aLogSize.Height())
 nY = aLogSize.Height() - pImpl->mnAscent;
 
-if (pImpl->mpBackColor)
+if (pImpl->mxBackColor)
 {
 tools::Rectangle aRect(Point(0, 0), aLogSize);
 Color aLineCol = rRenderContext.GetLineColor();
 Color aFillCol = rRenderContext.GetFillColor();
 rRenderContext.SetLineColor();
-rRenderContext.SetFillColor(*pImpl->mpBackColor);
+rRenderContext.SetFillColor(*pImpl->mxBackColor);
 rRenderContext.DrawRect(aRect);
 rRenderContext.SetLineColor(aLineCol);
 rRenderContext.SetFillColor(aFillCol);
 }
-if (pImpl->mpColor)
+if (pImpl->mxColor)
 {
 tools::Rectangle aRect(Point(nX, nY), aTxtSize);
 Color aLineCol = rRenderContext.GetLineColor();
 Color aFillCol = rRenderContext.GetFillColor();
 rRenderContext.SetLineColor();
-rRenderContext.SetFillColor(*pImpl->mpColor);
+rRenderContext.SetFillColor(*pImpl->mxColor);
 rRenderContext.DrawRect(aRect);
 rRenderContext.SetLineColor(aLineCol);
 rRenderContext.SetFillColor(aFillCol);
 }
 
-if (pImpl->mpTextLineColor)
+if (pImpl->mxTextLineColor)
 {
-rRenderContext.SetTextLineColor(*pImpl->mpTextLineColor);
+rRenderContext.SetTextLineColor(*pImpl->mxTextLineColor);
 }
 
-if (pImpl->mpOverlineColor)
+if (pImpl->mxOverlineColor)
 {
-rRenderContext.SetOverlineColor(*pImpl->mpOverlineColor);
+rRenderContext.SetOverlineColor(*pImpl->mxOverlineColor);
 }
 
 tools::Long nStdAscent = pImpl->mnAscent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Szűcs (via logerrit)]

 sc/qa/unit/subsequent_export-test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ebb2b0f61d36f92093c322a5c1379b04b57bd11
Author: Attila Szűcs 
AuthorDate: Mon Oct 19 18:32:30 2020 +0200
Commit: László Németh 
CommitDate: Mon Oct 26 16:32:51 2020 +0100

Clean-up of commit: 0d193c12a673fade8ece9d84cc4024fafdf52c9b

https://gerrit.libreoffice.org/c/core/+/104049

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

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 62ebac829bb6..08ef8c7fcdb0 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -5513,11 +5513,11 @@ void ScExportTest::testTdf76047_externalLink()
 CPPUNIT_ASSERT(pShell.is());
 
 // load data from external links. (tdf76047_externalLinkSource.ods)
-// that file have to be the same directory as tdf76047_externalLink.xlsx
+// that file has to be in the same directory as tdf76047_externalLink.xlsx
 pShell->ReloadAllLinks();
 ScDocument& rDoc = pShell->GetDocument();
 
-// compare the loaded data (from external links) to the data copied 
manually to the testfile
+// compare the data loaded from external links with the expected result 
stored in the test file
 for (int nCol = 1; nCol <= 5; nCol++)
 {
 for (int nRow = 3; nRow <= 5; nRow++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build libreoffice 6.3.3.2.0 error on windows 10 with cygwin

[Michael Weghorn]

On 26/10/2020 09.53, 方振华(601661) wrote:
> build libreoffice 6.3.3.2.0error on windows 10 with cygwin

Is there any particular reason to build this specific outdated version?

> 
> i modify *.hxx source code and run /opt/lo/bin/make in cygwin, i get
> some errors like "xxx" is not "xxx" member.
> 
> and then i remove the directory
> "xxx/build/workdir/PrecompileHeader/debug" and run /opt/lo/bin/make in
> cygwin, it compile success.
> 
> so i want to konow why？，and how to disable precompileheader cache. 

autogen option '--enable-pch=no' disables precompiled headers.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Attila Szűcs (via logerrit)]

 sc/qa/unit/copy_paste_test.cxx   |   57 ---
 sc/qa/unit/data/ods/tdf137621_autofillMergedBool.ods |binary
 sc/source/core/data/table4.cxx   |   11 +++
 3 files changed, 59 insertions(+), 9 deletions(-)

New commits:
commit 66c316cd4a703b4bc2e569b14888ea9e0d2ca9c9
Author: Attila Szűcs 
AuthorDate: Thu Oct 22 12:47:16 2020 +0200
Commit: László Németh 
CommitDate: Mon Oct 26 16:15:47 2020 +0100

tdf#137621 sc: autofill bool sequences in merged cells

Fixed FillAnalyse to not discover booleans as number sequences,
rather as a pattern that can be repeated.

Co-authored-by: Tibor Nagy (NISZ)
Change-Id: I0a32e756461eb4101b77724129b745e23a658b1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104655
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 12e0b64a3532..54202137d0de 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -45,6 +45,7 @@ public:
 void testTdf40993_fillMergedCells();
 void testTdf43958_clickSelectOnMergedCells();
 void testTdf88782_autofillLinearNumbersInMergedCells();
+void tdf137621_autofillMergedBool();
 void tdf137205_autofillDatesInMergedCells();
 
 CPPUNIT_TEST_SUITE(ScCopyPasteTest);
@@ -57,6 +58,7 @@ public:
 CPPUNIT_TEST(testTdf40993_fillMergedCells);
 CPPUNIT_TEST(testTdf43958_clickSelectOnMergedCells);
 CPPUNIT_TEST(testTdf88782_autofillLinearNumbersInMergedCells);
+CPPUNIT_TEST(tdf137621_autofillMergedBool);
 CPPUNIT_TEST(tdf137205_autofillDatesInMergedCells);
 CPPUNIT_TEST_SUITE_END();
 
@@ -648,10 +650,12 @@ void 
ScCopyPasteTest::testTdf88782_autofillLinearNumbersInMergedCells()
 pView->FillAuto(FILL_TO_LEFT, 9, 30, 16, 35, 8);//J31:Q36 -> B31:Q36
 
 // compare the results of fill-down with the reference stored in the test 
file
-// this compare the whole area blindly, for concrete test cases, check the 
test file
+// this compares the whole area blindly, for specific test cases, check 
the test file
 // the test file have instructions / explanations, so that is easy to 
understand
-for (int nCol = 1; nCol <= 10; nCol++) {
-for (int nRow = 8; nRow <= 27; nRow++) {
+for (int nCol = 1; nCol <= 10; nCol++)
+{
+for (int nRow = 8; nRow <= 27; nRow++)
+{
 CellType nType1 = rDoc.GetCellType(ScAddress(nCol, nRow, 0));
 CellType nType2 = rDoc.GetCellType(ScAddress(nCol + 22, nRow, 0));
 double* pValue1 = rDoc.GetValueCell(ScAddress(nCol, nRow, 0));
@@ -666,8 +670,10 @@ void 
ScCopyPasteTest::testTdf88782_autofillLinearNumbersInMergedCells()
 }
 
 // compare the results of fill-right and left with the reference stored in 
the test file
-for (int nCol = 1; nCol <= 24; nCol++) {
-for (int nRow = 30; nRow <= 35; nRow++) {
+for (int nCol = 1; nCol <= 24; nCol++)
+{
+for (int nRow = 30; nRow <= 35; nRow++)
+{
 CellType nType1 = rDoc.GetCellType(ScAddress(nCol, nRow, 0));
 CellType nType2 = rDoc.GetCellType(ScAddress(nCol, nRow + 16, 0));
 double* pValue1 = rDoc.GetValueCell(ScAddress(nCol, nRow, 0));
@@ -681,6 +687,39 @@ void 
ScCopyPasteTest::testTdf88782_autofillLinearNumbersInMergedCells()
 }
 }
 }
+
+void ScCopyPasteTest::tdf137621_autofillMergedBool()
+{
+ScDocShellRef xDocSh = 
loadDocAndSetupModelViewController("tdf137621_autofillMergedBool.", FORMAT_ODS, 
true);
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Get the document controller
+ScTabViewShell* pView = xDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pView != nullptr);
+
+// fillauto booleans, these areas contain only merged cells
+pView->FillAuto(FILL_TO_RIGHT, 0, 4, 3, 5, 8);   //A5:D6
+
+// compare the results of fill-right with the reference stored in the test 
file
+// this compares the whole area blindly, for specific test cases, check 
the test file
+for (int nCol = 4; nCol <= 11; nCol++)
+{
+for (int nRow = 4; nRow <= 5; nRow++)
+{
+CellType nType1 = rDoc.GetCellType(ScAddress(nCol, nRow, 0));
+CellType nType2 = rDoc.GetCellType(ScAddress(nCol, nRow + 3, 0));
+double* pValue1 = rDoc.GetValueCell(ScAddress(nCol, nRow, 0));
+double* pValue2 = rDoc.GetValueCell(ScAddress(nCol, nRow + 3, 0));
+
+CPPUNIT_ASSERT_EQUAL(nType1, nType2);
+if (pValue2 != nullptr)
+CPPUNIT_ASSERT_EQUAL(*pValue1, *pValue2);   //cells with 
boolean value
+else
+CPPUNIT_ASSERT_EQUAL(pValue1, pValue2); //empty cells
+}
+}
+}
+
 void ScCopyPasteTest::tdf137205_autofillDatesInMergedCells()
 {
 ScDocShellRef xDocSh = 
loadDocAndSetupModelViewController("tdf137205_AutofillDatesInMerg

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

[Miklos Vajna (via logerrit)]

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

New commits:
commit f214056f93ad6b14dad3a5125d65384e95303ff8
Author: Miklos Vajna 
AuthorDate: Mon Oct 26 12:46:13 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Oct 26 15:30:33 2020 +0100

configure: pdfium is used during pdf sig verify

So make it more obvious that disabling pdfium is not too secure.

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

diff --git a/configure.ac b/configure.ac
index 225d56d7e406..6d096db5da1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1353,7 +1353,7 @@ libo_FUZZ_ARG_ENABLE(pdfimport,
 
 libo_FUZZ_ARG_ENABLE(pdfium,
 AS_HELP_STRING([--disable-pdfium],
-[Disable building PDFium.])
+[Disable building PDFium. Results in unsecure PDF signature 
verification.])
 )
 
 libo_FUZZ_ARG_ENABLE(skia,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa sc/UITest_autofilter.mk sc/UITest_calc_dialogs.mk sc/UITest_calc_tests2.mk sc/UITest_calc_tests3.mk sc/UITest_calc_tests4.mk sc/UITest_calc_tests6.mk sc/UITest_ca

[Xisco Fauli (via logerrit)]

 sc/UITest_autofilter.mk |2 +-
 sc/UITest_calc_dialogs.mk   |2 +-
 sc/UITest_calc_tests.mk |2 +-
 sc/UITest_calc_tests2.mk|2 +-
 sc/UITest_calc_tests3.mk|2 +-
 sc/UITest_calc_tests4.mk|2 +-
 sc/UITest_calc_tests6.mk|2 +-
 sc/UITest_calc_tests7.mk|2 +-
 sc/UITest_calc_tests8.mk|2 +-
 sc/UITest_calc_tests9.mk|2 +-
 sc/UITest_chart.mk  |2 +-
 sc/UITest_conditional_format.mk |2 +-
 sc/UITest_goalSeek.mk   |2 +-
 sc/UITest_hideShowSheet.mk  |2 +-
 sc/UITest_inputLine.mk  |2 +-
 sc/UITest_key_f4.mk |2 +-
 sc/UITest_pageFormat.mk |2 +-
 sc/UITest_protect.mk|2 +-
 sc/UITest_range_name.mk |2 +-
 sc/UITest_sc_options.mk |2 +-
 sc/UITest_search_replace.mk |2 +-
 sc/UITest_signatureLine.mk  |2 +-
 sc/UITest_solver.mk |2 +-
 sc/UITest_sort.mk   |2 +-
 sc/UITest_statistics.mk |2 +-
 sc/UITest_textCase.mk   |2 +-
 sc/UITest_validity.mk   |2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 66484d60134dcca0a123fd54635adc8e89ef96a7
Author: Xisco Fauli 
AuthorDate: Mon Oct 26 10:42:26 2020 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 26 14:59:57 2020 +0100

uitest: sc: move data folder to the root uitest folder

Change-Id: I65e81bb3cc25283e882b4a63661c0959b297a76e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104802
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/UITest_autofilter.mk b/sc/UITest_autofilter.mk
index a6dc24cffbfb..539ca4556d5f 100644
--- a/sc/UITest_autofilter.mk
+++ b/sc/UITest_autofilter.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,autofilter,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,autofilter, \
-TDOC="$(SRCDIR)/sc/qa/uitest/autofilter/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data/autofilter" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_dialogs.mk b/sc/UITest_calc_dialogs.mk
index 42ed785b6000..85ba2d63b724 100644
--- a/sc/UITest_calc_dialogs.mk
+++ b/sc/UITest_calc_dialogs.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_dialogs,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,calc_dialogs, \
-TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests.mk b/sc/UITest_calc_tests.mk
index e316574a97bb..bedfc5fed5bc 100644
--- a/sc/UITest_calc_tests.mk
+++ b/sc/UITest_calc_tests.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_tests,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,calc_tests, \
-TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests2.mk b/sc/UITest_calc_tests2.mk
index 509224823e94..fb229bab9d40 100644
--- a/sc/UITest_calc_tests2.mk
+++ b/sc/UITest_calc_tests2.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_tests2,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,calc_tests2, \
-TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests3.mk b/sc/UITest_calc_tests3.mk
index 957f133c7798..db1c37642a41 100644
--- a/sc/UITest_calc_tests3.mk
+++ b/sc/UITest_calc_tests3.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_tests3,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,calc_tests3, \
-TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests4.mk b/sc/UITest_calc_tests4.mk
index dd78440272a3..ff3ae20c72aa 100644
--- a/sc/UITest_calc_tests4.mk
+++ b/sc/UITest_calc_tests4.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_tests4,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,calc_tests4, \
-TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests6.mk b/sc/UITest_calc_tests6.mk
index 9350d460783a..aebee3bceb3d 100644
--- a/sc/UITest_calc_tests6.mk
+++ b/sc/UITest_calc_tests6.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_tests6,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,calc_tests6, \
-TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+TDOC="$(SRCDIR)/sc/qa/uitest/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests7.mk b/sc/UITest_calc_tests7.mk
index 65ff569a40f9..b2e19b118ac0 100644
--- a/sc/UITest_calc_tests7.mk
+++ b/sc/UITest_calc_tests7.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UITest_add_modules,calc_tests7,$(SRCDI

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

[Noel (via logerrit)]

 sc/source/ui/inc/output.hxx   |7 ---
 sc/source/ui/view/output.cxx  |8 
 sc/source/ui/view/output2.cxx |   12 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit f74bf51d9cdfc64b72434d062a67dba65eaf7447
Author: Noel 
AuthorDate: Mon Oct 26 10:30:46 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 26 14:58:23 2020 +0100

std::unique_ptr -> std::optional

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

diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index a5de8bbac213..a1e5d6661135 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace sc {
 struct SpellCheckContext;
@@ -216,9 +217,9 @@ private:
 bool mbForceAutoColor;
 
 bool mbSyntaxMode;  // Syntax highlighting
-std::unique_ptr pValueColor;
-std::unique_ptr pTextColor;
-std::unique_ptr pFormulaColor;
+std::optional mxValueColor;
+std::optional mxTextColor;
+std::optional mxFormulaColor;
 
 Color   aGridColor;
 
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index c44ae0e2c095..4a9c035d16a2 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -277,12 +277,12 @@ void ScOutputData::SetMetaFileMode( bool bNewMode )
 void ScOutputData::SetSyntaxMode( bool bNewMode )
 {
 mbSyntaxMode = bNewMode;
-if ( bNewMode && !pValueColor )
+if ( bNewMode && !mxValueColor )
 {
 const svtools::ColorConfig& rColorCfg = SC_MOD()->GetColorConfig();
-pValueColor.reset( new Color( rColorCfg.GetColorValue( 
svtools::CALCVALUE ).nColor ) );
-pTextColor.reset( new Color( rColorCfg.GetColorValue( 
svtools::CALCTEXT ).nColor ) );
-pFormulaColor.reset( new Color( rColorCfg.GetColorValue( 
svtools::CALCFORMULA ).nColor ) );
+mxValueColor = rColorCfg.GetColorValue( svtools::CALCVALUE ).nColor;
+mxTextColor = rColorCfg.GetColorValue( svtools::CALCTEXT ).nColor;
+mxFormulaColor = rColorCfg.GetColorValue( svtools::CALCFORMULA 
).nColor;
 }
 }
 
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 50fbbd2070c1..564221da4ade 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -864,13 +864,13 @@ void ScOutputData::SetSyntaxColor( vcl::Font* pFont, 
const ScRefCellValue& rCell
 switch (rCell.meType)
 {
 case CELLTYPE_VALUE:
-pFont->SetColor(*pValueColor);
+pFont->SetColor(*mxValueColor);
 break;
 case CELLTYPE_STRING:
-pFont->SetColor(*pTextColor);
+pFont->SetColor(*mxTextColor);
 break;
 case CELLTYPE_FORMULA:
-pFont->SetColor(*pFormulaColor);
+pFont->SetColor(*mxFormulaColor);
 break;
 default:
 {
@@ -894,13 +894,13 @@ void ScOutputData::SetEditSyntaxColor( EditEngine& 
rEngine, const ScRefCellValue
 switch (rCell.meType)
 {
 case CELLTYPE_VALUE:
-aColor = *pValueColor;
+aColor = *mxValueColor;
 break;
 case CELLTYPE_STRING:
-aColor = *pTextColor;
+aColor = *mxTextColor;
 break;
 case CELLTYPE_FORMULA:
-aColor = *pFormulaColor;
+aColor = *mxFormulaColor;
 break;
 default:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 sc/inc/colorscale.hxx |6 +++---
 sc/qa/unit/subsequent_filters-test.cxx|8 
 sc/source/core/data/colorscale.cxx|4 ++--
 sc/source/filter/excel/xeextlst.cxx   |4 ++--
 sc/source/filter/oox/condformatbuffer.cxx |2 +-
 sc/source/filter/xml/xmlcondformat.cxx|2 +-
 sc/source/filter/xml/xmlexprt.cxx |4 ++--
 sc/source/ui/condformat/colorformat.cxx   |6 +++---
 sc/source/ui/unoobj/condformatuno.cxx |   10 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 1efcc72d4ac27c9c5f151e410ca3066521c14355
Author: Noel 
AuthorDate: Mon Oct 26 10:26:40 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 26 14:55:58 2020 +0100

std::unique_ptr -> std::optional

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

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index c6539ec52409..49e09e04bb26 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -17,6 +17,7 @@
 
 #include 
 #include 
+#include 
 
 //TODO: merge this with conditio.hxx
 
@@ -116,8 +117,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData
 mnMaxLength(r.mnMaxLength),
 mbOnlyBar(r.mbOnlyBar)
 {
-if(r.mpNegativeColor)
-mpNegativeColor.reset(new Color(*r.mpNegativeColor));
+mxNegativeColor = r.mxNegativeColor;
 
 if(r.mpLowerLimit)
 mpLowerLimit.reset( new ScColorScaleEntry(*r.mpLowerLimit));
@@ -138,7 +138,7 @@ struct SC_DLLPUBLIC ScDataBarFormatData
  *
  * Default color is 0xFF, this value is not set
  */
-std::unique_ptr mpNegativeColor;
+std::optional mxNegativeColor;
 /**
  * Color of the axis if used
  * Default color is black
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 3053f7bb8257..335ce70d51fa 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2380,8 +2380,8 @@ void ScFiltersTest::testCondFormatThemeColorXLSX()
 const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData();
 
 CPPUNIT_ASSERT_EQUAL(Color(157, 195, 230), 
pDataBarFormatData->maPositiveColor);
-CPPUNIT_ASSERT(pDataBarFormatData->mpNegativeColor);
-CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, *pDataBarFormatData->mpNegativeColor);
+CPPUNIT_ASSERT(pDataBarFormatData->mxNegativeColor);
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, *pDataBarFormatData->mxNegativeColor);
 
 CPPUNIT_ASSERT_EQUAL(size_t(1), rDoc.GetCondFormList(1)->size());
 pFormat = rDoc.GetCondFormat(0, 0, 1);
@@ -2419,8 +2419,8 @@ void ScFiltersTest::testCondFormatThemeColor2XLSX()
 const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData();
 
 CPPUNIT_ASSERT_EQUAL(Color(99, 142, 198), 
pDataBarFormatData->maPositiveColor);
-CPPUNIT_ASSERT(pDataBarFormatData->mpNegativeColor);
-CPPUNIT_ASSERT_EQUAL(Color(217, 217, 217), 
*pDataBarFormatData->mpNegativeColor);
+CPPUNIT_ASSERT(pDataBarFormatData->mxNegativeColor);
+CPPUNIT_ASSERT_EQUAL(Color(217, 217, 217), 
*pDataBarFormatData->mxNegativeColor);
 CPPUNIT_ASSERT_EQUAL(Color(197, 90, 17), pDataBarFormatData->maAxisColor);
 
 xDocSh->DoClose();
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index f12220ce110e..52496653ab1b 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -935,9 +935,9 @@ std::unique_ptr 
ScDataBarFormat::GetDataBarInfo(const ScAddress&
 // set color
 if(mpFormatData->mbNeg && nValue < 0)
 {
-if(mpFormatData->mpNegativeColor)
+if(mpFormatData->mxNegativeColor)
 {
-pInfo->maColor = *mpFormatData->mpNegativeColor;
+pInfo->maColor = *mpFormatData->mxNegativeColor;
 }
 else
 {
diff --git a/sc/source/filter/excel/xeextlst.cxx 
b/sc/source/filter/excel/xeextlst.cxx
index 35d2fac152d7..cca940350173 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -209,8 +209,8 @@ XclExpExtDataBar::XclExpExtDataBar( const XclExpRoot& 
rRoot, const ScDataBarForm
 const ScDataBarFormatData& rFormatData = *rFormat.GetDataBarData();
 mpLowerLimit.reset(new XclExpExtCfvo(*this, *rFormatData.mpLowerLimit, 
rPos, true));
 mpUpperLimit.reset(new XclExpExtCfvo(*this, *rFormatData.mpUpperLimit, 
rPos, false));
-if (rFormatData.mpNegativeColor)
-mpNegativeColor.reset(new 
XclExpExtNegativeColor(*rFormatData.mpNegativeColor));
+if (rFormatData.mxNegativeColor)
+mpNegativeColor.reset(new 
XclExpExtNegativeColor(*rFormatData.mxNegativeColor));
 else
 mpNegativeColor.reset( new XclExpExtNegativeColor( 
rFormatData.maPositiveColor ) );
 mpAxisColor.reset( new XclExpExtAxisColor( rFormatData.maAxi

[Libreoffice-commits] core.git: compilerplugins/clang Repository.mk smoketest/Executable_libtest.mk smoketest/libtest.cxx smoketest/Module_smoketest.mk solenv/clang-format

[Stephan Bergmann (via logerrit)]

 Repository.mk  |1 
 compilerplugins/clang/shouldreturnbool.cxx |3 
 smoketest/Executable_libtest.mk|   38 --
 smoketest/Module_smoketest.mk  |6 -
 smoketest/libtest.cxx  |  160 -
 solenv/clang-format/excludelist|1 
 6 files changed, 1 insertion(+), 208 deletions(-)

New commits:
commit 8a9a0447807ad7544a3df5a067dd26a4ee6613f1
Author: Stephan Bergmann 
AuthorDate: Mon Oct 26 10:56:15 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Oct 26 14:50:25 2020 +0100

Remove unmaintained Executable_libtest



"Re: Is Executable_libtest still useful?":

>> so I wonder whether that program is actually still maintained and used by
>> anybody.  (At least the last dozen or so changes to smoketest/libtest.cxx
>> were of the generic loplugin/typos/tools::Long etc. kind, and we could 
spare
>> ourselves future such work if we removed the file should it indeed be 
dead
>> code.)
>
> I think this can be removed. https://gitlab.com/ojwb/lloconv does the
> same and it seems to be maintained.

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

diff --git a/Repository.mk b/Repository.mk
index 08061a692087..d821025277d2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
idxdict \
langsupport \
$(if $(filter iOS,$(OS)),LibreOffice) \
-   libtest \
lngconvex \
localize \
makedepend \
diff --git a/compilerplugins/clang/shouldreturnbool.cxx 
b/compilerplugins/clang/shouldreturnbool.cxx
index 23749d6b6428..1372d8103374 100644
--- a/compilerplugins/clang/shouldreturnbool.cxx
+++ b/compilerplugins/clang/shouldreturnbool.cxx
@@ -42,8 +42,7 @@ public:
 if (loplugin::isSamePathname(fn, SRCDIR "/sal/rtl/alloc_cache.cxx"))
 return;
 // false +, slightly odd usage, but not wrong
-if (loplugin::isSamePathname(fn, SRCDIR 
"/libreofficekit/qa/tilebench/tilebench.cxx")
-|| loplugin::isSamePathname(fn, SRCDIR "/smoketest/libtest.cxx"))
+if (loplugin::isSamePathname(fn, SRCDIR 
"/libreofficekit/qa/tilebench/tilebench.cxx"))
 return;
 // uses the Unix convention of "non-zero return indicates error"
 if (loplugin::isSamePathname(fn, SRCDIR 
"/idlc/source/idlcproduce.cxx"))
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
deleted file mode 100644
index c1e33d35e10e..
--- a/smoketest/Executable_libtest.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Executable_Executable,libtest))
-
-$(eval $(call gb_Executable_set_include,libtest,\
-   $$(INCLUDE) \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_libs,libtest,\
-   -ldl \
-))
-endif
-
-$(eval $(call gb_Executable_add_exception_objects,libtest,\
-   smoketest/libtest \
-))
-
-liblibreoffice_OWN_LD_PATH_DIR := $(INSTROOT)/program/libolib
-liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call 
gb_Library__get_workdir_linktargetname,libreoffice)
-
-$(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
-   mkdir -p $(liblibreoffice_OWN_LD_PATH_DIR)/Library
-   cp -a $(call gb_Library_get_target,libreoffice) 
$(liblibreoffice_OWN_LD_SO)
-
-run_libtest: $(liblibreoffice_OWN_LD_SO)
-   
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library"
 \
-   $(WORKDIR)/LinkTarget/Executable/libtest \
-   $(INSTROOT)/program $(WORKDIR)/Zip/smoketestdoc.sxw \
-
-# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 7e8b6d5f11f6..217dbfa6543a 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -26,12 +26,6 @@ $(eval $(call gb_Module_add_targets,smoketest,\
 endif
 endif
 
-ifneq ($(filter LINUX WNT,$(OS)),)
-$(eval $(call gb_Module_add_check_targets,smoketest,\
-   Executable_libtest \
-))
-endif
-
 ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX))
 ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
deleted file mode 100644
index 7d90a8522353..
--- a/smoketest/libtest.cxx
+++ 

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

[Szymon Kłos (via logerrit)]

 sd/source/ui/view/drviewse.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit c277bedb0ac82194b05b4eac2e6e7367672c185f
Author: Szymon Kłos 
AuthorDate: Wed Sep 30 11:28:02 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon Oct 26 14:19:41 2020 +0100

Don't insert hyperlink outside the page

Change-Id: Ida562bdf4eab479b4df2bba7917466d5da788a6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103673
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104804
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 30b160ea88f7..33ed1a0ff2d6 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1500,8 +1500,11 @@ void DrawViewShell::InsertURLField(const OUString& rURL, 
const OUString& rText,
 ::tools::Rectangle aRect(aPos, GetActiveWindow()->GetOutputSizePixel() 
);
 aPos = aRect.Center();
 aPos = GetActiveWindow()->PixelToLogic(aPos);
-aPos.AdjustX( -(aSize.Width() / 2) );
-aPos.AdjustY( -(aSize.Height() / 2) );
+
+if (aPos.getX() - (aSize.Width() / 2) >= 0)
+aPos.AdjustX( -(aSize.Width() / 2) );
+if (aPos.getY() - (aSize.Height() / 2) >= 0)
+aPos.AdjustY( -(aSize.Height() / 2) );
 
 ::tools::Rectangle aLogicRect(aPos, aSize);
 pRectObj->SetLogicRect(aLogicRect);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa sw/UITest_chapterNumbering.mk sw/UITest_classification.mk sw/UITest_librelogo.mk sw/UITest_sw_findReplace.mk sw/UITest_sw_findSimilarity.mk sw/UITest_sw_navigator

[Xisco Fauli (via logerrit)]

 sw/UITest_chapterNumbering.mk   |2 +-
 sw/UITest_classification.mk |2 +-
 sw/UITest_librelogo.mk  |2 +-
 sw/UITest_sw_findReplace.mk |2 +-
 sw/UITest_sw_findSimilarity.mk  |2 +-
 sw/UITest_sw_navigator.mk   |2 +-
 sw/UITest_sw_options.mk |2 +-
 sw/UITest_sw_table.mk   |2 +-
 sw/UITest_sw_ui_fmtui.mk|2 +-
 sw/UITest_writer_dialogs.mk |2 +-
 sw/UITest_writer_macro_tests.mk |2 +-
 sw/UITest_writer_tests.mk   |2 +-
 sw/UITest_writer_tests2.mk  |2 +-
 sw/UITest_writer_tests3.mk  |2 +-
 sw/UITest_writer_tests4.mk  |2 +-
 sw/UITest_writer_tests5.mk  |2 +-
 sw/UITest_writer_tests6.mk  |2 +-
 sw/UITest_writer_tests7.mk  |2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit ceef6a891e30a9aab35911f795b75277c96b843e
Author: Xisco Fauli 
AuthorDate: Fri Oct 23 14:06:54 2020 +0200
Commit: Xisco Fauli 
CommitDate: Mon Oct 26 13:43:49 2020 +0100

uitest: sw: move data folder to the root uitest folder

Change-Id: Id68ff2b42c2148a90dc6bcd6d6ff13eb2be187ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104726
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/UITest_chapterNumbering.mk b/sw/UITest_chapterNumbering.mk
index 983bc27522eb..e7b91e07f68a 100644
--- a/sw/UITest_chapterNumbering.mk
+++ b/sw/UITest_chapterNumbering.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,chapterNumbering,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,chapterNumbering, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_classification.mk b/sw/UITest_classification.mk
index dfe023f5df39..b79e54cb5a75 100644
--- a/sw/UITest_classification.mk
+++ b/sw/UITest_classification.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,classification,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,classification, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_librelogo.mk b/sw/UITest_librelogo.mk
index 35e53641e782..5518b0ef294f 100644
--- a/sw/UITest_librelogo.mk
+++ b/sw/UITest_librelogo.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,librelogo,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,librelogo, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_sw_findReplace.mk b/sw/UITest_sw_findReplace.mk
index 6218c2e423c8..cfcf6e8218b5 100644
--- a/sw/UITest_sw_findReplace.mk
+++ b/sw/UITest_sw_findReplace.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_findReplace,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,sw_findReplace, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_sw_findSimilarity.mk b/sw/UITest_sw_findSimilarity.mk
index f0bc07e059e3..6b3402a85416 100644
--- a/sw/UITest_sw_findSimilarity.mk
+++ b/sw/UITest_sw_findSimilarity.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_findSimilarity,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,sw_findSimilarity, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_sw_navigator.mk b/sw/UITest_sw_navigator.mk
index a86522dfb3de..4341458828ae 100644
--- a/sw/UITest_sw_navigator.mk
+++ b/sw/UITest_sw_navigator.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_navigator,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,sw_navigator, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_sw_options.mk b/sw/UITest_sw_options.mk
index 8567c058490f..57fba160f36b 100644
--- a/sw/UITest_sw_options.mk
+++ b/sw/UITest_sw_options.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_options,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,sw_options, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_sw_table.mk b/sw/UITest_sw_table.mk
index 7ff053bf6c24..ce4434ebfb0a 100644
--- a/sw/UITest_sw_table.mk
+++ b/sw/UITest_sw_table.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_table,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,sw_table, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+TDOC="$(SRCDIR)/sw/qa/uitest/data" \
 ))
diff --git a/sw/UITest_sw_ui_fmtui.mk b/sw/UITest_sw_ui_fmtui.mk
index e31e34c45cf4..8cdbaa54bce0 100644
--- a/sw/UITest_sw_ui_fmtui.mk
+++ b/sw/UITest_sw_ui_fmtui.mk
@@ -12,5 +12,5 @@ $(eval $(call 
gb_UITest_add_modules,sw_ui_fmtui,$(SRCDIR)/sw/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,sw_ui_fmtui, \
-TDOC="$(SRCDIR)/sw/qa/u

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

[Noel (via logerrit)]

 editeng/source/rtf/svxrtf.cxx |   20 +++-
 include/editeng/svxrtf.hxx|   14 ++
 2 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 39ae9d29be0b4308b6e6ab7ee52c3fe6d6dc7d0c
Author: Noel 
AuthorDate: Mon Oct 26 10:17:14 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 26 13:01:53 2020 +0100

std::unique_ptr -> std::optional

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

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index affc44b8f5f2..17ef94553ec5 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -72,13 +72,11 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& 
rIn )
 , bIsInReadStyleTab( false)
 {
 pDfltFont.reset( new vcl::Font );
-pDfltColor.reset( new Color );
+mxDefaultColor = Color();
 }
 
 SvxRTFParser::~SvxRTFParser()
 {
-if( !aColorTbl.empty() )
-ClearColorTbl();
 if( !aAttrStack.empty() )
 ClearAttrStack();
 }
@@ -95,7 +93,7 @@ SvParserState SvxRTFParser::CallParser()
 if( !pInsPos )
 return SvParserState::Error;
 
-if( !aColorTbl.empty() )
+if( !maColorTable.empty() )
 ClearColorTbl();
 m_FontTable.clear();
 m_StyleTable.clear();
@@ -422,11 +420,11 @@ void SvxRTFParser::ReadColorTable()
 {
 // one color is finished, fill in the table
 // try to map the values to SV internal names
-Color* pColor = new Color( nRed, nGreen, nBlue );
-if( aColorTbl.empty() &&
+Color aColor( nRed, nGreen, nBlue );
+if( maColorTable.empty() &&
 sal_uInt8(-1) == nRed && sal_uInt8(-1) == nGreen && 
sal_uInt8(-1) == nBlue )
-*pColor = COL_AUTO;
-aColorTbl.push_back( pColor );
+aColor = COL_AUTO;
+maColorTable.push_back( aColor );
 nRed = 0;
 nGreen = 0;
 nBlue = 0;
@@ -579,11 +577,7 @@ void SvxRTFParser::ReadFontTable()
 
 void SvxRTFParser::ClearColorTbl()
 {
-while ( !aColorTbl.empty() )
-{
-delete aColorTbl.back();
-aColorTbl.pop_back();
-}
+maColorTable.clear();
 }
 
 void SvxRTFParser::ClearAttrStack()
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 2069abb48877..5457cf9765ae 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -23,16 +23,15 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
 
 namespace vcl { class Font; }
-class Color;
 struct SvxRTFStyleType;
 class SvxRTFItemStackType;
 class SvxRTFItemStackList : public 
std::vector> {};
@@ -160,7 +159,7 @@ struct RTFPardAttrMapIds
 
 class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
 {
-std::deque< Color* >  aColorTbl;
+std::vectormaColorTable;
 SvxRTFFontTbl m_FontTable;
 SvxRTFStyleTblm_StyleTable;
 std::deque< std::unique_ptr >  aAttrStack;
@@ -172,7 +171,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
 
 std::unique_ptr pInsPos;
 SfxItemPool* pAttrPool;
-std::unique_ptr  pDfltColor;
+std::optional  mxDefaultColor;
 std::unique_ptr   pDfltFont;
 std::unique_ptr pRTFDefaults;
 
@@ -339,10 +338,9 @@ public:
 
 inline const Color& SvxRTFParser::GetColor( size_t nId ) const
 {
-Color* pColor = pDfltColor.get();
-if( nId < aColorTbl.size() )
-pColor = aColorTbl[ nId ];
-return *pColor;
+if( nId < maColorTable.size() )
+return maColorTable[ nId ];
+return *mxDefaultColor;
 }
 
 inline SfxItemSet& SvxRTFParser::GetAttrSet()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 editeng/source/editeng/impedit.cxx |2 -
 editeng/source/editeng/impedit.hxx |8 +++---
 sw/inc/swtable.hxx |   13 +-
 sw/source/core/table/swtable.cxx   |   46 +
 4 files changed, 24 insertions(+), 45 deletions(-)

New commits:
commit f49a6361ce4d7dc4efaca0b1701a3ca0e0702eb2
Author: Noel 
AuthorDate: Mon Oct 26 10:03:47 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 26 11:51:07 2020 +0100

std::unique_ptr -> std::optional

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

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 2c18762e1f9d..9e82cedf32f4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -214,7 +214,7 @@ ImpEditView::~ImpEditView()
 
 void ImpEditView::SetBackgroundColor( const Color& rColor )
 {
-pBackgroundColor.reset( new Color( rColor ) );
+mxBackgroundColor = rColor;
 }
 
 void ImpEditView::RegisterViewShell(OutlinerViewShell* pViewShell)
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 921c0dfe5498..dc28f3db2a65 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -257,7 +257,7 @@ class ImpEditView : public vcl::unohelper::DragAndDropClient
 private:
 EditView* pEditView;
 std::unique_ptr>  pCursor;
-std::unique_ptrpBackgroundColor;
+std::optional  mxBackgroundColor;
 /// Containing view shell, if any.
 OutlinerViewShell*mpViewShell;
 /// Another shell, just listening to our state, if any.
@@ -436,9 +436,9 @@ public:
 boolDoAutoHeight() const{ return bool( nControl & 
EVControlBits::AUTOSIZEY); }
 boolDoInvalidateMore() const{ return bool( nControl & 
EVControlBits::INVONEMORE ); }
 
-voidSetBackgroundColor( const Color& rColor );
-const Color&GetBackgroundColor() const {
-return ( pBackgroundColor ? *pBackgroundColor : 
pOutWin->GetBackground().GetColor() ); }
+voidSetBackgroundColor( const Color& rColor );
+const Color & GetBackgroundColor() const {
+return ( mxBackgroundColor ? *mxBackgroundColor : 
pOutWin->GetBackground().GetColor() ); }
 
 /// Informs this edit view about which view shell contains it.
 void RegisterViewShell(OutlinerViewShell* pViewShell);
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index a101cfeeb85e..d878478f8978 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SwStartNode;
 class SwFormat;
@@ -402,8 +403,8 @@ class SW_DLLPUBLIC SwTableBox: public SwClient  
//Client of FrameFormat.
 const SwStartNode * m_pStartNode;
 SwTableLine *m_pUpper;
 
-std::unique_ptr mpUserColor;
-std::unique_ptr mpNumFormatColor;
+std::optional mxUserColor;
+std::optional mxNumFormatColor;
 tools::Long mnRowSpan;
 bool mbDummyFlag;
 
@@ -478,10 +479,10 @@ public:
 void ActualiseValueBox();
 
 // Access on internal data - currently used for the NumFormatter.
-inline const Color* GetSaveUserColor()  const;
-inline const Color* GetSaveNumFormatColor() const;
-inline void SetSaveUserColor(const Color* p );
-inline void SetSaveNumFormatColor( const Color* p );
+const std::optional& GetSaveUserColor()  const { return 
mxUserColor; }
+const std::optional& GetSaveNumFormatColor() const { return 
mxNumFormatColor; }
+void SetSaveUserColor(std::optional p ) { mxUserColor = p; }
+void SetSaveNumFormatColor( std::optional p ) { mxNumFormatColor = 
p; }
 
 tools::Long getRowSpan() const;
 void setRowSpan( tools::Long nNewRowSpan );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 003dd062aaaf..c78c9ffdea89 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -71,32 +71,6 @@ using namespace com::sun::star;
 static void ChgTextToNum( SwTableBox& rBox, const OUString& rText, const 
Color* pCol,
 bool bChgAlign, sal_uLong nNdPos );
 
-inline const Color* SwTableBox::GetSaveUserColor() const
-{
-return mpUserColor.get();
-}
-
-inline const Color* SwTableBox::GetSaveNumFormatColor() const
-{
-return mpNumFormatColor.get();
-}
-
-inline void SwTableBox::SetSaveUserColor(const Color* p )
-{
-if (p)
-mpUserColor.reset(new Color(*p));
-else
-mpUserColor.reset();
-}
-
-inline void SwTableBox::SetSaveNumFormatColor( const Color* p )
-{
-if (p)
-mpNumFormatColor.reset(new Color(*p));
-else
-mpNumFormatColor.reset();
-}
-
 tools::Long SwTableBox::getRowSpan() const
 {
 return mnRowSpan;
@@ -1990,8 +1964,10 @@ void ChgTe

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

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/tipofthedaydlg.cxx |   11 +++
 cui/source/inc/tipofthedaydlg.hxx |2 --
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 1629244a83092dc726276380115481283644986d
Author: Heiko Tietze 
AuthorDate: Mon Oct 26 10:12:42 2020 +0100
Commit: Heiko Tietze 
CommitDate: Mon Oct 26 11:49:21 2020 +0100

Fixes to TipOfTheDay

Callback removed

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

diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index b88369890529..ac6a4b9e6138 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -60,8 +60,6 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
 m_nCurrentTip++;
 
-m_aPreview.init(&m_aGraphic, LINK(this, TipOfTheDayDialog, ImplModifyHdl));
-
 UpdateTip();
 }
 
@@ -176,12 +174,9 @@ void TipOfTheDayDialog::UpdateTip()
 // use default image if none is available with the number
 if (aImageName.isEmpty() || !file_exists(aURL + aImageName))
 aImageName = "tipoftheday.png";
-GraphicFilter::LoadGraphic(aURL + aImageName, OUString(), m_aGraphic);
-}
-
-IMPL_LINK_NOARG(TipOfTheDayDialog, ImplModifyHdl, LinkParamNone*, void)
-{
-m_aPreview.SetPreview(m_aGraphic);
+Graphic aGraphic;
+GraphicFilter::LoadGraphic(aURL + aImageName, OUString(), aGraphic);
+m_aPreview.SetPreview(aGraphic);
 }
 
 IMPL_LINK(TipOfTheDayDialog, OnLinkClick, weld::LinkButton&, rButton, bool)
diff --git a/cui/source/inc/tipofthedaydlg.hxx 
b/cui/source/inc/tipofthedaydlg.hxx
index a63ac3cc44e5..44ea0134fe01 100644
--- a/cui/source/inc/tipofthedaydlg.hxx
+++ b/cui/source/inc/tipofthedaydlg.hxx
@@ -32,13 +32,11 @@ private:
 std::unique_ptr m_pLink;
 std::unique_ptr m_pPreview;
 
-Graphic m_aGraphic;
 sal_Int32 m_nCurrentTip;
 sal_Int32 m_nDay;
 void UpdateTip();
 DECL_LINK(OnNextClick, weld::Button&, void);
 DECL_LINK(OnLinkClick, weld::LinkButton&, bool);
-DECL_LINK(ImplModifyHdl, LinkParamNone*, void);
 
 public:
 TipOfTheDayDialog(weld::Window* pWindow);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/toolslong.cxx   |3 ++-
 extensions/source/update/ui/updatecheckui.cxx |6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a9266c39cc71c6f23bfcad4ff6d33ccac53b5e52
Author: Stephan Bergmann 
AuthorDate: Mon Oct 26 09:35:27 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Oct 26 11:39:45 2020 +0100

loplugin:toolslong (--enable-online-update)

...but where

> ~/lo/core/extensions/source/update/check/download.cxx:297:17: error: 
VarDecl, use "tools::Long" instead of 'long' [loplugin:toolslong]
> long nError;
> ^~~
> ~/lo/core/extensions/source/update/check/download.cxx:153:9: error: 
VarDecl, use "tools::Long" instead of 'long' [loplugin:toolslong]
> long nCode;
> ^~

were false positives (the third argument to

  curl_easy_getinfo(..., CURLINFO_RESPONSE_CODE, ...)

must be a pointer to long).

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

diff --git a/compilerplugins/clang/toolslong.cxx 
b/compilerplugins/clang/toolslong.cxx
index 1e808cf9daab..1f55fb76d1d6 100644
--- a/compilerplugins/clang/toolslong.cxx
+++ b/compilerplugins/clang/toolslong.cxx
@@ -123,7 +123,8 @@ void ToolsLong::run()
 
 StringRef fn(handler.getMainFileName());
 // sberg says this is fine
-if (loplugin::isSamePathname(fn, SRCDIR "/pyuno/source/module/pyuno.cxx"))
+if (loplugin::isSamePathname(fn, SRCDIR 
"/extensions/source/update/check/download.cxx")
+|| loplugin::isSamePathname(fn, SRCDIR 
"/pyuno/source/module/pyuno.cxx"))
 return;
 
 TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
diff --git a/extensions/source/update/ui/updatecheckui.cxx 
b/extensions/source/update/ui/updatecheckui.cxx
index 2ec81804cf71..4d4676113f2c 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -88,7 +88,7 @@ class BubbleWindow : public FloatingWindow
 SizemaMaxTextSize;
 tools::Rectangle   maTitleRect;
 tools::Rectangle   maTextRect;
-longmnTipOffset;
+tools::Long mnTipOffset;
 
 private:
 voidRecalcTextRects();
@@ -711,7 +711,7 @@ void BubbleWindow::Resize()
 tools::Rectangle aRect( 0, TIP_HEIGHT, aSize.Width(), aSize.Height() - 
TIP_HEIGHT );
 maRectPoly = tools::Polygon( aRect, 6, 6 );
 vcl::Region aRegion( maRectPoly );
-long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset;
+tools::Long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset;
 
 Point aPointArr[4];
 aPointArr[0] = Point( nTipOffset, TIP_HEIGHT );
@@ -751,7 +751,7 @@ void BubbleWindow::Paint(vcl::RenderContext& 
/*rRenderContext*/, const tools::Re
 
 Color aOldLine = GetLineColor();
 Size aSize = GetSizePixel();
-long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset;
+tools::Long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset;
 
 SetLineColor( GetSettings().GetStyleSettings().GetHelpColor() );
 DrawLine( Point( nTipOffset+2, TIP_HEIGHT ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Is Executable_libtest still useful?

[Stephan Bergmann]

On 26/10/2020 09:53, Miklos Vajna wrote:

I think this can be removed. https://gitlab.com/ojwb/lloconv does the
same and it seems to be maintained.


 "Remove unmaintained 
Executable_libtest"


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

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

[Szabolcs Toth (via logerrit)]

 cui/source/tabpages/swpossizetabpage.cxx |6 --
 include/svx/swframeposstrings.hxx|1 +
 svx/inc/swframeposstrings.hrc|1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 6a10ea009ef590ac13d01d19fbfbc28c916ef1d4
Author: Szabolcs Toth 
AuthorDate: Thu Oct 22 12:23:43 2020 +0200
Commit: László Németh 
CommitDate: Mon Oct 26 10:38:02 2020 +0100

tdf#137650 sw page top border relative orientation: add UI

as new menu item "page text area top" of Position/Vertical
popup menu "to:" in Position and Size dialog window of
shapes.

Follow-up of commit 1c593e1916c9164c7db71da2017cfc26972f8e9f
(tdf#133045 sw: add shape alignment to the top page border).
See also commit 8af2c4e3a517e3b75f2ace9719c1ca03153baddf
(sw from-bottom relative orientation: add UI)

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

diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index b0366bf48053..2b9c8c70a4b4 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -98,8 +98,9 @@ enum class LB {
 VertLine= 0x08, // vertical text line
 
 RelPagePrintAreaBottom = 0x10, // bottom of text area of page
+RelPagePrintAreaTop = 0x20,
 
-LAST = 0x20
+LAST = 0x40
 };
 
 }
@@ -118,6 +119,7 @@ RelationMap const aRelationMap[] =
 {SvxSwFramePosString::REL_FRM_RIGHT, 
SvxSwFramePosString::MIR_REL_FRM_RIGHT, LB::RelFrameRight,   
RelOrientation::FRAME_RIGHT},
 {SvxSwFramePosString::REL_PG_FRAME,  SvxSwFramePosString::REL_PG_FRAME,
  LB::RelPageFrame,RelOrientation::PAGE_FRAME},
 {SvxSwFramePosString::REL_PG_PRTAREA,SvxSwFramePosString::REL_PG_PRTAREA,  
  LB::RelPagePrintArea,  RelOrientation::PAGE_PRINT_AREA},
+
{SvxSwFramePosString::REL_PG_PRTAREA_TOP,SvxSwFramePosString::REL_PG_PRTAREA_TOP,
LB::RelPagePrintAreaTop,  RelOrientation::PAGE_PRINT_AREA_TOP},
 
{SvxSwFramePosString::REL_PG_PRTAREA_BOTTOM,SvxSwFramePosString::REL_PG_PRTAREA_BOTTOM,
LB::RelPagePrintAreaBottom,  RelOrientation::PAGE_PRINT_AREA_BOTTOM},
 {SvxSwFramePosString::REL_CHAR,  SvxSwFramePosString::REL_CHAR,
  LB::RelChar,RelOrientation::CHAR},
 
@@ -259,7 +261,7 @@ FrmMap const aHParaHtmlAbsMap[] =
 
 
 constexpr auto VERT_PARA_REL = LB::VertFrame|LB::VertPrintArea|
-  
LB::RelPageFrame|LB::RelPagePrintArea|LB::RelPagePrintAreaBottom;
+  LB::RelPageFrame|LB::RelPagePrintArea| 
LB::RelPagePrintAreaTop |LB::RelPagePrintAreaBottom;
 
 FrmMap const aVParaMap[] =
 {
diff --git a/include/svx/swframeposstrings.hxx 
b/include/svx/swframeposstrings.hxx
index 346553c70ec8..2aca2f195fbb 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -49,6 +49,7 @@ public:
 MIR_REL_FRM_RIGHT  ,
 REL_PG_FRAME   ,
 REL_PG_PRTAREA ,
+REL_PG_PRTAREA_TOP ,
 REL_PG_PRTAREA_BOTTOM  ,
 REL_BASE   ,
 REL_CHAR   ,
diff --git a/svx/inc/swframeposstrings.hrc b/svx/inc/swframeposstrings.hrc
index b08a9a3b525b..1d3da664b208 100644
--- a/svx/inc/swframeposstrings.hrc
+++ b/svx/inc/swframeposstrings.hrc
@@ -43,6 +43,7 @@ const char* RID_SVXSW_FRAMEPOSITIONS[] =
 NC_("RID_SVXSW_FRAMEPOSITIONS", "Outer paragraph border"),
 NC_("RID_SVXSW_FRAMEPOSITIONS", "Entire page"),
 NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area"),
+NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area top"),
 NC_("RID_SVXSW_FRAMEPOSITIONS", "Page text area bottom"),
 NC_("RID_SVXSW_FRAMEPOSITIONS", "Base line"),
 NC_("RID_SVXSW_FRAMEPOSITIONS", "Character"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - editeng/source include/editeng

[Mark Hung (via logerrit)]

 editeng/source/editeng/editeng.cxx  |   15 +--
 editeng/source/editeng/editview.cxx |7 ++-
 editeng/source/editeng/impedit.hxx  |2 +-
 editeng/source/editeng/impedit5.cxx |6 +++---
 editeng/source/editeng/textconv.cxx |2 +-
 include/editeng/editdata.hxx|2 ++
 include/editeng/editeng.hxx |1 +
 include/editeng/editview.hxx|1 +
 8 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit a419deb3279e9d3571ac55fa77c1b162f4eaabea
Author: Mark Hung 
AuthorDate: Mon Oct 19 00:07:34 2020 +0800
Commit: Xisco Fauli 
CommitDate: Mon Oct 26 10:25:45 2020 +0100

tdf#104378: don't reset para attributes while

converting Chinese characters.

In TextConvWrapper::ChangeText_impl, calls to
EditView::RemoveAttribs() reset the paragraph attributes.
That makes SvxLanguageItem of EE_CHAR_LANGUAGE_CJK become
LANGUAGE_DONTKNOW. Hence it always stops converting after the
first success.

This patch overload EditView::RemoveAttribs() so that it is
possible to clear all character attributes of the selction
without touching paragraph attributes.

Before, bRemoveParaAttribs either removes items between
EE_ITEMS_START and EE_CHAR_END, or removes items between
EE_CHAR_START and EE_CHAR_END. The patch add a new enum
class EERemoveParaAttribsMode, with the following values:

1. RemoveAll : correspond to the old bRemoveParaAttribs = true
2. RemoveCharItems: correspond to the old bRemoveParaAttribs = false
3. RemoveNone: new thing for "don't touch para attributes."

Change-Id: I5132e708dea9e2066f13f1b001bd954d7b477f56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104484
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit 5b74b3322fd51cf075eb0c218b3adb786a28b4c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104680
Reviewed-by: Xisco Fauli 

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 73d85a07b7ce..9af0db1ccdc3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -755,7 +755,15 @@ void EditEngine::RemoveCharAttribs(sal_Int32 nPara, 
sal_uInt16 nWhich, bool bRem
 
 void EditEngine::RemoveCharAttribs(const EditSelection& rSel, bool 
bRemoveParaAttribs, sal_uInt16 nWhich)
 {
-pImpEditEngine->RemoveCharAttribs(rSel, bRemoveParaAttribs, nWhich);
+const EERemoveParaAttribsMode eMode = bRemoveParaAttribs?
+EERemoveParaAttribsMode::RemoveAll :
+EERemoveParaAttribsMode::RemoveCharItems;
+pImpEditEngine->RemoveCharAttribs(rSel, eMode, nWhich);
+}
+
+void EditEngine::RemoveCharAttribs(const EditSelection& rSel, 
EERemoveParaAttribsMode eMode, sal_uInt16 nWhich)
+{
+pImpEditEngine->RemoveCharAttribs(rSel, eMode, nWhich);
 }
 
 EditEngine::ViewsType& EditEngine::GetEditViews()
@@ -1773,10 +1781,13 @@ SfxItemSet EditEngine::GetAttribs( sal_Int32 nPara, 
sal_Int32 nStart, sal_Int32
 
 void EditEngine::RemoveAttribs( const ESelection& rSelection, bool 
bRemoveParaAttribs, sal_uInt16 nWhich )
 {
+const EERemoveParaAttribsMode eMode = bRemoveParaAttribs?
+EERemoveParaAttribsMode::RemoveAll :
+EERemoveParaAttribsMode::RemoveCharItems;
 
 pImpEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
 EditSelection aSel( pImpEditEngine->ConvertSelection( 
rSelection.nStartPara, rSelection.nStartPos, rSelection.nEndPara, 
rSelection.nEndPos ) );
-pImpEditEngine->RemoveCharAttribs( aSel, bRemoveParaAttribs, nWhich  );
+pImpEditEngine->RemoveCharAttribs( aSel, eMode, nWhich  );
 pImpEditEngine->UndoActionEnd();
 pImpEditEngine->FormatAndUpdate();
 }
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 7c6698f7c2c8..7bfd9e616d40 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -559,10 +559,15 @@ void EditView::RemoveAttribsKeepLanguages( bool 
bRemoveParaAttribs )
 
 void EditView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
+RemoveAttribs(bRemoveParaAttribs ? EERemoveParaAttribsMode::RemoveAll
+: EERemoveParaAttribsMode::RemoveCharItems, nWhich);
+}
 
+void EditView::RemoveAttribs( EERemoveParaAttribsMode eMode, sal_uInt16 nWhich 
)
+{
 pImpEditView->DrawSelectionXOR();
 pImpEditView->pEditEngine->UndoActionStart( EDITUNDO_RESETATTRIBS );
-pImpEditView->pEditEngine->RemoveCharAttribs( 
pImpEditView->GetEditSelection(), bRemoveParaAttribs, nWhich  );
+pImpEditView->pEditEngine->RemoveCharAttribs( 
pImpEditView->GetEditSelection(), eMode, nWhich  );
 pImpEditView->pEditEngine->UndoActionEnd();
 pImpEditView->pEditEngine->FormatAndUpdate( this );
 }
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 0ecf4c47eb36..86310e5339fe 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/e

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

[Miklos Vajna (via logerrit)]

 sw/source/uibase/config/usrpref.cxx |  240 ++--
 sw/source/uibase/inc/usrpref.hxx|   12 -
 2 files changed, 126 insertions(+), 126 deletions(-)

New commits:
commit 8e7c714953f25375be8c508de14fbaa0cde85a40
Author: Miklos Vajna 
AuthorDate: Mon Oct 26 09:25:51 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Oct 26 10:15:22 2020 +0100

sw: prefix members of SwContentViewConfig, SwCursorConfig, SwGridConfig ...

... and SwLayoutViewConfig

See tdf#94879 for motivation.

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

diff --git a/sw/source/uibase/config/usrpref.cxx 
b/sw/source/uibase/config/usrpref.cxx
index f4261a717998..6c8ca7fe29a7 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -111,7 +111,7 @@ Sequence SwContentViewConfig::GetPropertyNames() 
const
 // clang 8.0.0 says strcmp isn't constexpr
 static_assert(std::strcmp("Update/Link", aPropNames[g_UpdateLinkIndex]) == 
0);
 #endif
-const int nCount = bWeb ? 12 : SAL_N_ELEMENTS(aPropNames);
+const int nCount = m_bWeb ? 12 : SAL_N_ELEMENTS(aPropNames);
 Sequence aNames(nCount);
 OUString* pNames = aNames.getArray();
 for(int i = 0; i < nCount; i++)
@@ -123,8 +123,8 @@ Sequence SwContentViewConfig::GetPropertyNames() 
const
 
 SwContentViewConfig::SwContentViewConfig(bool bIsWeb, SwMasterUsrPref& rPar) :
 ConfigItem(bIsWeb ? OUString("Office.WriterWeb/Content") :  
OUString("Office.Writer/Content")),
-rParent(rPar),
-bWeb(bIsWeb)
+m_rParent(rPar),
+m_bWeb(bIsWeb)
 {
 Load();
 EnableNotification( GetPropertyNames() );
@@ -151,30 +151,30 @@ void SwContentViewConfig::ImplCommit()
 bool bVal = false;
 switch(nProp)
 {
-case  0: bVal = rParent.IsGraphic();break;// 
"Display/GraphicObject",
-case  1: bVal = rParent.IsTable();  break;// "Display/Table",
-case  2: bVal = rParent.IsDraw();   break;// 
"Display/DrawingControl",
-case  3: bVal = rParent.IsFieldName();break;// 
"Display/FieldCode",
-case  4: bVal = rParent.IsPostIts();break;// "Display/Note",
-case  5: bVal = rParent.IsShowContentTips(); break; // 
"Display/ShowContentTips"
-case  6: bVal = rParent.IsViewMetaChars(); break; 
//"NonprintingCharacter/MetaCharacters"
-case  7: bVal = rParent.IsParagraph(true); break;// 
"NonprintingCharacter/ParagraphEnd",
-case  8: bVal = rParent.IsSoftHyph(); break;// 
"NonprintingCharacter/OptionalHyphen",
-case  9: bVal = rParent.IsBlank(true);  break;// 
"NonprintingCharacter/Space",
-case 10: bVal = rParent.IsLineBreak(true);break;// 
"NonprintingCharacter/Break",
-case 11: bVal = rParent.IsHardBlank(); break;// 
"NonprintingCharacter/ProtectedSpace",
-case 12: bVal = rParent.IsTab(true);break;// 
"NonprintingCharacter/Tab",
-case 13: bVal = rParent.IsShowHiddenField(); break;// 
"NonprintingCharacter/Fields: HiddenText",
-case 14: bVal = rParent.IsShowHiddenPara(); break;// 
"NonprintingCharacter/Fields: HiddenParagraph",
-case 15: bVal = rParent.IsShowHiddenChar(true);break;// 
"NonprintingCharacter/HiddenCharacter",
-case 16: bVal = rParent.IsShowBookmarks(true);break;// 
"NonprintingCharacter/Bookmarks",
-case 17: pValues[nProp] <<= rParent.GetUpdateLinkMode();
break;// "Update/Link",
-case 18: bVal = rParent.IsUpdateFields(); break;// "Update/Field",
-case 19: bVal = rParent.IsUpdateCharts(); break;// "Update/Chart"
-case 20: bVal = rParent.IsShowInlineTooltips(); break;// 
"Display/ShowInlineTooltips"
-case 21: bVal = rParent.IsUseHeaderFooterMenu(); break;// 
"Display/UseHeaderFooterMenu"
-case 22: bVal = rParent.IsShowOutlineContentVisibilityButton(); 
break;// "Display/ShowOutlineContentVisibilityButton"
-case 23: bVal = rParent.IsShowChangesInMargin(); break;// 
"Display/ShowChangesInMargin"
+case  0: bVal = m_rParent.IsGraphic();break;// 
"Display/GraphicObject",
+case  1: bVal = m_rParent.IsTable();  break;// "Display/Table",
+case  2: bVal = m_rParent.IsDraw();   break;// 
"Display/DrawingControl",
+case  3: bVal = m_rParent.IsFieldName();break;// 
"Display/FieldCode",
+case  4: bVal = m_rParent.IsPostIts();break;// "Display/Note",
+case  5: bVal = m_rParent.IsShowContentTips(); break; // 
"Display/ShowContentTips"
+case  6: bVal = m_rParent.IsViewMetaChars(); break; 
//"NonprintingCharacter/MetaCharacters"
+case  7: bVal = m_rParent.IsParagraph(true); break;// 
"NonprintingCharacter/ParagraphEnd",
+ 

Re: Build system help adding system obj file

[Michael Stahl]

On 25.10.20 05:25, Deborah Barkley-Yeung wrote:

Hello,

I'm trying to fix bug #48413. So looking at 
https://docs.microsoft.com/en-us/cpp/c-language/expanding-wildcard-arguments?view=vs-2019 
, 
I think I just need to link setargv.obj.


  However I don't understand the build system well enough to know how to 
make it link in a system object file. Does anyone have any suggestions 
about how to approach this?


i suspect something like this should work, you'll have to find a 
variable in config_host.mk that leads to the file...


$(eval $(call gb_Executable_add_libs,soffice_exe,\
$(SOMETHING)/setargv.obj \
))
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: error detected by loplugin:staticaccess

[Regina Henschel]

Hallo Mike, hallo Caolán,

thank you for helping me.

Kind regards
Regina

Mike Kaganski schrieb am 25-Oct-20 um 17:03:

Hi Regina,

On 25.10.2020 17:12, Regina Henschel wrote:

Hi all,

I got an error in https://gerrit.libreoffice.org/c/core/+/104643
But I do not know, how to write it correctly. Can you please help me?
The other compilers are fine, with the way I have written it.


Since GetObjData is a static method, it does not belong to an object, 
but to the class. So writing pDrawLayer->GetObjData(aObj) (which looks 
as if GetObjData was operating on pDrawLayer) is conceptually wrong, and 
[loplugin:staticaccess] suggests you to we-write it as


     ScDrawObjData* pData = ScDrawLayer::GetObjData(aObj);

instead.



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

build libreoffice 6.3.3.2.0 error on windows 10 with cygwin

[方振华(601661)]

build libreoffice 6.3.3.2.0 error on windows 10 with cygwin 



i modify *.hxx source code and run /opt/lo/bin/make in cygwin, i get some 
errors like "xxx" is not "xxx" member.



and then i remove the directory "xxx/build/workdir/PrecompileHeader/debug" and 
run  /opt/lo/bin/make in cygwin, it compile success.



so i want to konow why？，and how to disable precompileheader cache. ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[gokaysatir (via logerrit)]

 sc/sdi/scalc.sdi   |2 +-
 sc/source/ui/inc/viewfunc.hxx  |2 +-
 sc/source/ui/view/tabvwshf.cxx |   20 +++-
 sc/source/ui/view/viewfun2.cxx |8 +++-
 4 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit fc56c313d19c74ed737a93fbed8eaf3d6c962e5c
Author: gokaysatir 
AuthorDate: Wed Sep 30 15:48:44 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Oct 26 09:57:30 2020 +0100

Online: Hide right clicked sheet.

On core side, if user clicks on a tab with right mouse button, clicked tab 
is selected.
So, for core side, if this feature will be desired, some more modification 
will be needed.

Change-Id: Ic4755b27b8ba98d3a6aa086b2e0a3566d095ba16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103685
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104077
Reviewed-by: Andras Timar 

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 87ef5950d333..23b9c72fbe0f 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2576,7 +2576,7 @@ SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL
 
 
 SfxVoidItem Hide FID_TABLE_HIDE
-(SfxStringItem aTableName FID_TABLE_HIDE)
+(SfxInt16Item nTabNumber FID_TABLE_HIDE)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 85857d5065d7..fb64ff180989 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -273,7 +273,7 @@ public:
 const OUString& rSource );
 
 voidShowTable( const std::vector& rNames );
-voidHideTable( const ScMarkData& rMark );
+voidHideTable( const ScMarkData& rMark, SCTAB nTabToSelect = 
-1);
 
 voidMakeScenario(const OUString& rName, const OUString& 
rComment,
  const Color& rColor, ScScenarioFlags nFlags);
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index e0fbd782619b..0a297c717741 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -109,7 +109,25 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 if ( pDoc->IsDocEditable() )
 {
 ScMarkData& rMark = rViewData.GetMarkData();
-HideTable( rMark );
+SCTAB nActiveTab = -1;
+// For the cases when user right clicks on a non-active 
tab and hides it. This case is possible for Online.
+if (pReqArgs)
+{
+const SfxPoolItem *pItem;
+if( pReqArgs->HasItem( FID_TABLE_HIDE, &pItem ) )
+{
+SCTAB nTabNumber = static_cast(pItem)->GetValue();
+// Does selected sheets (tabs) list include the 
sheet to be hidden?
+std::set::iterator it = 
rMark.GetSelectedTabs().find(nTabNumber);
+if (it == rMark.GetSelectedTabs().end())
+{
+// No it doesn't, so we won't shift the 
selected tab. Let's remember its position.
+nActiveTab = GetViewData().GetTabNo();
+}
+rMark.SelectOneTable(nTabNumber);
+}
+}
+HideTable( rMark, nActiveTab );
 }
 }
 break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 1b948b916746..949abf8dbd98 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -3035,7 +3035,7 @@ void ScViewFunc::ShowTable( const std::vector& 
rNames )
 }
 }
 
-void ScViewFunc::HideTable( const ScMarkData& rMark )
+void ScViewFunc::HideTable( const ScMarkData& rMark, SCTAB nTabToSelect )
 {
 ScDocShell* pDocSh = GetViewData().GetDocShell();
 ScDocument& rDoc = pDocSh->GetDocument();
@@ -3072,6 +3072,12 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
 undoTabs.push_back(nTab);
 }
 }
+
+if (nTabToSelect != -1)
+{
+SetTabNo(nTabToSelect);
+}
+
 if (bUndo)
 {
 pDocSh->GetUndoManager()->AddUndoAction( 
o3tl::make_unique( pDocSh, undoTabs, false ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Is Executable_libtest still useful?

[Miklos Vajna]

Hi Stephan,

On Thu, Oct 22, 2020 at 03:11:09PM +0200, Stephan Bergmann 
 wrote:
> so I wonder whether that program is actually still maintained and used by
> anybody.  (At least the last dozen or so changes to smoketest/libtest.cxx
> were of the generic loplugin/typos/tools::Long etc. kind, and we could spare
> ourselves future such work if we removed the file should it indeed be dead
> code.)

I think this can be removed. https://gitlab.com/ojwb/lloconv does the
same and it seems to be maintained.

Regards,

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

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   28 
 1 file changed, 28 insertions(+)

New commits:
commit bebdc5e923c9e5dcb9d2f8d32244a9eeb925b31f
Author: Xisco Fauli 
AuthorDate: Thu Oct 15 23:44:04 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 26 09:30:02 2020 +0100

tdf#135260: sw_uiwriter: Add unittest

Change-Id: Iec50c3129097e99ae57543601d40c5a380db678f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104391
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit c143ad222a3c4c8d86699e1b3f20d3a5262da1e2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104746
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 76e6b84445aa..6bdd32559330 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -292,6 +292,7 @@ public:
 void testTdf84695Tab();
 void testTableStyleUndo();
 void testRedlineCopyPaste();
+void testTdf135260();
 void testRedlineParam();
 void testRedlineViewAuthor();
 void testTdf91292();
@@ -507,6 +508,7 @@ public:
 CPPUNIT_TEST(testTdf84695Tab);
 CPPUNIT_TEST(testTableStyleUndo);
 CPPUNIT_TEST(testRedlineCopyPaste);
+CPPUNIT_TEST(testTdf135260);
 CPPUNIT_TEST(testRedlineParam);
 CPPUNIT_TEST(testRedlineViewAuthor);
 CPPUNIT_TEST(testTdf91292);
@@ -5622,6 +5624,32 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf134436)
 CPPUNIT_ASSERT_EQUAL(OUString(""), pWrtShell->GetCursor()->GetText());
 }
 
+void SwUiWriterTest::testTdf135260()
+{
+SwDoc* pDoc = createDoc();
+SwDocShell* pDocShell = pDoc->GetDocShell();
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+pWrtShell->Insert("test");
+
+// Turn on track changes
+uno::Reference xPropertySet(mxComponent, 
uno::UNO_QUERY);
+xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(true));
+
+for(int i = 0; i < 4; i++) {
+pWrtShell->DelLeft();
+}
+
+SwEditShell* const pEditShell(pDoc->GetEditShell());
+// accept all redlines
+while(pEditShell->GetRedlineCount())
+pEditShell->AcceptRedline(0);
+
+// Without the fix in place, this test would have failed with
+// - Expected:
+// - Actual  : tes
+CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
+}
+
 void SwUiWriterTest::testRedlineParam()
 {
 // Create a document with minimal content.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf133982.docx |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   69 ++
 2 files changed, 69 insertions(+)

New commits:
commit c207a70dc1d42250b80d9bf63723fee11c9b0c2b
Author: Xisco Fauli 
AuthorDate: Fri Oct 16 18:32:32 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 26 09:29:52 2020 +0100

tdf#127635: sw_uiwriter: Add unittest

Change-Id: Ib25d5723057b79f49876df816bff5971ee3fa7c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/10
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 254c26f1c69e2eb23f66a79349b0ea78a5d467d3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104745
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 1ace94e3d473..76e6b84445aa 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -260,6 +260,7 @@ public:
 void testUnicodeNotationToggle();
 void testTextTableCellNames();
 void testShapeAnchorUndo();
+void testTdf127635();
 void testDde();
 void testDocModState();
 void testTdf94804();
@@ -474,6 +475,7 @@ public:
 CPPUNIT_TEST(testUnicodeNotationToggle);
 CPPUNIT_TEST(testTextTableCellNames);
 CPPUNIT_TEST(testShapeAnchorUndo);
+CPPUNIT_TEST(testTdf127635);
 CPPUNIT_TEST(testDde);
 CPPUNIT_TEST(testDocModState);
 CPPUNIT_TEST(testTdf94804);
@@ -4238,6 +4240,48 @@ void SwUiWriterTest::testDde()
 #endif
 }
 
+void SwUiWriterTest::testTdf127635()
+{
+SwDoc* pDoc = createDoc();
+
+SwXTextDocument* pXTextDocument = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pXTextDocument);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'a', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, ' ', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'b', 0);
+Scheduler::ProcessEventsToIdle();
+
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 2, 
/*bBasicCall=*/false);
+
+//Select 'a'
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+
+// enable redlining
+lcl_dispatchCommand(mxComponent, ".uno:TrackChanges", {});
+// hide
+lcl_dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines());
+
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'c', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, ' ', 0);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'd', 0);
+Scheduler::ProcessEventsToIdle();
+
+SwEditShell* const pEditShell(pDoc->GetEditShell());
+// accept all redlines
+while(pEditShell->GetRedlineCount())
+pEditShell->AcceptRedline(0);
+
+// Without the fix in place, this test would have failed with
+// - Expected: C d b
+// - Actual  : Cd  b
+CPPUNIT_ASSERT_EQUAL(OUString("C d b"), getParagraph(1)->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf132160)
 {
 load(DATA_DIRECTORY, "tdf132160.odt");
commit 95554417cad0a6597d9f633f87081ab3d2d03c11
Author: Xisco Fauli 
AuthorDate: Thu Jun 18 11:08:38 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 26 09:29:36 2020 +0100

tdf#133982: sw: Add unittest

Change-Id: I1a9b0a1150f8e3e1832aaa15a09049622bd83afc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96592
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9197a52c1bd79bbdc0756724c74fd2a679b9f626)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104744
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/data/tdf133982.docx 
b/sw/qa/extras/uiwriter/data/tdf133982.docx
new file mode 100644
index ..d2e8573d15ac
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf133982.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index cd8516d6c29e..1ace94e3d473 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -7356,6 +7356,31 @@ void SwUiWriterTest::testTdf38394()
 CPPUNIT_ASSERT_EQUAL(sReplaced, 
static_cast(pDoc->GetNodes()[nIndex])->GetText());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf133982)
+{
+load(DATA_DIRECTORY, "tdf133982.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), 

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx |   24 ++
 chart2/qa/extras/data/xlsx/tdf137505.xlsx |binary
 chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |   18 ++---
 chart2/qa/extras/xshape/data/reference/tdf90839-2.xml |   18 ++---
 chart2/qa/extras/xshape/data/reference/tdf90839-3.xml |   18 ++---
 chart2/qa/extras/xshape/data/reference/tdf90839-4.xml |   18 ++---
 chart2/source/view/main/DrawModelWrapper.cxx  |1 
 7 files changed, 61 insertions(+), 36 deletions(-)

New commits:
commit 0f0a5b63b19196f9463149a0a1991704c940efe2
Author: Balazs Varga 
AuthorDate: Fri Oct 16 13:45:20 2020 +0200
Commit: László Németh 
CommitDate: Mon Oct 26 09:15:00 2020 +0100

tdf#137505 OOXML Import: Custom shape in chart: fix font size

The default font size of text in shapes is 12pt in LibreOffice,
nevertheless, we used 24 pt for font size in custom shapes inside
chart objects during ooxml import.

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index ca454d2ae11f..705c4a69a25f 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -31,6 +31,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 
 #include 
@@ -167,6 +169,7 @@ public:
 void testTdf91250();
 void testTdf134111();
 void testTdf136752();
+void testTdf137505();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -282,6 +285,7 @@ public:
 CPPUNIT_TEST(testTdf91250);
 CPPUNIT_TEST(testTdf134111);
 CPPUNIT_TEST(testTdf136752);
+CPPUNIT_TEST(testTdf137505);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2700,6 +2704,26 @@ void Chart2ImportTest::testTdf136752()
 CPPUNIT_ASSERT_DOUBLES_EQUAL(1458, aLabelPosition.Y, 500);
 }
 
+void Chart2ImportTest::testTdf137505()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf137505.xlsx");
+Reference xChartDoc(getChartDocFromSheet(0, 
mxComponent),
+UNO_QUERY_THROW);
+
+Reference xDrawPageSupplier(xChartDoc, 
UNO_QUERY_THROW);
+Reference xDrawPage(xDrawPageSupplier->getDrawPage(), 
UNO_SET_THROW);
+Reference xCustomShape(xDrawPage->getByIndex(1), 
UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xCustomShape.is());
+
+float nFontSize;
+Reference< text::XText > xRange(xCustomShape, uno::UNO_QUERY_THROW);
+Reference < text::XTextCursor > xAt = xRange->createTextCursor();
+Reference< beans::XPropertySet > xProps(xAt, UNO_QUERY);
+// check the text size of custom shape, inside the chart.
+CPPUNIT_ASSERT(xProps->getPropertyValue("CharHeight") >>= nFontSize);
+CPPUNIT_ASSERT_EQUAL(float(12), nFontSize);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/tdf137505.xlsx 
b/chart2/qa/extras/data/xlsx/tdf137505.xlsx
new file mode 100644
index ..08fa6778bb04
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf137505.xlsx differ
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
index 2e255433da3b..2af62c344940 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   
   
@@ -16,7 +16,7 @@
  
  
   
-   
+   
 
 
 
@@ -30,7 +30,7 @@
  
 

-   
+   
 
 
 
@@ -50,7 +50,7 @@
   

 
- 
+ 
   
   
   
@@ -77,7 +77,7 @@
   

 
- 
+ 
   
   
   
@@ -91,7 +91,7 @@

   
  
- 
+ 
   
   
   
@@ -105,7 +105,7 @@

   
  
- 
+ 
   
   
   
@@ -119,7 +119,7 @@

   
  
- 
+ 
   
   
   
@@ -133,7 +133,7 @@

   
  
- 
+ 
   
   
   
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index 84eb759612ff..c8afb487a4ae 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   
   
@@ -16,7 +16,7 @@
  
  
   
-   
+   
 
 
 
@@ -30,7 +30,7 @@
  
 

-   
+   
 
 
 
@@ -50,7 

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

[Tünde Tóth (via logerrit)]

 sc/qa/unit/data/ods/external_hyperlink.ods |binary
 sc/qa/unit/subsequent_export-test.cxx  |   25 +++--
 sc/source/filter/excel/xecontent.cxx   |5 ++---
 3 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit fc58d7d65b9683db7b7632137126680b8483f6c5
Author: Tünde Tóth 
AuthorDate: Wed Oct 14 10:53:54 2020 +0200
Commit: László Németh 
CommitDate: Mon Oct 26 08:54:26 2020 +0100

tdf#129969 XLSX export: file URLs need IURI encoding

External hyperlinks with # in directory name didn't work
after XLSX export.

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

diff --git a/sc/qa/unit/data/ods/external_hyperlink.ods 
b/sc/qa/unit/data/ods/external_hyperlink.ods
new file mode 100644
index ..1e895b988497
Binary files /dev/null and b/sc/qa/unit/data/ods/external_hyperlink.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 71fa266a191e..62ebac829bb6 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -270,6 +270,7 @@ public:
 void testTdf137000_handle_upright();
 void testTdf126305_DataValidatyErrorAlert();
 void testTdf76047_externalLink();
+void testTdf129969();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -438,6 +439,7 @@ public:
 CPPUNIT_TEST(testTdf137000_handle_upright);
 CPPUNIT_TEST(testTdf126305_DataValidatyErrorAlert);
 CPPUNIT_TEST(testTdf76047_externalLink);
+CPPUNIT_TEST(testTdf129969);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -5516,8 +5518,10 @@ void ScExportTest::testTdf76047_externalLink()
 ScDocument& rDoc = pShell->GetDocument();
 
 // compare the loaded data (from external links) to the data copied 
manually to the testfile
-for (int nCol = 1; nCol <= 5; nCol++) {
-for (int nRow = 3; nRow <= 5; nRow++) {
+for (int nCol = 1; nCol <= 5; nCol++)
+{
+for (int nRow = 3; nRow <= 5; nRow++)
+{
 OUString aStr1 = rDoc.GetString(ScAddress(nCol, nRow, 0));
 OUString aStr2 = rDoc.GetString(ScAddress(nCol, nRow + 5, 0));
 OUString aStr3 = rDoc.GetString(ScAddress(nCol, nRow + 11, 0));
@@ -5528,6 +5532,23 @@ void ScExportTest::testTdf76047_externalLink()
 }
 }
 
+void ScExportTest::testTdf129969()
+{
+ScDocShellRef xShell = loadDoc("external_hyperlink.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+ScAddress aPos(0, 0, 0);
+const EditTextObject* pEditText = rDoc.GetEditText(aPos);
+const SvxFieldData* pData = pEditText->GetFieldData(0, 0, 
text::textfield::Type::URL);
+const SvxURLField* pURLData = static_cast(pData);
+
CPPUNIT_ASSERT(pURLData->GetURL().endsWith("/%23folder/test.ods#Sheet2.B10"));
+
+xDocSh->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index dbb28ec7b81c..27f07989c530 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -351,9 +351,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, 
const SvxURLField& rU
 {
 sal_uInt16 nLevel;
 bool bRel;
-/* TODO: should we differentiate between BIFF and OOXML and write IURI
- * encoded for OOXML? */
-OUString aFileName( BuildFileName( nLevel, bRel, rUrl, rRoot, false ) 
);
+OUString aFileName(
+BuildFileName(nLevel, bRel, rUrl, rRoot, rRoot.GetOutput() == 
EXC_OUTPUT_XML_2007));
 
 if( eProtocol == INetProtocol::Smb )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 libreofficekit/source/gtk/lokdocview.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6bcdbb97b99369b20f6f1d2bdbc6eca1ff1f1150
Author: Michael Meeks 
AuthorDate: Thu Oct 22 22:09:33 2020 +0100
Commit: Noel Grandin 
CommitDate: Mon Oct 26 08:51:07 2020 +0100

Allow some spelling dictionaries for gtktiledviewer.

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

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 6af262bb8df2..466a1cc85b0e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2779,6 +2779,9 @@ static gboolean lok_doc_view_initable_init (GInitable 
*initable, GCancellable* /
 if (priv->m_bUnipoll)
 g_setenv("SAL_LOK_OPTIONS", "unipoll", FALSE);
 
+static const char testingLangs[] = "de_DE en_GB en_US es_ES fr_FR it nl 
pt_BR pt_PT ru";
+g_setenv("LOK_ALLOWLIST_LANGUAGES", testingLangs, FALSE);
+
 priv->m_pOffice = lok_init_2(priv->m_aLOPath.c_str(), 
priv->m_aUserProfileURL.empty() ? nullptr : priv->m_aUserProfileURL.c_str());
 
 if (priv->m_pOffice == nullptr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits