[Libreoffice-commits] core.git: desktop/Executable_soffice_bin.mk desktop/Executable_soffice_com.mk desktop/Executable_soffice_exe.mk desktop/Executable_soffice.mk desktop/Executable_unopkg.mk desktop
Repository.mk |3 RepositoryFixes.mk |3 desktop/Executable_soffice.mk | 31 -- desktop/Executable_soffice_bin.mk |4 desktop/Executable_soffice_com.mk | 29 ++ desktop/Executable_soffice_exe.mk | 29 ++ desktop/Executable_unopkg.mk |4 desktop/Module_desktop.mk |3 desktop/source/app/cmdlinehelp.cxx | 79 +-- desktop/win32/source/loader.cxx| 193 ++ desktop/win32/source/loader.hxx|4 desktop/win32/source/officeloader/officeloader.cxx | 221 - desktop/win32/source/officeloader/soffice_com.cxx | 19 + desktop/win32/source/officeloader/soffice_exe.cxx | 19 + scp2/source/ooo/folderitem_ooo.scp | 12 - 15 files changed, 326 insertions(+), 327 deletions(-) New commits: commit 506173a7f42f34821238a63f3f8c7362c9fae9d9 Author: Mike Kaganski AuthorDate: Mon Nov 19 13:07:20 2018 +0300 Commit: Mike Kaganski CommitDate: Wed Nov 21 08:19:38 2018 +0100 tdf#112536 related: make soffice.bin a proper console application on Win Being a GUI application on Windows (with related flag in the executable header - see https://blogs.msdn.microsoft.com/oldnewthing/20090101-00/?p=19643/), OS would detect the subsystem before launching the application, and won't attach the parent console or redirected output handles from it to the application. Also, different hacks to reattach the GUI application to the console later are unreliable on different Windows versions, and work improperly (the output goes to the console after the launch command has already returned, which is wrong in batch files). This makes it extremily difficult to do CLI operations with LibreOffice on Windows, with error codes/warnings/messages/output missing or going to wrong consoles. Making an executable for CUI subsystem, on the other hand, makes Windows to allocate a console before starting it when the program is run by itself. This makes the console window to appear on screen unconditionally, even if it's hidden later when the program has started. This flashing is undesirable. But we use a wrapper executable on Windows, called soffice.exe, which is what actually launched by user, and which runs soffice.bin. This allows us to make soffice.bin the proper console application, and thus make it capable to behave properly in CLI scenarios, while avoid the console flashing when run from the soffice.exe (which would suppress the console creation using DETACHED_PROCESS creation flag to CreateProcessW). Also creating a new wrapper for console (soffice.com) allows to use command lines which omit explicit executable extension (no ".bin"), like this: "C:\Program Files\LibreOffice\program\soffice" --help which allows to continue using multiple available help resources unchanged, since .com extension is tried prior to .exe by Windows' cmd.exe. Change-Id: I089d0f30f860da6cfc781b4383f6598a08a4d238 Reviewed-on: https://gerrit.libreoffice.org/63572 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/Repository.mk b/Repository.mk index 36b35b7a4262..d23d93aaa9f5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -145,7 +145,8 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ $(if $(filter WNT,$(OS)), \ - soffice \ + soffice_exe \ + soffice_com \ unoinfo \ unopkg \ unopkg_com \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 82c0701e59dd..55c69ef11dba 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -37,6 +37,9 @@ else gb_Executable_FILENAMES := $(patsubst soffice_bin:soffice_bin%,soffice_bin:soffice.bin,$(gb_Executable_FILENAMES)) endif +gb_Executable_FILENAMES := $(patsubst soffice_exe:soffice_exe%,soffice_exe:soffice.exe,$(gb_Executable_FILENAMES)) +gb_Executable_FILENAMES := $(patsubst soffice_com:soffice_com%,soffice_com:soffice.com,$(gb_Executable_FILENAMES)) + gb_Executable_FILENAMES_FOR_BUILD := $(subst $(gb_Executable_EXT),$(gb_Executable_EXT_for_build),$(gb_Executable_FILENAMES)) # fixes for .jnilibs on Mac OS X that are not also needed as .dylibs: diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk deleted file mode 100644 index d1847d7bf76a.. --- a/desktop/Executable_soffice.mk +++ /dev/null @@ -1,31 +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
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/TPrivilegesResultSet.cxx |2 +-
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |5 ++---
connectivity/source/drivers/file/FDatabaseMetaData.cxx |2 +-
connectivity/source/drivers/mork/MDatabaseMetaData.cxx |5 ++---
connectivity/source/drivers/mork/MDatabaseMetaData.hxx |2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit 457aba546f43a4117c5c263028e35c8aaf9bc7f6
Author: Noel Grandin
AuthorDate: Tue Nov 20 12:29:55 2018 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 21 07:36:17 2018 +0100
fix some dodgy static vars in connectivity
no good reason for these to be static, and likely they will cause
trouble if this code is ever touched from multiple threads at the same
time
Change-Id: I3f29d3795bd1a059a75d0d1ab64b25478fd60121
Reviewed-on: https://gerrit.libreoffice.org/63662
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx
b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 02a51bd39b05..bb4f92397056 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -55,7 +55,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference<
XDatabaseMetaData>&
}
ODatabaseMetaDataResultSet::ORows aRows;
-static ODatabaseMetaDataResultSet::ORow aRow(8);
+ODatabaseMetaDataResultSet::ORow aRow(8);
aRow[5] = new ORowSetValueDecorator(sUserWorkingFor);
aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
aRow[7] = new ORowSetValueDecorator(OUString("YES"));
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 671bb230b60c..ff48493e1f20 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -257,11 +257,10 @@ OEvoabDatabaseMetaData::~OEvoabDatabaseMetaData()
}
-ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows(
const OUString& columnNamePattern )
+ODatabaseMetaDataResultSet::ORows OEvoabDatabaseMetaData::getColumnRows( const
OUString& columnNamePattern )
{
-static ODatabaseMetaDataResultSet::ORows aRows;
+ODatabaseMetaDataResultSet::ORows aRows;
ODatabaseMetaDataResultSet::ORow aRow(19);
-aRows.clear();
//
// Some entries in a row never change, so set them now
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 14b37131b679..1f44f23f1fe4 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -390,7 +390,7 @@ Reference< XResultSet > SAL_CALL
ODatabaseMetaData::getTablePrivileges(
{
if(match(tableNamePattern,*pBegin,'\0'))
{
-static ODatabaseMetaDataResultSet::ORow aRow(8);
+ODatabaseMetaDataResultSet::ORow aRow(8);
aRow[2] = new ORowSetValueDecorator(*pBegin);
aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 50b9347d642f..0ce5c3e856ca 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -50,7 +50,7 @@ ODatabaseMetaData::~ODatabaseMetaData()
}
-ODatabaseMetaDataResultSet::ORows& ODatabaseMetaData::getColumnRows(
+ODatabaseMetaDataResultSet::ORows ODatabaseMetaData::getColumnRows(
const OUString& tableNamePattern,
const OUString& columnNamePattern )
{
@@ -58,9 +58,8 @@ ODatabaseMetaDataResultSet::ORows&
ODatabaseMetaData::getColumnRows(
SAL_INFO("connectivity.mork", "tableNamePattern: " << tableNamePattern);
SAL_INFO("connectivity.mork", "columnNamePattern: " << columnNamePattern);
-static ODatabaseMetaDataResultSet::ORows aRows;
+ODatabaseMetaDataResultSet::ORows aRows;
ODatabaseMetaDataResultSet::ORow aRow(19);
-aRows.clear();
::osl::MutexGuard aGuard( m_aMutex );
std::vector< OUString > tables;
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index edad3a74aeaf..f3a16a566ec1 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -29,7 +29,7 @@ namespace connectivity
m_pMetaDataHelper;
/// @throws css::sdbc::SQLException
-ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString&
tableNamePattern, const OUString& columnNamePattern
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests6/tdf91726.py | 58 +++
1 file changed, 58 insertions(+)
New commits:
commit 994a858d098287733dd9997ca79b4bd6e8956937
Author: Zdeněk Crhonek
AuthorDate: Tue Nov 20 23:16:03 2018 +0100
Commit: Zdenek Crhonek
CommitDate: Wed Nov 21 07:24:26 2018 +0100
uitest for bug tdf#91726
Change-Id: I12dadaccf660cafb85f0a6e00d891f1dfd941ab0
Reviewed-on: https://gerrit.libreoffice.org/63684
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py
b/sc/qa/uitest/calc_tests6/tdf91726.py
new file mode 100644
index ..38703cb7e34a
--- /dev/null
+++ b/sc/qa/uitest/calc_tests6/tdf91726.py
@@ -0,0 +1,58 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+#Bug 91726 - AutoFormat: Crash when using an existing name for a new preset
+
+class tdf91726(UITestCase):
+def test_tdf91726_new_style(self):
+writer_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+#select A1:E9
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:E9"}))
+#AutoFormat Styles
+self.ui_test.execute_dialog_through_command(".uno:AutoFormat")
+xDialog = self.xUITest.getTopFocusWindow()
+#add new style "Default"
+xadd = xDialog.getChild("add")
+def handle_name_dlg(dialog):
+nameEntry = dialog.getChild("name_entry")
+nameEntry.executeAction("TYPE",
mkPropertyValues({"TEXT":"Default"}))
+xOKBtn = dialog.getChild("ok")
+def handle_error_dlg(dialog2):
+#Error message: You have entered an invalid name.
+#AutoFormat could not be created.
+#Try again using a different name.
+xOKBtn2 = dialog2.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn2)
+
+self.ui_test.execute_blocking_action(xOKBtn.executeAction,
args=('CLICK', ()),
+dialog_handler=handle_error_dlg)
+
+xDialog = self.xUITest.getTopFocusWindow()
+nameEntry = xDialog.getChild("name_entry")
+#back to name dialog, LO should not crash
+self.assertEqual(get_state_as_dict(nameEntry)["Text"], "Default")
+xCanceltn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCanceltn)
+
+self.ui_test.execute_blocking_action(xadd.executeAction,
args=('CLICK', ()),
+dialog_handler=handle_name_dlg)
+
+xCanceltn = xDialog.getChild("cancel")
+self.ui_test.close_dialog_through_button(xCanceltn)
+
+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-6-2' - sc/uiconfig
sc/uiconfig/scalc/popupmenu/pagebreak.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 9804df4c99f11a74459e99f964ff751c26eab788 Author: andreas kainz AuthorDate: Mon Nov 19 03:21:03 2018 +0100 Commit: andreas_kainz CommitDate: Wed Nov 21 07:05:47 2018 +0100 tdf#119714 add Normal View switch in calc pagebreak view Change-Id: I3b00ee5c851df368a98c6afa0b4c466fc8970fed Reviewed-on: https://gerrit.libreoffice.org/63566 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit d2d3dfe1d0ebb39ed70c66f4b5e9f7dcf9e4bb16) Reviewed-on: https://gerrit.libreoffice.org/63650 diff --git a/sc/uiconfig/scalc/popupmenu/pagebreak.xml b/sc/uiconfig/scalc/popupmenu/pagebreak.xml index dc9501d33afc..5db70bafbfca 100644 --- a/sc/uiconfig/scalc/popupmenu/pagebreak.xml +++ b/sc/uiconfig/scalc/popupmenu/pagebreak.xml @@ -28,6 +28,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui| 486 - sc/uiconfig/scalc/ui/notebookbar_compact.ui| 355 ++-- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 239 +++- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui| 375 ++--- 4 files changed, 703 insertions(+), 752 deletions(-) New commits: commit de7d95da32e0515f89172bbb99e6c73b94f2c410 Author: andreas kainz AuthorDate: Wed Nov 21 01:48:15 2018 +0100 Commit: andreas_kainz CommitDate: Wed Nov 21 07:06:02 2018 +0100 tdf#121401 calc keyboard navigation all notebookbars Change-Id: I45ad8e210954714ed97442ab899de489d64ecf0c Reviewed-on: https://gerrit.libreoffice.org/63691 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index e0a001bcaad8..bb4cbb0bd921 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1880,7 +1880,7 @@ True -False +True end True icons @@ -1907,7 +1907,7 @@ True -False +True end True icons @@ -1952,6 +1952,7 @@ True False False +end center True immediate @@ -1971,6 +1972,7 @@ True False False +end center True immediate @@ -2013,7 +2015,7 @@ True -False +True center 5 True @@ -2047,7 +2049,7 @@ True -False +True both-horiz False @@ -2072,7 +2074,7 @@ True -False +True both-horiz False @@ -2132,7 +2134,7 @@ True -False +True center True both @@ -2182,7 +2184,7 @@ True -False +True both-horiz False @@ -2242,7 +2244,7 @@ True -False +True center True both @@ -2276,7 +2278,7 @@ True -False +True both-horiz False @@ -2301,7 +2303,7 @@ True -False +True both-horiz False @@ -2364,7 +2366,7 @@ True -False +True center True both @@ -2398,7 +2400,7 @@ True -False +
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx | 14 ++
chart2/qa/extras/data/odt/tdf108022.odt |binary
2 files changed, 14 insertions(+)
New commits:
commit 0abce68927f45673b73d8f806e108a51a36fb543
Author: Markus Mohrhard
AuthorDate: Tue Nov 20 23:05:08 2018 +0100
Commit: Markus Mohrhard
CommitDate: Wed Nov 21 01:37:38 2018 +0100
add test for tdf108022
Change-Id: I00868938738e30afc2b212c01ed36d5223401ceb
Reviewed-on: https://gerrit.libreoffice.org/63683
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index b07e98661574..fbbfdaa45277 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -122,6 +122,7 @@ public:
void testChartTitlePropertiesBitmapFillPPTX();
void testTdf116163();
void testTdf119029();
+void testTdf108022();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
@@ -206,6 +207,7 @@ public:
CPPUNIT_TEST(testChartTitlePropertiesBitmapFillPPTX);
CPPUNIT_TEST(testTdf116163);
CPPUNIT_TEST(testTdf119029);
+CPPUNIT_TEST(testTdf108022);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -1937,6 +1939,18 @@ void Chart2ExportTest::testTdf119029()
"-540");
}
+void Chart2ExportTest::testTdf108022()
+{
+load("/chart2/qa/extras/data/odt/", "tdf108022.odt");
+reload("Office Open XML Text");
+
+// assert we really have two charts
+Reference xChartDoc1(getChartDocFromWriter(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc1.is());
+Reference xChartDoc2(getChartDocFromWriter(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc2.is());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/odt/tdf108022.odt
b/chart2/qa/extras/data/odt/tdf108022.odt
new file mode 100644
index ..b8659ec32c60
Binary files /dev/null and b/chart2/qa/extras/data/odt/tdf108022.odt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_single.ui | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 3df7ca1ee8f203bafa6298c1280ff47e7aca8eae Author: Jim Raykowski AuthorDate: Thu Nov 15 16:32:22 2018 -0900 Commit: andreas_kainz CommitDate: Wed Nov 21 01:34:30 2018 +0100 tdf#121401 Keyboard navigation for Writer NB contextual single Change-Id: Ibcb56c6c0f1456c472061039ecc0835928846724 Reviewed-on: https://gerrit.libreoffice.org/63458 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 697c308431101c936bbaae25ea6f6efd162b9d9f) Reviewed-on: https://gerrit.libreoffice.org/63686 diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 4e7af5672c68..a7b655ac5ce3 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -26,7 +26,7 @@ True -False +True False @@ -91,7 +91,7 @@ True -False +True False @@ -143,7 +143,7 @@ True -False +True False @@ -216,7 +216,7 @@ True -False +True False @@ -259,7 +259,7 @@ True -False +True False @@ -283,7 +283,7 @@ True -False +True False @@ -328,7 +328,7 @@ True -False +True False @@ -418,7 +418,7 @@ True -False +True False @@ -469,7 +469,7 @@ True -False +True True Horizontal Alignment start @@ -552,7 +552,7 @@ True -False +True end False @@ -592,7 +592,7 @@ True -False +True True Indent False @@ -672,7 +672,7 @@ True -False +True True Indent False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless vcl/source
vcl/headless/svpinst.cxx |4 +++- vcl/source/outdev/text.cxx |4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 2bf8469cbca01e53043097708909f6cdf2aae264 Author: Thorsten Behrens AuthorDate: Tue Nov 20 20:53:50 2018 +0100 Commit: Thorsten Behrens CommitDate: Wed Nov 21 01:07:43 2018 +0100 Fix headless build on Linux Conditional-compile some OpenGL-ness that crept in Change-Id: I8d12f34db3b4875470a0d81e9ef6a1654153b206 Reviewed-on: https://gerrit.libreoffice.org/63676 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 5f7176e748d1..330b69ab27dd 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -28,7 +28,9 @@ #include #include -#include +#ifndef LIBO_HEADLESS +# include +#endif #include #include diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index c6dbedddbe5c..2bb81ad8da2d 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -35,7 +35,9 @@ #include #include #include -#include +#ifdef MACOSX +# include +#endif #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/lc_autoformat.png|binary icon-themes/colibre/cmd/lc_autopilotmenu.png |binary icon-themes/colibre/cmd/sc_autoformat.png|binary icon-themes/colibre/cmd/sc_autopilotmenu.png |binary icon-themes/colibre/links.txt| 36 ++- icon-themes/colibre_svg/cmd/lc_autoformat.svg| 15 - icon-themes/colibre_svg/cmd/lc_autopilotmenu.svg |1 icon-themes/colibre_svg/cmd/sc_autoformat.svg| 18 --- icon-themes/colibre_svg/cmd/sc_autopilotmenu.svg |6 +++ 9 files changed, 51 insertions(+), 25 deletions(-) New commits: commit 9acac4b0ab7f39e71bcb8c9d4eb7e5657bbeb0b0 Author: andreas kainz AuthorDate: Tue Nov 20 08:34:28 2018 +0100 Commit: andreas_kainz CommitDate: Wed Nov 21 00:59:05 2018 +0100 tdf#120918 change AutoFormat Style in Colibre Change-Id: I23956b671a24cc8ac85cec4ea6220d1107f99b1e Reviewed-on: https://gerrit.libreoffice.org/63624 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 228fed36aba7d6a9d02911bcf602218682442a56) Reviewed-on: https://gerrit.libreoffice.org/63640 diff --git a/icon-themes/colibre/cmd/lc_autoformat.png b/icon-themes/colibre/cmd/lc_autoformat.png index 10590052952e..2984af3fa3d7 100644 Binary files a/icon-themes/colibre/cmd/lc_autoformat.png and b/icon-themes/colibre/cmd/lc_autoformat.png differ diff --git a/icon-themes/colibre/cmd/lc_autopilotmenu.png b/icon-themes/colibre/cmd/lc_autopilotmenu.png new file mode 100644 index ..10590052952e Binary files /dev/null and b/icon-themes/colibre/cmd/lc_autopilotmenu.png differ diff --git a/icon-themes/colibre/cmd/sc_autoformat.png b/icon-themes/colibre/cmd/sc_autoformat.png index 48b5737c9946..8cbb4fc23ad4 100644 Binary files a/icon-themes/colibre/cmd/sc_autoformat.png and b/icon-themes/colibre/cmd/sc_autoformat.png differ diff --git a/icon-themes/colibre/cmd/sc_autopilotmenu.png b/icon-themes/colibre/cmd/sc_autopilotmenu.png new file mode 100644 index ..48b5737c9946 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_autopilotmenu.png differ diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 11e8a66e5a31..fd1aa20d642c 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -376,24 +376,22 @@ cmd/lc_importfromfile.png cmd/lc_dataimport.png cmd/sc_importfromfile.png cmd/sc_dataimport.png # Wizard -cmd/lc_dbnewqueryautopilot.png cmd/lc_autoformat.png -cmd/lc_usewizards.png cmd/lc_autoformat.png -cmd/lc_graphicfiltertoolbox.png cmd/lc_autoformat.png -cmd/lc_dbnewtableautopilot.png cmd/lc_autoformat.png -cmd/lc_dbnewreportautopilot.png cmd/lc_autoformat.png -cmd/lc_dbnewformautopilot.png cmd/lc_autoformat.png -cmd/lc_commontaskbarvisible.png cmd/lc_autoformat.png -cmd/lc_autopilotmenu.png cmd/lc_autoformat.png -cmd/lc_newarrangement.png cmd/lc_autoformat.png -cmd/sc_dbnewqueryautopilot.png cmd/sc_autoformat.png -cmd/sc_usewizards.png cmd/sc_autoformat.png -cmd/sc_graphicfiltertoolbox.png cmd/sc_autoformat.png -cmd/sc_dbnewtableautopilot.png cmd/sc_autoformat.png -cmd/sc_dbnewreportautopilot.png cmd/sc_autoformat.png -cmd/sc_dbnewformautopilot.png cmd/sc_autoformat.png -cmd/sc_commontaskbarvisible.png cmd/sc_autoformat.png -cmd/sc_autopilotmenu.png cmd/sc_autoformat.png -cmd/sc_newarrangement.png cmd/sc_autoformat.png +cmd/lc_dbnewqueryautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_usewizards.png cmd/lc_autopilotmenu.png +cmd/lc_graphicfiltertoolbox.png cmd/lc_autopilotmenu.png +cmd/lc_dbnewtableautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_dbnewreportautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_dbnewformautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_commontaskbarvisible.png cmd/lc_autopilotmenu.png +cmd/lc_newarrangement.png cmd/lc_autopilotmenu.png +cmd/sc_dbnewqueryautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_usewizards.png cmd/sc_autopilotmenu.png +cmd/sc_graphicfiltertoolbox.png cmd/sc_autopilotmenu.png +cmd/sc_dbnewtableautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_dbnewreportautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_dbnewformautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_commontaskbarvisible.png cmd/sc_autopilotmenu.png +cmd/sc_newarrangement.png cmd/sc_autopilotmenu.png # Filter cmd/lc_formfilterexecute.png cmd/lc_datafilterstandardfilter.png @@ -1510,7 +1508,7 @@ svx/res/cd017.png cmd/sc_bezierinsert.png svx/res/cd018.png cmd/sc_bezierdelete.png svx/res/cd020.png cmd/sc_undo.png svx/res/cd021.png cmd/sc_redo.png -svx/res/cd025.png cmd/sc_autoformat.png +svx/res/cd025.png cmd/sc_autopilotmenu.png svx/res/cd026.png cmd/sc_bmpmask.png svx/res/color.png cmd/sc_bmpmask.png diff --git a/icon-themes/colibre_svg/cmd/lc_autoformat.svg b/icon-themes/colibre_svg/cmd/lc_autoformat.svg index a7ec3b0479c8..f9b6c100fdfc 100644 --- a/icon-themes/colibre_svg/cmd/lc_autoformat.svg +++ b/icon-themes/colibre_svg/cmd/lc_autoformat.svg @@ -1 +1,14 @@ -http://www.
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 29693c9c12c947e04f37adfd56290ae3abd18490 Author: Jens Carl AuthorDate: Tue Nov 20 22:21:15 2018 + Commit: Jens Carl CommitDate: Wed Nov 21 00:53:33 2018 +0100 Bin obsolete header Change-Id: I78a231024d90d36494cbd8e363da98fd3b420095 Reviewed-on: https://gerrit.libreoffice.org/63685 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx index 8cbabc2768fa..9f457ca34318 100644 --- a/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx +++ b/sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/breeze icon-themes/breeze_svg
icon-themes/breeze/res/lx03245.png |binary icon-themes/breeze/res/lx03246.png |binary icon-themes/breeze/res/lx03247.png |binary icon-themes/breeze/res/lx03249.png |binary icon-themes/breeze/res/lx03250.png |binary icon-themes/breeze/res/lx03251.png |binary icon-themes/breeze_svg/res/lx03245.svg |6 +++--- icon-themes/breeze_svg/res/lx03246.svg |6 ++ icon-themes/breeze_svg/res/lx03247.svg |6 +++--- icon-themes/breeze_svg/res/lx03249.svg |6 +++--- icon-themes/breeze_svg/res/lx03250.svg |6 +++--- icon-themes/breeze_svg/res/lx03251.svg |6 +++--- 12 files changed, 21 insertions(+), 15 deletions(-) New commits: commit 6c9c11af17b065538d9f9ba6ccc8fbff790dd49c Author: andreas kainz AuthorDate: Mon Nov 19 23:29:24 2018 +0100 Commit: andreas_kainz CommitDate: Wed Nov 21 00:31:57 2018 +0100 tdf#95073 new document Breeze icon without gray background Change-Id: I5d0d44be038f61616fe71cbfecf492b5abffbc8a Reviewed-on: https://gerrit.libreoffice.org/63612 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit ebe76aa2628617a71c1ada47e9db91dc3fb75d15) Reviewed-on: https://gerrit.libreoffice.org/63681 diff --git a/icon-themes/breeze/res/lx03245.png b/icon-themes/breeze/res/lx03245.png index 1c06916bd9f9..96a1a8541222 100644 Binary files a/icon-themes/breeze/res/lx03245.png and b/icon-themes/breeze/res/lx03245.png differ diff --git a/icon-themes/breeze/res/lx03246.png b/icon-themes/breeze/res/lx03246.png index c5f25743c274..96a1a8541222 100644 Binary files a/icon-themes/breeze/res/lx03246.png and b/icon-themes/breeze/res/lx03246.png differ diff --git a/icon-themes/breeze/res/lx03247.png b/icon-themes/breeze/res/lx03247.png index 8cb879fbdc25..96a1a8541222 100644 Binary files a/icon-themes/breeze/res/lx03247.png and b/icon-themes/breeze/res/lx03247.png differ diff --git a/icon-themes/breeze/res/lx03249.png b/icon-themes/breeze/res/lx03249.png index 5ddaeab24d4e..96a1a8541222 100644 Binary files a/icon-themes/breeze/res/lx03249.png and b/icon-themes/breeze/res/lx03249.png differ diff --git a/icon-themes/breeze/res/lx03250.png b/icon-themes/breeze/res/lx03250.png index d4a990d163b7..96a1a8541222 100644 Binary files a/icon-themes/breeze/res/lx03250.png and b/icon-themes/breeze/res/lx03250.png differ diff --git a/icon-themes/breeze/res/lx03251.png b/icon-themes/breeze/res/lx03251.png index 754f0b5aefba..96a1a8541222 100644 Binary files a/icon-themes/breeze/res/lx03251.png and b/icon-themes/breeze/res/lx03251.png differ diff --git a/icon-themes/breeze_svg/res/lx03245.svg b/icon-themes/breeze_svg/res/lx03245.svg index c7713127f5d4..ac3e892754c9 100644 --- a/icon-themes/breeze_svg/res/lx03245.svg +++ b/icon-themes/breeze_svg/res/lx03245.svg @@ -1,6 +1,6 @@ -http://www.w3.org/2000/svg"; viewBox="0 0 32 32"> +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> diff --git a/icon-themes/breeze_svg/res/lx03246.svg b/icon-themes/breeze_svg/res/lx03246.svg new file mode 100644 index ..ac3e892754c9 --- /dev/null +++ b/icon-themes/breeze_svg/res/lx03246.svg @@ -0,0 +1,6 @@ +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> + + diff --git a/icon-themes/breeze_svg/res/lx03247.svg b/icon-themes/breeze_svg/res/lx03247.svg index 2c67a29696a8..ac3e892754c9 100644 --- a/icon-themes/breeze_svg/res/lx03247.svg +++ b/icon-themes/breeze_svg/res/lx03247.svg @@ -1,6 +1,6 @@ -http://www.w3.org/2000/svg"; viewBox="0 0 32 32"> +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> diff --git a/icon-themes/breeze_svg/res/lx03249.svg b/icon-themes/breeze_svg/res/lx03249.svg index 2609d6aeab67..ac3e892754c9 100644 --- a/icon-themes/breeze_svg/res/lx03249.svg +++ b/icon-themes/breeze_svg/res/lx03249.svg @@ -1,6 +1,6 @@ -http://www.w3.org/2000/svg"; viewBox="0 0 32 32"> +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> diff --git a/icon-themes/breeze_svg/res/lx03250.svg b/icon-themes/breeze_svg/res/lx03250.svg index 7f3f6408792c..ac3e892754c9 100644 --- a/icon-themes/breeze_svg/res/lx03250.svg +++ b/icon-themes/breeze_svg/res/lx03250.svg @@ -1,6 +1,6 @@ -http://www.w3.org/2000/svg"; viewBox="0 0 32 32"> +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> diff --git a/icon-themes/breeze_svg/res/lx03251.svg b/icon-themes/breeze_svg/res/lx03251.svg index a786df87562f..ac3e892754c9 100644 --- a/icon-themes/breeze_svg/res/lx03251.svg +++ b/icon-themes/breeze_svg/res/lx03251.svg @@ -1,6 +1,6 @@ -http://www.w3.org/2000/svg"; viewBox="0 0 32 32"> +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk sc/Module_sc.mk sc/qa
framework/qa/complex/api_internal/api.lst |1 qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableChartsEnumeration.csv |2 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java | 192 -- sc/CppunitTest_sc_indexenumeration_tablechartsenumeration.mk | 45 ++ sc/Module_sc.mk |3 sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx | 167 sc/qa/unoapi/sc_5.sce |1 8 files changed, 214 insertions(+), 198 deletions(-) New commits: commit a0d1f5eca204e4de84e6e83f0c0765323a23833f Author: Jens Carl AuthorDate: Tue Nov 20 20:50:41 2018 + Commit: Jens Carl CommitDate: Tue Nov 20 23:19:46 2018 +0100 tdf#45904 Move XEnumeration Java tests to C++ Move XEnumeration Java tests to C++ for ScIndexEnumeration_TableChartsEnumeration. Change-Id: Ibbfcf9ec92c3bae4d6add044d2e62472f32d801e Reviewed-on: https://gerrit.libreoffice.org/63678 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index 2d0c3608180f..5c25127f8660 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -94,7 +94,6 @@ job96=sc.ScFilterDescriptorBase job97=sc.ScFunctionListObj job98=sc.ScHeaderFieldObj job99=sc.ScHeaderFieldsObj -job117=sc.ScIndexEnumeration_TableChartsEnumeration job122=sc.ScLabelRangesObj job125=sc.ScScenariosObj job126=sc.ScSheetLinkObj diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 58ede4e8b815..73982bf98210 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -993,7 +993,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \ -qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \ qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \ qadevOOo/tests/java/mod/_sc/ScModelObj \ qadevOOo/tests/java/mod/_sc/ScNamedRangesObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableChartsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableChartsEnumeration.csv deleted file mode 100644 index f4128d6ee2f6.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_TableChartsEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScIndexEnumeration_TableChartsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScIndexEnumeration_TableChartsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java deleted file mode 100644 index a29836e3f88d.. --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.awt.Rectangle; -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.XCellRangeAddressable; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.table.CellRangeAddress; -import com.sun.star.table.XCell; -import com.sun.star.table.XCellRange; -import com.sun.star.table.XTableCharts; -import co
[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - help3xsl/help.js help3xsl/online_transform.xsl source/text
help3xsl/help.js| 10 --
help3xsl/online_transform.xsl | 14 +-
source/text/shared/help/browserhelp.xhp |2 ++
3 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 10c207f682a65bb3ff434689822024e828308341
Author: Ilmari Lauhakangas
AuthorDate: Tue Nov 20 20:44:57 2018 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Nov 20 23:08:35 2018 +0100
tdf#119415 Add placeholder text for index filter
Change-Id: If7a0a863eb6b8bb95a5b6236f4f3d490739810a1
Reviewed-on: https://gerrit.libreoffice.org/63672
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit 126ef50e9756e79bf5b500edeaa9275260a1b7d3)
Reviewed-on: https://gerrit.libreoffice.org/63682
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 7837f7f67..2237ed5b1 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -11,8 +11,14 @@
var url = document.URL;
var moduleRegex = new RegExp('text\\/(\\w+)\\/');
var regexArray = moduleRegex.exec(url);
-// get the module name from the URL and remove the first character
-var currentModule = regexArray[1].toUpperCase().substring(1);
+var currentModule = null;
+// get the module name from the URL and remove the first character,
+// but first deal with snowflake Base
+if(url.indexOf('explorer/database/') !== -1) {
+currentModule = 'BASE';
+} else {
+currentModule = regexArray[1].toUpperCase().substring(1);
+}
var results = null;
var fullLinkified = '';
var modules = ['CALC', 'WRITER', 'IMPRESS', 'DRAW', 'BASE', 'MATH', 'CHART',
'BASIC', 'SHARED'];
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index ee6a5fbf2..95892bdd4 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -108,6 +108,8 @@
+
+
@@ -195,7 +197,17 @@
🔎︎
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/text/shared/help/browserhelp.xhp
b/source/text/shared/help/browserhelp.xhp
index 0f29667c1..a0e33d635 100644
--- a/source/text/shared/help/browserhelp.xhp
+++ b/source/text/shared/help/browserhelp.xhp
@@ -20,6 +20,8 @@
Language
Contents
Index
+Search in all
modules
+Search in chosen
module
If this page has been helpful, you can
support us!
%PRODUCTNAME %PRODUCTVERSION
Help
Click on text to copy to
clipboard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7913a9e9714692b1662910d33a14dfa875ceaf34 Author: Ilmari Lauhakangas AuthorDate: Tue Nov 20 20:44:57 2018 +0200 Commit: Gerrit Code Review CommitDate: Tue Nov 20 23:08:35 2018 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-6-2' - tdf#119415 Add placeholder text for index filter Change-Id: If7a0a863eb6b8bb95a5b6236f4f3d490739810a1 Reviewed-on: https://gerrit.libreoffice.org/63672 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas Reviewed-by: Adolfo Jayme Barrientos (cherry picked from commit 126ef50e9756e79bf5b500edeaa9275260a1b7d3) Reviewed-on: https://gerrit.libreoffice.org/63682 diff --git a/helpcontent2 b/helpcontent2 index 8aef24ea353e..10c207f682a6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8aef24ea353e04d75360d0b94ccbca6c6c8e9635 +Subproject commit 10c207f682a65bb3ff434689822024e828308341 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c1540d5751ee36a5c9fadae86575665dc3714cd Author: Ilmari Lauhakangas AuthorDate: Tue Nov 20 20:44:57 2018 +0200 Commit: Gerrit Code Review CommitDate: Tue Nov 20 23:02:31 2018 +0100 Update git submodules * Update helpcontent2 from branch 'master' - tdf#119415 Add placeholder text for index filter Change-Id: If7a0a863eb6b8bb95a5b6236f4f3d490739810a1 Reviewed-on: https://gerrit.libreoffice.org/63672 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 789b9f58490c..126ef50e9756 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 789b9f58490c731c2497152be787130851977967 +Subproject commit 126ef50e9756e79bf5b500edeaa9275260a1b7d3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/online_transform.xsl source/text
help3xsl/help.js| 10 --
help3xsl/online_transform.xsl | 14 +-
source/text/shared/help/browserhelp.xhp |2 ++
3 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 126ef50e9756e79bf5b500edeaa9275260a1b7d3
Author: Ilmari Lauhakangas
AuthorDate: Tue Nov 20 20:44:57 2018 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Nov 20 23:02:31 2018 +0100
tdf#119415 Add placeholder text for index filter
Change-Id: If7a0a863eb6b8bb95a5b6236f4f3d490739810a1
Reviewed-on: https://gerrit.libreoffice.org/63672
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 7837f7f67..2237ed5b1 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -11,8 +11,14 @@
var url = document.URL;
var moduleRegex = new RegExp('text\\/(\\w+)\\/');
var regexArray = moduleRegex.exec(url);
-// get the module name from the URL and remove the first character
-var currentModule = regexArray[1].toUpperCase().substring(1);
+var currentModule = null;
+// get the module name from the URL and remove the first character,
+// but first deal with snowflake Base
+if(url.indexOf('explorer/database/') !== -1) {
+currentModule = 'BASE';
+} else {
+currentModule = regexArray[1].toUpperCase().substring(1);
+}
var results = null;
var fullLinkified = '';
var modules = ['CALC', 'WRITER', 'IMPRESS', 'DRAW', 'BASE', 'MATH', 'CHART',
'BASIC', 'SHARED'];
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index ee6a5fbf2..95892bdd4 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -108,6 +108,8 @@
+
+
@@ -195,7 +197,17 @@
🔎︎
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/text/shared/help/browserhelp.xhp
b/source/text/shared/help/browserhelp.xhp
index 0f29667c1..a0e33d635 100644
--- a/source/text/shared/help/browserhelp.xhp
+++ b/source/text/shared/help/browserhelp.xhp
@@ -20,6 +20,8 @@
Language
Contents
Index
+Search in all
modules
+Search in chosen
module
If this page has been helpful, you can
support us!
%PRODUCTNAME %PRODUCTVERSION
Help
Click on text to copy to
clipboard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - vcl/headless vcl/source
Rebased ref, commits from common ancestor: commit 3748c7a7c48fd625b00153c787e9d38a2e631efe Author: Thorsten Behrens AuthorDate: Tue Nov 20 20:53:50 2018 +0100 Commit: Thorsten Behrens CommitDate: Tue Nov 20 22:57:12 2018 +0100 Fix headless build on Linux Conditional-compile some OpenGL-ness that crept in Change-Id: I8d12f34db3b4875470a0d81e9ef6a1654153b206 diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index c39ffaeb5205..9de3cb5733cb 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -27,7 +27,9 @@ #include #include -#include +#ifndef LIBO_HEADLESS +# include +#endif #include #include diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 6d43a5b9f9a3..f46c2328d63e 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -32,7 +32,9 @@ #include #include #include -#include +#ifdef MACOSX +# include +#endif #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar.ui| 504 +++ sw/uiconfig/swriter/ui/notebookbar_compact.ui| 348 +- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 291 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui| 376 +-- 4 files changed, 760 insertions(+), 759 deletions(-) New commits: commit 12a878a2517cb2260a016ed1c7e5d056687416e9 Author: andreas kainz AuthorDate: Tue Nov 20 15:35:38 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 22:47:49 2018 +0100 tdf#121401 writer keyboard navigation all notebookbars Change-Id: I66b384e57e3e6845bacfad34c5de1b6e5b437311 Reviewed-on: https://gerrit.libreoffice.org/63661 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index f85fa8f82334..ac3b50f4d4fe 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -1859,7 +1859,7 @@ True -False +True end True icons @@ -1886,7 +1886,7 @@ True -False +True end True icons @@ -1931,6 +1931,7 @@ True False False +end center True immediate @@ -1950,6 +1951,7 @@ True False False +end center True immediate @@ -2009,7 +2011,7 @@ True -False +True center 5 True @@ -2043,7 +2045,7 @@ True -False +True both-horiz False @@ -2068,7 +2070,7 @@ True -False +True both-horiz False @@ -2128,7 +2130,7 @@ True -False +True center True both @@ -2178,7 +2180,7 @@ True -False +True both-horiz False @@ -2238,7 +2240,7 @@ True -False +True center True both @@ -2272,7 +2274,7 @@ True -False +True both-horiz False @@ -2297,7 +2299,7 @@ True -False +True both-horiz False @@ -2360,7 +2362,7 @@ True -False +True center True both @@ -2394,7 +2396,7 @@ True -
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 755a7021c03b67854c6acb90249686782f254009 Author: andreas kainz AuthorDate: Mon Nov 19 23:38:30 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 22:46:49 2018 +0100 ZoomMode string description is now PopupLabel Label is now shorter Change-Id: I442c4bf9acbd85f340371014c20be3292a016beb Reviewed-on: https://gerrit.libreoffice.org/63613 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 976b7930a1137066a75babc6944ab48ea62ae9ac) Reviewed-on: https://gerrit.libreoffice.org/63675 Reviewed-by: andreas_kainz diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 4d6462137417..10be465b1e84 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1658,6 +1658,9 @@ + Zoom & Pan + + Zoom & Pan (CTRL to Zoom Out, SHIFT to Pan) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - fpicker/source framework/source include/unotools unotools/source
fpicker/source/win32/VistaFilePicker.cxx| 19 +--
framework/source/fwe/helper/titlehelper.cxx | 15 +++
include/unotools/mediadescriptor.hxx|1 +
unotools/source/misc/mediadescriptor.cxx|6 ++
4 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 02a5cbb9814dc224114dfbf3bc0b6c53658450c9
Author: Ilhan Yesil
AuthorDate: Mon Nov 19 14:50:25 2018 +0100
Commit: Thorsten Behrens
CommitDate: Tue Nov 20 22:43:46 2018 +0100
tdf#121497 "Save As": File Format Type unchanged in Windows
Added checks for filter title, so filter titles are Windows
conform.
Change-Id: I42485c465ea58540a99b8300c5205b902cb86a92
Reviewed-on: https://gerrit.libreoffice.org/63573
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit c444eb7934d4a3c190e1d060805d9d175c1a9127)
Reviewed-on: https://gerrit.libreoffice.org/63658
diff --git a/fpicker/source/win32/VistaFilePicker.cxx
b/fpicker/source/win32/VistaFilePicker.cxx
index e1eb66a9ce83..874bed2f5c5f 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,7 +119,14 @@ void SAL_CALL VistaFilePicker::appendFilter(const
OUString& sTitle ,
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+const sal_Int32 idx = sTitle.indexOf("(.");
+if (idx > 0)
+{
+const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
+}
+else
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
m_aAsyncExecute.triggerRequestThreadAware(rRequest,
AsyncRequests::NON_BLOCKED);
@@ -129,7 +136,14 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const
OUString& sTitle)
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+const sal_Int32 idx = sTitle.indexOf("(.");
+if (idx > 0)
+{
+const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
+}
+else
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
m_aAsyncExecute.triggerRequestThreadAware(rRequest,
AsyncRequests::NON_BLOCKED);
}
@@ -142,6 +156,7 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
m_aAsyncExecute.triggerRequestThreadAware(rRequest,
AsyncRequests::BLOCKED);
const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE,
OUString());
+
return sTitle;
}
commit 8848881e25e75387a7ac26503c7da3787dd25b80
Author: Samuel Mehrbrodt
AuthorDate: Tue Nov 20 09:12:36 2018 +0100
Commit: Thorsten Behrens
CommitDate: Tue Nov 20 22:43:35 2018 +0100
tdf#121537 Display SuggestedSaveAsName in title if set
Change-Id: I762eb7766a5cbe788c0a360c8a6f37b9b1106412
Reviewed-on: https://gerrit.libreoffice.org/63639
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 4355137901e18e24de2ab123fd0454147f1f3890)
Reviewed-on: https://gerrit.libreoffice.org/63648
Reviewed-by: Thorsten Behrens
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 3d7943623753..36141cfba0f1 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -32,6 +32,7 @@
#include
#include
+#include
#include
#include
#include
@@ -39,6 +40,11 @@
#include
#include
+
+using namespace css;
+using namespace css::uno;
+using namespace css::frame;
+
namespace framework{
TitleHelper::TitleHelper(const css::uno::Reference<
css::uno::XComponentContext >& rxContext)
@@ -339,6 +345,10 @@ void TitleHelper::impl_updateTitleForModel (const
css::uno::Reference< css::fram
if (xURLProvider.is())
sURL = xURLProvider->getLocation ();
+utl::MediaDescriptor aDescriptor(xModel->getArgs());
+const OUString sSuggestedSaveAsName =
aDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME(), OUString());
+
if (!sURL.isEmpty())
{
sTitle = impl_convertURL2Title(sURL);
@@ -346,6 +356,11 @@ void TitleHelper::impl_updateTitleForModel (const
css::uno::Reference< css::fram
xNumbers->releaseNumber (nLeasedNumber);
nLeasedNumber = css::frame::UntitledNumbersConst::INVALID_NUMBER;
}
+else if (!sSuggestedSaveAsName.isEmpty())
+{
+// tdf#121537 Use suggested save as name for title if file has not yet
been saved
+sTitle = sSuggestedSaveAsName;
+}
else
{
if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
diff --git a/include/unotools/mediadescriptor.hxx
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg
icon-themes/breeze/cmd/lc_setminimalcolumnwidth.png |binary icon-themes/breeze/cmd/lc_setminimalrowheight.png|binary icon-themes/breeze/cmd/sc_setminimalcolumnwidth.png |binary icon-themes/breeze/cmd/sc_setminimalrowheight.png|binary icon-themes/breeze/links.txt |8 icon-themes/breeze_dark/cmd/lc_setminimalcolumnwidth.png |binary icon-themes/breeze_dark/cmd/lc_setminimalrowheight.png |binary icon-themes/breeze_dark/cmd/sc_setminimalcolumnwidth.png |binary icon-themes/breeze_dark/cmd/sc_setminimalrowheight.png |binary icon-themes/breeze_svg/cmd/lc_setminimalcolumnwidth.svg |6 ++ icon-themes/breeze_svg/cmd/lc_setminimalrowheight.svg|6 ++ icon-themes/breeze_svg/cmd/sc_setminimalcolumnwidth.svg |7 +++ icon-themes/breeze_svg/cmd/sc_setminimalrowheight.svg|7 +++ icon-themes/colibre/links.txt|4 ++-- 14 files changed, 36 insertions(+), 2 deletions(-) New commits: commit de4ffc3a70da6a8ce9897b7f08e345c29b69fd3c Author: andreas kainz AuthorDate: Mon Nov 19 22:52:30 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 22:30:19 2018 +0100 tdf#120300 add setminima icons to colibre and breeze Change-Id: Ie454dab3f23bee4bf0321fe6f5a657a57cc5ef5e Reviewed-on: https://gerrit.libreoffice.org/63611 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 562f550ef139f0fdaf633884a01b55ee2d596bf6) Reviewed-on: https://gerrit.libreoffice.org/63674 diff --git a/icon-themes/breeze/cmd/lc_setminimalcolumnwidth.png b/icon-themes/breeze/cmd/lc_setminimalcolumnwidth.png new file mode 100644 index ..bad0fceb8d76 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_setminimalcolumnwidth.png differ diff --git a/icon-themes/breeze/cmd/lc_setminimalrowheight.png b/icon-themes/breeze/cmd/lc_setminimalrowheight.png new file mode 100644 index ..6518de90827c Binary files /dev/null and b/icon-themes/breeze/cmd/lc_setminimalrowheight.png differ diff --git a/icon-themes/breeze/cmd/sc_setminimalcolumnwidth.png b/icon-themes/breeze/cmd/sc_setminimalcolumnwidth.png new file mode 100644 index ..2a9ecc58e23d Binary files /dev/null and b/icon-themes/breeze/cmd/sc_setminimalcolumnwidth.png differ diff --git a/icon-themes/breeze/cmd/sc_setminimalrowheight.png b/icon-themes/breeze/cmd/sc_setminimalrowheight.png new file mode 100644 index ..a9b3fbef3f2d Binary files /dev/null and b/icon-themes/breeze/cmd/sc_setminimalrowheight.png differ diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index fc6cc36ed482..8d0dab440ac4 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1738,3 +1738,11 @@ cmd/lc_masterpage.png cmd/lc_slidemasterpage.png cmd/sc_pagemode.png cmd/sc_normalmultipanegui.png cmd/lc_pagemode.png cmd/lc_normalmultipanegui.png + +# calc context menu rowheader +# == +cmd/sc_rowheight.png cmd/sc_setminimalrowheight.png +cmd/sc_columnwidth.png cmd/sc_setminimalcolumnwidth.png + +cmd/lc_rowheight.png cmd/lc_setminimalrowheight.png +cmd/lc_columnwidth.png cmd/lc_setminimalcolumnwidth.png diff --git a/icon-themes/breeze_dark/cmd/lc_setminimalcolumnwidth.png b/icon-themes/breeze_dark/cmd/lc_setminimalcolumnwidth.png new file mode 100644 index ..3652257620c6 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_setminimalcolumnwidth.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_setminimalrowheight.png b/icon-themes/breeze_dark/cmd/lc_setminimalrowheight.png new file mode 100644 index ..9d9ee3022b03 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_setminimalrowheight.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_setminimalcolumnwidth.png b/icon-themes/breeze_dark/cmd/sc_setminimalcolumnwidth.png new file mode 100644 index ..76ddb1469626 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_setminimalcolumnwidth.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_setminimalrowheight.png b/icon-themes/breeze_dark/cmd/sc_setminimalrowheight.png new file mode 100644 index ..d57a9bc8fe38 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_setminimalrowheight.png differ diff --git a/icon-themes/breeze_svg/cmd/lc_setminimalcolumnwidth.svg b/icon-themes/breeze_svg/cmd/lc_setminimalcolumnwidth.svg new file mode 100644 index ..7492672bf41e --- /dev/null +++ b/icon-themes/breeze_svg/cmd/lc_setminimalcolumnwidth.svg @@ -0,0 +1,6 @@ +http://www.w3.org/2000/svg"; viewBox="0 0 24 24"> + + diff --git a/icon-themes/breeze_svg/cmd/lc_setminimalrowheight.svg b/icon-themes/breeze_svg/cmd/lc_setminimalrowheight.svg new file mode 100644 index ..952e29930cfe --- /dev/null +++ b/icon-themes/breeze_svg/cmd/lc_setminimalrowheight.svg @@ -0,0 +1,6 @@ +http://www.w3.org/2000
[Libreoffice-commits] core.git: vcl/source vcl/unx
vcl/source/app/salvtables.cxx|5 ++---
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |2 +-
vcl/unx/gtk3/gtk3gtkinst.cxx |7 ---
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 4853640c2ef30693ddaa5f5204aabc5a671c3692
Author: Caolán McNamara
AuthorDate: Tue Nov 20 15:13:08 2018 +
Commit: Caolán McNamara
CommitDate: Tue Nov 20 22:05:28 2018 +0100
coverity#1441469 silence Dereference null return value
and
coverity#1441468 Uninitialized pointer field
coverity#1441470 Uninitialized pointer field
coverity#1441467 Unchecked return value
Change-Id: I485fb0b5a83838a3c4913a74b5ea3ae70b4f6bd1
Reviewed-on: https://gerrit.libreoffice.org/63663
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 67ac7ed97986..b117e34f15d6 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1753,10 +1753,8 @@ IMPL_LINK(SalInstanceEntry, CursorListener,
VclWindowEvent&, rEvent, void)
struct SalInstanceTreeIter : public weld::TreeIter
{
SalInstanceTreeIter(const SalInstanceTreeIter* pOrig)
+: iter(pOrig ? pOrig->iter : nullptr)
{
-if (!pOrig)
-return;
-iter = pOrig->iter;
}
SvTreeListEntry* iter;
};
@@ -2160,6 +2158,7 @@ IMPL_LINK_NOARG(SalInstanceTreeView, ExpandingHdl,
SvTreeListBox*, bool)
if (pEntry->HasChildren())
{
auto pChild = m_xTreeView->FirstChild(pEntry);
+assert(pChild);
if (m_xTreeView->GetEntryText(pChild) == "")
{
m_xTreeView->RemoveEntry(pChild);
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index b4603bb32a80..2dd75d4f3166 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1233,7 +1233,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox
*pWidget, sal_Int16 nC
&iter, 0, &item, -1);
aItemList[i] = OUString(item, strlen(item),
RTL_TEXTENCODING_UTF8);
g_free(item);
-gtk_tree_model_iter_next(pTree, &iter);
+(void)gtk_tree_model_iter_next(pTree, &iter);
}
}
aAny <<= aItemList;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7e613bd202d1..885669361d99 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4129,9 +4129,10 @@ struct GtkInstanceTreeIter : public weld::TreeIter
{
GtkInstanceTreeIter(const GtkInstanceTreeIter* pOrig)
{
-if (!pOrig)
-return;
-iter = pOrig->iter;
+if (pOrig)
+iter = pOrig->iter;
+else
+memset(&iter, 0, sizeof(iter));
}
GtkTreeIter iter;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0a060db0c2bc27f529d28811e705b8c9f8de394d
Author: Mike Kaganski
AuthorDate: Mon Nov 19 09:27:30 2018 +0100
Commit: Mike Kaganski
CommitDate: Tue Nov 20 21:15:58 2018 +0100
Fix a copypaste error
Has been like this since commit 2d1ef8aa2493f044fa543c72b40bd8c8394d8d71
Change-Id: Idf0e05246f625befb4872e743b490a5594d24f8f
Reviewed-on: https://gerrit.libreoffice.org/63548
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 0c89f9125d86..951c416936bc 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1484,7 +1484,7 @@ void SbRtl_ConvertToUrl(StarBASIC *, SbxArray & rPar,
bool)
OUString aFileURL = aURLObj.GetMainURL(
INetURLObject::DecodeMechanism::NONE );
if( aFileURL.isEmpty() )
{
-::osl::File::getFileURLFromSystemPath( aFileURL, aFileURL );
+osl::File::getFileURLFromSystemPath(aStr, aFileURL);
}
if( aFileURL.isEmpty() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unable to build with poppler 0.71.0
On 19.11.2018 16:07, Andrey Cherepanov wrote:
> If build with poppler 0.71.0 I get errors for missing type GBool:
>
> In file included from
> /usr/src/RPM/BUILD/libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx:20:0:
> /usr/src/RPM/BUILD/libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:153:17:
> error: 'GBool' does not name a type; did you mean 'bool'
> virtual GBool upsideDown() override { return gTrue; }
> ^
> bool
> /usr/src/RPM/BUILD/libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:156:17:
> error: 'GBool' does not name a type; did you mean 'bool'
> virtual GBool useDrawChar() override { return gTrue; }
> ^
> bool
> ...
>
> There is commit
> https://gitlab.freedesktop.org/poppler/poppler/commit/163420b48bdddf9084208b3cadf04dafad52d40a
>
> Replace GBool, gTrue, and gFalse by bool, true, false, resp.
>
> So type GBool (and so on) is no longer exist and it should be replaced
> by bool in sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
>
Should be fixed in commit 5e8bdd9203dd642111c62a6668ee665a20d4ba19 <
https://git.libreoffice.org/core/+/5e8bdd9203dd642111c62a6668ee665a20d4ba19%5E%21/
>.
--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - vcl/source
vcl/source/outdev/text.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 84a46520ae523db9641eb7ed995ba800bbbaae63 Author: Thorsten Behrens AuthorDate: Tue Nov 20 20:53:50 2018 +0100 Commit: Thorsten Behrens CommitDate: Tue Nov 20 20:55:38 2018 +0100 Fix headless build on Linux OpenGL helper only needed for Mac here Change-Id: I8d12f34db3b4875470a0d81e9ef6a1654153b206 diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 6d43a5b9f9a3..f46c2328d63e 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -32,7 +32,9 @@ #include #include #include -#include +#ifdef MACOSX +# include +#endif #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sw/qa sw/source
filter/source/msfilter/rtfutil.cxx|3
sw/qa/extras/htmlexport/htmlexport.cxx| 12 +--
sw/source/filter/html/htmlreqifreader.cxx | 93 --
3 files changed, 93 insertions(+), 15 deletions(-)
New commits:
commit 1ca409292272632f443733450313de5a82c54a9c
Author: Miklos Vajna
AuthorDate: Tue Nov 20 17:31:02 2018 +0100
Commit: Miklos Vajna
CommitDate: Tue Nov 20 20:30:07 2018 +0100
sw reqif-xhtml export: write graphic of OLE object at OLE1 level
[MS-OLEDS] 2.2.5 EmbeddedObject actually has a last Presentation field,
and we didn't write it so far.
Luckily all the info can be extracted from the OLE2 container, so we can
roundtrip the OLE1 wrapper around OLE2 nicely.
Change-Id: I8d4922428dd5beeaae8b6cd4da0575db7014e4a2
Reviewed-on: https://gerrit.libreoffice.org/63667
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/filter/source/msfilter/rtfutil.cxx
b/filter/source/msfilter/rtfutil.cxx
index 13a8ef59b956..0d2f590c10fa 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -279,7 +279,8 @@ bool ExtractOLE2FromObjdata(const OString& rObjdata,
SvStream& rOle2)
if (nData)
{
-rOle2.WriteStream(aStream);
+// NativeData
+rOle2.WriteStream(aStream, nData);
rOle2.Seek(0);
}
}
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 5ae05a172078..c2d8143b67b9 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -555,14 +555,10 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfOle2,
"reqif-ole2.xhtml")
// filter to handle it, so nothing happened on double-click.
CPPUNIT_ASSERT(xEmbeddedObject.is());
uno::Reference xStream(xEmbeddedObject->getStream(),
uno::UNO_QUERY);
-// This was 80913, the RTF hexdump -> OLE1 binary -> OLE2 conversion was
-// missing.
-// Also, this was 38912 when we re-generated the OLE2 preview, which is
-// wrong, the OLE2 data is 38375 bytes in the ole2.ole (referenced by
-// reqif-ole2.xhtml). To see that this is the correct value, convert the
-// hexdump in ole2.ole to binary, remove the ole1 header and check the byte
-// size.
-CPPUNIT_ASSERT_EQUAL(static_cast(38375), xStream->getLength());
+// This was 38375, msfilter::rtfutil::ExtractOLE2FromObjdata() wrote
+// everything after the OLE1 header into the OLE2 stream, while the
+// Presentation field after the OLE2 data doesn't belong there.
+CPPUNIT_ASSERT_EQUAL(static_cast(37888), xStream->getLength());
// Finally the export also failed as it tried to open the stream from the
// document storage, but the embedded object already opened it, so an
// exception of type com.sun.star.io.IOException was thrown.
diff --git a/sw/source/filter/html/htmlreqifreader.cxx
b/sw/source/filter/html/htmlreqifreader.cxx
index fc2c11705b80..a119fc2fbc9c 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -92,8 +92,59 @@ OString ExtractOLEClassName(const tools::SvRef&
xStorage)
return read_uInt8s_ToOString(*pCompObj, nData);
}
+/// Parses the presentation stream of an OLE2 storage.
+bool ParseOLE2Presentation(SvStream& rOle2, sal_uInt32& nWidth, sal_uInt32&
nHeight,
+ SvStream& rPresentationData)
+{
+// See [MS-OLEDS] 2.3.4, OLEPresentationStream
+rOle2.Seek(0);
+tools::SvRef pStorage = new SotStorage(rOle2);
+tools::SvRef xOle2Presentation
+= pStorage->OpenSotStream("\002OlePres000", StreamMode::STD_READ);
+
+// Read AnsiClipboardFormat.
+sal_uInt32 nMarkerOrLength = 0;
+xOle2Presentation->ReadUInt32(nMarkerOrLength);
+if (nMarkerOrLength != 0x)
+// FormatOrAnsiString is not present
+return false;
+sal_uInt32 nFormatOrAnsiLength = 0;
+xOle2Presentation->ReadUInt32(nFormatOrAnsiLength);
+if (nFormatOrAnsiLength != 0x0003) // CF_METAFILEPICT
+return false;
+
+// Read TargetDeviceSize.
+sal_uInt32 nTargetDeviceSize = 0;
+xOle2Presentation->ReadUInt32(nTargetDeviceSize);
+if (nTargetDeviceSize != 0x0004)
+// TargetDevice is present
+return false;
+
+sal_uInt32 nAspect = 0;
+xOle2Presentation->ReadUInt32(nAspect);
+sal_uInt32 nLindex = 0;
+xOle2Presentation->ReadUInt32(nLindex);
+sal_uInt32 nAdvf = 0;
+xOle2Presentation->ReadUInt32(nAdvf);
+sal_uInt32 nReserved1 = 0;
+xOle2Presentation->ReadUInt32(nReserved1);
+xOle2Presentation->ReadUInt32(nWidth);
+xOle2Presentation->ReadUInt32(nHeight);
+sal_uInt32 nSize = 0;
+xOle2Presentation->ReadUInt32(nSize);
+
+// Read Data.
+if (nSize > xOle2Presentation->remainingSize())
+return false;
+std::vector aBuffer(nSize);
+xOle2Presentation->ReadBytes(a
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa06db87c17840cb647c5de5e0eec525d0396cd4 Author: Roman Kuznetsov AuthorDate: Tue Nov 20 09:51:11 2018 +0100 Commit: Heiko Tietze CommitDate: Tue Nov 20 20:24:29 2018 +0100 tdf#121490 Hide item Standard (Viewing Mode) toolbar from menu Change-Id: I9e3a071b9b5792a627a3c5b478ba16f0de386487 Reviewed-on: https://gerrit.libreoffice.org/63630 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 6a65455788483886db2060a4cbdea3f84bed4174) Reviewed-on: https://gerrit.libreoffice.org/63665 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 0f1b4a0b080b..fe41f19e58f9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -654,7 +654,7 @@ Standard (Viewing Mode) - false + true true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/cmdlinehelp.cxx | 264 ++---
1 file changed, 133 insertions(+), 131 deletions(-)
New commits:
commit 18c3d7c4d2ac72aa3ce1a7c592e227f4668bc1a4
Author: Mike Kaganski
AuthorDate: Tue Nov 20 17:08:39 2018 +0100
Commit: Mike Kaganski
CommitDate: Tue Nov 20 19:38:49 2018 +0100
Tidy up the --help text to properly fit into standard 80-ch terminal
Change-Id: I5b7f503e32c10b5a844817c040ab0dde27bf48f7
Reviewed-on: https://gerrit.libreoffice.org/63666
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index 0dbbe41dd660..656835082c59 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -42,143 +42,145 @@ namespace desktop
"\n";
const char aCmdLineHelp[] =
"Usage: %CMDNAME [argument...]\n"
-" argument - switches, switch parameters and document URIs
(filenames).\n\n"
-"Using without special arguments:\n"
-"Opens the start center, if it is used without any arguments.\n"
-" {file} Tries to open the file (files) in the
components\n"
-" suitable for them.\n"
-" {file} {macro:///Library.Module.MacroName}\n"
-" Opens the file and runs specified macros
from\n"
-" the file.\n\n"
-"Getting help and information:\n"
-" --help | -h | -?Shows this help and quits.\n"
-" --helpwriterOpens built-in or online Help on Writer.\n"
-" --helpcalc Opens built-in or online Help on Calc.\n"
-" --helpdraw Opens built-in or online Help on Draw.\n"
-" --helpimpress Opens built-in or online Help on Impress.\n"
-" --helpbase Opens built-in or online Help on Base.\n"
-" --helpbasic Opens built-in or online Help on Basic
scripting\n"
-" language.\n"
-" --helpmath Opens built-in or online Help on Math.\n"
-" --version Shows the version and quits.\n"
-" --nstemporarydirectory\n"
-" (MacOS X sandbox only) Returns path of the
temporary\n"
-" directory for the current user and exits.
Overrides\n"
-" all other arguments.\n\n"
-"General arguments:\n"
-" --quickstart[=no] Activates[Deactivates] the Quickstarter
service.\n"
-" --nolockcheck Disables check for remote instances using
one\n"
-" installation.\n"
-" --infilter={filter} Force an input filter type if possible. For
example:\n"
-" --infilter=\"Calc Office Open XML\"\n"
-" --infilter=\"Text (encoded):UTF8,LF,,,\"\n"
-" --pidfile={file}Store soffice.bin pid to {file}.\n"
-" --display {display} Sets the DISPLAY environment variable on
UNIX-like\n"
-" platforms to the value {display} (only
supported by a\n"
-" start script).\n\n"
-"User/programmatic interface control:\n"
-" --nologoDisables the splash screen at program start.\n"
-" --minimized Starts minimized. The splash screen is not
displayed.\n"
-" --nodefault Starts without displaying anything except the
splash\n"
-" screen (do not display initial window).\n"
-" --invisible Starts in invisible mode. Neither the start-up
logo nor\n"
-" the initial program window will be visible.
Application\n"
-" can be controlled, and documents and dialogs
can be\n"
-" controlled and opened via the API. Using the
parameter,\n"
-" the process can only be ended using the
taskmanager\n"
-" (Windows) or the kill command (UNIX-like
systems). It\n"
-" cannot be used in conjunction with
--quickstart.\n"
-" --headless Starts in \"headless mode\" which allows using
the\n"
-" application without GUI. This special mode can
be used\n"
-" when the application is controlled by external
clients\n"
-" via the API.\n"
+" argument - switches, switch parameters and document URIs
(filenames). \n\n"
+"Using without special arguments:
\n"
+"Opens the start center, if it is used without any arguments.
\n"
+" {file} Tries to open the file (files) in the
component
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/scrptrun.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 476525277727fe1550ff77f0d9979604ac74d00f
Author: Khaled Hosny
AuthorDate: Tue Nov 20 18:08:24 2018 +0200
Commit: Khaled Hosny
CommitDate: Tue Nov 20 19:20:50 2018 +0100
Don’t split HarfBuzz runs for Japanese text
Change-Id: Ib1b632690ae8491732d893788c9b09ced8e49933
Reviewed-on: https://gerrit.libreoffice.org/63668
Tested-by: Jenkins
Reviewed-by: Khaled Hosny
diff --git a/vcl/source/gdi/scrptrun.cxx b/vcl/source/gdi/scrptrun.cxx
index cbf16d6e85bd..f19e169fe93e 100644
--- a/vcl/source/gdi/scrptrun.cxx
+++ b/vcl/source/gdi/scrptrun.cxx
@@ -115,6 +115,19 @@ struct PairIndices
};
+// There are three Unicode script codes for Japaneese text, but only one
+// OpenType script tag, so we want to keep them in one run as splitting is
+// pointless for the purpose of OpenType shaping.
+UScriptCode getScript(UChar32 ch, UErrorCode* status)
+{
+UScriptCode script = uscript_getScript(ch, status);
+if (U_FAILURE(*status))
+return script;
+if (script == USCRIPT_KATAKANA || script == USCRIPT_KATAKANA_OR_HIRAGANA)
+return USCRIPT_HIRAGANA;
+return script;
+}
+
}
static const PairIndices gPairIndices;
@@ -159,7 +172,7 @@ UBool ScriptRun::next()
}
}
-UScriptCode sc = uscript_getScript(ch, &error);
+UScriptCode sc = getScript(ch, &error);
int32_t pairIndex = gPairIndices.getPairIndex(ch);
// Paired character handling:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 4 commits - connectivity/Module_connectivity.mk oox/source Repository.mk sw/source
Repository.mk |2
connectivity/Module_connectivity.mk|4
oox/source/drawingml/chart/seriescontext.cxx |4
oox/source/drawingml/chart/seriesconverter.cxx |4
sw/source/filter/ww8/docxattributeoutput.cxx | 131 -
sw/source/filter/ww8/docxattributeoutput.hxx |3
6 files changed, 77 insertions(+), 71 deletions(-)
New commits:
commit 14a91d625118eadffda4c0a102ad43d7f26d74b5
Author: Markus Mohrhard
AuthorDate: Sun Nov 18 22:00:23 2018 +0100
Commit: Andras Timar
CommitDate: Tue Nov 20 19:12:27 2018 +0100
tdf#108022, don't overwrite chart export information
Change-Id: I47d8a817022829c8cada614469303e440f377299
Reviewed-on: https://gerrit.libreoffice.org/63536
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit 9ccdf4d8abf6ec6612c88ab65be25eb6be89b455)
Reviewed-on: https://gerrit.libreoffice.org/63540
Tested-by: Xisco Faulí
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 21467c1c0fea676a33c7b7e75648947efea18fcb)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3afa61c66d6b..915075964cf5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4795,8 +4795,7 @@ bool DocxAttributeOutput::WriteOLEChart( const SdrObject*
pSdrObj, const Size& r
if (!SotExchange::IsChart(aClassID))
return false;
-m_postponedChart = pSdrObj;
-m_postponedChartSize = rSize;
+m_aPostponedCharts.push_back(std::pair(pSdrObj,
rSize));
return true;
}
@@ -4805,81 +4804,86 @@ bool DocxAttributeOutput::WriteOLEChart( const
SdrObject* pSdrObj, const Size& r
*/
void DocxAttributeOutput::WritePostponedChart()
{
-if(m_postponedChart == nullptr)
+if (m_aPostponedCharts.empty())
return;
-uno::Reference< chart2::XChartDocument > xChartDoc;
-uno::Reference< drawing::XShape > xShape(
const_cast(m_postponedChart)->getUnoShape(), uno::UNO_QUERY );
-if( xShape.is() )
-{
-uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY
);
-if( xPropSet.is() )
-xChartDoc.set( xPropSet->getPropertyValue( "Model" ),
uno::UNO_QUERY );
-}
-if( xChartDoc.is() )
+for (const auto& itr : m_aPostponedCharts)
{
-SAL_INFO("sw.ww8", "DocxAttributeOutput::WriteOLE2Obj: export chart ");
-m_pSerializer->startElementNS( XML_w, XML_drawing,
-FSEND );
-m_pSerializer->startElementNS( XML_wp, XML_inline,
-XML_distT, "0", XML_distB, "0", XML_distL, "0", XML_distR, "0",
-FSEND );
+uno::Reference< chart2::XChartDocument > xChartDoc;
+uno::Reference< drawing::XShape > xShape(
const_cast(itr.first)->getUnoShape(), uno::UNO_QUERY );
+if( xShape.is() )
+{
+uno::Reference< beans::XPropertySet > xPropSet( xShape,
uno::UNO_QUERY );
+if( xPropSet.is() )
+xChartDoc.set( xPropSet->getPropertyValue( "Model" ),
uno::UNO_QUERY );
+}
-OString aWidth( OString::number( TwipsToEMU(
m_postponedChartSize.Width() ) ) );
-OString aHeight( OString::number( TwipsToEMU(
m_postponedChartSize.Height() ) ) );
-m_pSerializer->singleElementNS( XML_wp, XML_extent,
-XML_cx, aWidth.getStr(),
-XML_cy, aHeight.getStr(),
-FSEND );
-// TODO - the right effectExtent, extent including the effect
-m_pSerializer->singleElementNS( XML_wp, XML_effectExtent,
-XML_l, "0", XML_t, "0", XML_r, "0", XML_b, "0",
-FSEND );
+if( xChartDoc.is() )
+{
+SAL_INFO("sw.ww8", "DocxAttributeOutput::WriteOLE2Obj: export
chart ");
+m_pSerializer->startElementNS( XML_w, XML_drawing,
+FSEND );
+m_pSerializer->startElementNS( XML_wp, XML_inline,
+XML_distT, "0", XML_distB, "0", XML_distL, "0", XML_distR,
"0",
+FSEND );
-OUString sName("Object 1");
-uno::Reference< container::XNamed > xNamed( xShape, uno::UNO_QUERY );
-if( xNamed.is() )
-sName = xNamed->getName();
+OString aWidth( OString::number( TwipsToEMU( itr.second.Width() )
) );
+OString aHeight( OString::number( TwipsToEMU( itr.second.Height()
) ) );
+m_pSerializer->singleElementNS( XML_wp, XML_extent,
+XML_cx, aWidth.getStr(),
+XML_cy, aHeight.getStr(),
+FSEND );
+// TODO - the right effectExtent, extent including the effect
+m_pSerializer->singleElementNS( XML_wp, XML_effectExtent,
+XML_l, "0", XML_t, "0", XML_r, "0", XML_b, "0",
+FSEND );
-/* If there is a scenar
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4a' - 13 commits - sw/inc sw/source
Rebased ref, commits from common ancestor:
commit 5042226b2bba8dc9d9ea24e699f46bbb85684041
Author: Michael Stahl
AuthorDate: Tue Nov 20 18:51:31 2018 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 20 18:52:49 2018 +0100
MoveLeftMargin
Change-Id: I670491dfef2756a17e3b4f44d25eaa75de8368af
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2a259413a5f3..a12024ffbd36 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1378,7 +1378,8 @@ public:
/** Adjust left margin via object bar (similar to adjustment of
numerations).
One can either change the margin "by" adding or subtracting a given
offset or set it "to" this position (bModulus = true). */
-void MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus );
+void MoveLeftMargin(const SwPaM& rPam, bool bRight, bool bModulus,
+SwRootFrame const* pLayout = nullptr);
// Query NumberFormatter.
inline SvNumberFormatter* GetNumberFormatter( bool bCreate = true );
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index e88f986d5b70..0b7d3a170ba1 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1638,7 +1638,8 @@ SwFormat* SwDoc::FindFormatByName( const SwFormatsBase&
rFormatArr,
return pFnd;
}
-void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool bRight, bool bModulus )
+void SwDoc::MoveLeftMargin(const SwPaM& rPam, bool bRight, bool bModulus,
+SwRootFrame const*const pLayout)
{
SwHistory* pHistory = nullptr;
if (GetIDocumentUndoRedo().DoesUndo())
@@ -1658,6 +1659,7 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool
bRight, bool bModulus )
SwTextNode* pTNd = aIdx.GetNode().GetTextNode();
if( pTNd )
{
+pTNd = sw::GetParaPropsNode(*pLayout, aIdx);
SvxLRSpaceItem aLS( static_cast(pTNd->SwContentNode::GetAttr( RES_LR_SPACE )) );
// #i93873# See also lcl_MergeListLevelIndentAsLRSpaceItem in
thints.cxx
@@ -1693,6 +1695,7 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool
bRight, bool bModulus )
SwRegHistory aRegH( pTNd, *pTNd, pHistory );
pTNd->SetAttr( aLS );
+aIdx = *sw::GetFirstAndLastNode(*pLayout, aIdx).second;
}
++aIdx;
}
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index e26d39007726..b2c2eab75197 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -564,10 +564,10 @@ void SwEditShell::MoveLeftMargin( bool bRight, bool
bModulus )
SwPaM aPam( *pCursor->GetPoint() );
for( size_t n = 0; n < aRangeArr.Count(); ++n )
GetDoc()->MoveLeftMargin( aRangeArr.SetPam( n, aPam ),
-bRight, bModulus );
+bRight, bModulus, GetLayout() );
}
else
-GetDoc()->MoveLeftMargin( *pCursor, bRight, bModulus );
+GetDoc()->MoveLeftMargin( *pCursor, bRight, bModulus, GetLayout() );
EndUndo( SwUndoId::END );
EndAllAction();
commit 166886d1d3efb4e84d337c5663d438d926411515
Author: Michael Stahl
AuthorDate: Tue Nov 20 18:26:18 2018 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 20 18:26:18 2018 +0100
SwEditShell::IsMoveLeftMargin()
Change-Id: I2bc29816af93ae265c0f0d11977b2d694e00ad6c
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 53712252e315..e26d39007726 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -524,6 +524,7 @@ bool SwEditShell::IsMoveLeftMargin( bool bRight, bool
bModulus ) const
for( sal_uLong n = nSttNd; bRet && n <= nEndNd; ++n )
if( nullptr != ( pCNd = GetDoc()->GetNodes()[ n ]->GetTextNode() ))
{
+pCNd = sw::GetParaPropsNode(*GetLayout(), *pCNd);
const SvxLRSpaceItem& rLS = static_cast(
pCNd->GetAttr( RES_LR_SPACE ));
if( bRight )
commit fa006e92b03bc332304f0e1589c91d9a3b6b409b
Author: Michael Stahl
AuthorDate: Tue Nov 20 18:26:12 2018 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 20 18:26:12 2018 +0100
SwEditShell::GetPaMTextFormatColl()
Change-Id: I10dcee40b98b752a30942a64c1115116dfc668be
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index efd9b459146c..53712252e315 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -299,6 +299,7 @@ SwTextFormatColl* SwEditShell::GetPaMTextFormatColl( SwPaM*
pPaM ) const
std::vector >>
SwEditShell::GetItemWithPaM( sal_uInt16 nWhich )
{
+assert(isCHRATR(nWhich)); // sw_redlinehide: only thing that works
std::vector >> vItem;
for(SwPaM& rCurrentPaM : GetCursor()->GetRingContainer())
{ // for all the point and mark (selections)
commit 0900de0eb3489f2e53e928787c50ea31591d042d
Author: Michael Sta
Re: Unable to build with poppler 0.71.0
Am Mon, 19 Nov 2018 16:07:09 +0300
schrieb Andrey Cherepanov :
> If build with poppler 0.71.0 I get errors for missing type GBool:
>
> In file included from
> /usr/src/RPM/BUILD/libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx:20:0:
> /usr/src/RPM/BUILD/libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:153:17:
> error: 'GBool' does not name a type; did you mean 'bool'
> virtual GBool upsideDown() override { return gTrue; }
> ^
> bool
> /usr/src/RPM/BUILD/libreoffice-6.0.7.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx:156:17:
> error: 'GBool' does not name a type; did you mean 'bool'
> virtual GBool useDrawChar() override { return gTrue; }
> ^
> bool
> ...
>
> There is commit
> https://gitlab.freedesktop.org/poppler/poppler/commit/163420b48bdddf9084208b3cadf04dafad52d40a
>
> Replace GBool, gTrue, and gFalse by bool, true, false, resp.
>
> So type GBool (and so on) is no longer exist and it should be replaced
> by bool in sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
>
Feel free to use this fix:
https://git.archlinux.org/svntogit/packages.git/plain/trunk/libreoffice-poppler-0.71.patch?h=packages/libreoffice-still
-Andy
Arch Linux
pgpxktHCh6rza.pgp
Description: Digitale Signatur von OpenPGP
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source
cui/source/tabpages/numfmt.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 79422c4378d3d504f191f3959edbc798ef1e332a
Author: Caolán McNamara
AuthorDate: Tue Nov 20 11:53:03 2018 +
Commit: Caolán McNamara
CommitDate: Tue Nov 20 18:29:32 2018 +0100
tdf#121538 index 1 never existed
Change-Id: I8493685ceab81a2bd07a3fc75b371a0f679695fb
Reviewed-on: https://gerrit.libreoffice.org/63652
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a13403059b88..69b25330c98e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1612,7 +1612,9 @@ IMPL_LINK_NOARG(SvxNumberFormatTabPage,
LostFocusHdl_Impl, weld::Widget&, void)
{
sal_uInt16 nSelPos = m_xLbFormat->get_selected_index();
pNumFmtShell->SetComment4Entry(nSelPos, m_xEdComment->get_text());
-m_xEdComment->set_text(m_xLbCategory->get_text(1));// String for
user defined
+// String for user defined, if present
+OUString sEntry = m_xLbCategory->n_children() > 1 ?
m_xLbCategory->get_text(1) : OUString();
+m_xEdComment->set_text(sEntry);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/odfexport/data/referencelanguage.odt |binary
sw/qa/extras/odfexport/odfexport.cxx |2 +-
sw/source/core/fields/reffld.cxx |2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 542d17d9384cced62db6bcfa45a5f44316409edc
Author: László Németh
AuthorDate: Tue Nov 20 09:44:43 2018 +0100
Commit: László Németh
CommitDate: Tue Nov 20 18:18:41 2018 +0100
tdf#115319 fix Hungarian article before letter i
in words, for example “az Ipsum”, not “a Ipsum”.
This bug was reported by Gellért Gyuris.
Complete commit 1037e3759bf178b52d16c12a811717f94ab9950a
(tdf#115319 references with Hungarian articles)
Change-Id: If930feb11a0308246d2512f0093bcacdc8675d0b
Reviewed-on: https://gerrit.libreoffice.org/63637
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/odfexport/data/referencelanguage.odt
b/sw/qa/extras/odfexport/data/referencelanguage.odt
index dcdd626fe3cf..9614bb3e31bc 100644
Binary files a/sw/qa/extras/odfexport/data/referencelanguage.odt and
b/sw/qa/extras/odfexport/data/referencelanguage.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 2ef4e2cd4400..0f60b411ede2 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1948,7 +1948,7 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage,
"referencelanguage.odt")
{
// Test loext:reference-language attribute of reference fields
// (used from LibreOffice 6.1, and proposed for next ODF)
-const char* aFieldTexts[] = { "A 2", "Az 50-esek",
+const char* aFieldTexts[] = { "A 2", "Az Isten", "Az 50-esek",
"A 2018-asok", "Az egyebek", "A fejezetek",
reinterpret_cast(u8"Az „Őseinket...”"), "a 2",
"Az v", "az 1", "Az e", "az 1",
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 0ba15e80664e..40793345af65 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -294,7 +294,7 @@ static void lcl_formatReferenceLanguage( OUString& rRefText,
0x00E1, 0x00C1, 0x00E9, 0x00C9, 0x00ED, 0x00CD,
0x00F3, 0x00D3, 0x00F6, 0x00D6, 0x0151, 0x0150,
0x00FA, 0x00DA, 0x00FC, 0x00DC, 0x0171, 0x0170, 0 };
-static OUString sVowels = "aAeEoOuU" + OUString(sVowelsWithDiacritic);
+static OUString sVowels = "aAeEiIoOuU" +
OUString(sVowelsWithDiacritic);
// handle more than 1-letter long Roman numbers and
// their possible combinations with letters:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/po
loleaflet/po/templates/loleaflet-help.pot | 608 +++--- loleaflet/po/templates/loleaflet-ui.pot | 178 2 files changed, 395 insertions(+), 391 deletions(-) New commits: commit 81739f99a4ce4177dc8672c21bac6243e0e105d2 Author: Andras Timar AuthorDate: Tue Nov 20 18:11:15 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 18:11:15 2018 +0100 loleaflet: updated pot files Change-Id: Ic7acf5b61c3f66728390cd16f15aaf0041aa0839 diff --git a/loleaflet/po/templates/loleaflet-help.pot b/loleaflet/po/templates/loleaflet-help.pot index 730927d39..b8cedcda8 100644 --- a/loleaflet/po/templates/loleaflet-help.pot +++ b/loleaflet/po/templates/loleaflet-help.pot @@ -3,933 +3,933 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 10:17+0200\n" +"POT-Creation-Date: 2018-11-20 18:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.13.0\n" +"X-Generator: Translate Toolkit 2.3.0\n" -#: dist/loleaflet-help.html+div.h1:25 +#: html/loleaflet-help.html%2Bdiv.h1:25-5 msgid "Keyboard Shortcuts" msgstr "" -#: dist/loleaflet-help.html+div.div.h2:27 +#: html/loleaflet-help.html%2Bdiv.div.h2:27-9 msgid "General Keyboard Shortcuts" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:29 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:29-18 msgid "Undo" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:29 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:29-49 msgid "Ctrl + Z" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:30 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:30-18 msgid "Redo" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:30 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:30-49 msgid "Ctrl + Y" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:31 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-18 msgid "Cut" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:31 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-48 msgid "Ctrl + X" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:32 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:32-18 msgid "Paste as unformatted text" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:32 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:32-70 msgid "Ctrl + Alt + Shift + V" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:33 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:33-18 msgid "Print (Download as PDF)" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:33 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:33-68 msgid "Ctrl + P" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:34 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:34-18 msgid "Display the Keyboard shortcuts help" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:34 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:34-80 msgid "Ctrl + Shift + ?" msgstr "" -#: dist/loleaflet-help.html+div.div.h2:38 -#: dist/loleaflet-help.html+div.div.h2:160 +#: html/loleaflet-help.html%2Bdiv.div.h2:38-9 +#: html/loleaflet-help.html%2Bdiv.div.h2:160-9 msgid "Text formatting" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:40 -#: dist/loleaflet-help.html+div.div.table.tr.td:137 -#: dist/loleaflet-help.html+div.div.table.tr.td:162 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:40-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:137-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:162-18 msgid "Bold" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:40 -#: dist/loleaflet-help.html+div.div.table.tr.td:137 -#: dist/loleaflet-help.html+div.div.table.tr.td:162 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:40-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:137-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:162-49 msgid "Ctrl + B" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:41 -#: dist/loleaflet-help.html+div.div.table.tr.td:138 -#: dist/loleaflet-help.html+div.div.table.tr.td:163 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:41-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:138-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:163-18 msgid "Italic" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:41 -#: dist/loleaflet-help.html+div.div.table.tr.td:138 -#: dist/loleaflet-help.html+div.div.table.tr.td:163 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:41-51 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:138-51 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:163-51 msgid "Ctrl + I" msgstr "" -#: dist/loleaflet-help.html+div.div.table.tr.td:42 -#: dist/loleaflet-help.html+div.div.table.tr.td:139
[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6.2.0.0.beta1'
Tag 'libreoffice-6.2.0.0.beta1' created by Andras Timar at 2018-11-20 17:07 + libreoffice-6.2.0.0.beta1 Changes since libreoffice-6-2-branch-point-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - loleaflet/po
loleaflet/po/help-kab.po | 112 -- loleaflet/po/help-sl.po | 504 --- loleaflet/po/ui-ab.po|2 loleaflet/po/ui-am.po|2 loleaflet/po/ui-ar.po|2 loleaflet/po/ui-bg.po|2 loleaflet/po/ui-bs.po|2 loleaflet/po/ui-ca.po|2 loleaflet/po/ui-cs.po|2 loleaflet/po/ui-cy.po|2 loleaflet/po/ui-da.po|2 loleaflet/po/ui-de.po|2 loleaflet/po/ui-dsb.po |2 loleaflet/po/ui-el.po|2 loleaflet/po/ui-en_GB.po |2 loleaflet/po/ui-eo.po|2 loleaflet/po/ui-es.po|2 loleaflet/po/ui-et.po|2 loleaflet/po/ui-eu.po|2 loleaflet/po/ui-fi.po|2 loleaflet/po/ui-fr.po|2 loleaflet/po/ui-fy.po|2 loleaflet/po/ui-gd.po|2 loleaflet/po/ui-gl.po|2 loleaflet/po/ui-gug.po |2 loleaflet/po/ui-he.po|2 loleaflet/po/ui-hi.po|2 loleaflet/po/ui-hr.po|2 loleaflet/po/ui-hsb.po |2 loleaflet/po/ui-hu.po|2 loleaflet/po/ui-id.po|2 loleaflet/po/ui-is.po|2 loleaflet/po/ui-it.po|2 loleaflet/po/ui-ja.po|2 loleaflet/po/ui-jv.po|2 loleaflet/po/ui-kk.po|2 loleaflet/po/ui-ko.po|2 loleaflet/po/ui-lt.po|2 loleaflet/po/ui-lv.po|2 loleaflet/po/ui-nb.po|2 loleaflet/po/ui-ne.po|2 loleaflet/po/ui-nl.po|2 loleaflet/po/ui-nn.po|2 loleaflet/po/ui-oc.po|2 loleaflet/po/ui-pl.po|2 loleaflet/po/ui-pt.po|2 loleaflet/po/ui-pt_BR.po |2 loleaflet/po/ui-ro.po|2 loleaflet/po/ui-ru.po|2 loleaflet/po/ui-sk.po|2 loleaflet/po/ui-sq.po|2 loleaflet/po/ui-sv.po|2 loleaflet/po/ui-ta.po|2 loleaflet/po/ui-tr.po|2 loleaflet/po/ui-ug.po|2 loleaflet/po/ui-uk.po|2 loleaflet/po/ui-uz.po|2 loleaflet/po/ui-vec.po |2 loleaflet/po/ui-zh_CN.po |2 loleaflet/po/ui-zh_TW.po |2 60 files changed, 1 insertion(+), 731 deletions(-) New commits: commit 7c829d85fcd133188d52295ae15fc85aab8decad Author: Andras Timar AuthorDate: Tue Nov 20 18:00:58 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 18:00:58 2018 +0100 loleaflet: cleanup obsolete po entries Change-Id: I4034cb6b884afe54aea4bf6c7bfcac7355219bc5 diff --git a/loleaflet/po/help-kab.po b/loleaflet/po/help-kab.po index 0ef9a91d6..51724656d 100644 --- a/loleaflet/po/help-kab.po +++ b/loleaflet/po/help-kab.po @@ -955,115 +955,3 @@ msgstr "" msgid "Select all in slide / drawing page" msgstr "" -#~ msgid "LOLeaflet Help" -#~ msgstr "Amnir n tallalt LO" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:124" -#~ msgid "Ctrl + A" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:159" -#~ msgid "Ctrl + B" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:160" -#~ msgid "Ctrl + I" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:161" -#~ msgid "Ctrl + U" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:163" -#~ msgid "Ctrl + M" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:166" -#~ msgid "Ctrl + D" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:167" -#~ msgid "Ctrl + A" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:168" -#~ msgid "Ctrl + E" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:169" -#~ msgid "Ctrl + L" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:170" -#~ msgid "Ctrl + R" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:171" -#~ msgid "Ctrl + J" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:172" -#~ msgid "Ctrl + 3" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:184" -#~ msgid "Ctrl + B" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:185" -#~ msgid "Ctrl + I" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:186" -#~ msgid "Ctrl + U" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:190" -#~ msgid "Ctrl + A" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:194" -#~ msgid "Ctrl + E" -#~ msgstr "Ctrl + Z" - -#, fuzzy -#~ msgctxt "dist/loleaflet-help.html html.body.div.table.tr.td:195" -#~ msgid "Ctrl + L" -#~ msgstr "Ctrl + Z" -
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/breeze icon-themes/colibre
icon-themes/breeze/links.txt | 12 icon-themes/colibre/links.txt | 12 2 files changed, 24 insertions(+) New commits: commit 7f51b819fda14c21557c0744a28f2c29eb6bc73f Author: andreas kainz AuthorDate: Mon Nov 19 02:35:31 2018 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Tue Nov 20 17:58:25 2018 +0100 Colibre Breeze icons: add masterpage and pagemode icons for draw from impress Change-Id: I60bb28ddf47ca4aa3ef16c9fd61e26ac80d4e721 Reviewed-on: https://gerrit.libreoffice.org/63563 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 295059082e46718526ab0cc296416447128ceb8c) Reviewed-on: https://gerrit.libreoffice.org/63656 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index fd885877fad7..fc6cc36ed482 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1726,3 +1726,15 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png cmd/sc_cellprotection.png cmd/sc_protect.png cmd/lc_cellprotection.png cmd/lc_protect.png + +# writer +# === +cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png + +# draw +# === +cmd/sc_masterpage.png cmd/sc_slidemasterpage.png +cmd/lc_masterpage.png cmd/lc_slidemasterpage.png + +cmd/sc_pagemode.png cmd/sc_normalmultipanegui.png +cmd/lc_pagemode.png cmd/lc_normalmultipanegui.png diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 6e5b2f6b5576..ab1b9ee502b2 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1783,3 +1783,15 @@ cmd/sc_convertmenu.png cmd/sc_bezierconvert.png cmd/sc_chartmenu.png cmd/sc_drawchart.png cmd/sc_objectmenu.png cmd/sc_insertframe.png +# writer +# === +cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png +cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png + +# draw +# === +cmd/sc_masterpage.png cmd/sc_slidemasterpage.png +cmd/lc_masterpage.png cmd/lc_slidemasterpage.png + +cmd/sc_pagemode.png cmd/sc_normalmultipanegui.png +cmd/lc_pagemode.png cmd/lc_normalmultipanegui.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a65455788483886db2060a4cbdea3f84bed4174 Author: Roman Kuznetsov AuthorDate: Tue Nov 20 09:51:11 2018 +0100 Commit: Heiko Tietze CommitDate: Tue Nov 20 16:34:40 2018 +0100 tdf#121490 Hide item Standard (Viewing Mode) toolbar from menu Change-Id: I9e3a071b9b5792a627a3c5b478ba16f0de386487 Reviewed-on: https://gerrit.libreoffice.org/63630 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 0f1b4a0b080b..fe41f19e58f9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -654,7 +654,7 @@ Standard (Viewing Mode) - false + true true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - 4 commits - bundled/include configure.ac debian/loolwsd.service .gitreview loolwsd.service
.gitreview |2 +- bundled/include/LibreOfficeKit/LibreOfficeKit.h |9 - configure.ac|2 +- debian/loolwsd.service |2 +- loolwsd.service |2 +- 5 files changed, 4 insertions(+), 13 deletions(-) New commits: commit a48c0784de720b7f912219d154feacc025fb0d06 Author: Andras Timar AuthorDate: Tue Nov 20 16:25:50 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 16:27:13 2018 +0100 fix mismerge Change-Id: I34c002d86ca32f0dec8c04b31ec242129db20c4d diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h index 4409e62ec..27d968c4a 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -347,15 +347,6 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::getSignatureState(). int (*getSignatureState) (LibreOfficeKitDocument* pThis); -/// Paints window with given id to the buffer with the give DPI scale -/// (every pixel is dpiscale-times larger). -/// @see lok::Document::paintWindow(). -void (*paintWindowDPI) (LibreOfficeKitDocument* pThis, unsigned nWindowId, -unsigned char* pBuffer, -const int x, const int y, -const int width, const int height, -const double dpiscale); - #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; commit de4ed0eb20885277faa549513b1656b4d469ab79 Author: Andras Timar AuthorDate: Tue Nov 20 14:06:29 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 14:06:29 2018 +0100 gitreview: Update default branch Change-Id: I452c52deee94c65cee9296f6161fa28a0cf43903 diff --git a/.gitreview b/.gitreview index fc87636e3..b89dcd89d 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=logerrit port=29418 project=online defaultremote=logerrit -defaultbranch=master +defaultbranch=libreoffice-6-2 commit 4859ca9e7de538d95bff5e13d0f4b62c4e648e44 Author: Andras Timar AuthorDate: Mon Jan 22 23:08:49 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 14:05:35 2018 +0100 correct file server root for LibreOffice Online 6.0 Change-Id: I407c0f69e9a001a3a86f13926f0dc303c4df6d21 Reviewed-on: https://gerrit.libreoffice.org/48366 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky (cherry picked from commit b0344acb473038418ff1a5f91c475b0e8f6d4d3b) diff --git a/debian/loolwsd.service b/debian/loolwsd.service index d43d59078..a2ae6e645 100644 --- a/debian/loolwsd.service +++ b/debian/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/libreoffice-online User=lool KillMode=control-group Restart=always diff --git a/loolwsd.service b/loolwsd.service index d43d59078..a2ae6e645 100644 --- a/loolwsd.service +++ b/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/libreoffice-online User=lool KillMode=control-group Restart=always commit 95a2cbe24a7ff07fe4ff1b22d3ac574be7fdea5e Author: Andras Timar AuthorDate: Tue Nov 20 14:04:56 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 14:04:56 2018 +0100 Bump version to 6.2.0.0.beta1 Change-Id: Iaec1ab790b948a0c4274a4f61d6db16ad7b32c61 diff --git a/configure.ac b/configure.ac index 39e4cf3b3..386fc1a32 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org]) +AC_INIT([libreoffice-online], [6.2.0.0.beta1], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/numfmt.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit c03a70770e667290e3766e639300c7ecef5eea1f
Author: Caolán McNamara
AuthorDate: Tue Nov 20 11:53:03 2018 +
Commit: Caolán McNamara
CommitDate: Tue Nov 20 16:29:15 2018 +0100
tdf#121538 index 1 never existed
Change-Id: I8493685ceab81a2bd07a3fc75b371a0f679695fb
Reviewed-on: https://gerrit.libreoffice.org/63651
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a13403059b88..69b25330c98e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1612,7 +1612,9 @@ IMPL_LINK_NOARG(SvxNumberFormatTabPage,
LostFocusHdl_Impl, weld::Widget&, void)
{
sal_uInt16 nSelPos = m_xLbFormat->get_selected_index();
pNumFmtShell->SetComment4Entry(nSelPos, m_xEdComment->get_text());
-m_xEdComment->set_text(m_xLbCategory->get_text(1));// String for
user defined
+// String for user defined, if present
+OUString sEntry = m_xLbCategory->n_children() > 1 ?
m_xLbCategory->get_text(1) : OUString();
+m_xEdComment->set_text(sEntry);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: bundled/include
bundled/include/LibreOfficeKit/LibreOfficeKit.h |9 - 1 file changed, 9 deletions(-) New commits: commit 027d12ff995f7f24e0a91775f96a3cc6864cdaa4 Author: Andras Timar AuthorDate: Tue Nov 20 16:25:50 2018 +0100 Commit: Andras Timar CommitDate: Tue Nov 20 16:25:50 2018 +0100 fix mismerge Change-Id: I34c002d86ca32f0dec8c04b31ec242129db20c4d diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h index 4409e62ec..27d968c4a 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -347,15 +347,6 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::getSignatureState(). int (*getSignatureState) (LibreOfficeKitDocument* pThis); -/// Paints window with given id to the buffer with the give DPI scale -/// (every pixel is dpiscale-times larger). -/// @see lok::Document::paintWindow(). -void (*paintWindowDPI) (LibreOfficeKitDocument* pThis, unsigned nWindowId, -unsigned char* pBuffer, -const int x, const int y, -const int width, const int height, -const double dpiscale); - #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/nss
external/nss/ExternalProject_nss.mk |4 external/nss/UnpackedTarball_nss.mk |1 external/nss/nss.parallel.patch | 653 3 files changed, 2 insertions(+), 656 deletions(-) New commits: commit f715d6156e9fd1d7e9cd0cc1f64954a47f1b5d2f Author: Jan-Marek Glogowski AuthorDate: Tue Nov 20 16:16:03 2018 +0100 Commit: Jan-Marek Glogowski CommitDate: Tue Nov 20 16:17:09 2018 +0100 Revert "Fix NSS parallel build" For whatever reason this now fails on Windows for multiple users (including myself). Doesn't look like an easy fix is possible, so this is reverted until I find some more time to look into it (or give up on it). This reverts commit baf0d6d65da8314d718380bb5750ccd29f3d9a08. Change-Id: I432637131ba8ac8be614496bd6da0e157372ae94 Reviewed-on: https://gerrit.libreoffice.org/63664 Reviewed-by: Jan-Marek Glogowski Tested-by: Jan-Marek Glogowski diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 2de4c5710fd8..a270e1f7de87 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ LIB="$(ILIB)" \ XCFLAGS="-arch:SSE $(SOLARINC)" \ - $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ + $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ ,nss) @@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ - $(MAKE) AR="$(AR)" \ + $(MAKE) -j1 AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \ COMMA=$(COMMA) \ diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index b734e0a24d70..e20598f4ae01 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -34,7 +34,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.utf8bom.patch.1) \ $(if $(filter ANDROID,$(OS)), \ external/nss/nss-android.patch.1) \ - external/nss/nss.parallel.patch \ )) ifeq ($(COM_IS_CLANG),TRUE) diff --git a/external/nss/nss.parallel.patch b/external/nss/nss.parallel.patch deleted file mode 100644 index 0e7c2ee715ae.. --- a/external/nss/nss.parallel.patch +++ /dev/null @@ -1,653 +0,0 @@ -diff -ur a/nss/nspr/config/config.mk b/nss/nspr/config/config.mk a/nss/nspr/config/config.mk2018-03-05 15:50:28.0 + -+++ b/nss/nspr/config/config.mk2018-10-16 15:43:00.444179603 + -@@ -64,7 +64,7 @@ - endif # NO_PROFILE_GUIDED_OPTIMIZE - - define MAKE_OBJDIR --if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi -+if test ! -e $(@D); then mkdir -p $(@D); fi - endef - - LINK_DLL = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS) -diff -ur a/nss/nspr/config/Makefile.in b/nss/nspr/config/Makefile.in a/nss/nspr/config/Makefile.in 2018-03-05 15:50:28.0 + -+++ b/nss/nspr/config/Makefile.in 2018-10-16 15:43:38.107971866 + -@@ -98,7 +98,7 @@ - - # Redefine MAKE_OBJDIR for just this directory - define MAKE_OBJDIR --if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi -+if test ! -e $(@D); then mkdir -p $(@D); fi - endef - - export:: $(TARGETS) -diff -ur a/nss/nss/cmd/lib/Makefile b/nss/nss/cmd/lib/Makefile a/nss/nss/cmd/lib/Makefile 2018-06-21 09:24:45.0 + -+++ b/nss/nss/cmd/lib/Makefile 2018-10-16 18:20:46.922690884 + -@@ -44,6 +44,5 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ### - --export:: private_export - - -diff -ur a/nss/nss/cmd/libpkix/testutil/Makefile b/nss/nss/cmd/libpkix/testutil/Makefile a/nss/nss/cmd/libpkix/testutil/Makefile2018-06-21 09:24:45.0 + -+++ b/nss/nss/cmd/libpkix/testutil/Makefile2018-10-16 18:20:46.922690884 + -@@ -47,5 +47,4 @@ - - include $(PLAT_DEPTH)/platrules.mk - --export:: private_export - -diff -ur a/nss/nss/cmd/shlibsign/Makefile b/nss/nss/cmd/shlibsign/Makefile a/nss/nss/cmd/shlibsign/Makefile 2018-10-18 11:31:47.775647843 + -+++ b/nss/nss/cmd/shlibsign/Makefile 2018-10-18 10:47:47.743324992 + -@@ -98,5 +98,7 @@ - endif - endif - --libs install :: $(CHECKLOC) -+libs:: -+ $(MAKE) install -+ $(MAKE) $(CHECKLOC) - -diff -ur a/nss/nss/corecon
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
5 new defect(s) introduced to LibreOffice found with Coverity Scan.
4 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 5 of 5 defect(s)
** CID 1441470: Uninitialized members (UNINIT_CTOR)
/vcl/unx/gtk3/gtk3gtkinst.cxx: 4133 in
GtkInstanceTreeIter::GtkInstanceTreeIter(const GtkInstanceTreeIter*)()
*** CID 1441470: Uninitialized members (UNINIT_CTOR)
/vcl/unx/gtk3/gtk3gtkinst.cxx: 4133 in
GtkInstanceTreeIter::GtkInstanceTreeIter(const GtkInstanceTreeIter*)()
4127
4128 struct GtkInstanceTreeIter : public weld::TreeIter
4129 {
4130 GtkInstanceTreeIter(const GtkInstanceTreeIter* pOrig)
4131 {
4132 if (!pOrig)
>>> CID 1441470: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member field "iter.user_data3" is not initialized in
>>> this constructor nor in any functions that it calls.
4133 return;
4134 iter = pOrig->iter;
4135 }
4136 GtkTreeIter iter;
4137 };
4138
** CID 1441469: Null pointer dereferences (NULL_RETURNS)
*** CID 1441469: Null pointer dereferences (NULL_RETURNS)
/vcl/source/app/salvtables.cxx: 2165 in
SalInstanceTreeView::ExpandingHdl(SvTreeListBox *)()
2159 bool bPlaceHolder = false;
2160 if (pEntry->HasChildren())
2161 {
2162 auto pChild = m_xTreeView->FirstChild(pEntry);
2163 if (m_xTreeView->GetEntryText(pChild) == "")
2164 {
>>> CID 1441469: Null pointer dereferences (NULL_RETURNS)
>>> Dereferencing a pointer that might be null "pChild" when calling
>>> "RemoveEntry".
2165 m_xTreeView->RemoveEntry(pChild);
2166 bPlaceHolder = true;
2167 }
2168 }
2169
2170 SalInstanceTreeIter aIter(nullptr);
** CID 1441468: Uninitialized members (UNINIT_CTOR)
/vcl/source/app/salvtables.cxx: 1758 in
SalInstanceTreeIter::SalInstanceTreeIter(const SalInstanceTreeIter*)()
*** CID 1441468: Uninitialized members (UNINIT_CTOR)
/vcl/source/app/salvtables.cxx: 1758 in
SalInstanceTreeIter::SalInstanceTreeIter(const SalInstanceTreeIter*)()
1752
1753 struct SalInstanceTreeIter : public weld::TreeIter
1754 {
1755 SalInstanceTreeIter(const SalInstanceTreeIter* pOrig)
1756 {
1757 if (!pOrig)
>>> CID 1441468: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "iter" is not initialized in this constructor
>>> nor in any functions that it calls.
1758 return;
1759 iter = pOrig->iter;
1760 }
1761 SvTreeListEntry* iter;
1762 };
1763
** CID 1441467: Error handling issues (CHECKED_RETURN)
/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx: 1236 in
SalGtkFilePicker::HandleGetListValue(_GtkComboBox *, short)()
*** CID 1441467: Error handling issues (CHECKED_RETURN)
/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx: 1236 in
SalGtkFilePicker::HandleGetListValue(_GtkComboBox *, short)()
1230 {
1231 gchar *item;
1232
gtk_tree_model_get(gtk_combo_box_get_model(pWidget),
1233 &iter, 0, &item, -1);
1234 aItemList[i] = OUString(item, strlen(item),
RTL_TEXTENCODING_UTF8);
1235 g_free(item);
>>> CID 1441467: Error handling issues (CHECKED_RETURN)
>>> Calling "gtk_tree_model_iter_next" without checking return value (as is
>>> done elsewhere 4 out of 5 times).
1236 gtk_tree_model_iter_next(pTree, &iter);
1237 }
1238 }
1239 aAny <<= aItemList;
1240 }
1241 break;
** CID 1441466:(TAINTED_SCALAR)
/filter/source/graphicfilter/ipict/ipict.cxx: 1095 in
PictReader::ReadPixMapEtc(BitmapEx &, bool, bool, tools::Rectangle *,
tools::Rectangle *, bool, bool)()
/filter/source/graphicfilter/ipict/ipict.cxx: 1126 in
PictReader::ReadPixMapEtc(BitmapEx &, bool, bool, tools::Rectangle *,
tools::Rectangle *, bool, bool)()
*** CID 1441466:(TAINTED_SCALAR)
/filter/source/graphicfilter/ipict/ipict.cxx: 1095 in
PictReader::ReadPixMapEtc(BitmapEx &,
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/CppunitTest.mk | 15 +-- 1 file changed, 5 insertions(+), 10 deletions(-) New commits: commit d5ed903618f200456feed9b410b7bd1ed8daeb62 Author: Stephan Bergmann AuthorDate: Tue Nov 20 13:27:23 2018 +0100 Commit: Stephan Bergmann CommitDate: Tue Nov 20 15:49:16 2018 +0100 Set CppunitTest-related env vars only during CppunitTest ...and not for every target's recipe, once solenv/gbuild/CppunitTest.mk is included Change-Id: I710160def23fae5f93c5a67ab25e03fdaa008e00 Reviewed-on: https://gerrit.libreoffice.org/63655 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 2217ffc53fbc..21cff341d57d 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -20,16 +20,11 @@ # CppunitTest class # Cap the number of threads unittests use. -export MAX_CONCURRENCY=4 +gb_CppunitTest_ENV_VARS := MAX_CONCURRENCY=4 # Disable searching for certificates by default -export MOZILLA_CERTIFICATE_FOLDER=0 +gb_CppunitTest_ENV_VARS += MOZILLA_CERTIFICATE_FOLDER=0 # Avoid hanging if the cups daemon requests a password. -export SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 -# Default unit tests to run with the headless plugin, if not set by the user -ifeq ($(SAL_USE_VCLPLUGIN),) - SAL_USE_VCLPLUGIN := svp - export SAL_USE_VCLPLUGIN -endif +gb_CppunitTest_ENV_VARS += SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 gb_CppunitTest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if $(SYSTEM_PYTHON),,$(call gb_Package_get_target,python3)) @@ -124,8 +119,6 @@ ifneq ($(gb_SUPPRESS_TESTS),) else $(call gb_Output_announce,$*,$(true),CUT,2) $(call gb_Helper_abbreviate_dirs,\ - $(if $(and $(gb_CppunitTest__vcl_no_svp), \ - $(filter svp,$(SAL_USE_VCLPLUGIN))),unset SAL_USE_VCLPLUGIN &&) \ mkdir -p $(dir $@) && \ rm -fr $@.user && cp -r $(WORKDIR)/unittest $@.user && \ $(if $(gb_CppunitTest__use_confpreinit), \ @@ -136,6 +129,8 @@ else ( \ $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \ $(if $(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \ + $(gb_CppunitTest_ENV_VARS) \ + $(if $(gb_CppunitTest__vcl_no_svp),,SAL_USE_VCLPLUGIN=$(or $(SAL_USE_VCLPLUGIN),svp)) \ $(EXTRA_ENV_VARS) \ $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
0 files changed New commits: commit 330a709899ed1bb037359a287e32c23bb4ffeef1 Author: Andrea Gelmini AuthorDate: Tue Nov 20 12:20:47 2018 +0100 Commit: Julien Nabet CommitDate: Tue Nov 20 15:33:02 2018 +0100 Removed executable permission on odt file Change-Id: Icece4e008b653ce334808e3bee968792c4c9e99c Reviewed-on: https://gerrit.libreoffice.org/63646 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt b/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/sfxhelp.cxx | 108 +--
1 file changed, 53 insertions(+), 55 deletions(-)
New commits:
commit 2b29217c586ca38bd8e8c360fb4b73c2ce81495f
Author: Noel Grandin
AuthorDate: Mon Nov 19 14:50:19 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 20 15:25:11 2018 +0100
clean up HelpLocaleString
to make it easier to read.
And fix the last two fall back cases, where it was assigning a different
value to aLocaleStr than it was returning, which means that it would
return a different value on the second invocation.
Change-Id: I6cac1ddd23b0a6a9e4ae8a0b9e7d94c0d877de39
Reviewed-on: https://gerrit.libreoffice.org/63642
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 19d08453f1d7..d52f74aa4a96 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -110,7 +110,7 @@ IMPL_STATIC_LINK_NOARG(NoHelpErrorBox, HelpRequestHdl,
weld::Widget&, bool)
return false;
}
-static OUString HelpLocaleString();
+static OUString const & HelpLocaleString();
namespace {
@@ -205,69 +205,67 @@ bool impl_hasHTMLHelpInstalled()
/// Return the locale we prefer for displaying help
// static OUString const & HelpLocaleString()
-static OUString HelpLocaleString()
+static OUString const & HelpLocaleString()
{
if (comphelper::LibreOfficeKit::isActive())
return comphelper::LibreOfficeKit::getLanguageTag().getBcp47();
static OUString aLocaleStr;
-if (aLocaleStr.isEmpty())
-{
-const OUString aEnglish("en-US");
-// detect installed locale
-aLocaleStr = utl::ConfigManager::getUILocale();
+if (!aLocaleStr.isEmpty())
+return aLocaleStr;
-if ( aLocaleStr.isEmpty() )
-aLocaleStr = aEnglish;
-else
-{
-// get fall-back language (country)
-OUString sLang = aLocaleStr ;
-sal_Int32 nSepPos = sLang.indexOf( '-' );
-if (nSepPos != -1)
-{
-sLang = sLang.copy( 0, nSepPos );
-}
-OUString sHelpPath("");
-sHelpPath = getHelpRootURL() + "/" +
utl::ConfigManager::getProductVersion() + "/" + aLocaleStr;
-if (impl_checkHelpLocalePath(sHelpPath))
-{
-return aLocaleStr;
-}
-sHelpPath = getHelpRootURL() + "/" +
utl::ConfigManager::getProductVersion() + "/" + sLang;
-if (impl_checkHelpLocalePath(sHelpPath))
-{
-aLocaleStr = sLang;
-return aLocaleStr;
-}
-sHelpPath = getHelpRootURL() + "/" + aLocaleStr;
-if (impl_checkHelpLocalePath(sHelpPath))
-{
-return aLocaleStr;
-}
-sHelpPath = getHelpRootURL() + "/" + sLang;
-if (impl_checkHelpLocalePath(sHelpPath))
-{
-aLocaleStr = sLang;
-return aLocaleStr;
-}
+const OUString aEnglish("en-US");
+// detect installed locale
+aLocaleStr = utl::ConfigManager::getUILocale();
-sHelpPath = getHelpRootURL() + "/" +
utl::ConfigManager::getProductVersion() + "/" + aEnglish;
-if (impl_checkHelpLocalePath(sHelpPath))
-{
-return aEnglish;
-}
-sHelpPath = getHelpRootURL() + "/" + aEnglish;
-if (impl_checkHelpLocalePath(sHelpPath))
-{
-aLocaleStr = sLang;
-return aEnglish;
-}
-aLocaleStr = utl::ConfigManager::getUILocale();
-return aLocaleStr;
-}
+if ( aLocaleStr.isEmpty() )
+{
+aLocaleStr = aEnglish;
+return aLocaleStr;
}
+// get fall-back language (country)
+OUString sLang = aLocaleStr;
+sal_Int32 nSepPos = sLang.indexOf( '-' );
+if (nSepPos != -1)
+{
+sLang = sLang.copy( 0, nSepPos );
+}
+OUString sHelpPath("");
+sHelpPath = getHelpRootURL() + "/" +
utl::ConfigManager::getProductVersion() + "/" + aLocaleStr;
+if (impl_checkHelpLocalePath(sHelpPath))
+{
+return aLocaleStr;
+}
+sHelpPath = getHelpRootURL() + "/" +
utl::ConfigManager::getProductVersion() + "/" + sLang;
+if (impl_checkHelpLocalePath(sHelpPath))
+{
+aLocaleStr = sLang;
+return aLocaleStr;
+}
+sHelpPath = getHelpRootURL() + "/" + aLocaleStr;
+if (impl_checkHelpLocalePath(sHelpPath))
+{
+return aLocaleStr;
+}
+sHelpPath = getHelpRootURL() + "/" + sLang;
+if (impl_checkHelpLocalePath(sHelpPath))
+{
+aLocaleStr = sLang;
+return aLocaleStr;
+}
+sHelpPath = getHelpRootURL() + "/" +
utl::ConfigManager::getProductVersion() + "/" + aEnglish;
+if (impl_checkHelpLocalePath(sHelpPath))
+{
+aLocale
[Libreoffice-commits] core.git: framework/qa
framework/qa/complex/XTitle/CheckXTitle.java | 32 +++
1 file changed, 28 insertions(+), 4 deletions(-)
New commits:
commit 9b3387f57d4a762f681ab5276aff8764426c6aa4
Author: Samuel Mehrbrodt
AuthorDate: Tue Nov 20 13:12:13 2018 +0100
Commit: Samuel Mehrbrodt
CommitDate: Tue Nov 20 14:56:12 2018 +0100
tdf#121537 Add test
Change-Id: Ifdf46dc79f9b3e2b5ab4c9635619a9d7f598affc
Reviewed-on: https://gerrit.libreoffice.org/63654
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/framework/qa/complex/XTitle/CheckXTitle.java
b/framework/qa/complex/XTitle/CheckXTitle.java
index c264c893552a..2e982fab586f 100644
--- a/framework/qa/complex/XTitle/CheckXTitle.java
+++ b/framework/qa/complex/XTitle/CheckXTitle.java
@@ -18,10 +18,7 @@
package complex.XTitle;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import util.utils;
import org.junit.After;
@@ -201,6 +198,33 @@ public class CheckXTitle
xDisProv = null;
}
+/** checks the if SuggestedSaveAsName is displayed in the title */
+@Test
+public void checkTitleSuggestedFileName() throws Exception
+{
+PropertyValue[] lArgs = new PropertyValue[2];
+
+lArgs[0] = new PropertyValue();
+lArgs[0].Name= "Hidden";
+lArgs[0].Value = Boolean.FALSE;
+lArgs[1] = new PropertyValue();
+lArgs[1].Name= "SuggestedSaveAsName";
+lArgs[1].Value = "suggestme.odt";
+
+// load doc
+XComponent xDoc =
m_xLoader.loadComponentFromURL("private:factory/swriter", "_blank", 0, lArgs);
+assertNotNull("Could not load temporary document", xDoc);
+
+XModel xModel = UnoRuntime.queryInterface( XModel.class, xDoc );
+XTitle xTitle = UnoRuntime.queryInterface( XTitle.class,
xModel.getCurrentController().getFrame() );
+
+String title = xTitle.getTitle();
+assertTrue(title.startsWith("suggestme.odt"));
+
+XDispatchProvider xDisProv = UnoRuntime.queryInterface(
XDispatchProvider.class, xModel.getCurrentController() );
+prepareQueryAndDispatch( xDisProv, UNO_URL_FOR_CLOSING_DOC );
+}
+
/** @short sets frame title and checks for infinite recursion
@descr sets frame title. then cycles through default and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa
framework/qa/complex/XTitle/CheckXTitle.java |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 210fbfbbf88ce6957b816e68bc442402b0668e69
Author: Samuel Mehrbrodt
AuthorDate: Tue Nov 20 12:37:06 2018 +0100
Commit: Samuel Mehrbrodt
CommitDate: Tue Nov 20 14:53:21 2018 +0100
Actually run CheckXTitle tests
@Test annotation was missing
Change-Id: I9e58026e5e131b18e35ab81d7927905316b58f11
Reviewed-on: https://gerrit.libreoffice.org/63653
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/framework/qa/complex/XTitle/CheckXTitle.java
b/framework/qa/complex/XTitle/CheckXTitle.java
index 875ccd90a93a..c264c893552a 100644
--- a/framework/qa/complex/XTitle/CheckXTitle.java
+++ b/framework/qa/complex/XTitle/CheckXTitle.java
@@ -155,6 +155,7 @@ public class CheckXTitle
disabled until the waitUntilDispatcherAvailable can be replaced
*/
+@Test
public void checkTitleNumbers() throws Exception
{
PropertyValue[] lArgs = new PropertyValue[1];
@@ -208,6 +209,7 @@ public class CheckXTitle
disabled until the waitUntilDispatcherAvailable can be replaced
*/
+@Test
public void setTitleAndCheck() throws Exception
{
PropertyValue[] lArgs = new PropertyValue[1];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/numpages.cxx | 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 4610388a6cccf45c232bcdfb67d45c0443058b9f
Author: Réka Csékei
AuthorDate: Tue Nov 20 12:26:34 2018 +0100
Commit: Tamás Zolnai
CommitDate: Tue Nov 20 14:48:58 2018 +0100
tdf#120563 Improve the preview of numbering with relative size
Fixes the preview on Customize tab page
Change-Id: If918522bda573c0f312b04592b4b7de957c9416b
Reviewed-on: https://gerrit.libreoffice.org/63649
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 5904c18affcf..07b1c912bf7b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2436,23 +2436,33 @@ void SvxNumberingPreview::Paint(vcl::RenderContext&
rRenderContext, const ::tool
}
else
{
-vcl::Font aColorFont(aStdFont);
+vcl::Font aFont(aStdFont);
+Size aTmpSize(aStdFont.GetFontSize());
+aTmpSize.setWidth( aTmpSize.Width() * (
rFmt.GetBulletRelSize()) );
+aTmpSize.setWidth( aTmpSize.Width() / 100 ) ;
+aTmpSize.setHeight( aTmpSize.Height() * (
rFmt.GetBulletRelSize()) );
+aTmpSize.setHeight( aTmpSize.Height() / 100 ) ;
+if(!aTmpSize.Height())
+aTmpSize.setHeight( 1 );
+aFont.SetFontSize(aTmpSize);
Color aTmpBulletColor = rFmt.GetBulletColor();
if (aTmpBulletColor == COL_AUTO)
aTmpBulletColor = aBackColor.IsDark() ? COL_WHITE :
COL_BLACK;
else if (aTmpBulletColor == aBackColor)
aTmpBulletColor.Invert();
-aColorFont.SetColor(aTmpBulletColor);
-pVDev->SetFont(aColorFont);
+aFont.SetColor(aTmpBulletColor);
+pVDev->SetFont(aFont);
aNum.SetLevel( nLevel );
if (pActNum->IsContinuousNumbering())
aNum.GetLevelVal()[nLevel] = nPreNum;
OUString aText(pActNum->MakeNumString(aNum));
-pVDev->DrawText(Point(nXStart, nYStart), aText);
-pVDev->SetFont(aStdFont);
+long nY = nYStart;
+nY -= (pVDev->GetTextHeight() - nTextHeight -
pVDev->GetFontMetric().GetDescent());
+pVDev->DrawText(Point(nXStart, nY), aText);
nTextOffset = pVDev->GetTextWidth(aText);
nTextOffset = nTextOffset + nXStep;
nPreNum++;
+pVDev->SetFont(aStdFont);
}
//#i5153# the selected rectangle(s) should be black
if (0 != (nActLevel & (1
[Libreoffice-commits] core.git: compilerplugins/clang solenv/CompilerTest_compilerplugins_clang.mk
compilerplugins/clang/test/unusedenumconstants.cxx | 92
compilerplugins/clang/unusedenumconstants.cxx | 133
compilerplugins/clang/unusedenumconstants.readonly.results | 1494 -
compilerplugins/clang/unusedenumconstants.untouched.results | 246
compilerplugins/clang/unusedenumconstants.writeonly.results |16716
solenv/CompilerTest_compilerplugins_clang.mk|1
6 files changed, 8183 insertions(+), 10499 deletions(-)
New commits:
commit 5e2322ec84840df9e268a5d2855073912413d463
Author: Noel Grandin
AuthorDate: Tue Nov 20 13:22:50 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 20 14:48:27 2018 +0100
loplugin:unusedenumconstants improvements
add some unit tests, and improve the heuristics
Change-Id: I95aa97a87e178ce8d506bd245710d0ae66ad08a4
Reviewed-on: https://gerrit.libreoffice.org/63647
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/compilerplugins/clang/test/unusedenumconstants.cxx
b/compilerplugins/clang/test/unusedenumconstants.cxx
new file mode 100644
index ..3de1a65537e0
--- /dev/null
+++ b/compilerplugins/clang/test/unusedenumconstants.cxx
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include
+
+namespace test1
+{
+void test1()
+{
+enum NameClashMode
+{
+NONE,
+NO_CLASH // expected-error {{write NO_CLASH
[loplugin:unusedenumconstants]}}
+};
+NameClashMode eNameClashMode = NO_CLASH;
+(void)eNameClashMode;
+}
+};
+
+enum class BrowseMode
+{
+Modules = 0x01, // expected-error {{read Modules
[loplugin:unusedenumconstants]}}
+Top = 0x02, // expected-error {{write Top [loplugin:unusedenumconstants]}}
+};
+namespace o3tl
+{
+template <> struct typed_flags : is_typed_flags
+{
+};
+}
+BrowseMode g_flags;
+int test2(BrowseMode nMode)
+{
+if (nMode & BrowseMode::Modules)
+return 1;
+g_flags |= BrowseMode::Top;
+return 0;
+}
+
+enum class Enum3
+{
+One = 0x01, // expected-error {{write One [loplugin:unusedenumconstants]}}
+Two = 0x02 // expected-error {{write Two [loplugin:unusedenumconstants]}}
+};
+namespace o3tl
+{
+template <> struct typed_flags : is_typed_flags
+{
+};
+}
+void test3_foo(Enum3);
+void test3() { test3_foo(Enum3::One | Enum3::Two); }
+
+namespace test4
+{
+enum Enum4
+{
+ONE, // expected-error {{write ONE [loplugin:unusedenumconstants]}}
+TWO
+};
+struct Test4Base
+{
+Test4Base(Enum4) {}
+};
+struct Test4 : public Test4Base
+{
+Test4()
+: Test4Base(Enum4::ONE)
+{
+}
+};
+};
+
+// check that conditional operator walks up the tree
+namespace test5
+{
+enum Enum
+{
+ONE, // expected-error {{write ONE [loplugin:unusedenumconstants]}}
+TWO // expected-error {{write TWO [loplugin:unusedenumconstants]}}
+};
+
+Enum foo(int x) { return x == 1 ? Enum::ONE : Enum::TWO; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedenumconstants.cxx
b/compilerplugins/clang/unusedenumconstants.cxx
index b106d308fdb5..74e9eb216da7 100644
--- a/compilerplugins/clang/unusedenumconstants.cxx
+++ b/compilerplugins/clang/unusedenumconstants.cxx
@@ -44,6 +44,7 @@ struct MyFieldInfo
std::string parentClass;
std::string fieldName;
std::string sourceLocation;
+SourceLocation loc;
};
bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs)
{
@@ -68,19 +69,31 @@ public:
{
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-// dump all our output in one write call - this is to try and limit IO
"crosstalk" between multiple processes
-// writing to the same logfile
-std::string output;
-for (const MyFieldInfo & s : definitionSet)
-output += "definition:\t" + s.parentClass + "\t" + s.fieldName +
"\t" + s.sourceLocation + "\n";
-for (const MyFieldInfo & s : writeSet)
-output += "write:\t" + s.parentClass + "\t" + s.fieldName + "\n";
-for (const MyFieldInfo & s : readSet)
-output += "read:\t" + s.parentClass + "\t" + s.fieldName + "\n";
-std::ofstream myfile;
-myfile.open( WORKDIR "/loplugin.unusedenumconstants.log",
std::ios::app | std::ios::out);
-myfile << output;
-myfile.close();
+if (!isUnitTestMode())
+{
+// dump all our output in one write call - this is to try and
limit IO "crosstalk" between multiple processes
+// writing to the same logfile
+std::string output;
+for (const MyFieldInfo & s : definitionSet
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/controls/formattedcontrol.cxx | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 9f0a4ae5dec545fe5d90c10ed4ddc2395e617e8e
Author: Noel Grandin
AuthorDate: Tue Nov 20 11:21:23 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 20 14:47:49 2018 +0100
clean up s_bTriedCreation static bool
very weird code, no need for hiding this bool inside a method
Change-Id: I75ee67af32ab012fe5ab5ae766abc56212bb08e6
Reviewed-on: https://gerrit.libreoffice.org/63643
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/toolkit/source/controls/formattedcontrol.cxx
b/toolkit/source/controls/formattedcontrol.cxx
index 7c763703a2b2..1bc3178305f8 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -59,22 +59,16 @@ namespace toolkit
}
-bool& lcl_getTriedCreation()
-{
-static bool s_bTriedCreation = false;
-return s_bTriedCreation;
-}
-
+static bool s_bTriedCreation = false;
const Reference< XNumberFormatsSupplier >&
lcl_getDefaultFormats_throw()
{
::osl::MutexGuard aGuard( getDefaultFormatsMutex() );
-bool& rbTriedCreation = lcl_getTriedCreation();
Reference< XNumberFormatsSupplier >& rDefaultFormats(
lcl_getDefaultFormatsAccess_nothrow() );
-if ( !rDefaultFormats.is() && !rbTriedCreation )
+if ( !rDefaultFormats.is() && !s_bTriedCreation )
{
-rbTriedCreation = true;
+s_bTriedCreation = true;
rDefaultFormats =
NumberFormatsSupplier::createWithDefaultLocale(
::comphelper::getProcessComponentContext() );
}
if ( !rDefaultFormats.is() )
@@ -101,7 +95,7 @@ namespace toolkit
Reference< XNumberFormatsSupplier >& rDefaultFormats(
lcl_getDefaultFormatsAccess_nothrow() );
Reference< XNumberFormatsSupplier >
xReleasePotentialLastReference( rDefaultFormats );
rDefaultFormats.clear();
-lcl_getTriedCreation() = false;
+s_bTriedCreation = false;
aGuard.clear();
xReleasePotentialLastReference.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/editmodulesdialog.ui |2 +- cui/uiconfig/ui/optlingupage.ui |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 85123ef1ce3085b33884f688e99792468a118df3 Author: Sabri Unal AuthorDate: Tue Nov 20 01:49:34 2018 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Tue Nov 20 14:04:30 2018 +0100 Related: tdf#121134: Changing http to https where possible Change-Id: I99f5ce24743a14a78d24da8c64bc6f9adfda6c4c Reviewed-on: https://gerrit.libreoffice.org/63615 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/editmodulesdialog.ui b/cui/uiconfig/ui/editmodulesdialog.ui index c5c72f00c2c5..a7e6f153aa97 100644 --- a/cui/uiconfig/ui/editmodulesdialog.ui +++ b/cui/uiconfig/ui/editmodulesdialog.ui @@ -88,7 +88,7 @@ True none 0 -http://extensions.libreoffice.org/dictionaries/ +https://extensions.libreoffice.org/dictionaries/ 0 diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index ae4310e83749..d4d3456e8e98 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -234,7 +234,7 @@ True none 0 -http://extensions.libreoffice.org/dictionaries/ +https://extensions.libreoffice.org/dictionaries/ 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6-2-branch-point'
Tag 'libreoffice-6-2-branch-point' created by Andras Timar at 2018-11-20 12:57 + libreoffice-6-2-branch-point Changes since libreoffice-6-1-branch-point-715: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'libreoffice-6-2'
New branch 'libreoffice-6-2' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - compilerplugins/clang
compilerplugins/clang/staticconstfield.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 8bd306d6f76e6787a71e7e1d99b0bcae48986de3
Author: Stephan Bergmann
AuthorDate: Tue Nov 20 08:58:39 2018 +0100
Commit: Stephan Bergmann
CommitDate: Tue Nov 20 13:46:51 2018 +0100
Fix loplugin:staticconstfield
...(ExprWithCleanups around the CXXConstructExpr in initializers for
members of
O[U]String type, with older Clang, as used in
compilerplugins/clang/test/staticconstfield.cxx), and thus revert
e3e8d52625c2dc7a277a955d4ae2ad10c60c5f1b "Temporarily disable
compilerplugins/clang/test/staticconstfield" again.
Change-Id: Ic5fcdd1a26e4a6810369e4f9d909200d25feb12e
Reviewed-on: https://gerrit.libreoffice.org/63628
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit b0e819bbc0b3ff20de04f31b593f7d5213659045)
Reviewed-on: https://gerrit.libreoffice.org/63657
Tested-by: Stephan Bergmann
diff --git a/compilerplugins/clang/staticconstfield.cxx
b/compilerplugins/clang/staticconstfield.cxx
index b10953a75617..eadbd26bef78 100644
--- a/compilerplugins/clang/staticconstfield.cxx
+++ b/compilerplugins/clang/staticconstfield.cxx
@@ -95,10 +95,11 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
bool found = false;
std::string value;
+auto const initexpr = compat::IgnoreImplicit(init->getInit());
if (tc.Const().Class("OUString").Namespace("rtl").GlobalNamespace()
|| tc.Const().Class("OString").Namespace("rtl").GlobalNamespace())
{
-if (auto constructExpr = dyn_cast(init->getInit()))
+if (auto constructExpr = dyn_cast(initexpr))
{
if (constructExpr->getNumArgs() >= 1
&& isa(constructExpr->getArg(0)))
@@ -112,7 +113,7 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
else if (type->isFloatingType())
{
APFloat x1(0.0f);
-if (init->getInit()->EvaluateAsFloat(x1, compiler.getASTContext()))
+if (initexpr->EvaluateAsFloat(x1, compiler.getASTContext()))
{
std::string s;
llvm::raw_string_ostream os(s);
@@ -123,15 +124,15 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
}
#endif
// ignore this, it seems to trigger an infinite recursion
-else if (isa(init->getInit()))
+else if (isa(initexpr))
;
// ignore this, calling EvaluateAsInt on it will crash clang
-else if (init->getInit()->isValueDependent())
+else if (initexpr->isValueDependent())
;
else
{
APSInt x1;
-if (init->getInit()->EvaluateAsInt(x1, compiler.getASTContext()))
+if (initexpr->EvaluateAsInt(x1, compiler.getASTContext()))
{
value = x1.toString(10);
found = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/uiconfig
sw/uiconfig/swriter/ui/asciifilterdialog.ui | 37 ++-- 1 file changed, 19 insertions(+), 18 deletions(-) New commits: commit 9ed0d9bac931e24461cbc1459286910520e44a33 Author: Adolfo Jayme Barrientos AuthorDate: Mon Nov 19 16:43:14 2018 -0600 Commit: Adolfo Jayme Barrientos CommitDate: Tue Nov 20 13:10:43 2018 +0100 HIG fixes in asciifilterdialog.ui Change-Id: Ie54292794aa4ecfce3fed97102aef75d0fec2d33 Reviewed-on: https://gerrit.libreoffice.org/63614 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos (cherry picked from commit ef2dfe4d54e1383b1f757f659f9cd1e13d12fba4) Reviewed-on: https://gerrit.libreoffice.org/63620 Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/asciifilterdialog.ui b/sw/uiconfig/swriter/ui/asciifilterdialog.ui index 52b382558059..e7f0fe3baac4 100644 --- a/sw/uiconfig/swriter/ui/asciifilterdialog.ui +++ b/sw/uiconfig/swriter/ui/asciifilterdialog.ui @@ -1,5 +1,5 @@ - + @@ -10,6 +10,9 @@ 0 0 dialog + + + False @@ -97,10 +100,10 @@ True False -_Character set +end +_Character set: True charset -0 0 @@ -111,10 +114,10 @@ True False -Default fonts +end +Default fonts: True font -0 0 @@ -125,10 +128,10 @@ True False -Lan_guage +end +Lan_guage: True language -0 0 @@ -139,9 +142,9 @@ True False -_Paragraph break +end +_Paragraph break: True -0 0 @@ -175,7 +178,7 @@ True False True -True +12 _CR & LF @@ -255,20 +258,21 @@ -Include byte-order-mark +Include byte-order mark True True False -0 +start True -0 +1 4 -2 -1 + + + @@ -297,8 +301,5 @@ cancel help - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/report/SectionWindow.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit a87ba810993a9cd1fd4739d6f42cdc6bc0c82cac
Author: Noel Grandin
AuthorDate: Mon Nov 19 13:36:01 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Nov 20 13:10:48 2018 +0100
remove bogus static variable in reportdesign OSectionWindow
which arrived with
commit bee746960f3d94d92e71006a7365a26669f52f8c
Date: Tue Feb 1 13:42:47 2011 +0100
dba34d: limit invalidate calls
and looks extremely dodgy, because it means only the very first report
design window will be correctly configured.
Change-Id: I127c733faaddcacd8507fa74aebe3b6da761327f
Reviewed-on: https://gerrit.libreoffice.org/63641
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx
b/reportdesign/source/ui/report/SectionWindow.cxx
index f76f3469ca48..3cc789fea738 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -207,13 +207,9 @@ bool OSectionWindow::setGroupSectionTitle(
void OSectionWindow::ImplInitSettings()
{
-static bool t = false;
-if ( t )
-{
EnableChildTransparentMode();
SetParentClipMode( ParentClipMode::NoClip );
SetPaintTransparent( true );
-}
SetBackground( );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Tue, 2018-11-20 at 11:48 +, Crashtest VM wrote: > New crashtest update available at > http://dev-builds.libreoffice.org/crashtest/492ea7e08571e466e37f870b7642a79df55c2e92/ checking https://dev-builds.libreoffice.org/crashtest/492ea7e08571e466e37f870b7642a79df55c2e92/exportCrash.txt I see that fdo48097-1.doc (etc) on reexport to .doc assert since... commit 46c1a75b144a4c5fd1f4ab0113b87fe030bebd27 Author: Justin Luth Date: Sat Oct 20 19:18:02 2018 +0300 tdf79435 doc/docx: round-trip legacy input formfields I imagine you're hoping to flush out some edge case examples. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice ESC call, Thur - 16:00 central European (local) time
Hi everyone, Prototype agenda below, bug metrics also at the link below; extra items appreciated as last-week: https://demo.collaboracloudsuite.com/tdf/ Lets use the new TDF jitsi goodness this week at: http://jitsi.documentfoundation.org/esc ATB, Michael. * Completed Action Items: * Pending Action Items: + run certification script (Kendy) [ not run yet ] + add screenshot builder to basic build stats (Christian) [ didn’t get to the build failure ] * Release Engineering update (Xisco) + 6.2 Beta 1 & feature freeze status + Late Features ? + donation infobar (Heiko) + red-lining paragraph attribute re-work (Michael S) - trying to aim for UI freeze on Dec 17 for switching the default + 6.1.4 RC1 week after the next (week 48, Nov 26) + Remotes + Android viewer + Online * Documentation (Olivier) * UX Update (Heiko) + Bugzilla (topicUI) statistics 255(255) (topicUI) bugs open, 298(298) - needsUXEval + Updates: BZ changes 1 week 1 month 3 months 12 months added 10(-5)35(0) 57(3) 100(4) commented 75(8)203(0)409(18)1466(-9) removed 1(-1) 3(1) 3(1)9(1) resolved 4(2) 10(-2)25(-1) 121(-4) + top 10 contributors: Thomas Lendo made 118 changes in 1 month, and 368 changes in 1 year Tietze, Heiko made 115 changes in 1 month, and 550 changes in 1 year Kainz, Andreas made 52 changes in 1 month, and 147 changes in 1 year Xisco Faulí made 44 changes in 1 month, and 273 changes in 1 year 和尚蟹 made 31 changes in 1 month, and 31 changes in 1 year Foote, V Stuart made 29 changes in 1 month, and 217 changes in 1 year Cor Nouws made 15 changes in 1 month, and 83 changes in 1 year kompilainenn made 15 changes in 1 month, and 55 changes in 1 year Muhammet Kara made 12 changes in 1 month, and 15 changes in 1 year Zolnai, Tamás made 11 changes in 1 month, and 147 changes in 1 year * Crash Testing (Caolan) + 2 (-+0) import failures, 0(+0) export failures + ?? 9 (+1) coverity issues + ?? 19 Google / ossfuzz: + 2 serious, lots of timeout issues / broken build: + in new red-lining code. + ForcePoint, round 9 + 4 writer layout issues + couple of other issues + end of Jan. embargo for one lower prio issue. + Miklos had a look at improving UI. + another issue in progress at higher prio. Still struggling to agree an embargo with AOO + now have a CVE to go with this. + CNA process joy ? + PVS Studio – still underway. * Crash Reporting (Xisco) + http://crashreport.libreoffice.org/stats/version/6.0.6.2 + 1377 1467 (last 7 days) (-90) + http://crashreport.libreoffice.org/stats/version/6.0.7.3 + 285 (last 7 days) (+170) + http://crashreport.libreoffice.org/stats/version/6.1.2.1 + 3522 4361 (last 7 days) (-839) + http://crashreport.libreoffice.org/stats/version/6.1.3.2 + 1427 512 (last 7 days) (+915) * Hackfests & Events (Thorsten) + next year hackfests coming up: + FOSDEM in February + Tirana perhaps in March/April + Paris in summer + tentative Dresden: late autumn (past mid-October, for having students) + hope to have one each quarter. + GSoC’19 + https://opensource.googleblog.com/2018/11/google-summer-of-code-15-years-strong.html + project signup starts to open Jan 15th + good to come up with good ideas / design plans for the wiki (Thorsten) + https://wiki.documentfoundation.org/Development/GSoC/Ideas + Heiko / Xisco as org. admins ? + trouble with decision of what projects ? (Heiko) + based on mentor power and student quality (Thorsten) * mentoring/easyhack update committer... 1 week 1 month 3 months 12 months open 54(-23) 112(-12) 116(-14) 127(-14) reviews 1233(-347) 5078(-71) 12648(-226) 33811(550) merged 253(-27)1234(-25)3557(-167) 15324(47) abandoned 14(-10) 114(-6) 223(5)988(-2) own commits 413(59) 1519(38) 4040(141)15705(150) review commits 109(-9) 374(59) 874(46) 3793(55) contributor... 1 week1 month 3 months 12 months open 25(-4) 46(-5)48(-7) 51(-7) reviews 74(15)236(17) 425(6) 19807(-458) merged 44(-3)150(30) 319(22) 1603(17) abandoned 2(-21)31(-4)66(-2) 312(-3) own commits 46(-9)164(27) 379(20) 1536(16) review commi
Weekly QA Report (W46-2018)
Hello, What have happened in QA in the last 7 days? * 126 bugs have been reported by 96 people. + Link: http://tinyurl.com/yc5bdoo2 * Top 15 reporters: + NISZ LibreOffice Team (7) + Liad Skiva (5) + Xisco Faulí (4) + Luke (4) + andreas_k (3) + Telesto (2) + Leandro Martín Drudi (2) + robert (2) + Jim Raykowski (2) + raal (2) + 和尚蟹 (2) + Olivier Tilloy (2) + Mike Kaganski (2) + Flywater (2) + . (2) * 59 bugs reported haven't been triaged yet. + Link: http://tinyurl.com/yb7frga5 * Total number of unconfirmed bugs: 530 * 931 comments have been written by 180 people. * 54 new people have signed up to Bugzilla. == STATUSES CHANGED == * 1 bug has been changed from 'ASSIGNED' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/ybsytaue + Done by: Caolán McNamara (1) * 23 bugs have been changed from 'ASSIGNED' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/yafka4vy + Done by: Caolán McNamara (7), Markus Mohrhard (3), Xisco Faulí (2) Eike Rathke (2), vmiklos (1), Olivier Hallot (1) Mike Kaganski (1), andreas_k (1), Jean-Pierre Ledure (1) * 1 bug has been changed from 'ASSIGNED' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/y8dxqxtf + Done by: Vera Blagoveschenskaya (1) * 3 bugs have been changed from 'NEEDINFO' to 'NEW'. + Link: http://tinyurl.com/yajyfvhu + Done by: Xisco Faulí (1), Julien Nabet (1) * 2 bugs have been changed from 'NEEDINFO' to 'REOPENED'. + Link: http://tinyurl.com/y76j8ovs + Done by: Mike Sapsard (1), Elias (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/y7gsq5pg + Done by: Adolfo Jayme (2) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/ybsu6y2d + Done by: bsb_2 (1), bkane521 (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/yastsh92 + Done by: Xisco Faulí (1), Drew Jensen (1) * 1 bug has been changed from 'NEEDINFO' to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/ybdyoz9f + Done by: Alex Thurgood (1) * 3 bugs have been changed from 'NEEDINFO' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/y9tamsz7 + Done by: Xisco Faulí (1), pavelz (1), Luke (1) * 15 bugs have been changed from 'NEEDINFO' to 'UNCONFIRMED'. + Link: http://tinyurl.com/yb7twbcl + Done by: Julian Ragan (2), Gabriele (2), Vera Blagoveschenskaya (1) Telesto (1), Ron West (1), AndrewB (1), Atanas (1) Konstantin Tkachenko (1), edwsaintesprit (1) rainer (1) * 22 bugs have been changed from 'NEW' to 'ASSIGNED'. + Link: http://tinyurl.com/yd3l4s7f + Done by: Caolán McNamara (6), Xisco Faulí (4), Markus Mohrhard (3) Eike Rathke (2), Winfried Donkers (1), vmiklos (1) Dennis Francis (1), Katarina Behrens (CIB) (1) * 2 bugs have been changed from 'NEW' to 'NEEDINFO'. + Link: http://tinyurl.com/y759r6od + Done by: Julien Nabet (1), Mikhail Zemlyanukha (1) * 9 bugs have been changed from 'NEW' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/y7tayrvz + Done by: Xisco Faulí (2), Heiko Tietze (1), Julien Nabet (1) Markus Mohrhard (1), Justin L (1), Alex Thurgood (1) * 11 bugs have been changed from 'NEW' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/yaatmq3n + Done by: Stephan Bergmann (2), Michael Stahl (2), Takeshi Abe (1) Olivier Hallot (1), Mike Kaganski (1), andreas_k (1) Adolfo Jayme (1) * 1 bug has been changed from 'NEW' to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/ydy28opz + Done by: Timur (1) * 2 bugs have been changed from 'NEW' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/yal676ub + Done by: Heiko Tietze (1), Telesto (1) * 2 bugs have been changed from 'NEW' to 'UNCONFIRMED'. + Link: http://tinyurl.com/y7oqgu5f + Done by: Xisco Faulí (2) * 1 bug has been changed from 'REOPENED' to 'NEEDINFO'. + Link: http://tinyurl.com/y8mm35jc + Done by: Xisco Faulí (1) * 1 bug has been changed from 'REOPENED' to 'NEW'. + Link: http://tinyurl.com/y8fqozck + Done by: Xisco Faulí (1) * 1 bug has been changed from 'REOPENED' to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/yb775nqc + Done by: Buovjaga (1) * 1 bug has been changed from 'REOPENED' to 'UNCONFIRMED'. + Link: http://tinyurl.com/y8alwbfq + Done by:
[Libreoffice-commits] core.git: wizards/source
wizards/source/importwizard/ImportDialog.xdl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbd5b255f016fc92530e2325bded0f07a0dbc861 Author: Matthias Seidel AuthorDate: Thu Nov 8 21:36:47 2018 + Commit: Caolán McNamara CommitDate: Tue Nov 20 12:54:05 2018 +0100 Center graphic (cherry picked from commit 58a04e692ad903a9a16e258afc7f80a37fa188cf) Change-Id: I3004f9607d9551e9c8bce1bedcfe8426ed392170 Reviewed-on: https://gerrit.libreoffice.org/63609 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index 2f9a3a9b1a8d..1f3fc71ff4d9 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -41,7 +41,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/charmap.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 0d4d93649ddb9962d877e23cdcc3d73e039d7772 Author: Caolán McNamara AuthorDate: Mon Nov 19 13:19:56 2018 + Commit: Caolán McNamara CommitDate: Tue Nov 20 12:53:49 2018 +0100 don't need to use a OUStringBuffer for one character Change-Id: I301a27edf47588d11080b91507b79be177a6f99c Reviewed-on: https://gerrit.libreoffice.org/63608 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 0d8a869a63d6..a3044f460996 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -532,9 +532,8 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, int x = pix.X(); int y = pix.Y(); -OUStringBuffer buf; -buf.appendUtf32(mxFontCharMap->GetCharFromIndex(i)); -OUString aCharStr(buf.makeStringAndClear()); +sal_UCS4 nChar = mxFontCharMap->GetCharFromIndex(i); +OUString aCharStr(&nChar, 1); int nTextWidth = rRenderContext.GetTextWidth(aCharStr); int tx = x + (nX - nTextWidth + 1) / 2; int ty = y + (nY - nTextHeight + 1) / 2; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/popupmenu/pagebreak.xml |1 + 1 file changed, 1 insertion(+) New commits: commit d2d3dfe1d0ebb39ed70c66f4b5e9f7dcf9e4bb16 Author: andreas kainz AuthorDate: Mon Nov 19 03:21:03 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 12:40:27 2018 +0100 tdf#119714 add Normal View switch in calc pagebreak view Change-Id: I3b00ee5c851df368a98c6afa0b4c466fc8970fed Reviewed-on: https://gerrit.libreoffice.org/63566 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sc/uiconfig/scalc/popupmenu/pagebreak.xml b/sc/uiconfig/scalc/popupmenu/pagebreak.xml index dc9501d33afc..5db70bafbfca 100644 --- a/sc/uiconfig/scalc/popupmenu/pagebreak.xml +++ b/sc/uiconfig/scalc/popupmenu/pagebreak.xml @@ -28,6 +28,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6-2-branch-point'
Tag 'libreoffice-6-2-branch-point' created by Christian Lohmaier at 2018-11-20 11:31 + Tag libreoffice-6-2-branch-point -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJb8/CgAAoJEPQ0oe+v7q6jv78P/2vlciVUn7oVwKNN6+M7/+sP iSMMPhgq41Jm5Hvggy2T65G+7GACFFoBYI0X1EGS92FpHXXPi/q6d9Utzt8MITau dFNMbbXE+oUdU23atsRH7S4sGziRbJK3EYLfdos9Rn9qGeYzBRDVbuxTES79S12K 2rGBzfJ+yTuix/HuRS52/rqFUBHzYvCV5NPGWeFqiYDp2YmsbeoIFDekqiN0U8IR le608VsE3ZSQwze9J9We1MUe5BVq/M0hzAJkEJHj/6ZfQnb9fEY7p4nQQ18KlfI3 pucjUJTmTr4Vu5guvRK1s895KyWzscCfgtLV/+1wKExy9y38YQYgi50lSMq9vTex p4fhWIKFN9zeGuvgxsuWfunhYLQFmt2oc5JtdeK0n2m6WpnDfTI8+ZmeX782VgPm NvRyH87MrmDVIkmbAU6TH8LrgSvqpohUbomeE47IhbXqrVcuFEIbcTtod3kYdYB0 KVCaz4ST3hb3hgI7sVpJwgSNSKSYWv0SULGBpjhP2O+EdP3Feu+C6ECKUbWXscfw AGbQXpbifv0/eMIECjV2XljVxLPwTq6A3obqcsGkLHxcf88kYjkQCqwJe7ISBv0i HgdTuvkoPzKCtTKqT+CkimIItdiVfHjcSD2drNmieY9/o8susLY4CLuC2spHzSVf vW4/9oxgDMMFdLk1Wthf =2+hu -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6-2-branch-point'
Tag 'libreoffice-6-2-branch-point' created by Christian Lohmaier at 2018-11-20 11:31 + Tag libreoffice-6-2-branch-point -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJb8/CjAAoJEPQ0oe+v7q6j3N0QALoXPYN6PVsilP50It4h3+xS c5uZNsKgNwdZ+uJjcGktEoRVXEizAY0zblXb/MWw1wmgUZhjKjOLAsdOlTow9+sj /RU3DMsIO7+B+Rwb1nBwU6ROEdq1YOIxe6LYlyaIzAiOTnup6jBmbTTCujHGU/Ze +a3mylHTAkKu41Io7PwHdHIOSs36dz3zXyOKc6zIS7iOztQY6e05qoWSNIgUVzJ6 DDks2a4CB6xuqAfIPRDxNGkVzqKh/EP7C3zLhhx7SlHWDkCZ1ZamTqLOt0CE41yJ ZF2iDS6QZDCUzb85pp0Zey5lMbZeZ8OPCJj7WkATMrnz0seyXbOyuhT/x9ptB+4H 2jAI0UywTxg/gonlYUdDZc87bIRJ+/m/kJhA2Ag0dEkVyrKgwbRB7JcL4OQYNJbk zq/GiANxEgJ4ZJ2JlZu6aP/lKvq/tDv1NHQ3bDnz+3ZpxK0vIdI7xPKgath+QSRW U+UrPD/mFQP/HXMp9OLFXnVVTvDtv3cxBAb5U475phl1OZcjLwe4qEa0RxuWEKeP WWUILAUU0EZtTNer+A4ZgvOfAR3n9OApK99B8KH9EOeLC6FAQDjGcOLznCYbYNW9 kDY/QOwWWSkHcrj59HYgDm7/8sJP647raU/0LVirprblsrkB5lI5chKT8URJzTcS cyD4zH8H12U+z4ZG6n4v =k+2j -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-6824: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6-2-branch-point'
Tag 'libreoffice-6-2-branch-point' created by Christian Lohmaier at 2018-11-20 11:31 + Tag libreoffice-6-2-branch-point -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJb8/CcAAoJEPQ0oe+v7q6jSNoP/jDfX0M7xTTX7GmsVAvvQ5jZ ELvHmPkONXnoR9SDSpplkWXGDelxvM9GezXROZNrfZ9Fe4q2Apu3JaVTQJigqUle ahs7NKfj8ZlnFt5JZKK/jHdya8gaaqJFPLKtlI0pjMmf/SDDzlG+SL4IxsinZEXd GnMRCpksJ8uAArf9qFn3abGt8JQFNf9h8k0pn7H2zo7DFuvyk532SlcsBeytCOyU 3K8l3+83/ym9bKQGgBslQV7TsEKRF3Umjuf4J5/xEIfCd1YhyoUZWL3G4rf+Lubg nj6x/5mNB2dWzaN8mfOyIZZIFHUXZr/nes3PhnjZpB+glfpw4BRSxog0sgz6voRS +Q9lN/++Zn3qgblFfZtcNU9oSMgFBa+oK53elosdY5pej1EzTKkdZ639gYRUK3Ud caxCBzf7slDZZT19h4mn7VhJeA8rf+zwnbnxtuBs1qiHEtVZXNfHHVgDk/7pbb9w 6oM01aOZo4TDytfc2VdzyMAP/EAUsoARBeB/AeePWfCkEzloRC3If1L8SEbQYqQ4 fnyb5qBa86B9FRXFMvvdcjUuJmn/JcVJ4ZHZhNiiABHTwaTH5bC+oCnK9Tf3Emdj bRh+UUpMJA6EACF3UcQIgg87bScXHu1oABVUytnmEB91ml9FEFD32fyYZBJkT5yz 0DzsgSb0INktuc7AV43q =mgqJ -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-260: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6-2-branch-point'
Tag 'libreoffice-6-2-branch-point' created by Christian Lohmaier at 2018-11-20 11:31 + Tag libreoffice-6-2-branch-point -BEGIN PGP SIGNATURE- iQIcBAABAgAGBQJb8/CXAAoJEPQ0oe+v7q6jtBoQAIK1SQ4Cfs3ehkKidk/IkwQS FtIQcvIMFEwXlrxHh3Is/TfSja7IMxObIsLCIh4wHqT/orY+eM3dewdsnPTV6xUf x5boYv4BlvW38PJS4nC/eFmZXLQMejYnMQo6C2fw8vEqEoMsQ0YjMMIRaOPN1ztR Fqf5+qHBDXmTOSSX5h8zg5rcvob3NglEZpJ/RTImmPepBCF2SYNrEigEkAuMMGtC S93nTwtk4DykH7dTb/aXPNgWhFOEbCi29HbCdyFHbWaAOZLUKo0N8hrOwgYyxlg/ nD4gJfLHTHzn/g4s80coJFKjHdpsFl/AtGvbQ/ERn6cP0fxBP2aCIgv3vxR8y22D 2jNEuM+BJ3b794ruwKg6/Low5aNTjFQDbAL5jRX7SEaVdjffdWI2qptJGl8MVwqW WDD7yCPI8Zss5Zxh4Cki4jvl0p1OeZlQeRLdsGZl8uNWVxrUvjZ7R+g/J1UtvbME k0CA+icMQzBOOd9Yey3oT4PHg7Uk2HRX0HFTUxbqKiqS/G6oOEaWfdG/mKGzyJMS NV6sDeIhP58hlgwvejUrWkcYpJKY2QlkuQcK8j5RwcwV1f60lc8LrllB8BahtKna ZO3FKGJi6vcIRrsZHhO9sLM6o89DA+/LqJCaAozdSgrlQFuZNquoIUEXwuWkJTcT /GpNHhSWXqLLMiQ5uGnA =qlc1 -END PGP SIGNATURE- Changes since libreoffice-6-1-branch-point-13: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: docker/Dockerfile
docker/Dockerfile |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 567cd458a1fa5e341d759d98033eef2a57942176 Author: Samuel Mehrbrodt AuthorDate: Fri Nov 16 11:18:29 2018 +0100 Commit: Samuel Mehrbrodt CommitDate: Tue Nov 20 12:29:08 2018 +0100 Docker: Install an editor So that one can edit files in the docker container Change-Id: Ibfc9b624e2ae2ea417f87225d6d8d4212c6b1fb3 Reviewed-on: https://gerrit.libreoffice.org/63464 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/docker/Dockerfile b/docker/Dockerfile index ec8150117..c4c1423e0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,8 @@ RUN apt-get update && apt-get upgrade -y # install LibreOffice run-time dependencies # install apt-transport-https in order to set up repo for Poco # install adduser, findutils and cpio that we need later -RUN apt-get -y install apt-transport-https locales-all libpng12-0 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils +# install an editor +RUN apt-get -y install apt-transport-https locales-all libpng12-0 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils nano # set up 3rd party repo of Poco, dependency of loolwsd RUN echo "deb https://collaboraoffice.com/repos/Poco/ /" >> /etc/apt/sources.list.d/poco.list ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source include/unotools unotools/source
framework/source/fwe/helper/titlehelper.cxx | 15 +++
include/unotools/mediadescriptor.hxx|1 +
unotools/source/misc/mediadescriptor.cxx|6 ++
3 files changed, 22 insertions(+)
New commits:
commit 4355137901e18e24de2ab123fd0454147f1f3890
Author: Samuel Mehrbrodt
AuthorDate: Tue Nov 20 09:12:36 2018 +0100
Commit: Samuel Mehrbrodt
CommitDate: Tue Nov 20 12:16:35 2018 +0100
tdf#121537 Display SuggestedSaveAsName in title if set
Change-Id: I762eb7766a5cbe788c0a360c8a6f37b9b1106412
Reviewed-on: https://gerrit.libreoffice.org/63639
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 3d7943623753..36141cfba0f1 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -32,6 +32,7 @@
#include
#include
+#include
#include
#include
#include
@@ -39,6 +40,11 @@
#include
#include
+
+using namespace css;
+using namespace css::uno;
+using namespace css::frame;
+
namespace framework{
TitleHelper::TitleHelper(const css::uno::Reference<
css::uno::XComponentContext >& rxContext)
@@ -339,6 +345,10 @@ void TitleHelper::impl_updateTitleForModel (const
css::uno::Reference< css::fram
if (xURLProvider.is())
sURL = xURLProvider->getLocation ();
+utl::MediaDescriptor aDescriptor(xModel->getArgs());
+const OUString sSuggestedSaveAsName =
aDescriptor.getUnpackedValueOrDefault(
+utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME(), OUString());
+
if (!sURL.isEmpty())
{
sTitle = impl_convertURL2Title(sURL);
@@ -346,6 +356,11 @@ void TitleHelper::impl_updateTitleForModel (const
css::uno::Reference< css::fram
xNumbers->releaseNumber (nLeasedNumber);
nLeasedNumber = css::frame::UntitledNumbersConst::INVALID_NUMBER;
}
+else if (!sSuggestedSaveAsName.isEmpty())
+{
+// tdf#121537 Use suggested save as name for title if file has not yet
been saved
+sTitle = sSuggestedSaveAsName;
+}
else
{
if (nLeasedNumber == css::frame::UntitledNumbersConst::INVALID_NUMBER)
diff --git a/include/unotools/mediadescriptor.hxx
b/include/unotools/mediadescriptor.hxx
index 24e8d4678ec0..b568bd770f3a 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -99,6 +99,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public
comphelper::SequenceAsHashMap
static const OUString& PROP_MODEL();
static const OUString& PROP_VIEWONLY();
static const OUString& PROP_DOCUMENTBASEURL();
+static const OUString& PROP_SUGGESTEDSAVEASNAME();
// interface
public:
diff --git a/unotools/source/misc/mediadescriptor.cxx
b/unotools/source/misc/mediadescriptor.cxx
index 674f2a98a986..e0222f90ca89 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -326,6 +326,12 @@ const OUString& MediaDescriptor::PROP_DOCUMENTBASEURL()
return sProp;
}
+const OUString& MediaDescriptor::PROP_SUGGESTEDSAVEASNAME()
+{
+static const OUString sProp("SuggestedSaveAsName");
+return sProp;
+}
+
MediaDescriptor::MediaDescriptor()
: SequenceAsHashMap()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4a' - 10 commits - sw/inc sw/qa sw/source
Rebased ref, commits from common ancestor:
commit bdfe74259ec1179527b7d883021210f0bce634a5
Author: Michael Stahl
AuthorDate: Tue Nov 20 11:04:41 2018 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 20 11:56:38 2018 +0100
sw_redlinehide_4a: SwEditShell::ReplaceDropText
Change-Id: Iaf6101f02bd5dbeb9a07e796932186b5e2b1a563
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 111fec2ae91f..5727845b060f 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -511,6 +511,13 @@ void SwEditShell::ReplaceDropText( const OUString &rStr,
SwPaM* pPaM )
const SwNodeIndex& rNd = pCursor->GetPoint()->nNode;
SwPaM aPam( rNd, rStr.getLength(), rNd, 0 );
+SwTextFrame const*const pTextFrame(static_cast(
+rNd.GetNode().GetTextNode()->getLayoutFrame(GetLayout(;
+if (pTextFrame)
+{
+*aPam.GetPoint() =
pTextFrame->MapViewToModelPos(TextFrameIndex(0));
+*aPam.GetMark() =
pTextFrame->MapViewToModelPos(TextFrameIndex(rStr.getLength()));
+}
if( !GetDoc()->getIDocumentContentOperations().Overwrite( aPam, rStr )
)
{
OSL_FAIL( "Doc->getIDocumentContentOperations().Overwrite(Str)
failed." );
commit 98935d4cc936f7ec50abb2c456c906f908b7d3db
Author: Michael Stahl
AuthorDate: Mon Nov 19 17:44:37 2018 +0100
Commit: Michael Stahl
CommitDate: Tue Nov 20 11:56:38 2018 +0100
sw_redlinehide_4a: InsertItemSet/InsertPoolItem
It's really quite annoying to have RES_BREAK applied to all nodes; so
apply the node-items only to the first-/properties-node and skip hidden
nodes.
Keep applying text/character items as before, except skip over hidden
nodes.
Change-Id: I085afd59af78caf1ca8dac4080c53bdbdb4e56a1
diff --git a/sw/inc/IDocumentContentOperations.hxx
b/sw/inc/IDocumentContentOperations.hxx
index fb4006334a15..f761b27aa331 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -37,6 +37,7 @@ class SwFrameFormat;
class SwDrawFrameFormat;
class SwFlyFrameFormat;
class SwNodeIndex;
+class SwRootFrame;
namespace utl { class TransliterationWrapper; }
namespace svt { class EmbeddedObjectRef; }
@@ -212,10 +213,13 @@ public:
false.
*/
virtual bool InsertPoolItem(const SwPaM &rRg, const SfxPoolItem&,
-const SetAttrMode nFlags =
SetAttrMode::DEFAULT, bool bExpandCharToPara=false) = 0;
+const SetAttrMode nFlags =
SetAttrMode::DEFAULT,
+SwRootFrame const* pLayout = nullptr,
+bool bExpandCharToPara=false) = 0;
virtual void InsertItemSet (const SwPaM &rRg, const SfxItemSet&,
-const SetAttrMode nFlags = SetAttrMode::DEFAULT) = 0;
+const SetAttrMode nFlags = SetAttrMode::DEFAULT,
+SwRootFrame const* pLayout = nullptr) = 0;
/** Removes any leading white space from the paragraph
*/
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 2727b3e39274..55cdf20367e2 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -45,6 +45,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1013,6 +1014,81 @@ namespace
namespace //local functions originally from docfmt.cxx
{
+
+bool lcl_ApplyOtherSet(
+SwContentNode & rNode,
+SwHistory *const pHistory,
+SfxItemSet const& rOtherSet,
+SfxItemSet const& rFirstSet,
+SfxItemSet const& rPropsSet,
+SwRootFrame const*const pLayout,
+SwNodeIndex *const o_pIndex = nullptr)
+{
+assert(rOtherSet.Count());
+
+bool ret(false);
+SwTextNode *const pTNd = rNode.GetTextNode();
+sw::MergedPara const* pMerged(nullptr);
+if (pLayout && pLayout->IsHideRedlines() && pTNd)
+{
+SwTextFrame const*const pTextFrame(static_cast(
+pTNd->getLayoutFrame(pLayout)));
+if (pTextFrame)
+{
+pMerged = pTextFrame->GetMergedPara();
+}
+if (pMerged)
+{
+if (rFirstSet.Count())
+{
+if (pHistory)
+{
+SwRegHistory aRegH(pMerged->pFirstNode,
*pMerged->pFirstNode, pHistory);
+ret = pMerged->pFirstNode->SetAttr(rFirstSet);
+}
+else
+{
+ret = pMerged->pFirstNode->SetAttr(rFirstSet);
+}
+}
+if (rPropsSet.Count())
+{
+if (pHistory)
+{
+
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - include/sfx2 sc/source sd/source sfx2/source starmath/inc starmath/source sw/inc sw/source
include/sfx2/viewfrm.hxx |3 ++-
include/sfx2/viewsh.hxx |2 +-
sc/source/ui/inc/prevwsh.hxx |2 +-
sc/source/ui/inc/tabvwsh.hxx |2 +-
sc/source/ui/view/prevwsh.cxx|2 +-
sc/source/ui/view/tabvwsh4.cxx |7 +--
sd/source/ui/inc/ViewShellBase.hxx |2 +-
sd/source/ui/view/ViewShellBase.cxx |2 +-
sfx2/source/view/viewfrm.cxx | 14 --
sfx2/source/view/viewsh.cxx |3 ++-
starmath/inc/view.hxx|2 +-
starmath/source/view.cxx |2 +-
sw/inc/view.hxx |2 +-
sw/source/uibase/inc/pview.hxx |2 +-
sw/source/uibase/uiview/pview.cxx|2 +-
sw/source/uibase/uiview/viewport.cxx |2 +-
16 files changed, 29 insertions(+), 22 deletions(-)
New commits:
commit 67d7d8be25819a291a6363fed0112146ba436619
Author: Stephan Bergmann
AuthorDate: Wed Nov 30 15:22:30 2016 +0100
Commit: Thorsten Behrens
CommitDate: Tue Nov 20 11:55:56 2018 +0100
ScTabViewShell::InnerResizePixel must not mark document as modified...
...when merely toggling the edit mode of a Calc document embedded in another
document (via "Insert - Object - OLE Object... - LibreOffice 5.4
Spreadsheet").
Interestingly, none of the other document kinds seem to have this problem.
(Maybe it's even unhelpful that ScTabViewShell::InnerResizePixel calls
SetDocumentModified() at all?) Anyway, pass this inplaceEditModeChange
information down there.
Change-Id: Iffb24b068419e3608c9f4b5e9645e44e1716aafe
Reviewed-on: https://gerrit.libreoffice.org/63582
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 3a3e8dd6a5e3..dfae17f0a81d 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -128,7 +128,8 @@ public:
voidUnlockAdjustPosSizePixel()
{ m_nAdjustPosPixelLock--; }
voidDoAdjustPosSizePixel( SfxViewShell * pSh,
-const Point &rPos, const Size &rSize );
+const Point &rPos, const Size &rSize,
+bool inplaceEditModeChange );
voidShow();
boolIsVisible() const;
voidToTop();
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index f76e00c70328..00195db4350a 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -159,7 +159,7 @@ protected:
virtual voidActivate(bool IsMDIActivate) override;
virtual voidDeactivate(bool IsMDIActivate) override;
-virtual voidInnerResizePixel( const Point &rOfs, const
Size &rSize );
+virtual voidInnerResizePixel( const Point &rOfs, const
Size &rSize, bool inplaceEditModeChange );
virtual voidOuterResizePixel( const Point &rOfs, const
Size &rSize );
virtual voidSetZoomFactor( const Fraction &rZoomX, const
Fraction &rZoomY );
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 59f10257c805..a476976b1aef 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -65,7 +65,7 @@ protected:
virtual voidDeactivate(bool bMDI) override;
virtual voidAdjustPosSizePixel( const Point &rPos, const Size &rSize )
override;
-virtual voidInnerResizePixel( const Point &rOfs, const Size &rSize )
override;
+virtual voidInnerResizePixel( const Point &rOfs, const Size &rSize,
bool inplaceEditModeChange ) override;
virtual voidOuterResizePixel( const Point &rOfs, const Size &rSize )
override;
virtual voidWriteUserData(OUString &, bool bBrowse = false) override;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 1dc17536be4e..9cef71bc509a 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -193,7 +193,7 @@ protected:
virtual voidAdjustPosSizePixel( const Point &rPos, const Size &rSize )
override; // alt
-virtual voidInnerResizePixel( const Point &rOfs, const Size &rSize )
override; // neu
+virtual voidInnerResizePixel( const Point &rOfs, const Size &rSize,
bool inplaceEditModeChange ) override; // neu
virtual voidOuterResizePixel( const Point &rOfs, const Size &rSize )
override;
virtual voidSetZoomFactor( const Fraction &rZoomX, const Fraction
&rZoomY ) override;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 885273f78739..8f0ddf44ab04 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -223,7 +223,7 @@ void ScPreviewShell::AdjustPosSizePixel( const Point &rPos,
const Size &rSize )
UpdateNeededScr
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 11 +
sw/source/filter/ww8/docxattributeoutput.cxx | 19 -
3 files changed, 25 insertions(+), 5 deletions(-)
New commits:
commit f2f2143316acb449baaf29dd5300a6acf8a5c632
Author: Serge Krot
AuthorDate: Fri Nov 16 09:53:37 2018 +0100
Commit: Thorsten Behrens
CommitDate: Tue Nov 20 11:55:29 2018 +0100
tdf#121456: sw: DOCX: tabs export and TABS_RELATIVE_TO_INDENT prop
In DOCX, w:pos specifies the position of the current custom tab stop
with respect to the current page margins.
But in ODT, zero position could be page margins or paragraph indent
according to used settings DocumentSettingId::TABS_RELATIVE_TO_INDENT
Added new unit test.
Change-Id: Ic56a8527380b6562f4239df1edce0c9b4649af24
Reviewed-on: https://gerrit.libreoffice.org/63460
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt
b/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt
new file mode 100755
index ..ff8d5400950b
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf121456_tabsOffset.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 40e9fb19c3ca..2728c75b51be 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -120,6 +120,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs2,
"tdf63561_clearTabs2.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty<
uno::Sequence >(getParagraph(4), "ParaTabStops").getLength());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf121456_tabsOffset, "tdf121456_tabsOffset.odt")
+{
+for (int i=2; i<8; i++)
+{
+uno::Sequence< style::TabStop > stops = getProperty<
uno::Sequence >(getParagraph( i ), "ParaTabStops");
+CPPUNIT_ASSERT_EQUAL( sal_Int32(1), stops.getLength());
+CPPUNIT_ASSERT_EQUAL( css::style::TabAlign_RIGHT, stops[ 0 ].Alignment
);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(17000), stops[ 0 ].Position );
+}
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf106174_rtlParaAlign,
"tdf106174_rtlParaAlign.docx")
{
CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER),
getProperty(getParagraph(1), "ParaAdjust"));
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 241c1e1b..c576fec3ec09 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7707,7 +7707,7 @@ void DocxAttributeOutput::ParaWidows( const
SvxWidowsItem& rWidows )
}
static void impl_WriteTabElement( FSHelperPtr const & pSerializer,
- const SvxTabStop& rTab )
+ const SvxTabStop& rTab, long tabsOffset )
{
FastAttributeList *pTabElementAttrList =
FastSerializerHelper::createAttrList();
@@ -7729,9 +7729,11 @@ static void impl_WriteTabElement( FSHelperPtr const &
pSerializer,
break;
}
-// Because GetTabPos already includes indent, we don't need to add
nCurrentLeft (CurrentLeft is indentation information)
-//pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::valueOf(
rTab.GetTabPos() + nCurrentLeft ) );
-pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::number(
rTab.GetTabPos()) );
+// Write position according to used offset of the whole paragraph.
+// In DOCX, w:pos specifies the position of the current custom tab stop
with respect to the current page margins.
+// But in ODT, zero position could be page margins or paragraph indent
according to used settings.
+// This is handled outside of this method and provided for us in
tabsOffset parameter.
+pTabElementAttrList->add( FSNS( XML_w, XML_pos ), OString::number(
rTab.GetTabPos() + tabsOffset ) );
sal_Unicode cFillChar = rTab.GetFill();
@@ -7770,6 +7772,13 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem& rTabStop )
m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND );
+// Get offset for tabs
+// In DOCX, w:pos specifies the position of the current custom tab stop
with respect to the current page margins.
+// But in ODT, zero position could be page margins or paragraph indent
according to used settings.
+long tabsOffset = 0;
+if
(m_rExport.m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::TABS_RELATIVE_TO_INDENT))
+tabsOffset = m_rExport.GetItem(RES_LR_SPACE).GetTextLeft();
+
// clear unused inherited tabs - otherwise the style will add them back in
sal_Int32 nCurrTab = 0;
for ( sal_uInt16 i = 0; i < nInheritedTabCount; ++i )
@@ -7789,7 +7798,7 @@ void DocxAttributeOutput::ParaTabStop( const
SvxTabStopItem& rTabStop )
for
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/VistaFilePicker.cxx | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
New commits:
commit c444eb7934d4a3c190e1d060805d9d175c1a9127
Author: Ilhan Yesil
AuthorDate: Mon Nov 19 14:50:25 2018 +0100
Commit: Thorsten Behrens
CommitDate: Tue Nov 20 11:54:25 2018 +0100
tdf#121497 "Save As": File Format Type unchanged in Windows
Added checks for filter title, so filter titles are Windows
conform.
Change-Id: I42485c465ea58540a99b8300c5205b902cb86a92
Reviewed-on: https://gerrit.libreoffice.org/63573
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/fpicker/source/win32/VistaFilePicker.cxx
b/fpicker/source/win32/VistaFilePicker.cxx
index e1eb66a9ce83..874bed2f5c5f 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,7 +119,14 @@ void SAL_CALL VistaFilePicker::appendFilter(const
OUString& sTitle ,
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+const sal_Int32 idx = sTitle.indexOf("(.");
+if (idx > 0)
+{
+const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
+}
+else
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
m_aAsyncExecute.triggerRequestThreadAware(rRequest,
AsyncRequests::NON_BLOCKED);
@@ -129,7 +136,14 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const
OUString& sTitle)
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+const sal_Int32 idx = sTitle.indexOf("(.");
+if (idx > 0)
+{
+const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
+}
+else
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
m_aAsyncExecute.triggerRequestThreadAware(rRequest,
AsyncRequests::NON_BLOCKED);
}
@@ -142,6 +156,7 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
m_aAsyncExecute.triggerRequestThreadAware(rRequest,
AsyncRequests::BLOCKED);
const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE,
OUString());
+
return sTitle;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 21 +-
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 35 ++
2 files changed, 31 insertions(+), 25 deletions(-)
New commits:
commit 5e8bdd9203dd642111c62a6668ee665a20d4ba19
Author: Mike Kaganski
AuthorDate: Tue Nov 20 08:45:38 2018 +0100
Commit: Stephan Bergmann
CommitDate: Tue Nov 20 11:46:14 2018 +0100
poppler dropped GBool since 0.71
See
https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html
Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
Reviewed-on: https://gerrit.libreoffice.org/63625
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 575a90acb094..ab74b36b4595 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
m_pDoc( pDoc ),
m_aFontMap(),
-m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
+m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
m_bSkipImages(false)
{
}
@@ -939,9 +939,9 @@ void PDFOutDev::endTextObject(GfxState*)
}
void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
- int width, int height, GBool invert,
- GBool /*interpolate*/,
- GBool /*inlineImg*/ )
+ int width, int height, poppler_bool invert,
+ poppler_bool /*interpolate*/,
+ poppler_bool /*inlineImg*/ )
{
if (m_bSkipImages)
return;
@@ -969,8 +969,8 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*,
Stream* str,
void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
int width, int height, GfxImageColorMap* colorMap,
- GBool /*interpolate*/,
- int* maskColors, GBool /*inlineImg*/ )
+ poppler_bool /*interpolate*/,
+ int* maskColors, poppler_bool /*inlineImg*/ )
{
if (m_bSkipImages)
return;
@@ -1018,11 +1018,10 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream*
str,
void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
int width, int height,
GfxImageColorMap* colorMap,
-GBool /*interpolate*/,
+poppler_bool /*interpolate*/,
Stream* maskStr,
int maskWidth, int maskHeight,
-GBool maskInvert
-, GBool /*maskInterpolate*/
+poppler_bool maskInvert, poppler_bool
/*maskInterpolate*/
)
{
if (m_bSkipImages)
@@ -1036,11 +1035,11 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*,
Stream* str,
void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
int width, int height,
GfxImageColorMap* colorMap,
-GBool /*interpolate*/,
+poppler_bool /*interpolate*/,
Stream* maskStr,
int maskWidth, int maskHeight,
GfxImageColorMap* maskColorMap
-, GBool /*maskInterpolate*/
+, poppler_bool /*maskInterpolate*/
)
{
if (m_bSkipImages)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index da021a2a039b..a6135fac4d7f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -130,6 +130,13 @@ namespace pdfi
{ return const_cast(familyName); }
};
+// Versions before 0.15 defined GBool as int; 0.15 redefined it as bool;
0.71 dropped GBool
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71
+typedef GBool poppler_bool;
+#else
+typedef bool poppler_bool;
+#endif
+
class PDFOutDev : public OutputDev
{
// not owned by this class
@@ -151,17 +158,17 @@ namespace pdfi
// Does this device use upside-down coordinates?
// (Upside-down means (0,0) is the top left corner of the page.)
-virtual GBool upsideDown() override { return gTrue; }
+virtual poppler_bool upsideDown() override { return true; }
// Does this device use drawChar() or drawString(
[Libreoffice-commits] core.git: compilerplugins/clang solenv/CompilerTest_compilerplugins_clang.mk
compilerplugins/clang/staticconstfield.cxx | 11 ++-
solenv/CompilerTest_compilerplugins_clang.mk |1 +
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit b0e819bbc0b3ff20de04f31b593f7d5213659045
Author: Stephan Bergmann
AuthorDate: Tue Nov 20 08:58:39 2018 +0100
Commit: Stephan Bergmann
CommitDate: Tue Nov 20 11:18:45 2018 +0100
Fix loplugin:staticconstfield
...(ExprWithCleanups around the CXXConstructExpr in initializers for
members of
O[U]String type, with older Clang, as used in
compilerplugins/clang/test/staticconstfield.cxx), and thus revert
e3e8d52625c2dc7a277a955d4ae2ad10c60c5f1b "Temporarily disable
compilerplugins/clang/test/staticconstfield" again.
Change-Id: Ic5fcdd1a26e4a6810369e4f9d909200d25feb12e
Reviewed-on: https://gerrit.libreoffice.org/63628
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/staticconstfield.cxx
b/compilerplugins/clang/staticconstfield.cxx
index b10953a75617..eadbd26bef78 100644
--- a/compilerplugins/clang/staticconstfield.cxx
+++ b/compilerplugins/clang/staticconstfield.cxx
@@ -95,10 +95,11 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
bool found = false;
std::string value;
+auto const initexpr = compat::IgnoreImplicit(init->getInit());
if (tc.Const().Class("OUString").Namespace("rtl").GlobalNamespace()
|| tc.Const().Class("OString").Namespace("rtl").GlobalNamespace())
{
-if (auto constructExpr = dyn_cast(init->getInit()))
+if (auto constructExpr = dyn_cast(initexpr))
{
if (constructExpr->getNumArgs() >= 1
&& isa(constructExpr->getArg(0)))
@@ -112,7 +113,7 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
else if (type->isFloatingType())
{
APFloat x1(0.0f);
-if (init->getInit()->EvaluateAsFloat(x1, compiler.getASTContext()))
+if (initexpr->EvaluateAsFloat(x1, compiler.getASTContext()))
{
std::string s;
llvm::raw_string_ostream os(s);
@@ -123,15 +124,15 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
}
#endif
// ignore this, it seems to trigger an infinite recursion
-else if (isa(init->getInit()))
+else if (isa(initexpr))
;
// ignore this, calling EvaluateAsInt on it will crash clang
-else if (init->getInit()->isValueDependent())
+else if (initexpr->isValueDependent())
;
else
{
APSInt x1;
-if (init->getInit()->EvaluateAsInt(x1, compiler.getASTContext()))
+if (initexpr->EvaluateAsInt(x1, compiler.getASTContext()))
{
value = x1.toString(10);
found = true;
diff --git a/solenv/CompilerTest_compilerplugins_clang.mk
b/solenv/CompilerTest_compilerplugins_clang.mk
index 96f71a5beda2..5b07568c1f75 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -53,6 +53,7 @@ $(eval $(call
gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
compilerplugins/clang/test/simplifyconstruct \
compilerplugins/clang/test/simplifydynamiccast \
compilerplugins/clang/test/singlevalfields \
+compilerplugins/clang/test/staticconstfield \
compilerplugins/clang/test/staticvar \
compilerplugins/clang/test/stringbuffer \
compilerplugins/clang/test/stringconstant \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui |11329 - 1 file changed, 11327 insertions(+), 2 deletions(-) New commits: commit 7c0c1524f45e73ce24180efc26f969f370fbeb79 Author: andreas kainz AuthorDate: Mon Nov 19 02:34:34 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 11:08:57 2018 +0100 NB draw groupedbar compact big update and sync with impress Change-Id: I69ee7466d6e13d3b0c51c27a8668d567c0427a35 Reviewed-on: https://gerrit.libreoffice.org/63562 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index d65f9879df72..1b081e0b1c45 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -1,6 +1,11331 @@ - + + + +True +False + + +True +False +.uno:ExtrusionToggle + + + + +True +False + + + + +True +False +.uno:ExtrusionTiltDown + + + + +True +False +.uno:ExtrusionTiltUp + + + + +True +False +.uno:ExtrusionTiltLeft + + + + +True +False +.uno:ExtrusionTiltRight + + + + +True +False + + + + +True +False +.uno:Window3D + + + + +True +False + + +True +False +.uno:WrapOff + + + + +True +False +.uno:WrapOn + + + + +True +False +.uno:WrapIdeal + + + + +True +False +.uno:WrapLeft + + + + +True +False +.uno:WrapRight + + + + +True +False +.uno:WrapThrough + + + + +True +False +.uno:WrapThroughTransparent + + + + +True +False +.uno:WrapContour + + + + +True +False +.uno:WrapAnchorOnly + + + + +True +False +.uno:TextWrap + + + + +True +False + + + + +True +False +.uno:SetObjectToForeground + + + + +True +False +.uno:SetObjectToBackground + + + + +True +False + + +True +False +.uno:TableSort + + + + +True +False +.uno:AutoSum + + + + +True +False + + +True +False +.uno:GraphicFilterSepia + + + + +True +False +.uno:GraphicFilterSobel + + + + +True +False +.uno:GraphicFilterInvert + + + + +True +False +.uno:GraphicFilterMosaic + + + + +True +False +.uno:GraphicFilterPopart + + + + +True +False +.uno:GraphicFilterPoster + + + + +True +False +.uno:GraphicFilterRelief + + + + +True +False +.uno:GraphicFilterRemoveNoise + + + + +True +False +.uno:GraphicFilterSharpen + + + + +True +False +.uno:GraphicFilterSmooth + + + + +True +False +.uno:GraphicFilterSolarize + + + + +True +False +.uno:GrafMode + + + + +True +False + + +True +False +.uno:Line + + + + +True +False +.uno:Freeline_Unfilled + + + + +True +False +.uno:Freeline + + + + +True +False +.uno:Bezier_Unfilled + + + + +True +False +.uno:BezierFill + + + + +True +False +.uno:Polygon_Unfilled + + + + +True +False +.uno:Polygon_Diagonal_Unfilled + + + + +True +False +.uno:Polygon_Diagonal + + + + +True +False + + + + +True +False +.uno:BasicShapes + + + + +True +False +.uno:SymbolShapes + + + + +True +False +.uno:ArrowShapes + + + + +
[Libreoffice-commits] core.git: sc/IwyuFilter_sc.yaml sc/qa
sc/IwyuFilter_sc.yaml|6 ++
sc/qa/perf/scperfobj.cxx |5 -
sc/qa/unit/bugfix-test.cxx |1 -
sc/qa/unit/chart2dataprovider.cxx|4
sc/qa/unit/cond_format_merge.cxx | 20 ++--
sc/qa/unit/copy_paste_test.cxx |1 -
sc/qa/unit/datacache.cxx |1 -
sc/qa/unit/dataproviders_test.cxx|2 --
sc/qa/unit/datatransformation_test.cxx |6 --
sc/qa/unit/filters-test.cxx | 12
sc/qa/unit/functions_test.hxx|6 --
sc/qa/unit/helper/csv_handler.hxx|7 +--
sc/qa/unit/helper/debughelper.hxx|6 --
sc/qa/unit/helper/qahelper.cxx |8 ++--
sc/qa/unit/helper/qahelper.hxx | 10 ++
sc/qa/unit/helper/xpath.hxx | 17 -
sc/qa/unit/mark_test.cxx |6 --
sc/qa/unit/opencl-test.cxx | 22 --
sc/qa/unit/parallelism.cxx | 17 -
sc/qa/unit/pivottable_filters_test.cxx |5 +
sc/qa/unit/range.cxx |1 -
sc/qa/unit/rangelst_test.cxx |2 --
sc/qa/unit/screenshots/screenshots.cxx | 19 ---
sc/qa/unit/subsequent_export-test.cxx| 14 ++
sc/qa/unit/subsequent_filters-test.cxx | 14 +++---
sc/qa/unit/tiledrendering/tiledrendering.cxx |6 --
sc/qa/unit/ucalc.cxx | 15 ---
sc/qa/unit/ucalc.hxx |3 ++-
sc/qa/unit/ucalc_condformat.cxx |1 +
sc/qa/unit/ucalc_formula.cxx |9 +
sc/qa/unit/ucalc_pivottable.cxx |6 --
sc/qa/unit/ucalc_sharedformula.cxx |4 +++-
sc/qa/unit/ucalc_sort.cxx|5 +++--
33 files changed, 73 insertions(+), 188 deletions(-)
New commits:
commit a87a062fd4fac61fde6aa7f6b4277cc77438d119
Author: Gabor Kelemen
AuthorDate: Thu Nov 8 23:35:22 2018 +0100
Commit: Miklos Vajna
CommitDate: Tue Nov 20 10:42:40 2018 +0100
tdf#42949 Fix IWYU warnings in sc/qa/{perf,unit}/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I031faa67192f21d20938c8cc8056db138326a1ca
Reviewed-on: https://gerrit.libreoffice.org/63143
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index f7db11f4decc..fbc77d9daac6 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -369,6 +369,12 @@ blacklist:
sc/inc/unitconv.hxx:
# base class has to be a complete type
- map
+sc/qa/unit/ucalc_formula.cxx:
+# Needed in template
+- docpool.hxx
+sc/qa/unit/functions_test.hxx:
+# Needed for css shortcut
+- sal/types.h
sc/source/core/inc/addinlis.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index 628fc1233669..4c63d3d1c6aa 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -27,16 +27,11 @@
#include
#include
#include
-#include
-#include
#include
-#include
#include
-#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 94fa2d188189..d7386343efdb 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -10,7 +10,6 @@
#include
#include
#include
-#include
#include "helper/qahelper.hxx"
using namespace ::com::sun::star;
diff --git a/sc/qa/unit/chart2dataprovider.cxx
b/sc/qa/unit/chart2dataprovider.cxx
index f482283062f9..2e30b6090745 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -12,13 +12,9 @@
#include
#include
-#include
-#include
#include
-#include
#include
-#include
#include "helper/qahelper.hxx"
diff --git a/sc/qa/unit/cond_format_merge.cxx b/sc/qa/unit/cond_format_merge.cxx
index 0ce3f21909bd..28da3a88fbb2 100644
--- a/sc/qa/unit/cond_format_merge.cxx
+++ b/sc/qa/unit/cond_format_merge.cxx
@@ -10,16 +10,24 @@
#include
#include
-#include
#include
#include
-#include
+#include
#include
-#include
-#include
-
-#include "helper/qahelper.hxx"
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace lang
+{
+class XComponent;
+}
+}
+}
+}
using namespace css;
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 742005df7e26..3b57bad7a6ec 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -8,7 +8,6 @@
*/
#include
-#include
#include
#include
diff --git a/sc/qa/unit/datacache.cxx b/sc/q
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf120551.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |8 +++
writerfilter/source/dmapper/GraphicImport.cxx | 27 --
3 files changed, 33 insertions(+), 2 deletions(-)
New commits:
commit dc38fc68dc130a8b35c1791ee7af4e44142e0698
Author: Miklos Vajna
AuthorDate: Mon Nov 19 21:41:07 2018 +0100
Commit: Miklos Vajna
CommitDate: Tue Nov 20 10:40:38 2018 +0100
tdf#120551 DOCX import: fix position of group shape with absolute position
Regression from commit af313fc149f80adb0f1680ca20e19745ccb7fede
(tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat
option, 2017-01-06), the group shape which covers most of the single
page in the document had a negative left position, while it should have
a small positive one (checking the drawingML markup).
This was a pre-existing problem, but now it's visible since we no longer
force objects to be on the page in Word compat mode.
Seeing the ODT import never positions group shapes (it's just a
container for child shapes), probably the DOCX import shouldn't do that
either. Start moving into this direction, first only for
absolute-positioned toplevel group shapes only, which already fixes the
bug.
(cherry picked from commit d220e476df38e86e094066a690985c624316d37f)
Change-Id: I152ba06a81a2bd09195a4c724da4b8878b0457bb
Reviewed-on: https://gerrit.libreoffice.org/63629
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlimport/data/tdf120551.docx
b/sw/qa/extras/ooxmlimport/data/tdf120551.docx
new file mode 100644
index ..0fc0057c4e03
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf120551.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 743ed626fe8b..8466180c7903 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -92,6 +92,14 @@ DECLARE_OOXMLIMPORT_TEST(testGroupShapeFontName,
"groupshape-fontname.docx")
getProperty(getRun(getParagraphOfText(1, xText), 1),
"CharFontNameAsian"));
}
+DECLARE_OOXMLIMPORT_TEST(test120551, "tdf120551.docx")
+{
+auto nHoriOrientPosition = getProperty(getShape(1),
"HoriOrientPosition");
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected: 436, Actual : -2542'.
+CPPUNIT_ASSERT_EQUAL(static_cast(436), nHoriOrientPosition);
+}
+
DECLARE_OOXMLIMPORT_TEST(testTdf111550, "tdf111550.docx")
{
// The test document has following ill-formed structure:
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 1e070a3e2a2c..9f188d88b499 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -66,11 +66,27 @@
#include "WrapPolygonHandler.hxx"
#include "util.hxx"
+using namespace css;
+
+namespace
+{
+bool isTopGroupObj(const uno::Reference& xShape)
+{
+SdrObject* pObject = GetSdrObjectFromXShape(xShape);
+if (!pObject)
+return false;
+
+if (pObject->getParentSdrObjectFromSdrObject())
+return false;
+
+return pObject->IsGroupObject();
+}
+}
+
namespace writerfilter {
namespace dmapper
{
-using namespace css;
class XInputStreamHelper : public cppu::WeakImplHelper
{
@@ -800,8 +816,15 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(sal_Int32(0)));
// Position of the groupshape should be set after
children have been added.
+// Long-term we should get rid of positioning group
+// shapes, though. Do it for top-level ones with
+// absolute page position as a start.
// fdo#80555: also set position for graphic shapes
here
-
m_xShape->setPosition(awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
+if (!isTopGroupObj(m_xShape)
+|| m_pImpl->nHoriRelation !=
text::RelOrientation::PAGE_FRAME
+|| m_pImpl->nVertRelation !=
text::RelOrientation::PAGE_FRAME)
+m_xShape->setPosition(
+awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
if (nRotation)
xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(nRotation));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/lc_autoformat.png|binary icon-themes/colibre/cmd/lc_autopilotmenu.png |binary icon-themes/colibre/cmd/sc_autoformat.png|binary icon-themes/colibre/cmd/sc_autopilotmenu.png |binary icon-themes/colibre/links.txt| 36 ++- icon-themes/colibre_svg/cmd/lc_autoformat.svg| 15 - icon-themes/colibre_svg/cmd/lc_autopilotmenu.svg |1 icon-themes/colibre_svg/cmd/sc_autoformat.svg| 18 --- icon-themes/colibre_svg/cmd/sc_autopilotmenu.svg |6 +++ 9 files changed, 51 insertions(+), 25 deletions(-) New commits: commit 228fed36aba7d6a9d02911bcf602218682442a56 Author: andreas kainz AuthorDate: Tue Nov 20 08:34:28 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 10:26:08 2018 +0100 tdf#120918 change AutoFormat Style in Colibre Change-Id: I23956b671a24cc8ac85cec4ea6220d1107f99b1e Reviewed-on: https://gerrit.libreoffice.org/63624 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/lc_autoformat.png b/icon-themes/colibre/cmd/lc_autoformat.png index 10590052952e..2984af3fa3d7 100644 Binary files a/icon-themes/colibre/cmd/lc_autoformat.png and b/icon-themes/colibre/cmd/lc_autoformat.png differ diff --git a/icon-themes/colibre/cmd/lc_autopilotmenu.png b/icon-themes/colibre/cmd/lc_autopilotmenu.png new file mode 100644 index ..10590052952e Binary files /dev/null and b/icon-themes/colibre/cmd/lc_autopilotmenu.png differ diff --git a/icon-themes/colibre/cmd/sc_autoformat.png b/icon-themes/colibre/cmd/sc_autoformat.png index 48b5737c9946..8cbb4fc23ad4 100644 Binary files a/icon-themes/colibre/cmd/sc_autoformat.png and b/icon-themes/colibre/cmd/sc_autoformat.png differ diff --git a/icon-themes/colibre/cmd/sc_autopilotmenu.png b/icon-themes/colibre/cmd/sc_autopilotmenu.png new file mode 100644 index ..48b5737c9946 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_autopilotmenu.png differ diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 11e8a66e5a31..fd1aa20d642c 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -376,24 +376,22 @@ cmd/lc_importfromfile.png cmd/lc_dataimport.png cmd/sc_importfromfile.png cmd/sc_dataimport.png # Wizard -cmd/lc_dbnewqueryautopilot.png cmd/lc_autoformat.png -cmd/lc_usewizards.png cmd/lc_autoformat.png -cmd/lc_graphicfiltertoolbox.png cmd/lc_autoformat.png -cmd/lc_dbnewtableautopilot.png cmd/lc_autoformat.png -cmd/lc_dbnewreportautopilot.png cmd/lc_autoformat.png -cmd/lc_dbnewformautopilot.png cmd/lc_autoformat.png -cmd/lc_commontaskbarvisible.png cmd/lc_autoformat.png -cmd/lc_autopilotmenu.png cmd/lc_autoformat.png -cmd/lc_newarrangement.png cmd/lc_autoformat.png -cmd/sc_dbnewqueryautopilot.png cmd/sc_autoformat.png -cmd/sc_usewizards.png cmd/sc_autoformat.png -cmd/sc_graphicfiltertoolbox.png cmd/sc_autoformat.png -cmd/sc_dbnewtableautopilot.png cmd/sc_autoformat.png -cmd/sc_dbnewreportautopilot.png cmd/sc_autoformat.png -cmd/sc_dbnewformautopilot.png cmd/sc_autoformat.png -cmd/sc_commontaskbarvisible.png cmd/sc_autoformat.png -cmd/sc_autopilotmenu.png cmd/sc_autoformat.png -cmd/sc_newarrangement.png cmd/sc_autoformat.png +cmd/lc_dbnewqueryautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_usewizards.png cmd/lc_autopilotmenu.png +cmd/lc_graphicfiltertoolbox.png cmd/lc_autopilotmenu.png +cmd/lc_dbnewtableautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_dbnewreportautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_dbnewformautopilot.png cmd/lc_autopilotmenu.png +cmd/lc_commontaskbarvisible.png cmd/lc_autopilotmenu.png +cmd/lc_newarrangement.png cmd/lc_autopilotmenu.png +cmd/sc_dbnewqueryautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_usewizards.png cmd/sc_autopilotmenu.png +cmd/sc_graphicfiltertoolbox.png cmd/sc_autopilotmenu.png +cmd/sc_dbnewtableautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_dbnewreportautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_dbnewformautopilot.png cmd/sc_autopilotmenu.png +cmd/sc_commontaskbarvisible.png cmd/sc_autopilotmenu.png +cmd/sc_newarrangement.png cmd/sc_autopilotmenu.png # Filter cmd/lc_formfilterexecute.png cmd/lc_datafilterstandardfilter.png @@ -1510,7 +1508,7 @@ svx/res/cd017.png cmd/sc_bezierinsert.png svx/res/cd018.png cmd/sc_bezierdelete.png svx/res/cd020.png cmd/sc_undo.png svx/res/cd021.png cmd/sc_redo.png -svx/res/cd025.png cmd/sc_autoformat.png +svx/res/cd025.png cmd/sc_autopilotmenu.png svx/res/cd026.png cmd/sc_bmpmask.png svx/res/color.png cmd/sc_bmpmask.png diff --git a/icon-themes/colibre_svg/cmd/lc_autoformat.svg b/icon-themes/colibre_svg/cmd/lc_autoformat.svg index a7ec3b0479c8..f9b6c100fdfc 100644 --- a/icon-themes/colibre_svg/cmd/lc_autoformat.svg +++ b/icon-themes/colibre_svg/cmd/lc_autoformat.svg @@ -1 +1,14 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> + + + + diff --git a/icon-themes/colibre_sv
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_single.ui | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 697c308431101c936bbaae25ea6f6efd162b9d9f Author: Jim Raykowski AuthorDate: Thu Nov 15 16:32:22 2018 -0900 Commit: andreas_kainz CommitDate: Tue Nov 20 10:24:58 2018 +0100 tdf#121401 Keyboard navigation for Writer NB contextual single Change-Id: Ibcb56c6c0f1456c472061039ecc0835928846724 Reviewed-on: https://gerrit.libreoffice.org/63458 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 4e7af5672c68..a7b655ac5ce3 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -26,7 +26,7 @@ True -False +True False @@ -91,7 +91,7 @@ True -False +True False @@ -143,7 +143,7 @@ True -False +True False @@ -216,7 +216,7 @@ True -False +True False @@ -259,7 +259,7 @@ True -False +True False @@ -283,7 +283,7 @@ True -False +True False @@ -328,7 +328,7 @@ True -False +True False @@ -418,7 +418,7 @@ True -False +True False @@ -469,7 +469,7 @@ True -False +True True Horizontal Alignment start @@ -552,7 +552,7 @@ True -False +True end False @@ -592,7 +592,7 @@ True -False +True True Indent False @@ -672,7 +672,7 @@ True -False +True True Indent False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk sc/Module_sc.mk sc/qa
framework/qa/complex/api_internal/api.lst |1 qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SubTotalFieldsEnumeration.csv |2 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java | 107 -- sc/CppunitTest_sc_indexenumeration_subtotalfieldsenumeration.mk | 43 sc/Module_sc.mk |1 sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx | 103 + sc/qa/unoapi/sc_5.sce |1 8 files changed, 147 insertions(+), 112 deletions(-) New commits: commit dc0616cda97c5039ae6b46ded001b51c6f9de498 Author: Jens Carl AuthorDate: Tue Nov 20 07:22:27 2018 + Commit: Jens Carl CommitDate: Tue Nov 20 10:18:46 2018 +0100 tdf#45904 Move XEnumeration Java tests to C++ Move XEnumeration Java test to C++ for ScIndexEnumeration_SubTotalFieldsEnumeration. Change-Id: Ibe2b283e99230c5e517eb80858ff31459f2c9844 Reviewed-on: https://gerrit.libreoffice.org/63627 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index d4a6db38b1eb..2d0c3608180f 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -94,7 +94,6 @@ job96=sc.ScFilterDescriptorBase job97=sc.ScFunctionListObj job98=sc.ScHeaderFieldObj job99=sc.ScHeaderFieldsObj -job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration job117=sc.ScIndexEnumeration_TableChartsEnumeration job122=sc.ScLabelRangesObj job125=sc.ScScenariosObj diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index b443935bd60e..58ede4e8b815 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -993,7 +993,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \ -qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \ qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \ qadevOOo/tests/java/mod/_sc/ScModelObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SubTotalFieldsEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SubTotalFieldsEnumeration.csv deleted file mode 100644 index 1cba00a04945.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SubTotalFieldsEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScIndexEnumeration_SubTotalFieldsEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScIndexEnumeration_SubTotalFieldsEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java deleted file mode 100644 index 0854b11989f7.. --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XIndexAccess; -import com.sun.star.lang.XComponent; -import com.sun.star.sheet.GeneralFunction; -import com.sun.star.sheet.SubTotalColumn; -import com.sun.star.sheet.XSpreadsheet; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.sheet.XSpreadsheets; -import com.sun.star.sheet.XSubTotalCalculatable; -impor
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 3 +++ 1 file changed, 3 insertions(+) New commits: commit 976b7930a1137066a75babc6944ab48ea62ae9ac Author: andreas kainz AuthorDate: Mon Nov 19 23:38:30 2018 +0100 Commit: andreas_kainz CommitDate: Tue Nov 20 09:36:11 2018 +0100 ZoomMode string description is now PopupLabel Label is now shorter Change-Id: I442c4bf9acbd85f340371014c20be3292a016beb Reviewed-on: https://gerrit.libreoffice.org/63613 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 4d6462137417..10be465b1e84 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1658,6 +1658,9 @@ + Zoom & Pan + + Zoom & Pan (CTRL to Zoom Out, SHIFT to Pan) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source include/vcl sfx2/source solenv/gbuild vcl/inc vcl/README.vars vcl/source vcl/win vcl/workben
framework/source/services/frame.cxx |4 ++--
include/vcl/settings.hxx|1 -
include/vcl/svapp.hxx | 12 ++--
sfx2/source/doc/objmisc.cxx |2 +-
solenv/gbuild/CppunitTest.mk| 14 +-
solenv/gbuild/Module.mk |2 ++
solenv/gbuild/platform/com_MSC_class.mk |1 -
solenv/gbuild/platform/macosx.mk|3 ---
solenv/gbuild/platform/windows.mk |3 ---
vcl/README.vars |2 --
vcl/inc/svdata.hxx |2 +-
vcl/source/app/settings.cxx | 10 --
vcl/source/app/svapp.cxx|5 +++--
vcl/source/opengl/OpenGLHelper.cxx | 13 +
vcl/source/window/dialog.cxx|6 +++---
vcl/source/window/window.cxx|2 +-
vcl/win/window/salframe.cxx |3 +--
vcl/workben/commonfuzzer.hxx|2 +-
vcl/workben/fftester.cxx|2 +-
19 files changed, 36 insertions(+), 53 deletions(-)
New commits:
commit 6cdfe5ebb4f6c06bfa8b0e67e778dd68131c14e3
Author: Jan-Marek Glogowski
AuthorDate: Tue Oct 9 19:29:54 2018 +0200
Commit: Jan-Marek Glogowski
CommitDate: Tue Nov 20 09:19:09 2018 +0100
Drop some headless mode variants
This fixes OSX "make debugrun" by dropping VCL_HIDE_WINDOWS
handling and removing the internal GetPseudoHeadless() API.
While at it moves the DialogCancelMode enum out of Application.
Change-Id: I4876e752ddbfc39dd44faa673fb0e97810089a75
Reviewed-on: https://gerrit.libreoffice.org/61598
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/framework/source/services/frame.cxx
b/framework/source/services/frame.cxx
index 8a718d787ecf..66fe3032356a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2115,8 +2115,8 @@ void SAL_CALL Frame::disposing()
// notifications which we don't need here really.
// (b) Don't forget to save the old value of IsDialogCancelEnabled()
to
// restore it afterwards (to not kill headless mode).
-Application::DialogCancelMode old = Application::GetDialogCancelMode();
-Application::SetDialogCancelMode( Application::DialogCancelMode::Silent );
+DialogCancelMode old = Application::GetDialogCancelMode();
+Application::SetDialogCancelMode( DialogCancelMode::Silent );
// We should be alone for ever and further dispose calls are rejected by
lines before ...
// I hope it :-)
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index c70da34cb993..adadeb39662f 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -631,7 +631,6 @@ public:
boolGetDisablePrinting() const;
voidSetEnableLocalizedDecimalSep( bool bEnable
);
boolGetEnableLocalizedDecimalSep() const;
-boolGetPseudoHeadless() const;
booloperator ==( const MiscSettings& rSet )
const;
booloperator !=( const MiscSettings& rSet )
const;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 7e7d4c205299..c66142b9035a 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -219,6 +219,12 @@ private:
std::vector aData;
};
+enum class DialogCancelMode {
+Off, ///< do not automatically cancel dialogs
+Silent, ///< silently cancel any dialogs
+Fatal ///< cancel any dialogs by std::abort
+};
+
/**
@brief Base class used mainly for the LibreOffice Desktop class.
@@ -236,12 +242,6 @@ private:
class VCL_DLLPUBLIC Application
{
public:
-enum class DialogCancelMode {
-Off, ///< do not automatically cancel dialogs
-Silent, ///< silently cancel any dialogs
-Fatal ///< cancel any dialogs by std::abort
-};
-
/** @name Initialization
The following functions perform initialization and deinitialization
of the application.
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index e245800f2fec..4e1ae9b99327 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1804,7 +1804,7 @@ bool
SfxObjectShell::IsContinueImportOnFilterExceptions(const OUString& aErrMess
{
if (mbContinueImportOnFilterExceptions == undefined)
{
-if (Application::GetDialogCancelMode() ==
Application::DialogCancelMode::Off)
+if (Application::GetDialogCancelMode() == DialogCancelMode::Off)
{
// Ask the user to try to continue or abort loading
OUString aMessage = SfxResId(STR_QMSG_ERROR_OPENING_FILE);
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 23d72de5716c..2217ffc53fbc 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTe
[Libreoffice-commits] online.git: wsd/TileCache.cpp
wsd/TileCache.cpp | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit b6ddf485f35457701f862e59930445016dbe85c2
Author: Miklos Vajna
AuthorDate: Tue Nov 20 09:14:44 2018 +0100
Commit: Miklos Vajna
CommitDate: Tue Nov 20 09:14:44 2018 +0100
TileCache::TileBeingRendered: make members private
Change-Id: I2ea4a10bd6fa78b1d8738d941d1c52fc46352ab9
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 224614422..b46d16044 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -93,8 +93,6 @@ void TileCache::completeCleanup() const
/// rendering latency.
struct TileCache::TileBeingRendered
{
-std::vector> _subscribers;
-
TileBeingRendered(const std::string& cachedName, const TileDesc& tile)
: _startTime(std::chrono::steady_clock::now()),
_tile(tile),
@@ -110,7 +108,9 @@ struct TileCache::TileBeingRendered
std::chrono::steady_clock::time_point getStartTime() const { return
_startTime; }
double getElapsedTimeMs() const { return
std::chrono::duration_cast
(std::chrono::steady_clock::now() - _startTime).count(); }
+std::vector>& getSubscribers() { return
_subscribers; }
private:
+std::vector> _subscribers;
std::chrono::steady_clock::time_point _startTime;
TileDesc _tile;
std::string _cachedName;
@@ -132,7 +132,7 @@ void TileCache::forgetTileBeingRendered(const
std::shared_ptrgetCacheName()) !=
_tilesBeingRendered.end());
-for(auto& subscriber : tileBeingRendered->_subscribers)
+for(auto& subscriber : tileBeingRendered->getSubscribers())
{
std::shared_ptr session = subscriber.lock();
if(session && tile.getId() == -1)
@@ -207,7 +207,7 @@ void TileCache::saveTileAndNotify(const TileDesc& tile,
const char *data, const
// Notify subscribers, if any.
if (tileBeingRendered)
{
-const size_t subscriberCount = tileBeingRendered->_subscribers.size();
+const size_t subscriberCount =
tileBeingRendered->getSubscribers().size();
if (subscriberCount > 0)
{
std::string response = tile.serialize("tile:");
@@ -220,7 +220,7 @@ void TileCache::saveTileAndNotify(const TileDesc& tile,
const char *data, const
payload->append("\n", 1);
payload->append(data, size);
-auto& firstSubscriber = tileBeingRendered->_subscribers[0];
+auto& firstSubscriber = tileBeingRendered->getSubscribers()[0];
std::shared_ptr firstSession =
firstSubscriber.lock();
if (firstSession)
{
@@ -241,7 +241,7 @@ void TileCache::saveTileAndNotify(const TileDesc& tile,
const char *data, const
for (size_t i = 1; i < subscriberCount; ++i)
{
-auto& subscriber = tileBeingRendered->_subscribers[i];
+auto& subscriber = tileBeingRendered->getSubscribers()[i];
std::shared_ptr session = subscriber.lock();
if (session)
{
@@ -498,7 +498,7 @@ void TileCache::subscribeToTileRendering(const TileDesc&
tile, const std::shared
if (tileBeingRendered)
{
-for (const auto &s : tileBeingRendered->_subscribers)
+for (const auto &s : tileBeingRendered->getSubscribers())
{
if (s.lock().get() == subscriber.get())
{
@@ -509,8 +509,8 @@ void TileCache::subscribeToTileRendering(const TileDesc&
tile, const std::shared
}
LOG_DBG("Subscribing " << subscriber->getName() << " to tile " << name
<< " which has " <<
-tileBeingRendered->_subscribers.size() << " subscribers
already.");
-tileBeingRendered->_subscribers.push_back(subscriber);
+tileBeingRendered->getSubscribers().size() << " subscribers
already.");
+tileBeingRendered->getSubscribers().push_back(subscriber);
if(tile.getId() == -1)
subscriber->traceSubscribeToTile(tileBeingRendered->getCacheName());
@@ -531,7 +531,7 @@ void TileCache::subscribeToTileRendering(const TileDesc&
tile, const std::shared
assert(_tilesBeingRendered.find(cachedName) ==
_tilesBeingRendered.end());
tileBeingRendered = std::make_shared(cachedName,
tile);
-tileBeingRendered->_subscribers.push_back(subscriber);
+tileBeingRendered->getSubscribers().push_back(subscriber);
if(tile.getId() == -1)
subscriber->traceSubscribeToTile(tileBeingRendered->getCacheName());
_tilesBeingRendered[cachedName] = tileBeingRendered;
@@ -581,7 +581,7 @@ std::string TileCache::cancelTiles(const
std::shared_ptr &subscri
continue;
}
-auto& subscribers = it->second->_subscribers;
+auto& subscribers = it->second->getSubscribers();
LOG_TRC("Tile " << it->first << " has " << subscribers.size() << "
subscribers.");
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf120551.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |8 +++
writerfilter/source/dmapper/GraphicImport.cxx | 27 --
3 files changed, 33 insertions(+), 2 deletions(-)
New commits:
commit d220e476df38e86e094066a690985c624316d37f
Author: Miklos Vajna
AuthorDate: Mon Nov 19 21:41:07 2018 +0100
Commit: Miklos Vajna
CommitDate: Tue Nov 20 09:07:44 2018 +0100
tdf#120551 DOCX import: fix position of group shape with absolute position
Regression from commit af313fc149f80adb0f1680ca20e19745ccb7fede
(tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat
option, 2017-01-06), the group shape which covers most of the single
page in the document had a negative left position, while it should have
a small positive one (checking the drawingML markup).
This was a pre-existing problem, but now it's visible since we no longer
force objects to be on the page in Word compat mode.
Seeing the ODT import never positions group shapes (it's just a
container for child shapes), probably the DOCX import shouldn't do that
either. Start moving into this direction, first only for
absolute-positioned toplevel group shapes only, which already fixes the
bug.
Change-Id: I152ba06a81a2bd09195a4c724da4b8878b0457bb
Reviewed-on: https://gerrit.libreoffice.org/63606
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlimport/data/tdf120551.docx
b/sw/qa/extras/ooxmlimport/data/tdf120551.docx
new file mode 100644
index ..0fc0057c4e03
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf120551.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 743ed626fe8b..8466180c7903 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -92,6 +92,14 @@ DECLARE_OOXMLIMPORT_TEST(testGroupShapeFontName,
"groupshape-fontname.docx")
getProperty(getRun(getParagraphOfText(1, xText), 1),
"CharFontNameAsian"));
}
+DECLARE_OOXMLIMPORT_TEST(test120551, "tdf120551.docx")
+{
+auto nHoriOrientPosition = getProperty(getShape(1),
"HoriOrientPosition");
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected: 436, Actual : -2542'.
+CPPUNIT_ASSERT_EQUAL(static_cast(436), nHoriOrientPosition);
+}
+
DECLARE_OOXMLIMPORT_TEST(testTdf111550, "tdf111550.docx")
{
// The test document has following ill-formed structure:
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 1e070a3e2a2c..9f188d88b499 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -66,11 +66,27 @@
#include "WrapPolygonHandler.hxx"
#include "util.hxx"
+using namespace css;
+
+namespace
+{
+bool isTopGroupObj(const uno::Reference& xShape)
+{
+SdrObject* pObject = GetSdrObjectFromXShape(xShape);
+if (!pObject)
+return false;
+
+if (pObject->getParentSdrObjectFromSdrObject())
+return false;
+
+return pObject->IsGroupObject();
+}
+}
+
namespace writerfilter {
namespace dmapper
{
-using namespace css;
class XInputStreamHelper : public cppu::WeakImplHelper
{
@@ -800,8 +816,15 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(sal_Int32(0)));
// Position of the groupshape should be set after
children have been added.
+// Long-term we should get rid of positioning group
+// shapes, though. Do it for top-level ones with
+// absolute page position as a start.
// fdo#80555: also set position for graphic shapes
here
-
m_xShape->setPosition(awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
+if (!isTopGroupObj(m_xShape)
+|| m_pImpl->nHoriRelation !=
text::RelOrientation::PAGE_FRAME
+|| m_pImpl->nVertRelation !=
text::RelOrientation::PAGE_FRAME)
+m_xShape->setPosition(
+awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
if (nRotation)
xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(nRotation));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk sc/Module_sc.mk sc/qa
framework/qa/complex/api_internal/api.lst |1 qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv |2 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java | 88 - sc/CppunitTest_sc_indexenumeration_spreadsheetviewpanesenumeration.mk | 43 sc/Module_sc.mk |1 sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx | 91 ++ sc/qa/unoapi/sc_5.sce |1 8 files changed, 135 insertions(+), 93 deletions(-) New commits: commit 0c627e494052f8717856712358763eb670b5a5fb Author: Jens Carl AuthorDate: Tue Nov 20 06:56:51 2018 + Commit: Jens Carl CommitDate: Tue Nov 20 08:59:37 2018 +0100 tdf#45904 Move XEnumeration Java tests to C++ Move XEnumeration Java tests to C++ for ScIndexEnumeration_SpreadsheetViewPanesEnumeration. Change-Id: I03c05cd894bf84816618ac28deb01ecb2fd8779e Reviewed-on: https://gerrit.libreoffice.org/63622 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index fdf7f3030838..d4a6db38b1eb 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -94,7 +94,6 @@ job96=sc.ScFilterDescriptorBase job97=sc.ScFunctionListObj job98=sc.ScHeaderFieldObj job99=sc.ScHeaderFieldsObj -job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration job117=sc.ScIndexEnumeration_TableChartsEnumeration job122=sc.ScLabelRangesObj diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 4cf8ba0bfdab..b443935bd60e 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -993,7 +993,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \ qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration \ - qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration \ qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration \ qadevOOo/tests/java/mod/_sc/ScLabelRangesObj \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv deleted file mode 100644 index 03d0ea5a3fb6.. --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScIndexEnumeration_SpreadsheetViewPanesEnumeration.csv +++ /dev/null @@ -1,2 +0,0 @@ -"ScIndexEnumeration_SpreadsheetViewPanesEnumeration";"com::sun::star::container::XEnumeration";"hasMoreElements()" -"ScIndexEnumeration_SpreadsheetViewPanesEnumeration";"com::sun::star::container::XEnumeration";"nextElement()" diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java deleted file mode 100644 index 11050dd12994.. --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package mod._sc; - -import java.io.PrintWriter; - -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.SOfficeFactory; - -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XIndexAccess; -import com.sun.star.frame.XController; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XComponent; -import com.sun.star
