[Libreoffice-commits] core.git: solenv/clang-format
solenv/clang-format/blacklist |1 + 1 file changed, 1 insertion(+) New commits: commit b6691cfb96ad76a205e506e5a3ebbff80d5c0fa7 Author: Stephan Bergmann Date: Tue Apr 3 08:48:46 2018 +0200 Put back blacklisted file ...that had been removed with 5c573a2f7473bae7bb965ca36557cd1b0bf7b9c9 "tdf#115131 made a common submenu for toolbars and notebookbars", apparently in error. Change-Id: Ic86ae8885872065a8e1c9b833bdd56081caea457 diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 50e828ba480e..1ad63cbac793 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -5282,6 +5282,7 @@ framework/inc/uielement/menubarmanager.hxx framework/inc/uielement/menubarmerger.hxx framework/inc/uielement/menubarwrapper.hxx framework/inc/uielement/newmenucontroller.hxx +framework/inc/uielement/notebookbarmenucontroller.hxx framework/inc/uielement/progressbarwrapper.hxx framework/inc/uielement/rootitemcontainer.hxx framework/inc/uielement/spinfieldtoolbarcontroller.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/qa sc/qa sc/UITest_autofilter.mk sc/UITest_calc_tests.mk solenv/gbuild sw/qa sw/UITest_writer_tests.mk uitest/manual_tests uitest/UITest_manual_tests.mk uitest/UI
pyuno/qa/pytests/insertremovecells.py|5 +--
sc/UITest_autofilter.mk |5 +++
sc/UITest_calc_tests.mk |5 +++
sc/qa/uitest/autofilter/autofilterBugs.py|6 ++-
sc/qa/uitest/calc_tests/mergedRowsColumns.py |5 +--
sc/qa/uitest/calc_tests/subtotals.py |5 +--
sc/qa/uitest/calc_tests/tdf62267.py |5 +--
sc/qa/uitest/calc_tests/tdf65856.py |5 +--
sc/qa/uitest/calc_tests/tdf81351.py |5 +--
sc/qa/uitest/calc_tests/tdf86253.py |5 +--
sc/qa/uitest/calc_tests/tdf99386.py |5 +--
solenv/gbuild/UITest.mk |2 -
sw/UITest_writer_tests.mk|4 ++
sw/qa/uitest/writer_tests/tdf108124.py |5 +--
sw/qa/uitest/writer_tests/tdf113284.py |5 +--
uitest/UITest_manual_tests.mk|5 +++
uitest/UITest_writer_demo.mk |5 +++
uitest/manual_tests/calc.py |5 +--
uitest/writer_tests/tdf104649.py |6 ++-
unotest/source/python/org/libreoffice/unotest.py | 38 +--
20 files changed, 94 insertions(+), 37 deletions(-)
New commits:
commit d76281864b0e83812c0edf7490b1e8271e89fff5
Author: Stephan Bergmann
Date: Thu Mar 29 18:35:54 2018 +0200
Create temp copies of test docs in Python/UITests
...where necessary, so the tests will succeed if SRCDIR is a read-only tree.
Change-Id: Iea4c52d5982d3eba079088ef1670ff557ce30c3f
Reviewed-on: https://gerrit.libreoffice.org/52122
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/pyuno/qa/pytests/insertremovecells.py
b/pyuno/qa/pytests/insertremovecells.py
index 0d7979c4c8d1..e14717639d7e 100644
--- a/pyuno/qa/pytests/insertremovecells.py
+++ b/pyuno/qa/pytests/insertremovecells.py
@@ -9,7 +9,7 @@ try:
except ImportError:
from urllib import pathname2url
-from org.libreoffice.unotest import pyuno, mkPropertyValue
+from org.libreoffice.unotest import pyuno, mkPropertyValue, makeCopyFromTDOC
class InsertRemoveCells(unittest.TestCase):
@@ -29,8 +29,7 @@ class InsertRemoveCells(unittest.TestCase):
('Hidden', True),
('ReadOnly', False)
))
-tdoc_dir = getenv('TDOC')
-tdoc_path = pathname2url(path.join(tdoc_dir, 'fdo74824.ods'))
+tdoc_path = pathname2url(makeCopyFromTDOC('fdo74824.ods'))
if platform.system() == 'Windows':
tdoc_path = re.sub(r'^//(/[A-Za-z]:/)/', r'\1', tdoc_path)
url = 'file://' + tdoc_path
diff --git a/sc/UITest_autofilter.mk b/sc/UITest_autofilter.mk
index 93bf17200bb1..a6dc24cffbfb 100644
--- a/sc/UITest_autofilter.mk
+++ b/sc/UITest_autofilter.mk
@@ -12,4 +12,9 @@ $(eval $(call gb_UITest_UITest,autofilter))
$(eval $(call gb_UITest_add_modules,autofilter,$(SRCDIR)/sc/qa/uitest,\
autofilter/ \
))
+
+$(eval $(call gb_UITest_set_defs,autofilter, \
+TDOC="$(SRCDIR)/sc/qa/uitest/autofilter/data" \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests.mk b/sc/UITest_calc_tests.mk
index c9a4e5c3f44b..e316574a97bb 100644
--- a/sc/UITest_calc_tests.mk
+++ b/sc/UITest_calc_tests.mk
@@ -12,4 +12,9 @@ $(eval $(call gb_UITest_UITest,calc_tests))
$(eval $(call gb_UITest_add_modules,calc_tests,$(SRCDIR)/sc/qa/uitest,\
calc_tests/ \
))
+
+$(eval $(call gb_UITest_set_defs,calc_tests, \
+TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/autofilter/autofilterBugs.py
b/sc/qa/uitest/autofilter/autofilterBugs.py
index 370af59d8a5c..e216d7994d8c 100644
--- a/sc/qa/uitest/autofilter/autofilterBugs.py
+++ b/sc/qa/uitest/autofilter/autofilterBugs.py
@@ -10,12 +10,14 @@ from uitest.uihelper.common import get_state_as_dict
import time
from uitest.debug import sleep
from uitest.uihelper.common import select_pos
-from uitest.path import get_srcdir_url
from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
+import org.libreoffice.unotest
+import pathlib
+
def get_url_for_data_file(file_name):
-return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
class autofilter(UITestCase):
diff --git a/sc/qa/uitest/calc_tests/mergedRowsColumns.py
b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
index 2f081e6355cd..1302c7b64bd5 100644
--- a/sc/qa/uitest/calc_tests/mergedRowsColumns.py
+++ b/sc/qa/uitest/calc_tests/mergedRowsColumns.py
@@ -8,14 +8,15 @@
from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.framework import UITestCase
from libreoffice.calc.document import get_column
+import org.libreoffice.unotest
+import pathlib
import time
from uitest.debug import sleep
-from uitest.path import get_srcdir_url
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
icon-themes/sifr/cmd/lc_defineprintarea.png |binary icon-themes/sifr_dark/cmd/lc_defineprintarea.png |binary icon-themes/sifr_svg/cmd/lc_defineprintarea.svg | 142 +++ 3 files changed, 142 insertions(+) New commits: commit 20c680092fa2598feb4541b1c69a8389779dbae4 Author: Matthias Freund Date: Mon Apr 2 23:21:40 2018 +0200 tdf#75256 Sifr bug fix Wrong filename and lc_defineprintarea matches 32px and 16px now Change-Id: I7aab973ad30f820d65c1049d62161e51879a6b4a Reviewed-on: https://gerrit.libreoffice.org/52275 Tested-by: Jenkins Reviewed-by: Matthias Freund diff --git a/icon-themes/sifr/cmd/lc_defineprintarea.png b/icon-themes/sifr/cmd/lc_defineprintarea.png index 804d31a79de8..faf5b1297a56 100644 Binary files a/icon-themes/sifr/cmd/lc_defineprintarea.png and b/icon-themes/sifr/cmd/lc_defineprintarea.png differ diff --git a/icon-themes/sifr/sc/res/sc26050.pngD b/icon-themes/sifr/sc/res/sc26050.png similarity index 100% rename from icon-themes/sifr/sc/res/sc26050.pngD rename to icon-themes/sifr/sc/res/sc26050.png diff --git a/icon-themes/sifr_dark/cmd/lc_defineprintarea.png b/icon-themes/sifr_dark/cmd/lc_defineprintarea.png index e5b239ed0012..ec8d773a9de6 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_defineprintarea.png and b/icon-themes/sifr_dark/cmd/lc_defineprintarea.png differ diff --git a/icon-themes/sifr_svg/cmd/lc_defineprintarea.svg b/icon-themes/sifr_svg/cmd/lc_defineprintarea.svg new file mode 100644 index ..673b503b7298 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_defineprintarea.svg @@ -0,0 +1,142 @@ + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + viewBox="0 0 24 24" + version="1.1" + id="svg5" + sodipodi:docname="lc_defineprintarea.svg" + inkscape:version="0.92.3 (unknown)" + inkscape:export-filename="/home/matthias/git/icons/sifr_svg/lc_defineprintarea.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"; /> + +http://creativecommons.org/licenses/by-sa/4.0/"; /> + + +The Document Foundation + + + + +Matthias Freund + + + + http://creativecommons.org/licenses/by-sa/4.0/";> +http://creativecommons.org/ns#Reproduction"; /> +http://creativecommons.org/ns#Distribution"; /> +http://creativecommons.org/ns#Notice"; /> +http://creativecommons.org/ns#Attribution"; /> +http://creativecommons.org/ns#DerivativeWorks"; /> +http://creativecommons.org/ns#ShareAlike"; /> + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xcellrangeformula.hxx| 34 +
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |2
qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula.java | 62
--
sc/qa/extras/sccellcursorobj.cxx| 11 +
sc/qa/extras/sccellrangeobj.cxx | 37 +++--
sc/qa/extras/sctablesheetobj.cxx|7 +
test/Library_subsequenttest.mk |1
test/source/sheet/xcellrangeformula.cxx | 41 ++
11 files changed, 112 insertions(+), 88 deletions(-)
New commits:
commit a7fc11be3083b61a70e7a55e0436032771e37f20
Author: Jens Carl
Date: Tue Apr 3 03:46:14 2018 +
tdf#45904 Move _XCellRangeFormula Java tests to C++
Change-Id: Iff5ca30e47a3a3eee704ad9aefdf61b3fcd72f5d
Reviewed-on: https://gerrit.libreoffice.org/52286
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xcellrangeformula.hxx
b/include/test/sheet/xcellrangeformula.hxx
new file mode 100644
index ..9fcc432c8358
--- /dev/null
+++ b/include/test/sheet/xcellrangeformula.hxx
@@ -0,0 +1,34 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XCELLRANGEFORMULA_HXX
+#define INCLUDED_TEST_SHEET_XCELLRANGEFORMULA_HXX
+
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellRangeFormula
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetSetFormulaArray();
+
+protected:
+~XCellRangeFormula() {}
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_SHEET_XCELLRANGEFORMULA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index ec99ac93dde8..9e076552c42e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -567,7 +567,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
-qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \
qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement \
qadevOOo/tests/java/ifc/sheet/_XCellRangeReferrer \
qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index f5563cfe7758..cf6417dcdf44 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -116,8 +116,6 @@
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
"ScCellCursorObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()"
"ScCellCursorObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()"
-"ScCellCursorObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()"
-"ScCellCursorObj";"com::sun::star::sheet::XCellRangeFormula#optional";"setFormulaArray()"
"ScCellCursorObj";"com::sun::star::util::XIndent";"decrementIndent()"
"ScCellCursorObj";"com::sun::star::util::XIndent";"incrementIndent()"
"ScCellCursorObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index fb6d2e76829d..3ca844258495 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -111,8 +111,6 @@
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
"ScCellRangeObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()"
"ScCellRangeObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()"
-"ScCellRangeObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()"
-"ScCellRangeObj";"com::sun::star::sheet::XCellRangeFormula#optional";"setFormulaArray()"
"ScCellRangeObj";"com::sun::star::util::XIndent";"decrementIndent()"
"ScCellRangeObj";"com::sun::star::util::XIndent";"incrementIndent()"
"ScCellRangeObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
diff --git a/qadevOOo/objdsc/sc/com.sun
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/lc_actionmode.png|binary icon-themes/colibre/cmd/lc_dsbformletter.png |binary icon-themes/colibre/cmd/lc_dsbinsertcontent.png |binary icon-themes/colibre/cmd/lc_extrusiondirectionfloater.png |binary icon-themes/colibre/cmd/lc_extrusiontoggle.png |binary icon-themes/colibre/cmd/lc_fields.png|binary icon-themes/colibre/cmd/lc_insertfixedtext.png |binary icon-themes/colibre/cmd/lc_pickthrough.png |binary icon-themes/colibre/cmd/lc_tablemodefix.png |binary icon-themes/colibre/cmd/lc_tablemodefixprop.png |binary icon-themes/colibre/cmd/lc_tablemodevariable.png |binary icon-themes/colibre/cmd/sc_actionmode.png|binary icon-themes/colibre/cmd/sc_dsbformletter.png |binary icon-themes/colibre/cmd/sc_dsbinsertcontent.png |binary icon-themes/colibre/cmd/sc_fields.png|binary icon-themes/colibre/cmd/sc_pickthrough.png |binary icon-themes/colibre/cmd/sc_tablemodefix.png |binary icon-themes/colibre/cmd/sc_tablemodefixprop.png |binary icon-themes/colibre/cmd/sc_tablemodevariable.png |binary icon-themes/colibre/links.txt| 14 +++ icon-themes/colibre_svg/cmd/lc_actionmode.svg|1 icon-themes/colibre_svg/cmd/lc_dsbformletter.svg |1 icon-themes/colibre_svg/cmd/lc_dsbinsertcontent.svg |1 icon-themes/colibre_svg/cmd/lc_extrusiondirectionfloater.svg |2 - icon-themes/colibre_svg/cmd/lc_extrusiontoggle.svg |2 - icon-themes/colibre_svg/cmd/lc_fields.svg|1 icon-themes/colibre_svg/cmd/lc_pickthrough.svg |1 icon-themes/colibre_svg/cmd/lc_tablemodefix.svg |1 icon-themes/colibre_svg/cmd/lc_tablemodefixprop.svg |1 icon-themes/colibre_svg/cmd/lc_tablemodevariable.svg |1 icon-themes/colibre_svg/cmd/sc_actionmode.svg|1 icon-themes/colibre_svg/cmd/sc_dsbformletter.svg |1 icon-themes/colibre_svg/cmd/sc_dsbinsertcontent.svg |1 icon-themes/colibre_svg/cmd/sc_fields.svg|5 +++ icon-themes/colibre_svg/cmd/sc_insertfixedtext.svg |4 --- icon-themes/colibre_svg/cmd/sc_pickthrough.svg |5 +++ icon-themes/colibre_svg/cmd/sc_tablemodefix.svg |8 ++ icon-themes/colibre_svg/cmd/sc_tablemodefixprop.svg |8 ++ icon-themes/colibre_svg/cmd/sc_tablemodevariable.svg |8 ++ 39 files changed, 61 insertions(+), 6 deletions(-) New commits: commit d2bacf86dc0f3f7809ba772a53fdb601d3893be0 Author: andreas kainz Date: Tue Apr 3 00:18:53 2018 +0200 Colibre icons: finish cmd galaxy folder Change-Id: I74a38bc0304112b97badba206cd20d96fae4ce29 Reviewed-on: https://gerrit.libreoffice.org/52276 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/lc_actionmode.png b/icon-themes/colibre/cmd/lc_actionmode.png new file mode 100644 index ..a79d901f7c5e Binary files /dev/null and b/icon-themes/colibre/cmd/lc_actionmode.png differ diff --git a/icon-themes/colibre/cmd/lc_dsbformletter.png b/icon-themes/colibre/cmd/lc_dsbformletter.png new file mode 100644 index ..74fb774cf636 Binary files /dev/null and b/icon-themes/colibre/cmd/lc_dsbformletter.png differ diff --git a/icon-themes/colibre/cmd/lc_dsbinsertcontent.png b/icon-themes/colibre/cmd/lc_dsbinsertcontent.png new file mode 100644 index ..f7a2956c1fda Binary files /dev/null and b/icon-themes/colibre/cmd/lc_dsbinsertcontent.png differ diff --git a/icon-themes/colibre/cmd/lc_extrusiondirectionfloater.png b/icon-themes/colibre/cmd/lc_extrusiondirectionfloater.png index 650772bc0f29..4641fa916c59 100644 Binary files a/icon-themes/colibre/cmd/lc_extrusiondirectionfloater.png and b/icon-themes/colibre/cmd/lc_extrusiondirectionfloater.png differ diff --git a/icon-themes/colibre/cmd/lc_extrusiontoggle.png b/icon-themes/colibre/cmd/lc_extrusiontoggle.png index a81e0470e0af..c4136d37f959 100644 Binary files a/icon-themes/colibre/cmd/lc_extrusiontoggle.png and b/icon-themes/colibre/cmd/lc_extrusiontoggle.png differ diff --git a/icon-themes/colibre/cmd/lc_fields.png b/icon-themes/colibre/cmd/lc_fields.png new file mode 100644 index ..c27a6773ef6d Binary files /dev/null and b/icon-themes/colibre/cmd/lc_fields.png differ diff --git a/icon-themes/colibre/cmd/lc_insertfixedtext.png b/icon-themes/colibre/cmd/lc_insertfixedtext.png new file mode 100644 index ..4b865b5da166 Binary files /dev/null and b/icon-themes/colibre/cmd/lc_insertfixedtext.png differ diff --git a/icon-themes/colibre/cmd/lc_pickthrough.png b
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/km/lc_bold.png|binary icon-themes/colibre/cmd/km/lc_italic.png |binary icon-themes/colibre/cmd/km/lc_underline.png |binary icon-themes/colibre/cmd/km/lc_underlinedouble.png |binary icon-themes/colibre/cmd/km/sc_bold.png|binary icon-themes/colibre/cmd/km/sc_italic.png |binary icon-themes/colibre/cmd/km/sc_underline.png |binary icon-themes/colibre/cmd/km/sc_underlinedouble.png |binary icon-themes/colibre_svg/cmd/km/lc_bold.svg|1 + icon-themes/colibre_svg/cmd/km/lc_italic.svg |1 + icon-themes/colibre_svg/cmd/km/lc_underline.svg |1 + icon-themes/colibre_svg/cmd/km/lc_underlinedouble.svg |1 + icon-themes/colibre_svg/cmd/km/sc_bold.svg|1 + icon-themes/colibre_svg/cmd/km/sc_italic.svg |1 + icon-themes/colibre_svg/cmd/km/sc_underline.svg |4 icon-themes/colibre_svg/cmd/km/sc_underlinedouble.svg |4 16 files changed, 14 insertions(+) New commits: commit 925a6a9983a079c66af5c3b107d38d1fcdd6bf39 Author: andreas kainz Date: Tue Apr 3 01:50:48 2018 +0200 Colibre icons: add language support for km Change-Id: I02540abad87c4d63a45d0aa5f831a2ef59765282 Reviewed-on: https://gerrit.libreoffice.org/52284 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/km/lc_bold.png b/icon-themes/colibre/cmd/km/lc_bold.png new file mode 100644 index ..4d149ff8f33f Binary files /dev/null and b/icon-themes/colibre/cmd/km/lc_bold.png differ diff --git a/icon-themes/colibre/cmd/km/lc_italic.png b/icon-themes/colibre/cmd/km/lc_italic.png new file mode 100644 index ..58dcc71cc92e Binary files /dev/null and b/icon-themes/colibre/cmd/km/lc_italic.png differ diff --git a/icon-themes/colibre/cmd/km/lc_underline.png b/icon-themes/colibre/cmd/km/lc_underline.png new file mode 100644 index ..72b631392f9a Binary files /dev/null and b/icon-themes/colibre/cmd/km/lc_underline.png differ diff --git a/icon-themes/colibre/cmd/km/lc_underlinedouble.png b/icon-themes/colibre/cmd/km/lc_underlinedouble.png new file mode 100644 index ..4c7ec334877a Binary files /dev/null and b/icon-themes/colibre/cmd/km/lc_underlinedouble.png differ diff --git a/icon-themes/colibre/cmd/km/sc_bold.png b/icon-themes/colibre/cmd/km/sc_bold.png new file mode 100644 index ..95b7f2b4e4de Binary files /dev/null and b/icon-themes/colibre/cmd/km/sc_bold.png differ diff --git a/icon-themes/colibre/cmd/km/sc_italic.png b/icon-themes/colibre/cmd/km/sc_italic.png new file mode 100644 index ..ddecdc09f1a0 Binary files /dev/null and b/icon-themes/colibre/cmd/km/sc_italic.png differ diff --git a/icon-themes/colibre/cmd/km/sc_underline.png b/icon-themes/colibre/cmd/km/sc_underline.png new file mode 100644 index ..605ac1ea199c Binary files /dev/null and b/icon-themes/colibre/cmd/km/sc_underline.png differ diff --git a/icon-themes/colibre/cmd/km/sc_underlinedouble.png b/icon-themes/colibre/cmd/km/sc_underlinedouble.png new file mode 100644 index ..8a15c568d404 Binary files /dev/null and b/icon-themes/colibre/cmd/km/sc_underlinedouble.png differ diff --git a/icon-themes/colibre_svg/cmd/km/lc_bold.svg b/icon-themes/colibre_svg/cmd/km/lc_bold.svg new file mode 100644 index ..3106e35efbf4 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/km/lc_bold.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/km/lc_italic.svg b/icon-themes/colibre_svg/cmd/km/lc_italic.svg new file mode 100644 index ..91b5ffbd8fd5 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/km/lc_italic.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/km/lc_underline.svg b/icon-themes/colibre_svg/cmd/km/lc_underline.svg new file mode 100644 index ..34cf6ab9664d --- /dev/null +++ b/icon-themes/colibre_svg/cmd/km/lc_underline.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/km/lc_underlinedouble.svg b/icon-themes/colibre_svg/cmd/km/lc_underlinedouble.svg new file mode 100644 index ..962794d76448 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/km/lc_underlinedouble.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/km/sc_bold.svg b/icon-themes/colibre_svg/cmd/km/sc_bold.svg new file mode 100644 index ..1a8b4d3c4f88 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/km/sc_bold.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/km/sc_italic.svg b/icon-themes/colibre_svg/cmd/km/sc_italic.svg new file mode 100644 index ..a5f72d69b3e5 --- /dev/null +++ b/icon-them
[Libreoffice-commits] core.git: include/vcl sd/source svx/source vcl/source
include/vcl/bitmapex.hxx |2 +-
sd/source/ui/view/viewoverlaymanager.cxx |2 +-
svx/source/gallery2/galobj.cxx |2 +-
vcl/source/gdi/bitmapex.cxx | 15 ++-
vcl/source/graphic/GraphicObject2.cxx|2 +-
vcl/source/window/menubarwindow.cxx |2 +-
6 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 8e0eb015e74775b9bf02326ffd7b67e83ad6c60d
Author: Chris Sherlock
Date: Tue Apr 3 01:05:33 2018 +1000
vcl: use BitmapEx::Scale() where needed and SetSizePixel() elsewhere
Change-Id: If4b2f3c209d1aefbe5756645d448c992387bae16
Reviewed-on: https://gerrit.libreoffice.org/52268
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index c61969869b33..dedd064b17d3 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -79,7 +79,7 @@ public:
AlphaMask GetAlpha() const;
const Size& GetSizePixel() const { return maBitmapSize; }
-voidSetSizePixel( const Size& rNewSize, BmpScaleFlag
nScaleFlag = BmpScaleFlag::Default );
+voidSetSizePixel(const Size& rNewSize);
const Size& GetPrefSize() const { return maBitmap.GetPrefSize(); }
voidSetPrefSize( const Size& rPrefSize ) {
maBitmap.SetPrefSize( rPrefSize ); }
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx
b/sd/source/ui/view/viewoverlaymanager.cxx
index f7646704b3fb..215a3a0038e7 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -340,7 +340,7 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int
nHighlight )
Size aSize( getButtonImage( 0, bLarge )->GetSizePixel() );
-aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) );
+aRet.Scale(Size(aSize.Width() << 1, aSize.Height() << 1));
const ::tools::Rectangle aRectSrc( Point( 0, 0 ), aSize );
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index d307b65bfd47..d9e6a205cbfe 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -118,7 +118,7 @@ bool SgaObject::CreateThumb( const Graphic& rGraphic )
else
aBmpSize.setHeight( FRound( aBmpSize.Width() /
fFactorLog ) );
-aBmpEx.SetSizePixel( aBmpSize, BmpScaleFlag::BestQuality );
+aBmpEx.Scale(aBmpSize, BmpScaleFlag::BestQuality);
}
}
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 63856412e01a..6dac0651ff9c 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -64,7 +64,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc,
Size aSize )
return;
maBitmap = Bitmap( aSize, rBitmapEx.maBitmap.GetBitCount() );
-maBitmapSize = aSize;
+SetSizePixel(aSize);
if( rBitmapEx.IsAlpha() )
{
mbAlpha = true;
@@ -297,12 +297,9 @@ BitmapChecksum BitmapEx::GetChecksum() const
return nCrc;
}
-void BitmapEx::SetSizePixel( const Size& rNewSize, BmpScaleFlag nScaleFlag )
+void BitmapEx::SetSizePixel(const Size& rNewSize)
{
-if(GetSizePixel() != rNewSize)
-{
-Scale( rNewSize, nScaleFlag );
-}
+maBitmapSize = rNewSize;
}
bool BitmapEx::Invert()
@@ -348,7 +345,7 @@ bool BitmapEx::Scale( const double& rScaleX, const double&
rScaleY, BmpScaleFlag
maMask.Scale( rScaleX, rScaleY, nScaleFlag );
}
-maBitmapSize = maBitmap.GetSizePixel();
+SetSizePixel(maBitmap.GetSizePixel());
SAL_WARN_IF( !!maMask && maBitmap.GetSizePixel() !=
maMask.GetSizePixel(), "vcl",
"BitmapEx::Scale(): size mismatch for bitmap and alpha
mask." );
@@ -430,7 +427,7 @@ bool BitmapEx::Crop( const tools::Rectangle& rRectPixel )
if( bRet && ( meTransparent == TransparentType::Bitmap ) && !!maMask )
maMask.Crop( rRectPixel );
-maBitmapSize = maBitmap.GetSizePixel();
+SetSizePixel(maBitmap.GetSizePixel());
SAL_WARN_IF( !!maMask && maBitmap.GetSizePixel() !=
maMask.GetSizePixel(), "vcl",
"BitmapEx::Crop(): size mismatch for bitmap and alpha
mask." );
@@ -463,7 +460,7 @@ void BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, bool
bExpandTransparent )
maMask.Expand( nDX, nDY, &aColor );
}
-maBitmapSize = maBitmap.GetSizePixel();
+SetSizePixel(maBitmap.GetSizePixel());
SAL_WARN_IF( !!maMask && maBitmap.GetSizePixel() !=
maMask.GetSizePixel(), "vcl",
"BitmapEx::Expand(): size mismatch for bitmap and alpha
mask." );
diff --git a/vcl/source/graphic/GraphicObject2.cxx
b/vcl/source/graphic/GraphicObject2.cxx
index 7e951479912a..e46b035f60b7 100644
--- a/vcl/source/graphic/GraphicObject2.cxx
+++ b/vcl/
Re: "Microsoft Excel Is Going Beyond Text and Numbers"
On 04/02/2018 09:48 AM, Heiko Tietze wrote: > Interesting question - filed a ticket in BZ > > https://bugs.documentfoundation.org/show_bug.cgi?id=116744 From my perspective, it looks like Microsoft Excell 2019 is offering the following additional functionality: * Real Time Currency Exchange Rates; * Real Time Stock Market Data; * Historical Currency Exchange Rates; * Historical Stock Market Data; * Census data; * Scientific knowledge; * Political knowledge; * Geographical knowledge; * Sports knowlege; * General knowledge; * Pop Trivia --- everything not covered above; Break this up into basic steps. Real time Stock Market Data and Currency Exchange data was available using the Get_Quote Extension, which stopped working when Yahoo changed their financial portal structure: * Rewriting it for Currency Exchange data from XE.com is a possible solution - user API key is required; * I don't know what the rules are, for any current vendors of stock market data. I didn't use Get_Quote, because it didn't cover the stock exchange I tracked - each stock market probably needs its own extension. Census Data: Web scraping might be possible. * US Census data is available using the appropriate APIs. User key required; * I didn't look at census data for other countries; * Initially at least, create extensions that are country specific; The following knowledge sets: * Scientific knowledge; * Political knowledge; * Geographical knowledge; * Sports knowledge; * General knowledge; * Pop Trivia --- everything not covered above; probably can be pulled, at least in part, from WikiData. Personally, I'd like to see both a cloud based, and non-cloud based version of an extension that uses WikiData. However, at 31 GB for a zipped archive, it might be too big to be practical. The second big issue is, will whoever creates the extension, also maintain it? ### I don't see the relevance of Bug 116762 to this issue. The extension described therein, maybe. jonathon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] cppunit.git: include/cppunit include/msvc6 src/cppunit
include/cppunit/plugin/TestPlugIn.h|2 ++ include/msvc6/testrunner/TestPlugInInterface.h |2 ++ src/cppunit/Win32DynamicLibraryManager.cpp |2 ++ 3 files changed, 6 insertions(+) New commits: commit 5ee5394ccec1e9fa07f2a84d73209472c8a1daab Author: Markus Mohrhard Date: Mon Apr 2 23:17:19 2018 +0200 tdf#116653, avoid NOMINMAX redefinition warnings with mingw diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h index 52b5b35..4c57093 100644 --- a/include/cppunit/plugin/TestPlugIn.h +++ b/include/cppunit/plugin/TestPlugIn.h @@ -146,7 +146,9 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); #define NOUSER #define NOKERNEL #define NOSOUND +#ifndef NOMINMAX #define NOMINMAX +#endif #define BLENDFUNCTION void// for mingw & gcc #include #endif diff --git a/include/msvc6/testrunner/TestPlugInInterface.h b/include/msvc6/testrunner/TestPlugInInterface.h index 7b35a08..79c128d 100644 --- a/include/msvc6/testrunner/TestPlugInInterface.h +++ b/include/msvc6/testrunner/TestPlugInInterface.h @@ -10,7 +10,9 @@ #define NOUSER #define NOKERNEL #define NOSOUND +#ifndef NOMINMAX #define NOMINMAX +#endif #include #endif diff --git a/src/cppunit/Win32DynamicLibraryManager.cpp b/src/cppunit/Win32DynamicLibraryManager.cpp index acadf46..5dac4fa 100644 --- a/src/cppunit/Win32DynamicLibraryManager.cpp +++ b/src/cppunit/Win32DynamicLibraryManager.cpp @@ -8,7 +8,9 @@ #define NOUSER #define NOKERNEL #define NOSOUND +#ifndef NOMINMAX #define NOMINMAX +#endif #define BLENDFUNCTION void// for mingw & gcc #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03020401.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 686b52540f532ba0037df3a783b8f8dc0f5a2ba7 Author: dennisroczek Date: Sun Apr 1 16:01:45 2018 +0100 fix some openoffice bugzilla links * remove redirects * use https links Change-Id: Ifaa9cefb64b54a9c3a85715df4e63f989c41b551 Reviewed-on: https://gerrit.libreoffice.org/52230 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/shared/03020401.xhp b/source/text/sbasic/shared/03020401.xhp index 8d367ee00..eea88c05f 100644 --- a/source/text/sbasic/shared/03020401.xhp +++ b/source/text/sbasic/shared/03020401.xhp @@ -39,7 +39,7 @@ -This statement currently does not work as documented. See http://www.openoffice.org/issues/show_bug.cgi?id=30692";>this issue for more information. +This statement currently does not work as documented. See https://bz.apache.org/ooo/show_bug.cgi?id=30692";>this issue for more information. Syntax: ___ 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 55d5d9d365ea18e66cef045756f772e2fa9d0648 Author: dennisroczek Date: Sun Apr 1 16:01:45 2018 +0100 Updated core Project: help 686b52540f532ba0037df3a783b8f8dc0f5a2ba7 fix some openoffice bugzilla links * remove redirects * use https links Change-Id: Ifaa9cefb64b54a9c3a85715df4e63f989c41b551 Reviewed-on: https://gerrit.libreoffice.org/52230 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 03f934e2c836..686b52540f53 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 03f934e2c836af98bb8d7722b4a4ecec9c741910 +Subproject commit 686b52540f532ba0037df3a783b8f8dc0f5a2ba7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Bootstrap connectivity/source extensions/qa i18npool/source include/oox odk/CustomTarget_html.mk odk/examples odk/README oox/source scripting/java sw/source uno
android/Bootstrap/src/org/libreoffice/kit/Document.java |
2 +-
connectivity/source/drivers/firebird/Driver.cxx |
2 +-
extensions/qa/integration/extensions/ServicesHandler.java|
2 +-
i18npool/source/localedata/data/locale.dtd |
8
include/oox/ppt/slidetransition.hxx |
2 +-
odk/CustomTarget_html.mk |
10 +-
odk/README |
2 +-
odk/examples/java/Inspector/UnoNode.java |
2 +-
odk/examples/java/Spreadsheet/CalcAddins.java|
2 +-
oox/source/export/drawingml.cxx |
4 ++--
scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh |
8
scripting/java/com/sun/star/script/framework/provider/javascript/template.js |
4 ++--
sw/source/uibase/misc/swruler.cxx|
2 +-
unotools/source/misc/ServiceDocumenter.hxx |
2 +-
unoxml/source/dom/document.hxx |
4 ++--
xmerge/source/bridge/java/XMergeBridge.java |
2 +-
16 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit e39c75b05c9ff865768e7f2694e5369cc35aa23b
Author: dennisroczek
Date: Mon Apr 2 15:11:58 2018 +0100
use https links for api.libreoffice.org and opengrok
Change-Id: I74dd0142562cb8698f19b2715fa1d514f82bd749
Reviewed-on: https://gerrit.libreoffice.org/52262
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 855bdd2c5a2e..69f8f76c3eb4 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -54,7 +54,7 @@ public class Document {
/**
* Callback message types
- * Refer to
http://opengrok.libreoffice.org/xref/core/include/LibreOfficeKit/LibreOfficeKitEnums.h
+ * Refer to
https://opengrok.libreoffice.org/xref/core/include/LibreOfficeKit/LibreOfficeKitEnums.h
* for more details about each callback.
*/
public static final int CALLBACK_INVALIDATE_TILES = 0;
diff --git a/connectivity/source/drivers/firebird/Driver.cxx
b/connectivity/source/drivers/firebird/Driver.cxx
index 5fd13a4c4ca9..8a6ebafdb897 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -219,7 +219,7 @@ Sequence< DriverPropertyInfo > SAL_CALL
FirebirdDriver::getPropertyInfo(
sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( )
{
// The major and minor version are sdbc driver specific. Must begin with
1.0
-// as per
http://api.libreoffice.org/docs/common/ref/com/sun/star/sdbc/XDriver.html
+// as per
https://api.libreoffice.org/docs/common/ref/com/sun/star/sdbc/XDriver.html
return 1;
}
diff --git a/extensions/qa/integration/extensions/ServicesHandler.java
b/extensions/qa/integration/extensions/ServicesHandler.java
index 6152a3befa23..c84e128e8892 100644
--- a/extensions/qa/integration/extensions/ServicesHandler.java
+++ b/extensions/qa/integration/extensions/ServicesHandler.java
@@ -50,7 +50,7 @@ public class ServicesHandler implements XPropertyHandler
try
{
// translate the service name into a URL to dispatch
-String documentationURL =
"http://api.libreoffice.org/docs/common/ref/"; + m_serviceName.replace('.','/')
+ ".html";
+String documentationURL =
"https://api.libreoffice.org/docs/common/ref/"; + m_serviceName.replace('.','/')
+ ".html";
System.out.println( documentationURL );
// the OpenHyperlink command, to be dispatched to the Desktop
diff --git a/i18npool/source/localedata/data/locale.dtd
b/i18npool/source/localedata/data/locale.dtd
index 1425d6f33789..ef6fec20d968 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -168,7 +168,7 @@
hyphen-minus separates the currency symbol from the hexagesimal MS-LCID,
letters contained in the LCID have to be in upper case, leading zeros are
to be omitted. LCIDs are defined in include/i18nlangtag/lang.h (
- http://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h )
+ https://opengrok.libreoffice.org/xref/core/include/i18nlangtag/lang.h )
-->
@@ -216,7 +216,7 @@
The format indices 0..59 are reserved and, for backwards compatibility,
indices 0..49 MUST be used as stated in
offapi/com/sun/star/i18n/NumberFo
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/swabstdlg.hxx |2 -
sw/source/ui/dialog/swdlgfact.cxx| 14 ---
sw/source/ui/dialog/swdlgfact.hxx| 13 +--
sw/source/ui/misc/bookmark.cxx |2 -
sw/source/ui/utlui/swrenamexnameddlg.cxx | 49 +++
sw/source/uibase/inc/swrenamexnameddlg.hxx | 29 +++
sw/source/uibase/utlui/content.cxx |2 -
sw/uiconfig/swriter/ui/renameobjectdialog.ui | 18 ++---
8 files changed, 66 insertions(+), 63 deletions(-)
New commits:
commit 91af9a53df79d256dc6a02c900fa570fe10d63ad
Author: Caolán McNamara
Date: Mon Apr 2 17:54:45 2018 +0100
weld SwRenameXNamedDlg
Change-Id: I3373ac37509e5230b6e6e07d85035d0b02252e24
Reviewed-on: https://gerrit.libreoffice.org/52273
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index d7d95a1fc4fe..c0e2484a4d75 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -441,7 +441,7 @@ public:
virtual VclPtr CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
virtual VclPtr CreateSwFieldEditDlg ( SwView& rVw ) =
0;
-virtual VclPtr
CreateSwRenameXNamedDlg(vcl::Window* pParent,
+virtual VclPtr
CreateSwRenameXNamedDlg(weld::Window* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess) = 0;
virtual VclPtr
CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 1d1ad97285a2..eae34ddfb912 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -137,7 +137,10 @@ short AbstractSwAutoFormatDlg_Impl::Execute()
return m_xDlg->execute();
}
IMPL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl);
+short AbstractSwRenameXNamedDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractFieldInputDlg_Impl);
@@ -400,14 +403,14 @@ void AbstractSwFieldDlg_Impl::ShowReferencePage()
void AbstractSwRenameXNamedDlg_Impl::SetForbiddenChars( const OUString& rSet )
{
-pDlg->SetForbiddenChars( rSet );
+m_xDlg->SetForbiddenChars( rSet );
}
voidAbstractSwRenameXNamedDlg_Impl::SetAlternativeAccess(
css::uno::Reference< css::container::XNameAccess > & xSecond,
css::uno::Reference< css::container::XNameAccess > & xThird )
{
-pDlg->SetAlternativeAccess( xSecond, xThird);
+m_xDlg->SetAlternativeAccess( xSecond, xThird);
}
voidAbstractSwModalRedlineAcceptDlg_Impl::AcceptAll( bool bAccept )
@@ -877,12 +880,11 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg (
return VclPtr::Create( pDlg );
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(vcl::Window* pParent,
+VclPtr
SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(weld::Window* pParent,
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
{
-VclPtr pDlg = VclPtr::Create(
pParent,xNamed, xNameAccess);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
SwRenameXNamedDlg(pParent,xNamed, xNameAccess));
}
VclPtr
SwAbstractDialogFactory_Impl::CreateSwModalRedlineAcceptDlg(vcl::Window
*pParent)
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 882a5ffb2003..d2e1f5e342a8 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -306,8 +306,15 @@ class AbstractSwFieldDlg_Impl : public AbstractSwFieldDlg
class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
{
-DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
-virtual voidSetForbiddenChars( const OUString& rSet ) override;
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractSwRenameXNamedDlg_Impl(SwRenameXNamedDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+virtual void SetForbiddenChars( const OUString& rSet ) override;
virtual void SetAlternativeAccess(
css::uno::Reference< css::container::XNameAccess > & xSecond,
css::uno::Reference< css::container::XNameAccess > & xThird )
override;
@@ -531,7 +538,7 @@ public:
const SfxItemSet* pItemSet, SwWrtShell* pSh) override;
virtual VclPtr CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, vcl::Window *pParent) override;
virtual VclPtr CreateSwFieldEditDlg ( SwView& rVw )
override;
-virtual VclPtr
CreateSwRenameXNamedDlg(vcl::Window* pParent,
+virtual VclPtr
CreateSwRenameXNamedDlg(weld::Window* pParent,
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/swabstdlg.hxx |2 +-
sw/source/ui/dialog/swdlgfact.cxx |9 ++---
sw/source/ui/dialog/swdlgfact.hxx | 15 ++-
sw/source/ui/dialog/swuiexp.cxx|1 +
sw/source/ui/table/mergetbl.cxx| 26 +++---
sw/source/uibase/inc/mergetbl.hxx | 20
sw/source/uibase/shells/tabsh.cxx |2 +-
sw/uiconfig/swriter/ui/mergetabledialog.ui | 15 +--
8 files changed, 51 insertions(+), 39 deletions(-)
New commits:
commit 0c466688fef13295e2a5fcbe23e215b528c4f781
Author: Caolán McNamara
Date: Mon Apr 2 17:27:05 2018 +0100
weld SwMergeTableDlg
Change-Id: Idbe96bb8150fc695408faa38342237191aceb777
Reviewed-on: https://gerrit.libreoffice.org/52271
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index aa80546e98f7..d7d95a1fc4fe 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -446,7 +446,7 @@ public:
css::uno::Reference< css::container::XNameAccess > & xNameAccess) = 0;
virtual VclPtr
CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
-virtual VclPtr CreateTableMergeDialog(
vcl::Window* pParent, bool& rWithPrev ) = 0;
+virtual VclPtr
CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) = 0;
virtual VclPtr CreateFrameTabDialog(const
OUString &rDialogType,
SfxViewFrame *pFrame,
vcl::Window *pParent,
const SfxItemSet& rCoreSet,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 309a7393ea6a..1d1ad97285a2 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -111,6 +111,10 @@ short AbstractSwTableHeightDlg_Impl::Execute()
{
return m_xDlg->execute();
}
+short AbstractSwMergeTableDlg_Impl::Execute()
+{
+return m_xDlg->execute();
+}
short AbstractSwSortDlg_Impl::Execute()
{
return m_xDlg->execute();
@@ -887,10 +891,9 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateSwMo
return VclPtr::Create( pDlg );
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateTableMergeDialog(vcl::Window* pParent,
bool& rWithPrev)
+VclPtr
SwAbstractDialogFactory_Impl::CreateTableMergeDialog(weld::Window* pParent,
bool& rWithPrev)
{
-VclPtr pDlg = VclPtr::Create( pParent, rWithPrev
);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
SwMergeTableDlg(pParent, rWithPrev));
}
VclPtr
SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const OUString &rDialogType,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index d2cab9091623..882a5ffb2003 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -28,6 +28,7 @@ class SwBreakDlg;
class SwSortDlg;
class SwTableHeightDlg;
class SwTableWidthDlg;
+class SwMergeTableDlg;
class SignatureLineDialog;
class SfxTabDialog;
class SwConvertTableDlg;
@@ -168,6 +169,18 @@ public:
virtual short Execute() override;
};
+class AbstractSwMergeTableDlg_Impl : public VclAbstractDialog
+{
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractSwMergeTableDlg_Impl(SwMergeTableDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+};
+
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add
for
{
protected:
@@ -523,7 +536,7 @@ public:
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
override;
virtual VclPtr
CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) override;
-virtual VclPtr
CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) override;
+virtual VclPtr
CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) override;
virtual VclPtr CreateFrameTabDialog( const
OUString &rDialogType,
SfxViewFrame *pFrame,
vcl::Window *pParent,
const SfxItemSet& rCoreSet,
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 657801c4af65..c063c8c924cd 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index b00fca6ca93e..fa51a3b60aa3 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -20,29 +20,25 @@
#include
#include
-SwMergeTableDlg::SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev )
-: SvxStandardDialog(pParent, "MergeTableDialog",
"modules/swriter/ui/mergetabledialog.ui")
+SwMergeTableDlg::SwMergeTableDlg(weld::Window *pParent, bool&
[Libreoffice-commits] core.git: include/svtools include/vcl svtools/source sw/inc sw/source sw/uiconfig
include/svtools/unitconv.hxx |2 +
include/vcl/weld.hxx | 14 +++
svtools/source/misc/unitconv.cxx | 54 +++
sw/inc/colwd.hxx | 20 --
sw/inc/swabstdlg.hxx |2 -
sw/source/ui/dialog/swdlgfact.cxx | 10 +++--
sw/source/ui/dialog/swdlgfact.hxx | 15 +++
sw/source/ui/dialog/swuiexp.cxx |1
sw/source/ui/table/colwd.cxx | 67 ++
sw/source/uibase/inc/tablemgr.hxx |2 -
sw/source/uibase/shells/tabsh.cxx |2 -
sw/source/uibase/table/tablemgr.cxx |2 -
sw/uiconfig/swriter/ui/columnwidth.ui | 19 +++--
13 files changed, 148 insertions(+), 62 deletions(-)
New commits:
commit fa8822c48e2a79589bebbd015b36d1da8b338cc2
Author: Caolán McNamara
Date: Mon Apr 2 15:30:08 2018 +0100
weld SwTableWidthDlg
Change-Id: I272a783c9b7a8f725314e416fbd81217105ee5a6
Reviewed-on: https://gerrit.libreoffice.org/52266
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx
index 756c4fdfe9ab..6d663df72b1c 100644
--- a/include/svtools/unitconv.hxx
+++ b/include/svtools/unitconv.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SVTOOLS_UNITCONV_HXX
#include
+#include
#include
#include
@@ -31,6 +32,7 @@ typedef long (*FUNC_CONVERT)(long);
// Functions -
+SVT_DLLPUBLIC void SetFieldUnit(weld::MetricSpinButton& rCtrl, FieldUnit
eUnit, bool bAll = false);
SVT_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit,
bool bAll = false );
SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit );
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index e791724c0a43..a5a6d75035fb 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -493,6 +493,20 @@ public:
max = ConvertValue(max, m_eSrcUnit, eDestUnit);
}
+void set_min(int min, FieldUnit eValueUnit)
+{
+int dummy, max;
+get_range(dummy, max, eValueUnit);
+set_range(min, max, eValueUnit);
+}
+
+void set_max(int max, FieldUnit eValueUnit)
+{
+int min, dummy;
+get_range(min, dummy, eValueUnit);
+set_range(min, max, eValueUnit);
+}
+
void set_increments(int step, int page, FieldUnit eValueUnit)
{
step = ConvertValue(step, eValueUnit, m_eSrcUnit);
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 88845fe9794b..f99b2806076c 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -19,6 +19,60 @@
#include
+void SetFieldUnit(weld::MetricSpinButton& rField, FieldUnit eUnit, bool bAll)
+{
+int nMin, nMax;
+rField.get_range(nMin, nMax, FUNIT_TWIP);
+nMin = rField.denormalize(nMin);
+nMax = rField.denormalize(nMax);
+
+if (!bAll)
+{
+switch (eUnit)
+{
+case FUNIT_M:
+case FUNIT_KM:
+eUnit = FUNIT_CM;
+break;
+case FUNIT_FOOT:
+case FUNIT_MILE:
+eUnit = FUNIT_INCH;
+break;
+default: //prevent warning
+break;
+}
+}
+
+rField.set_unit(eUnit);
+
+if (FUNIT_POINT == eUnit && rField.get_digits() > 1)
+rField.set_digits(1);
+else
+rField.set_digits(2);
+
+switch (eUnit)
+{
+// _CHAR and _LINE sets the step of "char" and "line" unit, they are
same as FUNIT_MM
+case FUNIT_CHAR:
+case FUNIT_LINE:
+case FUNIT_MM:
+rField.set_increments(50, 500, eUnit);
+break;
+case FUNIT_INCH:
+rField.set_increments(2, 20, eUnit);
+break;
+default:
+rField.set_increments(10, 100, eUnit);
+break;
+}
+
+if (!bAll)
+{
+nMin = rField.normalize(nMin);
+nMax = rField.normalize(nMax);
+rField.set_range(nMin, nMax, FUNIT_TWIP);
+}
+}
void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll )
{
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index c6d13e159130..894ed19b2f5a 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -19,24 +19,22 @@
#ifndef INCLUDED_SW_INC_COLWD_HXX
#define INCLUDED_SW_INC_COLWD_HXX
-#include
-#include
+#include
class SwTableFUNC;
-class SwTableWidthDlg final : public SvxStandardDialog
+class SwTableWidthDlg final : public weld::GenericDialogController
{
-VclPtr m_pColNF;
-VclPtrm_pWidthMF;
-SwTableFUNC &rFnc;
+SwTableFUNC &m_rFnc;
-virtual voidApply() override;
-DECL_LINK(LoseFocusHdl, Edit&, void);
+std::unique_ptr m_xColNF;
+std::unique_ptr m_xWidthMF;
+
+DECL_LINK(LoseFocusHdl, weld::SpinButton&, void);
publi
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/colwd.hxx|3 ++
sw/inc/swabstdlg.hxx|2 -
sw/source/ui/dialog/swdlgfact.cxx |9 --
sw/source/ui/dialog/swdlgfact.hxx | 15 ++
sw/source/ui/dialog/swuiexp.cxx |1
sw/source/ui/table/colwd.cxx| 14 +-
sw/source/ui/table/rowht.cxx| 50 +++-
sw/source/uibase/inc/rowht.hxx | 18 ++--
sw/source/uibase/shells/tabsh.cxx |2 -
sw/uiconfig/swriter/ui/rowheight.ui | 20 ++
10 files changed, 79 insertions(+), 55 deletions(-)
New commits:
commit cc78e723723bac34a43e5f3ad05947f775abe0db
Author: Caolán McNamara
Date: Mon Apr 2 16:57:30 2018 +0100
weld SwTableHeightDlg
Change-Id: I46b90b97da28a7461a069867bade40a64b17c9b5
Reviewed-on: https://gerrit.libreoffice.org/52269
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 894ed19b2f5a..379f4584c922 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -25,6 +25,7 @@ class SwTableFUNC;
class SwTableWidthDlg final : public weld::GenericDialogController
{
+private:
SwTableFUNC &m_rFnc;
std::unique_ptr m_xColNF;
@@ -32,6 +33,8 @@ class SwTableWidthDlg final : public
weld::GenericDialogController
DECL_LINK(LoseFocusHdl, weld::SpinButton&, void);
+void Apply();
+
public:
SwTableWidthDlg(weld::Window *pParent, SwTableFUNC &rFnc);
short execute();
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 9c900e9d4b6f..aa80546e98f7 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -425,7 +425,7 @@ public:
virtual VclPtr CreateSwSelGlossaryDlg(const
OUString &rShortName) = 0;
virtual VclPtr CreateSwSortingDialog(weld::Window *
pParent, SwWrtShell &rSh) = 0;
-virtual VclPtr CreateSwTableHeightDialog(vcl::Window
*pParent, SwWrtShell &rSh) = 0;
+virtual VclPtr CreateSwTableHeightDialog(weld::Window
*pParent, SwWrtShell &rSh) = 0;
virtual VclPtr CreateSwColumnDialog(vcl::Window
*pParent, SwWrtShell &rSh) = 0;
virtual VclPtr
CreateSplitTableDialog(weld::Window* pParent, SwWrtShell &rSh) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index ca8b8c12fb44..309a7393ea6a 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -107,6 +107,10 @@ short AbstractSwTableWidthDlg_Impl::Execute()
{
return m_xDlg->execute();
}
+short AbstractSwTableHeightDlg_Impl::Execute()
+{
+return m_xDlg->execute();
+}
short AbstractSwSortDlg_Impl::Execute()
{
return m_xDlg->execute();
@@ -806,10 +810,9 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateSwColumnDialog(vcl
return VclPtr::Create( pDlg );
}
-VclPtr
SwAbstractDialogFactory_Impl::CreateSwTableHeightDialog(vcl::Window *pParent,
SwWrtShell &rSh)
+VclPtr
SwAbstractDialogFactory_Impl::CreateSwTableHeightDialog(weld::Window *pParent,
SwWrtShell &rSh)
{
-VclPtr pDlg = VclPtr::Create( pParent, rSh);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new
SwTableHeightDlg(pParent, rSh));
}
VclPtr
SwAbstractDialogFactory_Impl::CreateSwSortingDialog(weld::Window *pParent,
SwWrtShell &rSh)
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 6635787db0fc..d2cab9091623 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -26,6 +26,7 @@ class SwAsciiFilterDlg;
class Dialog;
class SwBreakDlg;
class SwSortDlg;
+class SwTableHeightDlg;
class SwTableWidthDlg;
class SignatureLineDialog;
class SfxTabDialog;
@@ -155,6 +156,18 @@ public:
virtual short Execute() override;
};
+class AbstractSwTableHeightDlg_Impl : public VclAbstractDialog
+{
+protected:
+std::unique_ptr m_xDlg;
+public:
+explicit AbstractSwTableHeightDlg_Impl(SwTableHeightDlg* p)
+: m_xDlg(p)
+{
+}
+virtual short Execute() override;
+};
+
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add
for
{
protected:
@@ -490,7 +503,7 @@ public:
virtual VclPtr CreateSwAutoMarkDialog(vcl::Window
*pParent, SwWrtShell &rSh) override;
virtual VclPtr CreateSwSelGlossaryDlg(const
OUString &rShortName) override;
virtual VclPtr CreateSwSortingDialog(weld::Window *
pParent, SwWrtShell &rSh) override;
-virtual VclPtr CreateSwTableHeightDialog(vcl::Window
*pParent, SwWrtShell &rSh) override;
+virtual VclPtr CreateSwTableHeightDialog(weld::Window
*pParent, SwWrtShell &rSh) override;
virtual VclPtr CreateSwColumnDialog(vcl::Window
*pParent, SwWrtShell &rSh) override;
virtual VclPtr
CreateSplitTableDialog(weld::Window* pParent, SwWrtShell &rSh) override;
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 1b681c9e8b52..657801c4af65 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.
[Libreoffice-commits] core.git: svx/uiconfig sw/source sw/uiconfig
svx/uiconfig/ui/passwd.ui |3 +
sw/source/uibase/uiview/pview.cxx | 65 +++-
sw/uiconfig/swriter/ui/previewzoomdialog.ui | 25 +-
3 files changed, 41 insertions(+), 52 deletions(-)
New commits:
commit 3cf2909f268ec63897d862714853ab85a295eb08
Author: Caolán McNamara
Date: Mon Apr 2 14:36:59 2018 +0100
weld SwPreviewZoomDlg
Change-Id: Ie159032cfdf6201aba707a8980845ac15c1fba17
Reviewed-on: https://gerrit.libreoffice.org/52264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/uiconfig/ui/passwd.ui b/svx/uiconfig/ui/passwd.ui
index b1367463462a..3facc8882c07 100644
--- a/svx/uiconfig/ui/passwd.ui
+++ b/svx/uiconfig/ui/passwd.ui
@@ -120,6 +120,7 @@
True
True
False
+True
password
@@ -176,6 +177,7 @@
True
True
False
+True
password
@@ -189,6 +191,7 @@
True
True
False
+True
password
diff --git a/sw/source/uibase/uiview/pview.cxx
b/sw/source/uibase/uiview/pview.cxx
index 32d37c62c8e8..dbcef1d013f0 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -139,47 +140,31 @@ static void lcl_InvalidateZoomSlots(SfxBindings&
rBindings)
}
// At first the zoom dialog
-class SwPreviewZoomDlg : public SvxStandardDialog
+class SwPreviewZoomDlg : public weld::GenericDialogController
{
-VclPtr m_pRowEdit;
-VclPtr m_pColEdit;
-
-virtual void Apply() override;
+SwPagePreviewWin& m_rParent;
+std::unique_ptr m_xRowEdit;
+std::unique_ptr m_xColEdit;
public:
-explicit SwPreviewZoomDlg( SwPagePreviewWin& rParent );
-virtual ~SwPreviewZoomDlg() override;
-virtual void dispose() override;
-};
-
-SwPreviewZoomDlg::SwPreviewZoomDlg( SwPagePreviewWin& rParent )
-: SvxStandardDialog(&rParent, "PreviewZoomDialog",
"modules/swriter/ui/previewzoomdialog.ui")
-{
-get(m_pRowEdit, "rows");
-get(m_pColEdit, "cols");
-
-m_pRowEdit->SetValue( rParent.GetRow() );
-m_pColEdit->SetValue( rParent.GetCol() );
-}
-
-SwPreviewZoomDlg::~SwPreviewZoomDlg()
-{
-disposeOnce();
-}
-
-void SwPreviewZoomDlg::dispose()
-{
-m_pRowEdit.clear();
-m_pColEdit.clear();
-SvxStandardDialog::dispose();
-}
+SwPreviewZoomDlg(SwPagePreviewWin& rParent)
+: GenericDialogController(rParent.GetFrameWeld(),
"modules/swriter/ui/previewzoomdialog.ui", "PreviewZoomDialog")
+, m_rParent(rParent)
+, m_xRowEdit(m_xBuilder->weld_spin_button("rows"))
+, m_xColEdit(m_xBuilder->weld_spin_button("cols"))
+{
+m_xRowEdit->set_value(rParent.GetRow());
+m_xColEdit->set_value(rParent.GetCol());
+}
-void SwPreviewZoomDlg::Apply()
-{
-static_cast(GetParent())->CalcWish(
-sal_uInt8(m_pRowEdit->GetValue()),
-sal_uInt8(m_pColEdit->GetValue()) );
-}
+void execute()
+{
+if (run() == RET_OK)
+{
+m_rParent.CalcWish(sal_uInt8(m_xRowEdit->get_value()),
sal_uInt8(m_xColEdit->get_value()));
+}
+}
+};
// all for SwPagePreviewWin
SwPagePreviewWin::SwPagePreviewWin( vcl::Window *pParent, SwPagePreview&
rPView )
@@ -709,8 +694,10 @@ void SwPagePreview::Execute( SfxRequest &rReq )
}
else
-ScopedVclPtrInstance( *m_pViewWin
)->Execute();
-
+{
+SwPreviewZoomDlg aDlg(*m_pViewWin);
+aDlg.execute();
+}
}
break;
case FN_SHOW_BOOKVIEW:
diff --git a/sw/uiconfig/swriter/ui/previewzoomdialog.ui
b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
index 59f1cc33fcc6..d46718c6709f 100644
--- a/sw/uiconfig/swriter/ui/previewzoomdialog.ui
+++ b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
@@ -1,6 +1,7 @@
+
-
+
1
10
@@ -19,6 +20,9 @@
False
6
Multiple Pages
+True
+0
+0
dialog
@@ -86,7 +90,6 @@
True
False
-center
6
6
True
@@ -97,32 +100,28 @@
True
False
-0
_Rows
True
rows
+0
0
0
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xarrayformularange.hxx | 35 ++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv |2
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |2
qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange.java | 173
--
sc/qa/extras/sccellcursorobj.cxx| 17
sc/qa/extras/sccellrangeobj.cxx |5
sc/qa/extras/sctablesheetobj.cxx|7
test/Library_subsequenttest.mk |1
test/source/sheet/xarrayformularange.cxx| 54 +++
11 files changed, 113 insertions(+), 186 deletions(-)
New commits:
commit 387896a05189c60570e031191c3f5959e7737bcb
Author: Jens Carl
Date: Mon Apr 2 06:14:32 2018 +
tdf#45904 Move _XArrayFormulaRange Java tests to C++
Change-Id: I87b6e52507428537fcc574842c2da9c36fbd672b
Reviewed-on: https://gerrit.libreoffice.org/52247
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xarrayformularange.hxx
b/include/test/sheet/xarrayformularange.hxx
new file mode 100644
index ..8f54f7097ba6
--- /dev/null
+++ b/include/test/sheet/xarrayformularange.hxx
@@ -0,0 +1,35 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XARRAUFORMULARANGE_HXX
+#define INCLUDED_TEST_SHEET_XARRAUFORMULARANGE_HXX
+
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XArrayFormulaRange
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual css::uno::Reference getXSpreadsheet() = 0;
+
+void testGetSetArrayFormula();
+
+protected:
+~XArrayFormulaRange() {}
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_SHEET_XARRAUFORMULARANGE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index ca3665894180..ec99ac93dde8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -566,7 +566,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor \
qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
-qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \
qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 3f85f6821258..f5563cfe7758 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -116,8 +116,6 @@
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
"ScCellCursorObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()"
"ScCellCursorObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()"
-"ScCellCursorObj";"com::sun::star::sheet::XArrayFormulaRange";"getArrayFormula()"
-"ScCellCursorObj";"com::sun::star::sheet::XArrayFormulaRange";"setArrayFormula()"
"ScCellCursorObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()"
"ScCellCursorObj";"com::sun::star::sheet::XCellRangeFormula#optional";"setFormulaArray()"
"ScCellCursorObj";"com::sun::star::util::XIndent";"decrementIndent()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 08ca6f6f39c3..fb6d2e76829d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -111,8 +111,6 @@
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
"ScCellRangeObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()"
"ScCellRangeObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()"
-"ScCellRangeObj";"com::sun::star::sheet::XArrayFormulaRange";"getArrayFormula()"
-"ScCellRangeObj";"com::sun::star::sheet::XArrayFormulaRange";"setArrayFormula()"
"ScCellRangeObj";"com::sun::star::sheet::XCellRangeFormula#optional";"getFormulaArray()"
"ScCellRangeObj";"com::sun::star::sheet::XCellRangeFormula#optional";"setFormulaArray()"
"ScCellRan
[Libreoffice-commits] core.git: Branch 'feature/SOSAW080' - svx/source
svx/source/svdraw/svdobj.cxx | 51 +--
1 file changed, 30 insertions(+), 21 deletions(-)
New commits:
commit 2c70acb6353e165bcf2bd3dd8553924307c88427
Author: Armin Le Grand
Date: Mon Apr 2 12:04:28 2018 +0200
SOSAW080: Reworked SvxShape to use SdrObject's SdrModel
Change-Id: I17bcb44d2e29920c0c74430c2d9c703b36cfa0ad
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4f480f4046aa..d1dc3a339ac0 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -347,22 +347,7 @@ SdrObject::~SdrObject()
// when they get called from ObjectInDestruction().
mpImpl->maObjectUsers.clear();
-try
-{
-SvxShape* pSvxShape = getSvxShape();
-if ( pSvxShape )
-{
-OSL_ENSURE(!pSvxShape->HasSdrObjectOwnership(),"Please check where
this call come from and replace it with SdrObject::Free");
-pSvxShape->InvalidateSdrObject();
-uno::Reference< lang::XComponent > xShapeComp( getWeakUnoShape(),
uno::UNO_QUERY_THROW );
-xShapeComp->dispose();
-}
-}
-catch( const uno::Exception& )
-{
-DBG_UNHANDLED_EXCEPTION();
-}
-
+// UserCall
SendUserCall(SdrUserCallType::Delete, GetLastBoundRect());
o3tl::reset_preserve_ptr_during(pPlusData);
@@ -374,14 +359,38 @@ SdrObject::~SdrObject()
void SdrObject::Free( SdrObject*& _rpObject )
{
SdrObject* pObject = _rpObject; _rpObject = nullptr;
-if ( pObject == nullptr )
+
+if(nullptr == pObject)
+{
// nothing to do
return;
+}
-SvxShape* pShape = pObject->getSvxShape();
-if ( pShape && pShape->HasSdrObjectOwnership() )
-// only the shape is allowed to delete me, and will reset the
ownership before doing so
-return;
+SvxShape* pShape(pObject->getSvxShape());
+
+if(pShape)
+{
+if(pShape->HasSdrObjectOwnership())
+{
+// only the SvxShape is allowed to delete me, and will reset
+// the ownership before doing so
+return;
+}
+else
+{
+// not only delete pObject, but also need to dispose uno shape
+try
+{
+pShape->InvalidateSdrObject();
+uno::Reference< lang::XComponent > xShapeComp(
pObject->getWeakUnoShape(), uno::UNO_QUERY_THROW );
+xShapeComp->dispose();
+}
+catch( const uno::Exception& )
+{
+DBG_UNHANDLED_EXCEPTION();
+}
+}
+}
delete pObject;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sc/source sfx2/source
include/sfx2/basedlgs.hxx |5
sc/source/ui/pagedlg/tphf.cxx |9 +++-
sfx2/source/dialog/basedlgs.cxx | 41 +++-
3 files changed, 9 insertions(+), 46 deletions(-)
New commits:
commit 75a271fdc40aab116c1468683e64f843d292dc48
Author: Caolán McNamara
Date: Mon Apr 2 14:20:14 2018 +0100
can now remove ResId based config id scheme
Change-Id: Id1ad413dacc7eb07269debba65426236bef28610
Reviewed-on: https://gerrit.libreoffice.org/52259
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 670fc10f7238..f5f40b8d6748 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -45,7 +45,6 @@ class FixedLine;
class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog
{
-sal_uInt32 nUniqId;
OUStringaExtraData;
const SfxItemSet* pInputSet;
SfxItemSet* pOutputSet;
@@ -61,8 +60,6 @@ protected:
SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString&
rUIXMLDescription);
OUString& GetExtraData() { return aExtraData; }
-sal_uInt32 GetUniqId() const { return nUniqId; }
-voidSetUniqId(sal_uInt32 nSettingsId) { nUniqId =
nSettingsId; }
voidCreateOutputItemSet( SfxItemPool& rPool );
voidCreateOutputItemSet( const SfxItemSet& rInput );
voidSetInputSet( const SfxItemSet* pInSet ) { pInputSet =
pInSet; }
@@ -177,7 +174,7 @@ public:
virtual ~SfxSingleTabDialog() override;
virtual voiddispose() override;
-voidSetTabPage(SfxTabPage* pTabPage, sal_uInt32
nSettingsId = 0);
+voidSetTabPage(SfxTabPage* pTabPage);
SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; }
OKButton* GetOKButton() const { return pOKBtn; }
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 41983ea64c32..6b7b5f4bae03 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -201,7 +201,6 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
{
OUString aText;
VclPtrInstance< SfxSingleTabDialog > pDlg(this, aDataSet);
-const int nSettingsId = 42;
bool bRightPage = m_pCntSharedBox->IsChecked()
|| ( SvxPageUsage::Left != nPageUsage );
@@ -209,17 +208,17 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
{
aText = ScGlobal::GetRscString( STR_PAGEHEADER );
if ( bRightPage )
-pDlg->SetTabPage( ScRightHeaderEditPage::Create(
pDlg->get_content_area(), &aDataSet ), nSettingsId );
+pDlg->SetTabPage( ScRightHeaderEditPage::Create(
pDlg->get_content_area(), &aDataSet ) );
else
-pDlg->SetTabPage( ScLeftHeaderEditPage::Create(
pDlg->get_content_area(), &aDataSet ), nSettingsId );
+pDlg->SetTabPage( ScLeftHeaderEditPage::Create(
pDlg->get_content_area(), &aDataSet ) );
}
else
{
aText = ScGlobal::GetRscString( STR_PAGEFOOTER );
if ( bRightPage )
-pDlg->SetTabPage( ScRightFooterEditPage::Create(
pDlg->get_content_area(), &aDataSet ), nSettingsId );
+pDlg->SetTabPage( ScRightFooterEditPage::Create(
pDlg->get_content_area(), &aDataSet ) );
else
-pDlg->SetTabPage( ScLeftFooterEditPage::Create(
pDlg->get_content_area(), &aDataSet ), nSettingsId );
+pDlg->SetTabPage( ScLeftFooterEditPage::Create(
pDlg->get_content_area(), &aDataSet ) );
}
SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e671d8e6dfbe..126d2f9bf511 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -93,15 +93,7 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const
SfxHint& rHint )
void SfxModalDialog::SetDialogData_Impl()
{
// save settings (position and user data)
-OUString sConfigId;
-if (isLayoutEnabled())
-sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8);
-else
-{
-SAL_WARN("sfx.config", "Dialog needs to be converted to .ui format");
-sConfigId = OUString::number(nUniqId);
-}
-
+OUString sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8);
SvtViewOptions aDlgOpt(EViewType::Dialog, sConfigId);
aDlgOpt.SetWindowState(OStringToOUString(
GetWindowState(WindowStateMask::Pos), RTL_TEXTENCODING_ASCII_US));
@@ -119,15 +111,7 @@ void SfxModalDialog::GetDialogData_Impl()
*/
{
-OUString sConfigId;
-if (isLayoutEnabled())
-sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8)
[Libreoffice-commits] core.git: include/vcl
include/vcl/dialog.hxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 840be9fdccb99eb3faccf9695186810eba5de8e4 Author: Caolán McNamara Date: Mon Apr 2 13:50:31 2018 +0100 make ensureRepaint private Change-Id: Iaa15e12af8e59ed585e07d620353a05e4b8b5a26 Reviewed-on: https://gerrit.libreoffice.org/52257 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 6104def06236..45f76c1e5521 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -72,6 +72,11 @@ private: DECL_DLLPRIVATE_LINK(ImplAsyncCloseHdl, void*, void); DECL_DLLPRIVATE_LINK(ResponseHdl, Button*, void); +// ensureRepaint - triggers Application::Yield until the dialog is +// completely repainted. Sometimes needed for dialogs showing progress +// during actions +void ensureRepaint(); + protected: using Window::ImplInit; voidImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag = InitFlag::Default ); @@ -121,11 +126,6 @@ public: virtual void PrePaint(vcl::RenderContext& rRenderContext) override; virtual void PostPaint(vcl::RenderContext& rRenderContext) override; -// ensureRepaint - triggers Application::Yield until the dialog is -// completely repainted. Sometimes needed for dialogs showing progress -// during actions -void ensureRepaint(); - // Screenshot interface virtual std::vector getAllPageUIXMLDescriptions() const; virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar.css|1 +
loleaflet/dist/toolbar/toolbar.js | 14 --
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit d990423011fed42a78b8fe4376ba2b17922957f1
Author: ozturkemre
Date: Wed Mar 28 13:26:44 2018 +0300
tdf#116406 insert sheet now jump to correct sheet
Change-Id: I0bd6b35a3086283202a155bead6d666b42f0502c
Reviewed-on: https://gerrit.libreoffice.org/51368
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index d18e62f65..1e16ef1a1 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -274,6 +274,7 @@ button.leaflet-control-search-next
.w2ui-icon.help{ background: url('../images/lc_helpindex.svg') no-repeat
center !important; }
.w2ui-icon.incrementindent{ background: url('../images/lc_decrementlevel.svg')
no-repeat center !important; }
.w2ui-icon.insertpage{ background: url('../images/lc_insertpage.svg')
no-repeat center !important; }
+.w2ui-icon.insertsheet{ background: url('../images/plus.svg') no-repeat center
!important; }
.w2ui-icon.italic{ background: url('../images/lc_italic.svg') no-repeat center
!important; }
.w2ui-icon.insertgraphic{ background: url('../images/lc_gallery.svg')
no-repeat center !important; }
.w2ui-icon.inserttable{ background: url('../images/lc_inserttable.svg')
no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index 586de601f..f2ee8690f 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -277,6 +277,11 @@ function onClick(id, item, subItem) {
callback: onDelete
});
}
+ else if (id === 'insertsheet') {
+ var nPos = $('#spreadsheet-tab-scroll')[0].childElementCount;
+ map.insertPage(nPos + 1);
+
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
+ }
else if (id === 'firstrecord') {
$('#spreadsheet-tab-scroll').scrollLeft(0);
}
@@ -290,9 +295,6 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft()
+ 120);
}
- else if (id === 'insertpage') {
-
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
- }
else if (id.startsWith('menu:wrap:wrap-'))
{
var wrapType = id.substring('menu:wrap:wrap-'.length);
@@ -645,7 +647,7 @@ $(function () {
{type: 'button', id: 'prevrecord', img: 'prevrecord',
hidden: true, hint: _('Previous sheet')},
{type: 'button', id: 'nextrecord', img: 'nextrecord',
hidden: true, hint: _('Next sheet')},
{type: 'button', id: 'lastrecord', img: 'lastrecord',
hidden: true, hint: _('Last sheet')},
- {type: 'button', id: 'insertpage', img: 'insertpage',
hidden:true, hint: _('Insert sheet')}
+ {type: 'button', id: 'insertsheet', img:
'insertsheet', hidden:true, hint: _('Insert sheet')}
],
onClick: function (e) {
onClick(e.target);
@@ -1549,7 +1551,7 @@ map.on('updateparts pagenumberchanged', function (e) {
toolbar.show('nextrecord');
toolbar.show('prevrecord');
toolbar.show('lastrecord');
- toolbar.show('insertpage');
+ toolbar.show('insertsheet');
}
});
@@ -1622,7 +1624,7 @@ map.on('updatepermission', function (e) {
}
}
- var spreadsheetButtons = ['firstrecord', 'prevrecord', 'nextrecord',
'lastrecord', 'insertpage'];
+ var spreadsheetButtons = ['firstrecord', 'prevrecord', 'nextrecord',
'lastrecord', 'insertsheet'];
var formulaBarButtons = ['sum', 'function'];
var presentationButtons = ['insertpage', 'duplicatepage', 'deletepage'];
var toolbarDownButtons = ['next', 'prev'];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source include/svx svx/source svx/uiconfig
basctl/source/basicide/moduldl2.cxx |6 +-
include/svx/passwd.hxx | 48 ++---
svx/source/dialog/passwd.cxx| 99 +++-
svx/uiconfig/ui/passwd.ui | 35
4 files changed, 86 insertions(+), 102 deletions(-)
New commits:
commit 7637054838aa71374dc02c32566dcd5d3ded2d0d
Author: Caolán McNamara
Date: Mon Apr 2 14:12:53 2018 +0100
weld SvxPasswordDialog
Change-Id: I2e51f1a0a96eb042a4460bb9591b63a169eb6de2
Reviewed-on: https://gerrit.libreoffice.org/52258
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basctl/source/basicide/moduldl2.cxx
b/basctl/source/basicide/moduldl2.cxx
index a1a11613ca19..2722a2dfd187 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -668,10 +668,10 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
bool const bProtected = xPasswd->isLibraryPasswordProtected(
aLibName );
// change password dialog
-VclPtrInstance< SvxPasswordDialog > pDlg( this, true,
!bProtected );
-pDlg->SetCheckPasswordHdl( LINK( this, LibPage,
CheckPasswordHdl ) );
+SvxPasswordDialog aDlg(GetFrameWeld(), true, !bProtected);
+aDlg.SetCheckPasswordHdl(LINK(this, LibPage,
CheckPasswordHdl));
-if ( pDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
{
bool const bNewProtected =
xPasswd->isLibraryPasswordProtected( aLibName );
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 2ddbb6373f56..227d1288f813 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -19,49 +19,39 @@
#ifndef INCLUDED_SVX_PASSWD_HXX
#define INCLUDED_SVX_PASSWD_HXX
-#include
-
-#include
-
-#include
-
-#include
+#include
#include
// class SvxPasswordDialog ---
-class SVX_DLLPUBLIC SvxPasswordDialog : public SfxModalDialog
+class SVX_DLLPUBLIC SvxPasswordDialog : public weld::GenericDialogController
{
private:
-VclPtr m_pOldFL;
-VclPtr m_pOldPasswdFT;
-VclPtr m_pOldPasswdED;
-VclPtr m_pNewPasswdED;
-VclPtr m_pRepeatPasswdED;
-VclPtr m_pOKBtn;
+OUString m_aOldPasswdErrStr;
+OUString m_aRepeatPasswdErrStr;
+Link m_aCheckPasswordHdl;
+bool m_bEmpty;
-OUString aOldPasswdErrStr;
-OUString aRepeatPasswdErrStr;
+std::unique_ptr m_xOldFL;
+std::unique_ptr m_xOldPasswdFT;
+std::unique_ptr m_xOldPasswdED;
+std::unique_ptr m_xNewPasswdED;
+std::unique_ptr m_xRepeatPasswdED;
+std::unique_ptr m_xOKBtn;
-Link aCheckPasswordHdl;
-
-bool bEmpty;
-
-DECL_LINK(ButtonHdl, Button*, void);
-DECL_LINK(EditModifyHdl, Edit&, void);
+DECL_LINK(ButtonHdl, weld::Button&, void);
+DECL_LINK(EditModifyHdl, weld::Entry&, void);
public:
-SvxPasswordDialog( vcl::Window* pParent, bool
bAllowEmptyPasswords, bool bDisableOldPassword );
-virtual ~SvxPasswordDialog() override;
-virtual voiddispose() override;
+SvxPasswordDialog(weld::Window* pParent, bool bAllowEmptyPasswords, bool
bDisableOldPassword);
+virtual ~SvxPasswordDialog() override;
-OUStringGetOldPassword() const { return m_pOldPasswdED->GetText();
}
-OUStringGetNewPassword() const { return m_pNewPasswdED->GetText();
}
+OUStringGetOldPassword() const { return
m_xOldPasswdED->get_text(); }
+OUStringGetNewPassword() const { return
m_xNewPasswdED->get_text(); }
-voidSetCheckPasswordHdl( const Link&
rLink ) { aCheckPasswordHdl = rLink; }
+voidSetCheckPasswordHdl( const Link&
rLink ) { m_aCheckPasswordHdl = rLink; }
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 641624fd236e..45b6a1f284fb 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -24,93 +24,78 @@
#include
#include
-IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void)
+IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, weld::Button&, void)
{
bool bOK = true;
-if ( m_pNewPasswdED->GetText() != m_pRepeatPasswdED->GetText() )
+if (m_xNewPasswdED->get_text() != m_xRepeatPasswdED->get_text())
{
-std::unique_ptr
xBox(Application::CreateMessageDialog(GetFrameWeld(),
+std::unique_ptr
xBox(Application::CreateMessageDialog(m_xDialog.get(),
VclMessageType::Warning, VclButtonsType::Ok,
-
aRepeatPasswdErrStr));
+
m_aRepeatPasswdErrStr));
xB
[Libreoffice-commits] core.git: ucb/source
ucb/source/core/ucbcmds.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 52829d9a7a57fa98a0d8f109612352605c54cc47
Author: Takeshi Abe
Date: Mon Apr 2 22:59:29 2018 +0900
ucb: The sequence's length is 3, not 2.
This completes 1a9261124eed5baa04b069a1cb1b51f24423ec9b.
Change-Id: I03e6167bca67f8852250d8464b6fde5e4e690f32
Reviewed-on: https://gerrit.libreoffice.org/52261
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index edb8347ad928..1fd8f877350b 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -215,9 +215,8 @@ public:
CommandProcessorInfo::CommandProcessorInfo()
+: m_pInfo( new uno::Sequence< ucb::CommandInfo >( 3 ) )
{
-m_pInfo.reset( new uno::Sequence< ucb::CommandInfo >( 2 ) );
-
(*m_pInfo)[ 0 ]
= ucb::CommandInfo(
GETCOMMANDINFO_NAME, // Name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig
sd/inc/sdabstdlg.hxx|2
sd/source/ui/dlg/brkdlg.cxx | 106 +---
sd/source/ui/dlg/sddlgfact.cxx | 14
sd/source/ui/dlg/sddlgfact.hxx | 11 +++
sd/source/ui/inc/BreakDlg.hxx | 53 ++
sd/source/ui/view/drviews2.cxx |2
sd/uiconfig/sdraw/ui/breakdialog.ui | 33 ---
7 files changed, 97 insertions(+), 124 deletions(-)
New commits:
commit 50d9f1508709e0849e8ecabfe04ac9281160d9e0
Author: Caolán McNamara
Date: Mon Apr 2 12:29:05 2018 +0100
weld Break dialog
Change-Id: I1657a02c775cf08e0888ba4cc9f9ae3b06550020
Reviewed-on: https://gerrit.libreoffice.org/52256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 9582ea377530..35b7233eea73 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -178,7 +178,7 @@ class SdAbstractDialogFactory
public:
SD_DLLPUBLIC static SdAbstractDialogFactory* Create();
-virtual VclPtr CreateBreakDlg(vcl::Window*
pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong
nSumActionCount, sal_uLong nObjCount ) = 0;
+virtual VclPtr CreateBreakDlg(weld::Window*
pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong
nSumActionCount, sal_uLong nObjCount ) = 0;
virtual VclPtrCreateCopyDlg(vcl::Window*
pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
virtual VclPtr
CreateSdCustomShowDlg(vcl::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
virtual VclPtr
CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell) = 0;
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 724df7d201cb..80e8fb8f6a8f 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -38,59 +38,34 @@ namespace sd {
* dialog to split metafiles
*/
-BreakDlg::BreakDlg(
-vcl::Window* pWindow,
-DrawView* _pDrView,
-DrawDocShell* pShell,
-sal_uLong nSumActionCount,
-sal_uLong nObjCount )
-: SfxModalDialog(pWindow, "BreakDialog", "modules/sdraw/ui/breakdialog.ui")
-, mpProgress( nullptr )
+BreakDlg::BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell*
pShell,
+sal_uLong nSumActionCount, sal_uLong nObjCount)
+: GenericDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui",
"BreakDialog")
+, m_xFiObjInfo(m_xBuilder->weld_label("metafiles"))
+, m_xFiActInfo(m_xBuilder->weld_label("metaobjects"))
+, m_xFiInsInfo(m_xBuilder->weld_label("drawingobjects"))
+, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+, m_pDrView(pDrView)
+, m_bCancel(false)
{
m_aUpdateIdle.SetPriority( TaskPriority::REPAINT );
m_aUpdateIdle.SetInvokeHandler( LINK( this, BreakDlg, InitialUpdate ) );
m_aUpdateIdle.SetDebugName( "sd::BreakDlg m_aUpdateIdle" );
-get(m_pFiObjInfo, "metafiles");
-get(m_pFiActInfo, "metaobjects");
-get(m_pFiInsInfo, "drawingobjects");
-get(m_pBtnCancel, "cancel");
+m_xBtnCancel->connect_clicked(LINK(this, BreakDlg, CancelButtonHdl));
-m_pBtnCancel->SetClickHdl( LINK( this, BreakDlg, CancelButtonHdl));
+m_xProgress.reset(new SfxProgress(pShell, SdResId(STR_BREAK_METAFILE),
nSumActionCount*3));
-mpProgress = new SfxProgress( pShell, SdResId(STR_BREAK_METAFILE),
nSumActionCount*3 );
-
-pProgrInfo = new SvdProgressInfo( LINK(this, BreakDlg, UpDate) );
+m_xProgrInfo.reset(new SvdProgressInfo(LINK(this, BreakDlg, UpDate)));
// every action is edited 3 times in DoImport()
-pProgrInfo->Init( nObjCount );
-
-pDrView = _pDrView;
-bCancel = false;
-}
-
-BreakDlg::~BreakDlg()
-{
-disposeOnce();
-}
-
-void BreakDlg::dispose()
-{
-delete mpProgress;
-mpProgress = nullptr;
-delete pProgrInfo;
-pProgrInfo = nullptr;
-m_pFiObjInfo.clear();
-m_pFiActInfo.clear();
-m_pFiInsInfo.clear();
-m_pBtnCancel.clear();
-SfxModalDialog::dispose();
+m_xProgrInfo->Init( nObjCount );
}
// Control-Handler for cancel button
-IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, Button*, void)
+IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, weld::Button&, void)
{
-bCancel = true;
-m_pBtnCancel->Disable();
+m_bCancel = true;
+m_xBtnCancel->set_sensitive(false);
}
/**
@@ -101,73 +76,72 @@ IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, Button*, void)
*/
IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
{
-if(pProgrInfo == nullptr)
+if (!m_xProgrInfo)
return true;
// update status bar or show a error message?
if(nInit == reinterpret_cast(1))
{
-std::unique_ptr
xErrBox(Application::CreateMessageDialog(GetFrameWeld(),
+std::unique_ptr
xErrBox(Application::CreateMessageDialog(m_xDialog.get(),
VclMessageType::
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - filter/source include/filter sw/qa sw/source writerfilter/source
filter/source/msfilter/util.cxx |7 ++-
include/filter/msfilter/util.hxx |5 +
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx| 16
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx| 10 ++
sw/source/core/text/xmldump.cxx |3 ++-
writerfilter/source/dmapper/BorderHandler.cxx|2 +-
writerfilter/source/dmapper/CellColorHandler.cxx | 10 +-
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
writerfilter/source/dmapper/TDefTableHandler.cxx |2 +-
writerfilter/source/ooxml/OOXMLFactory.cxx |9 +
writerfilter/source/ooxml/OOXMLFactory.hxx |1 +
writerfilter/source/ooxml/OOXMLPropertySet.cxx | 16
writerfilter/source/ooxml/OOXMLPropertySet.hxx |7 +++
writerfilter/source/ooxml/factoryimpl.py |5 -
writerfilter/source/ooxml/model.xml |2 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 --
17 files changed, 74 insertions(+), 31 deletions(-)
New commits:
commit ccef956c4f11ac6c0612a0d22845d02743c91039
Author: Luke Deller
Date: Thu Mar 8 01:11:40 2018 +1100
tdf#116179 Support reading "auto" colour from docx
In docx a colour value is represented as a 6-digit hex RGB value, or
alternatively the word "auto" to represent automatic colour.
- Add support for reading the value "auto" as COL_AUTO. Previously
this would be read as if it were a hex value, stopping at the
letter 'u' which is not a valid hex digit, resulting in the colour
0x0A - a very dark blue, which looks close enough to black that
it went unnoticed for a long time :-)
- Remove code which tried to handle this wrong 0x0A value,
including the constant OOXML_COLOR_AUTO, as it is no longer needed
and will cause surprises for anyone who really wanted this exact
shade of dark blue
- Fix unit tests that were checking for 0x0A
Reviewed-on: https://gerrit.libreoffice.org/50995
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/51461
Reviewed-by: Mike Kaganski
(cherry picked from commit 3967aebca94be9ceea3e36b43f7f53589473ad4e)
Change-Id: I670341931147ff9341ad6281cd3b53c02b46
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 607791f96a1f..24603aa4d704 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -126,14 +126,11 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar,
}
-OString ConvertColor( const Color &rColor, bool bAutoColor )
+OString ConvertColor( const Color &rColor )
{
OString color( "auto" );
-if (bAutoColor && rColor.GetColor() == OOXML_COLOR_AUTO)
-return color;
-
-if ( rColor.GetColor() != COL_AUTO )
+if ( rColor != COL_AUTO )
{
const char pHexDigits[] = "0123456789ABCDEF";
char pBuffer[] = "00";
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 8aa01f5be952..66183e35f2b9 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -58,15 +58,12 @@ MSFILTER_DLLPUBLIC sal_Unicode
bestFitOpenSymbolToMSFont(sal_Unicode cBullet,
rtl_TextEncoding& r_ioChrSet, OUString& r_ioFontName);
-#define OOXML_COLOR_AUTO 0x0a
-
/**
* Converts tools Color to HTML color (without leading hashmark).
*
* @param rColor color to convert
- * @param bAutoColor if OOXML_COLOR_AUTO should be recognized as an auto color
*/
-MSFILTER_DLLPUBLIC OString ConvertColor( const Color &rColor, bool bAutoColor
= false );
+MSFILTER_DLLPUBLIC OString ConvertColor( const Color &rColor );
/** Paper size in 1/100 millimeters. */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a767a6e5955a..0c2a84620139 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -694,7 +694,7 @@ DECLARE_OOXMLEXPORT_TEST(testNumOverrideLvltext,
"num-override-lvltext.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(2),
comphelper::SequenceAsHashMap(xRules->getByIndex(1))["ParentNumbering"].get());
// The paragraph marker's red font color was inherited by the number
portion, this was ff.
-CPPUNIT_ASSERT_EQUAL(OUString("0a"),
parseDump("//Special[@nType='POR_NUMBER']/SwFont", "color"));
+CPPUNIT_ASSERT_EQUAL(OUString(""),
parseDump("//Special[@nType='POR_NUMBER']/SwFont", "color"));
}
DECLARE_OOXMLEXPORT_TEST(testNumOverrideStart, "num-override-start.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 0796a20f2502..fb5fcfba122d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlex
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/printdlg.cxx |4 1 file changed, 4 insertions(+) New commits: commit fb4660e217de4658587a62fd58f038f4b984277f Author: Armin Le Grand Date: Mon Apr 2 15:44:45 2018 +0200 PrintPreviewWindow dynamic preview Bitmap II Added reset of PreviewBitmap when new/different Metafile gets set Change-Id: Ib8053c21fc868607adfff4f1a75f005d29ce356b diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 4fba6f5e5d6b..d7124a15fc3b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -243,6 +243,10 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" ); maVertDim->SetText( aBuf.makeStringAndClear() ); +// We have a new Metafile and evtl. a new page, so we need to reset +// the PreviewBitmap to force new creation +maPreviewBitmap = Bitmap(); + // sets/calculates e.g. maPreviewSize // also triggers preparePreviewBitmap() Resize(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8graf.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e5b11989438f7292cf8042f2c7da4d607735386e
Author: Caolán McNamara
Date: Mon Apr 2 11:41:12 2018 +0100
ofz#7285 Integer overflow
Change-Id: I56f642013ba8d1047067d69251f8a60bd768ee2e
Reviewed-on: https://gerrit.libreoffice.org/52254
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e66861a699b8..ebbe33bb390c 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2997,10 +2997,10 @@ SwFlyFrameFormat*
SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObj
SfxItemSet &rFlySet )
{
SwFlyFrameFormat* pRetFrameFormat = nullptr;
-long nWidthTw = pF->nXaRight - pF->nXaLeft;
+sal_Int32 nWidthTw = o3tl::saturating_sub(pF->nXaRight, pF->nXaLeft);
if (0 > nWidthTw)
nWidthTw = 0;
-long nHeightTw = pF->nYaBottom - pF->nYaTop;
+sal_Int32 nHeightTw = o3tl::saturating_sub(pF->nYaBottom, pF->nYaTop);
if (0 > nHeightTw)
nHeightTw = 0;
___
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 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f98ada6c79384e580c1a97cf818ff8970c9eaded Author: Andrea Gelmini Date: Sat Mar 31 10:16:35 2018 +0200 Fix typo Change-Id: I0289c22c62c4bf7ad93d01571008f34d78d15a1d Reviewed-on: https://gerrit.libreoffice.org/52197 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index f8c68508dbed..08f4e6f33b96 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -7185,7 +7185,7 @@ center True - + True False center ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit b4e9171e598dd6c2a5774b079e0b3203aaf1b29d Author: Caolán McNamara Date: Mon Apr 2 11:35:53 2018 +0100 ofz#7229 Divide by zero Change-Id: I7bd2f19d5dc99e9041b3ef0fc10caef6d8b7ca6a Reviewed-on: https://gerrit.libreoffice.org/52253 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index a476a800dc93..2f6e45f1d373 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -330,6 +330,10 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection if (nCols < 2) //check for no columns or other weird state return false; +const sal_uInt16 nNetWriterWidth = writer_cast(nNetWidth); +if (nNetWriterWidth == 0) +return false; + SwFormatCol aCol; // Create SwFormatCol //sprmSDxaColumns - Default distance is 1.25 cm @@ -346,8 +350,7 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection aCol.SetLineWidth(1); } -aCol.Init(nCols, writer_cast(nColSpace), -writer_cast(nNetWidth)); +aCol.Init(nCols, writer_cast(nColSpace), nNetWriterWidth); // sprmSFEvenlySpaced if (!rSep.fEvenlySpaced) @@ -365,7 +368,7 @@ bool wwSectionManager::SetCols(SwFrameFormat &rFormat, const wwSection &rSection pCol->SetLeft(writer_cast(nLeft)); pCol->SetRight(writer_cast(nRight)); } -aCol.SetWishWidth(writer_cast(nNetWidth)); +aCol.SetWishWidth(nNetWriterWidth); } rFormat.SetFormatAttr(aCol); return true; ___ 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-5.3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf107035.docx |binary sw/source/core/unocore/unotext.cxx |4 2 files changed, 4 insertions(+) New commits: commit c1f393d899360e11e25d562d90285895f1e751e9 Author: Luke Deller Date: Mon Mar 5 00:14:28 2018 +1100 tdf#107035 Fix field character style DOCX import Reinstate a call to DontExpandFormat which was removed from appendTextContent in commit 232ad2f2588beff50cb5c1f3b689c581ba317583 This ensures that direct character formatting which ended immediately before the insertion point will not be expanded to cover the inserted content. Reviewed-on: https://gerrit.libreoffice.org/50729 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit 18cbb8fe699131a234355e1d00fa917fede6ac46) Change-Id: Ie5fa6b5c5acee4f885f9e67535e98801af23661a diff --git a/sw/qa/extras/ooxmlexport/data/tdf107035.docx b/sw/qa/extras/ooxmlexport/data/tdf107035.docx new file mode 100644 index ..a8ab045b61c9 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf107035.docx differ diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 37ec4681d715..17e81aab7abe 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -527,6 +527,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) aIllegal.Message = "first parameter invalid"; throw aIllegal; } +// Any direct formatting ending at the insert position (xRange) should not +// be expanded to cover the inserted content (xContent) +GetDoc()->DontExpandFormat( *aPam.Start() ); + // first test if the range is at the right position, then call // xContent->attach const SwStartNode* pOwnStartNode = GetStartNode(); ___ 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/vcl/res/check1.png|binary icon-themes/colibre/vcl/res/check2.png|binary icon-themes/colibre/vcl/res/check3.png|binary icon-themes/colibre/vcl/res/check4.png|binary icon-themes/colibre/vcl/res/check5.png|binary icon-themes/colibre/vcl/res/check6.png|binary icon-themes/colibre/vcl/res/check7.png|binary icon-themes/colibre/vcl/res/check8.png|binary icon-themes/colibre/vcl/res/check9.png|binary icon-themes/colibre/vcl/res/checkmono1.png|binary icon-themes/colibre/vcl/res/checkmono2.png|binary icon-themes/colibre/vcl/res/checkmono3.png|binary icon-themes/colibre/vcl/res/checkmono4.png|binary icon-themes/colibre/vcl/res/checkmono5.png|binary icon-themes/colibre/vcl/res/checkmono6.png|binary icon-themes/colibre/vcl/res/checkmono7.png|binary icon-themes/colibre/vcl/res/checkmono8.png|binary icon-themes/colibre/vcl/res/checkmono9.png|binary icon-themes/colibre/vcl/res/index.png |binary icon-themes/colibre/vcl/res/pin.png |binary icon-themes/colibre/vcl/res/radio1.png|binary icon-themes/colibre/vcl/res/radio2.png|binary icon-themes/colibre/vcl/res/radio3.png|binary icon-themes/colibre/vcl/res/radio4.png|binary icon-themes/colibre/vcl/res/radio5.png|binary icon-themes/colibre/vcl/res/radio6.png|binary icon-themes/colibre/vcl/res/radiomono1.png|binary icon-themes/colibre/vcl/res/radiomono2.png|binary icon-themes/colibre/vcl/res/radiomono3.png|binary icon-themes/colibre/vcl/res/radiomono4.png|binary icon-themes/colibre/vcl/res/radiomono5.png|binary icon-themes/colibre/vcl/res/radiomono6.png|binary icon-themes/colibre/vcl/res/scrmsk.png|binary icon-themes/colibre/vcl/res/scrollh.png |binary icon-themes/colibre/vcl/res/scrollv.png |binary icon-themes/colibre/vcl/res/scrollvh.png |binary icon-themes/colibre/vcl/res/spinner-16-01.png |binary icon-themes/colibre/vcl/res/spinner-16-02.png |binary icon-themes/colibre/vcl/res/spinner-16-03.png |binary icon-themes/colibre/vcl/res/spinner-16-04.png |binary icon-themes/colibre/vcl/res/spinner-16-05.png |binary icon-themes/colibre/vcl/res/spinner-16-06.png |binary icon-themes/colibre/vcl/res/spinner-32-01.png |binary icon-themes/colibre/vcl/res/spinner-32-02.png |binary icon-themes/colibre/vcl/res/spinner-32-03.png |binary icon-themes/colibre/vcl/res/spinner-32-04.png |binary icon-themes/colibre/vcl/res/spinner-32-05.png |binary icon-themes/colibre/vcl/res/spinner-32-06.png |binary icon-themes/colibre/vcl/res/spinner-32-07.png |binary icon-themes/colibre/vcl/res/spinner-32-08.png |binary icon-themes/colibre/vcl/res/spinner-32-09.png |binary icon-themes/colibre/vcl/res/spinner-32-10.png |binary icon-themes/colibre/vcl/res/spinner-32-11.png |binary icon-themes/colibre/vcl/res/spinner-32-12.png |binary icon-themes/colibre/vcl/res/spinner-64-01.png |binary icon-themes/colibre/vcl/res/spinner-64-02.png |binary icon-themes/colibre/vcl/res/spinner-64-03.png |binary icon-themes/colibre/vcl/res/spinner-64-04.png |binary icon-themes/colibre/vcl/res/spinner-64-05.png |binary icon-themes/colibre/vcl/res/spinner-64-06.png |binary icon-themes/colibre/vcl/res/spinner-64-07.png |binary icon-themes/colibre/vcl/res/spinner-64-08.png |binary icon-themes/colibre/vcl/res/spinner-64-09.png |binary icon-themes/colibre/vcl/res/spinner-64-10.png |binary icon-themes/colibre/vcl/res/spinner-64-11.png |binary icon-themes/colibre/vcl/res/spinner-64-12.png |binary icon-themes/colibre/vcl/res/splharw.png |binary icon-themes/colibre/vcl/res/splhpin.png |binary icon-themes/colibre/vcl/res/splvarw.png |binary icon-themes/colibre/vcl/res/splvpin.png |binary icon-themes/colibre/vcl/res/wheelh.png|binary icon-themes/colibre/vcl/res/wheelv.png|binary icon-themes/colibre/vcl/res/wheelvh.png |binary 73 files changed New commits: commit 39715e982cf599b6afe6e7736da844d5929f6a84 Author: andreas kainz Date: Mon Apr 2 08:01:04 2018 +0200 Colibre icons: finish vcl galaxy folder Change-Id: Ife7d88d89e48b70418df574c0f204f3bf3a04850 Reviewed-on: https://gerrit.libreoffice.org/52246 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/vcl/res/check1.png b/icon-themes/colibre/vcl/res/check1.png new file mode 100644 index ..914a81292f56 Binary files /dev/null and b/icon-themes/colibre/vcl/res/check1.png differ diff --git a/icon-themes/colibre/vcl/res/check2.png b/icon-themes/colibre/vcl/res/check2.png new file mode 100644 index ..31b78c4b26d0 Binary files /dev/null and b/icon-themes/colibre/vcl/res/check2.png differ diff --git a/icon-themes/colibre/vcl/res/check3.png b/icon-themes/colibre/vcl/res/check3.png new file mode 100644 index ..2b890f47732f Binary files /dev/null and b/ic
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/srchdlg.cxx | 10 --
svx/source/tbxctrls/tbunosearchcontrollers.cxx |4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 6acda2a36c9025e0d3fe94d6ca8788ab60c3203e
Author: Jim Raykowski
Date: Thu Mar 29 11:07:04 2018 -0800
tdf#116596 Dynamically size Findbar searchlabel
Change-Id: I74d09d439ada6d92fca396ac45c60340cb55e668
Reviewed-on: https://gerrit.libreoffice.org/52043
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 99e6823b3cde..3b7fca06a673 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2369,7 +2369,6 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
return aInfo;
}
-
static void lcl_SetSearchLabelWindow(const OUString& rStr)
{
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
@@ -2394,15 +2393,14 @@ static void lcl_SetSearchLabelWindow(const OUString&
rStr)
{
vcl::Window* pSearchLabel = pToolBox->GetItemWindow(id);
assert(pSearchLabel);
-pSearchLabel->Hide();
pSearchLabel->SetText(rStr);
-if (!rStr.isEmpty())
-{
+if (rStr.isEmpty())
+pSearchLabel->SetSizePixel(Size(16,
pSearchLabel->get_preferred_size().Height()));
+else
pSearchLabel->SetSizePixel(pSearchLabel->get_preferred_size());
-pSearchLabel->Show();
-}
}
}
+xLayoutManager->doLayout();
pToolBox->Resize();
}
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index cfe346d3cc2f..aa4b03fb033a 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -1269,7 +1269,7 @@ void SAL_CALL
SearchLabelToolboxController::statusChanged( const css::frame::Fea
{
OUString aStr = SvxSearchDialogWrapper::GetSearchLabel();
m_pSL->SetText(aStr);
-long aWidth = !aStr.isEmpty() ? m_pSL->get_preferred_size().getWidth()
: 300;
+long aWidth = !aStr.isEmpty() ? m_pSL->get_preferred_size().getWidth()
: 16;
m_pSL->SetSizePixel(Size(aWidth,
m_pSL->get_preferred_size().getHeight()));
}
}
@@ -1277,7 +1277,7 @@ void SAL_CALL
SearchLabelToolboxController::statusChanged( const css::frame::Fea
css::uno::Reference< css::awt::XWindow > SAL_CALL
SearchLabelToolboxController::createItemWindow( const css::uno::Reference<
css::awt::XWindow >& Parent )
{
m_pSL = VclPtr::Create(VCLUnoHelper::GetWindow( Parent ));
-m_pSL->SetSizePixel(Size(300, 25));
+m_pSL->SetSizePixel(Size(16, 25));
return VCLUnoHelper::GetInterface(m_pSL);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/LibreOfficeLight
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
| 40 ++
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
|4 -
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
|4 -
ios/LibreOfficeLight/LibreOfficeLight/ButtonScrollView.swift
|2
ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
|6 -
ios/LibreOfficeLight/LibreOfficeLight/DocumentOverlaysView.swift
|2
ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift
|2
7 files changed, 17 insertions(+), 43 deletions(-)
New commits:
commit ac65efa1cff5c3ae763c24d0f1340617625e3fbc
Author: jan Iversen
Date: Mon Apr 2 12:27:13 2018 +0200
iOS, update source to xcode 9.3 swift 4.1
Change-Id: I68464a213303ebe7dd850659031baf4cd7bdfa73
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 48a6475acad0..67e33800b54a 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -97,19 +97,10 @@
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift;
name = DocumentController.swift; path =
LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift;
sourceTree = SOURCE_ROOT; };
39B092501E5F3DEA00682A59 /* LibreOfficeLight-Prefix.pch */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = "LibreOfficeLight-Prefix.pch"; sourceTree = ""; };
+ 39B4245D2060FB2300347588 /* ucbhelper.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = ucbhelper.cxx; path = ../../unotools/source/ucbhelper/ucbhelper.cxx;
sourceTree = ""; };
39E950521FC9842000D82C49 /* source */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = source; path = ../source;
sourceTree = ""; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path =
Info.plist; sourceTree = ""; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.swift; path = PropertiesController.swift; sourceTree = ""; };
- 39FD89C9204E87E900E7179F /* except.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = except.cxx; path =
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx"; sourceTree =
""; };
- 39FD89D8204E8EEE00E7179F /* call.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = call.cxx; path =
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx"; sourceTree =
""; };
- 39FD89D9204E8EEE00E7179F /* abi.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = abi.cxx; path =
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx"; sourceTree =
""; };
- 39FD89DA204E8EEE00E7179F /* uno2cpp.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = uno2cpp.cxx; path =
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx"; sourceTree =
""; };
- 39FD89DB204E8EEE00E7179F /* share.hxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name
= share.hxx; path =
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx"; sourceTree =
""; };
- 39FD89DC204E8EEE00E7179F /* call.hxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name
= call.hxx; path = "../../bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx";
sourceTree = ""; };
- 39FD89DD204E8EEE00E7179F /* abi.hxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name
= abi.hxx; path = "../../bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx";
sourceTree = ""; };
- 39FD89DE204E8EEE00E7179F /* callvirtualmethod.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = callvirtualmethod.cxx; path =
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx";
sourceTree = ""; };
- 39FD89DF204E8EEF00E7179F /* cpp2uno.cxx */ = {isa =
PBXFileReference; fi
[Libreoffice-commits] core.git: Branch 'feature/SOSAW080' - include/svx svx/source
include/svx/unoshape.hxx | 15 -
svx/source/unodraw/tableshape.cxx | 34 +-
svx/source/unodraw/unoshap2.cxx | 178 ++
svx/source/unodraw/unoshap3.cxx | 101 +++
svx/source/unodraw/unoshap4.cxx | 80 +++---
svx/source/unodraw/unoshape.cxx | 483 +++---
6 files changed, 446 insertions(+), 445 deletions(-)
New commits:
commit f9d2cc0a43faecae76c0f106a4a423d0eb480b4b
Author: Armin Le Grand
Date: Mon Apr 2 12:04:28 2018 +0200
SOSAW080: Reworked SvxShape to use SdrObject's SdrModel
Change-Id: I17bcb44d2e29920c0c74430c2d9c703b36cfa0ad
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 626031962daf..422f6b13b446 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -137,8 +137,10 @@ protected:
const SvxItemPropertySet* mpPropSet;
const SfxItemPropertyMapEntry* maPropMapEntries;
-::tools::WeakReference< SdrObject > mpObj;
-SdrModel* mpModel;
+private:
+::tools::WeakReference< SdrObject > mpSdrObjectWeakReference;
+
+protected:
// translations for writer, which works in TWIPS
void ForceMetricToItemPoolMetric(Pair& rPoint) const throw();
void ForceMetricToItemPoolMetric(Point& rPoint) const throw() {
ForceMetricToItemPoolMetric(rPoint.toPair()); }
@@ -206,8 +208,13 @@ public:
void TakeSdrObjectOwnership();
bool HasSdrObjectOwnership() const;
-void InvalidateSdrObject() { mpObj.reset( nullptr ); };
-SdrObject* GetSdrObject() const {return mpObj.get();}
+// used exclusively by SdrObject
+void InvalidateSdrObject();
+
+// Encapsulated access to SdrObject
+SdrObject* GetSdrObject() const { return mpSdrObjectWeakReference.get(); }
+bool HasSdrObject() const { return mpSdrObjectWeakReference.is(); }
+
void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; }
/// @throws css::uno::RuntimeException
css::uno::Any GetBitmap( bool bMetaFile = false ) const;
diff --git a/svx/source/unodraw/tableshape.cxx
b/svx/source/unodraw/tableshape.cxx
index a34815611bca..281dfa288ea9 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -59,8 +59,8 @@ bool SvxTableShape::setPropertyValueImpl(
if( !(rValue >>= xTemplate) )
throw IllegalArgumentException();
-if( mpObj.is() )
-static_cast< sdr::table::SdrTableObj* >( mpObj.get()
)->setTableStyle(xTemplate);
+if( HasSdrObject() )
+static_cast< sdr::table::SdrTableObj* >( GetSdrObject()
)->setTableStyle(xTemplate);
return true;
}
@@ -71,9 +71,9 @@ bool SvxTableShape::setPropertyValueImpl(
case OWN_ATTR_TABLETEMPLATE_BANDINGROWS:
case OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS:
{
-if( mpObj.is() )
+if( HasSdrObject() )
{
-TableStyleSettings aSettings( static_cast<
sdr::table::SdrTableObj* >( mpObj.get() )->getTableStyleSettings() );
+TableStyleSettings aSettings( static_cast<
sdr::table::SdrTableObj* >( GetSdrObject() )->getTableStyleSettings() );
switch( pProperty->nWID )
{
@@ -85,7 +85,7 @@ bool SvxTableShape::setPropertyValueImpl(
case OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS:rValue >>=
aSettings.mbUseColumnBanding; break;
}
-static_cast< sdr::table::SdrTableObj* >( mpObj.get()
)->setTableStyleSettings(aSettings);
+static_cast< sdr::table::SdrTableObj* >( GetSdrObject()
)->setTableStyleSettings(aSettings);
}
return true;
@@ -106,25 +106,25 @@ bool SvxTableShape::getPropertyValueImpl(
{
case OWN_ATTR_OLEMODEL:
{
-if( mpObj.is() )
+if( HasSdrObject() )
{
-rValue <<= static_cast< sdr::table::SdrTableObj* >( mpObj.get()
)->getTable();
+rValue <<= static_cast< sdr::table::SdrTableObj* >( GetSdrObject()
)->getTable();
}
return true;
}
case OWN_ATTR_TABLETEMPLATE:
{
-if( mpObj.is() )
+if( HasSdrObject() )
{
-rValue <<= static_cast< sdr::table::SdrTableObj* >( mpObj.get()
)->getTableStyle();
+rValue <<= static_cast< sdr::table::SdrTableObj* >( GetSdrObject()
)->getTableStyle();
}
return true;
}
case OWN_ATTR_BITMAP:
{
-if( mpObj.is() )
+if( HasSdrObject() )
{
-Graphic aGraphic( SvxGetGraphicForShape( *mpObj.get() ) );
+Graphic aGraphic( SvxGetGraphicForShape( *GetSdrObject() ) );
rValue <<= aGraphic.GetXGraphic();
}
return true;
@@ -136,9 +136,9 @@ bool SvxTableShape::getPropertyValueImpl(
case OWN_ATTR_TABLETEMPLATE_BANDINGROWS:
case OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS:
{
-if( mpObj.is() )
+if( HasSdrObject() )
{
-TableStyleSettings aSettings( static_cast<
sdr::table
Weekly QA Report (W13-2018)
Hello, What have happened in QA in the last 7 days? * 104 bugs have been created, of which, 36 are still unconfirmed ( Total Unconfirmed bugs: 378 ) + Created bugs: http://tinyurl.com/y8ccrz5h + Still unconfirmed bugs: http://tinyurl.com/yaw47n7g * 996 comments have been written by 174 users. * 50 new users have signed up to Bugzilla. == STATUSES CHANGED == * 11 bugs have been changed to 'ASSIGNED'. + Link: http://tinyurl.com/ybhwn4hr + Done by: Xisco Faulí ( 1 ), Miklos Vajna ( 1 ), Heiko Tietze ( 1 ), Thorsten Behrens (CIB) ( 1 ), nicksonthanda10 ( 1 ), László Németh ( 1 ), tagezi ( 1 ), Justin L ( 1 ), Bartosz ( 1 ), Adolfo Jayme ( 1 ), Aron Budea ( 1 ) * 2 bugs have been changed to 'CLOSED'. + Link: http://tinyurl.com/y72h4fly + Done by: Eike Rathke ( 2 ) * 24 bugs have been changed to 'NEEDINFO'. + Link: http://tinyurl.com/ydh5yewh + Done by: Xisco Faulí ( 10 ), Buovjaga ( 4 ), Timur ( 2 ), Regina Henschel ( 1 ), raal ( 1 ), Mark Hung ( 1 ), Justin L ( 1 ), Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 ), Jacques Guilleron ( 1 ), Aron Budea ( 1 ) * 51 bugs have been changed to 'NEW'. + Link: http://tinyurl.com/y9ld7uzy + Done by: Buovjaga ( 17 ), Xisco Faulí ( 6 ), V Stuart Foote ( 5 ), m.a.riosv ( 4 ), Julien Nabet ( 2 ), Yousuf Philips (jay) ( 2 ), Jean-Baptiste Faure ( 2 ), Timur ( 2 ), Aron Budea ( 2 ), vatprc_cyq ( 1 ), Heiko Tietze ( 1 ), raal ( 1 ), Olivier Hallot ( 1 ), Alex Thurgood ( 1 ), Eyal Rozenberg ( 1 ), Dieter Praas ( 1 ), Harald Berger ( 1 ), Katarina Behrens (CIB) ( 1 ) * 2 bugs have been changed to 'REOPENED'. + Link: http://tinyurl.com/ybkzj7wo + Done by: Samuel Mehrbrodt (CIB) ( 1 ), Adrien ( 1 ) * 34 bugs have been changed to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/yaodjcsp + Done by: Buovjaga ( 8 ), V Stuart Foote ( 5 ), Xisco Faulí ( 3 ), Heiko Tietze ( 2 ), Telesto ( 2 ), Justin L ( 2 ), Winfried Donkers ( 1 ), Julien Nabet ( 1 ), raal ( 1 ), Mike Kaganski ( 1 ), m.a.riosv ( 1 ), Gabor Kelemen ( 1 ), Alex Thurgood ( 1 ), ilya ( 1 ), Timur ( 1 ), Adolfo Jayme ( 1 ), eisa01 ( 1 ), Aron Budea ( 1 ) * 26 bugs have been changed to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y95vv9rj + Done by: Heiko Tietze ( 4 ), Jim Raykowski ( 3 ), Justin L ( 3 ), Szymon Kłos ( 2 ), Winfried Donkers ( 1 ), V Stuart Foote ( 1 ), Miklos Vajna ( 1 ), Andras Timar ( 1 ), Serge Krot (CIB) ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), Noel Grandin ( 1 ), nicksonthanda10 ( 1 ), Mike Kaganski ( 1 ), andreas_k ( 1 ), himajin10 ( 1 ), Adolfo Jayme ( 1 ), Dennis Roczek ( 1 ), Caolán McNamara ( 1 ) * 2 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/ya8z4u2r + Done by: Timur ( 2 ) * 3 bugs have been changed to 'RESOLVED INVALID'. + Link: http://tinyurl.com/ycvnnsom + Done by: V Stuart Foote ( 1 ), Jean-Baptiste Faure ( 1 ), Timur ( 1 ) * 2 bugs have been changed to 'RESOLVED MOVED'. + Link: http://tinyurl.com/y9v8kg96 + Done by: Xisco Faulí ( 2 ) * 6 bugs have been changed to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/y923kl57 + Done by: Xavier Van Wijmeersch ( 1 ), Xisco Faulí ( 1 ), V Stuart Foote ( 1 ), Buovjaga ( 1 ), Hylton Conacher ( 1 ), Aron Budea ( 1 ) * 3 bugs have been changed to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/y9j8gm5k + Done by: V Stuart Foote ( 1 ), Luke ( 1 ), Linus Drumbler ( 1 ) * 5 bugs have been changed to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/ydhj6a2x + Done by: V Stuart Foote ( 1 ), Buovjaga ( 1 ), Regina Henschel ( 1 ), andreas_k ( 1 ), Justin L ( 1 ) * 19 bugs have been changed to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/yacrkdrm + Done by: eisa01 ( 5 ), Buovjaga ( 3 ), m.a.riosv ( 2 ), V Stuart Foote ( 1 ), Libomark ( 1 ), Noel Grandin ( 1 ), jmason900 ( 1 ), Jean-Baptiste Faure ( 1 ), Timur ( 1 ), Dennis Roczek ( 1 ), tommy27 ( 1 ), Aron Budea ( 1 ) * 7 bugs have been changed to 'UNCONFIRMED'. + Link: http://tinyurl.com/y9bhsbqt + Done by: Xisco Faulí ( 2 ), V Stuart Foote ( 2 ), Buovjaga ( 1 ), Leo ( 1 ), Heinrich Hartl ( 1 ) * 26 bugs have been changed to 'VERIFIED FIXED'. + Link: http://tinyurl.com/ybuxfrqm + Done by: Xisco Faulí ( 19 ), Buovjaga ( 3 ), Timur ( 2 ), Heiko Tietze ( 1 ), Thomas Lendo ( 1 ) == KEYWORDS ADDED == * 'bibisectRequest' has been added to 4 bugs. + Link: http://tinyurl.com/yabzropg + Done by: Xisco Faulí ( 2 ), Telesto ( 2 ) * 'bibisected' has been added to 9 bugs. + Link: http://tinyurl.com/y6w3kz6e + Done by: Xisco Faulí ( 6 ), Buovjaga ( 2 ), Marina Latini ( 1 ) * 'bisected' has been added to 8 bugs. + Link: http://tinyurl.com/yddohhhu + Done by: Xisco Faulí ( 6 ), Buovjaga ( 2 ) * 'dataLoss' ha
Re: "Microsoft Excel Is Going Beyond Text and Numbers"
Interesting question - filed a ticket in BZ https://bugs.documentfoundation.org/show_bug.cgi?id=116744 On 01.04.2018 15:57, theUser BL wrote: > To be compatibe to actual and future version of Excel this news could be > interesting for you: > https://www.thurrott.com/office/155211/microsoft-excel-going-beyond-text-numbers > > Possible comming Excel functions like USDinYEN(), EURinUSD(), CADtoUSD() or > GBPtoEUR(). > Where everytime the current exchange rate is taken from the internet and > used. > > So the new Excel will be the old Excel plus a big database in background, > which will be permanent updated. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > -- Dr. Heiko Tietze UX designer Tel. +49 (0)179/1268509 signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/printdlg.hxx |6 -
vcl/source/window/printdlg.cxx | 168 +
2 files changed, 123 insertions(+), 51 deletions(-)
New commits:
commit d51bc7b3813ccbdf41a50664d41b2fa3d25c6954
Author: Armin Le Grand
Date: Fri Mar 30 13:02:02 2018 +0200
PrintPreviewWindow dynamic preview Bitmap
The PrintDialog includes a preview (PrintPreviewWindow)
that currently used a fixed-pixel-size preview that takes
the aspect ratio into account (which may already explode
due to just growing vertically - try a much higher than
wide page). It is not dynamic and by using the high-quality
scale (BmpScaleFlag::BestQuality) for output it can get
rather slow in repainting. Also holds the VDev for creating
the preview all the time without need.
Made that process dynamic and responding to real resizing,
thus not using that huge number of pixels from the start.
Also use a VDev only temporary and use intelligent size
management.
Still keeping the high-quality scale due to ::DrawBitmap
with a target size not scaling well (still) and also
::DrawOutDev not good in quality. Those two should work
better nowadays, but adaption would be risky.
Change-Id: I211412a063def33a4e8f40c7442702770cd11a8e
Reviewed-on: https://gerrit.libreoffice.org/52150
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 2371eaa5469b..f8c799e7ff97 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -39,12 +39,11 @@ namespace vcl
public:
class PrintPreviewWindow : public vcl::Window
{
-static const sal_Int32 PREVIEW_BITMAP_WIDTH;
-
GDIMetaFile maMtf;
SizemaOrigSize;
SizemaPreviewSize;
-VclPtr maPageVDev;
+sal_Int32 mnDPIX;
+sal_Int32 mnDPIY;
Bitmap maPreviewBitmap;
OUStringmaReplacementString;
OUStringmaToolTipString;
@@ -62,7 +61,6 @@ namespace vcl
virtual void Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect ) override;
virtual void Command( const CommandEvent& ) override;
virtual void Resize() override;
-virtual void DataChanged( const DataChangedEvent& ) override;
void setPreview( const GDIMetaFile&, const Size& i_rPaperSize,
const OUString& i_rPaperName,
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 5c10cc161d0b..4fba6f5e5d6b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -66,8 +66,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void
makeShowNupOrderWindow(VclPtr
PrintDialog::PrintPreviewWindow::PrintPreviewWindow( vcl::Window* i_pParent )
: Window( i_pParent, 0 )
+, maMtf()
, maOrigSize( 10, 10 )
-, maPageVDev( VclPtr::Create(*this) )
+, maPreviewSize()
+, mnDPIX(Application::GetDefaultDevice()->GetDPIX())
+, mnDPIY(Application::GetDefaultDevice()->GetDPIY())
+, maPreviewBitmap()
+, maReplacementString()
, maToolTipString(VclResId( SV_PRINT_PRINTPREVIEW_TXT))
, mbGreyscale( false )
, maHorzDim(VclPtr::Create(this, WB_HORZ | WB_CENTER))
@@ -75,7 +80,6 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow(
vcl::Window* i_pParent )
{
SetPaintTransparent( true );
SetBackground();
-maPageVDev->SetBackground( Wallpaper(COL_WHITE) );
maHorzDim->Show();
maVertDim->Show();
@@ -92,22 +96,9 @@ void PrintDialog::PrintPreviewWindow::dispose()
{
maHorzDim.disposeAndClear();
maVertDim.disposeAndClear();
-maPageVDev.disposeAndClear();
Window::dispose();
}
-const sal_Int32 PrintDialog::PrintPreviewWindow::PREVIEW_BITMAP_WIDTH = 1600;
-
-void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent&
i_rDCEvt )
-{
-// react on settings changed
-if( i_rDCEvt.GetType() == DataChangedEventType::SETTINGS )
-{
-maPageVDev->SetBackground( Wallpaper(COL_WHITE) );
-}
-Window::DataChanged( i_rDCEvt );
-}
-
void PrintDialog::PrintPreviewWindow::Resize()
{
Size aNewSize( GetSizePixel() );
@@ -141,19 +132,6 @@ void PrintDialog::PrintPreviewWindow::Resize()
maPreviewSize = aScaledSize;
-// #i104784# if we render the page too small then rounding issues result in
-// layout artifacts looking really bad. So scale the page unto a device
that is not
-// full page size but not too small either. This also results in much
better visual
-// quality of the preview, e.g. when its height approaches the number of
text lines
-// find a good scaling factor
-
-double aAspectRatio = aScaledSize.Height() /
static_cast(aScaledSize.Width());
-
-aScaledSize.setWidth( PREVIEW_BIT
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/lc_basicshapes.paper.png |binary icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sequential-access.png |binary icon-themes/elementary/cmd/sc_basicshapes.paper.png |binary icon-themes/elementary/cmd/sc_calloutshapes.png |binary icon-themes/elementary/cmd/sc_calloutshapes.round-callout.png |binary icon-themes/elementary/cmd/sc_flowchartshapes.flowchart-sequential-access.png |binary icon-themes/elementary_svg/cmd/lc_basicshapes.paper.svg |2 +- icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg |2 +- icon-themes/elementary_svg/cmd/sc_basicshapes.paper.svg |2 +- icon-themes/elementary_svg/cmd/sc_calloutshapes.rectangular-callout.svg |5 + icon-themes/elementary_svg/cmd/sc_calloutshapes.round-callout.svg |3 ++- icon-themes/elementary_svg/cmd/sc_calloutshapes.svg |3 ++- icon-themes/elementary_svg/cmd/sc_flowchartshapes.flowchart-sequential-access.svg |3 ++- 13 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 7571d0f84c07b4b49e1db225a64787e6bcc582b5 Author: andreas kainz Date: Mon Apr 2 09:13:04 2018 +0200 Elementary icons: fix callout and flowchart icons Change-Id: I613252af8c4ad6103d9835c4a6f8fe223593f17a Reviewed-on: https://gerrit.libreoffice.org/52250 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/elementary/cmd/lc_basicshapes.paper.png b/icon-themes/elementary/cmd/lc_basicshapes.paper.png index 14df96e343a5..aa28120e012f 100644 Binary files a/icon-themes/elementary/cmd/lc_basicshapes.paper.png and b/icon-themes/elementary/cmd/lc_basicshapes.paper.png differ diff --git a/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sequential-access.png b/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sequential-access.png index a666b3782906..a6a6b0716ff6 100644 Binary files a/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sequential-access.png and b/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sequential-access.png differ diff --git a/icon-themes/elementary/cmd/sc_basicshapes.paper.png b/icon-themes/elementary/cmd/sc_basicshapes.paper.png index 8f27170604ef..63d65e61e9ea 100644 Binary files a/icon-themes/elementary/cmd/sc_basicshapes.paper.png and b/icon-themes/elementary/cmd/sc_basicshapes.paper.png differ diff --git a/icon-themes/elementary/cmd/sc_calloutshapes.png b/icon-themes/elementary/cmd/sc_calloutshapes.png index ae0b8c8bf477..da991c98927b 100644 Binary files a/icon-themes/elementary/cmd/sc_calloutshapes.png and b/icon-themes/elementary/cmd/sc_calloutshapes.png differ diff --git a/icon-themes/elementary/cmd/sc_calloutshapes.round-callout.png b/icon-themes/elementary/cmd/sc_calloutshapes.round-callout.png index ae0b8c8bf477..034b06a36874 100644 Binary files a/icon-themes/elementary/cmd/sc_calloutshapes.round-callout.png and b/icon-themes/elementary/cmd/sc_calloutshapes.round-callout.png differ diff --git a/icon-themes/elementary/cmd/sc_flowchartshapes.flowchart-sequential-access.png b/icon-themes/elementary/cmd/sc_flowchartshapes.flowchart-sequential-access.png index ae0b8c8bf477..afc8ee6d39f4 100644 Binary files a/icon-themes/elementary/cmd/sc_flowchartshapes.flowchart-sequential-access.png and b/icon-themes/elementary/cmd/sc_flowchartshapes.flowchart-sequential-access.png differ diff --git a/icon-themes/elementary_svg/cmd/lc_basicshapes.paper.svg b/icon-themes/elementary_svg/cmd/lc_basicshapes.paper.svg index 7ecb1286e0de..8ae35d5b0f70 100644 --- a/icon-themes/elementary_svg/cmd/lc_basicshapes.paper.svg +++ b/icon-themes/elementary_svg/cmd/lc_basicshapes.paper.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg b/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg index 0daf6f289116..ac90d34c1e16 100644 --- a/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg +++ b/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/elementary_svg/cmd/sc_basicshapes.paper.svg b/icon-themes/elementary_svg/cmd/sc_basicshapes.paper.svg index 11b446f03ad9..f3c2e81e48f4 100644 --- a/icon-themes/elementary_svg/cmd/sc_basicshapes.paper.svg +++ b/icon-themes
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/lc_basicshapes.paper.png |binary icon-themes/colibre/cmd/lc_flowchartshapes.flowchart-sequential-access.png |binary icon-themes/colibre/cmd/sc_basicshapes.paper.png |binary icon-themes/colibre/cmd/sc_calloutshapes.png |binary icon-themes/colibre/cmd/sc_calloutshapes.round-callout.png |binary icon-themes/colibre/cmd/sc_flowchartshapes.flowchart-sequential-access.png |binary icon-themes/colibre_svg/cmd/lc_basicshapes.paper.svg |2 +- icon-themes/colibre_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg |2 +- icon-themes/colibre_svg/cmd/sc_basicshapes.paper.svg |2 +- icon-themes/colibre_svg/cmd/sc_calloutshapes.round-callout.svg |3 ++- icon-themes/colibre_svg/cmd/sc_calloutshapes.svg |2 +- icon-themes/colibre_svg/cmd/sc_flowchartshapes.flowchart-sequential-access.svg |3 ++- 12 files changed, 8 insertions(+), 6 deletions(-) New commits: commit 374081d762b13c7a6b6dc12921073fedf9c3d5e5 Author: andreas kainz Date: Mon Apr 2 08:58:42 2018 +0200 Colibre icons: fix callout and flowchart icons Change-Id: I2bb93f8555cdc1d7d758b40797f9f5d7147c7b2b Reviewed-on: https://gerrit.libreoffice.org/52248 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/lc_basicshapes.paper.png b/icon-themes/colibre/cmd/lc_basicshapes.paper.png index ffd4279cd279..f38ac5d3c280 100644 Binary files a/icon-themes/colibre/cmd/lc_basicshapes.paper.png and b/icon-themes/colibre/cmd/lc_basicshapes.paper.png differ diff --git a/icon-themes/colibre/cmd/lc_flowchartshapes.flowchart-sequential-access.png b/icon-themes/colibre/cmd/lc_flowchartshapes.flowchart-sequential-access.png index 8fef9b6080d7..ab121e826b1c 100644 Binary files a/icon-themes/colibre/cmd/lc_flowchartshapes.flowchart-sequential-access.png and b/icon-themes/colibre/cmd/lc_flowchartshapes.flowchart-sequential-access.png differ diff --git a/icon-themes/colibre/cmd/sc_basicshapes.paper.png b/icon-themes/colibre/cmd/sc_basicshapes.paper.png index 88159dac3186..14c8c3ce5a84 100644 Binary files a/icon-themes/colibre/cmd/sc_basicshapes.paper.png and b/icon-themes/colibre/cmd/sc_basicshapes.paper.png differ diff --git a/icon-themes/colibre/cmd/sc_calloutshapes.png b/icon-themes/colibre/cmd/sc_calloutshapes.png index a114f1ea2268..6f4aacb7fd01 100644 Binary files a/icon-themes/colibre/cmd/sc_calloutshapes.png and b/icon-themes/colibre/cmd/sc_calloutshapes.png differ diff --git a/icon-themes/colibre/cmd/sc_calloutshapes.round-callout.png b/icon-themes/colibre/cmd/sc_calloutshapes.round-callout.png index a114f1ea2268..a2d1859a50b2 100644 Binary files a/icon-themes/colibre/cmd/sc_calloutshapes.round-callout.png and b/icon-themes/colibre/cmd/sc_calloutshapes.round-callout.png differ diff --git a/icon-themes/colibre/cmd/sc_flowchartshapes.flowchart-sequential-access.png b/icon-themes/colibre/cmd/sc_flowchartshapes.flowchart-sequential-access.png index a114f1ea2268..8c0589507274 100644 Binary files a/icon-themes/colibre/cmd/sc_flowchartshapes.flowchart-sequential-access.png and b/icon-themes/colibre/cmd/sc_flowchartshapes.flowchart-sequential-access.png differ diff --git a/icon-themes/colibre_svg/cmd/lc_basicshapes.paper.svg b/icon-themes/colibre_svg/cmd/lc_basicshapes.paper.svg index f360c8508067..11aeb489e91e 100644 --- a/icon-themes/colibre_svg/cmd/lc_basicshapes.paper.svg +++ b/icon-themes/colibre_svg/cmd/lc_basicshapes.paper.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg b/icon-themes/colibre_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg index 75d59188b271..aff2c2c17ec5 100644 --- a/icon-themes/colibre_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg +++ b/icon-themes/colibre_svg/cmd/lc_flowchartshapes.flowchart-sequential-access.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_basicshapes.paper.svg b/icon-themes/colibre_svg/cmd/sc_basicshapes.paper.svg index d552990c8c24..1742f1737aa0 100644 --- a/icon-themes/colibre_svg/cmd/sc_basicshapes.paper.svg +++ b/icon-themes/colibre_svg/cmd/sc_basicshapes.paper.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_calloutshapes.round-callout.svg b/icon-themes/colibre_svg/cmd/sc_calloutshapes.round-callout.svg index 268eb3663446..3b39cee674b1 100644 --- a/icon-themes/colibre_svg/cmd/sc_calloutshapes.round-callout.svg +++
Re: make fails on MacOS 10.13.4 with c++11 related issues
On 2 April 2018 at 11:17, Ch g wrote: > I noticed several invalid option, Valgrind, header file not found errors > by "grep -C 5 error config.log", the related output are: > That is normal. That is what the configure script does, figures out what options are valid. (Among other things.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3abd8b51cd855cf55dbc0f3cfeb8390a783372fc
Author: Mike Kaganski
Date: Mon Apr 2 08:48:09 2018 +0100
Also use GetLanguageTag() for formatting percents
Reading MetricFormatter value (in MetricFormatter::GetValueFromStringUnit)
uses ImplGetLocaleDataWrapper() to convert the string using current locale
(including decimal and thousands separator), which calls GetLanguageTag().
On the other hand, in case of percent value, setting the control text (in
MetricFormatter::CreateFieldText) uses
Application::GetSettings().GetUILanguageTag().
This gives wrong results e.g. when UI language is different from locale.
For instance, if UI language is English (US), and locale is Russian, then
increasing from "999 %" would give "1,000 %" (using English (US) locale),
and then reading back, it would be processed as 1 % (using Russian locale,
where comma is decimal separator).
This change unifies setting percent text to also use GetLanguageTag().
Change-Id: I9b8a2ee5d3be709a8db3807ea81e105d6475b6a4
Reviewed-on: https://gerrit.libreoffice.org/52251
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8d5fec70ec8a..a59557dcbb9b 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1381,7 +1381,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64
nValue ) const
{
double dValue = nValue;
dValue /= ImplPower10(GetDecimalDigits());
-return unicode::formatPercent(dValue,
Application::GetSettings().GetUILanguageTag());
+return unicode::formatPercent(dValue, GetLanguageTag());
}
OUString aStr = NumericFormatter::CreateFieldText( nValue );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: make fails on MacOS 10.13.4 with c++11 related issues
I noticed several invalid option, Valgrind, header file not found errors by "grep -C 5 error config.log", the related output are: config.log-107-Target: x86_64-apple-darwin17.5.0 config.log-108-Thread model: posix config.log-109-InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin config.log-110-configure:6486: $? = 0 config.log-111-configure:6475: gcc -V >&5 config.log:112:clang: error: argument to '-V' is missing (expected 1 value) config.log:113:clang: error: no input files config.log-114-configure:6486: $? = 1 config.log-115-configure:6475: gcc -qversion >&5 -- config.log-114-configure:6486: $? = 1 config.log-115-configure:6475: gcc -qversion >&5 config.log:116:clang: error: unknown argument: '-qversion' config.log:117:clang: error: no input files config.log-118-configure:6486: $? = 1 config.log-119-configure:6506: checking whether the C compiler works config.log-120-configure:6528: gccconftest.c >&5 config.log-121-configure:6532: $? = 0 config.log-122-configure:6580: result: yes -- config.log-209-configure:10317: checking whether to treat the installation as read-only config.log-210-configure:10330: result: no config.log-211-configure:10533: checking for -Bsymbolic-functions linker support config.log-212-configure:10552: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -o conftest-Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo conftest.c >&5 config.log-213-ld: unknown option: -Bsymbolic-functions config.log:214:clang: error: linker command failed with exit code 1 (use -v to see invocation) config.log-215-configure:10552: $? = 1 config.log-216-configure: failed program was: config.log-217-| /* confdefs.h */ config.log-218-| #define PACKAGE_NAME "LibreOffice" config.log-219-| #define PACKAGE_TARNAME "libreoffice" -- config.log-275-configure:11035: result: yes config.log-276-configure:11046: checking the Clang version config.log-277-configure:11067: result: Clang "9.1.0 (clang-902.0.39.1)", 90100 config.log-278-configure:11101: checking whether /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk is already ccached config.log-279-configure:11123: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -c --ccache-skip -O2 conftest.c >&5 config.log:280:clang: error: unsupported option '--ccache-skip' config.log-281-configure:11123: $? = 1 config.log-282-configure: failed program was: config.log-283-| /* confdefs.h */ config.log-284-| #define PACKAGE_NAME "LibreOffice" config.log-285-| #define PACKAGE_TARNAME "libreoffice" -- config.log-334-configure:11171: $? = 0 config.log-335-configure:11178: result: yes config.log-336-configure:11185: checking whether /Users/almas/lode/opt/bin/ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk supports -finline-limit=0 config.log:337:configure:11200: /Users/almas/lode/opt/bin/ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -o conftest -Werror -finline-limit=0 conftest.c >&5 config.log:338:clang: error: optimization flag '-finline-limit=0' is not supported [-Werror,-Wignored-optimization-argument] config.log-339-configure:11200: $? = 1 config.log-340-configure: failed program was: config.log-341-| /* confdefs.h */ config.log-342-| #define PACKAGE_NAME "LibreOffice" config.log-343-| #define PACKAGE_TARNAME "libreoffice" -- config.log-405-configure:12021: result: none config.log-406-configure:12157: checking how to run the C preprocessor config.log-407-configure:12188: /Users/almas/lode/opt/bin/ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk -E conftest.c config.log-408-configure:12188: $? = 0 config.log-409-configure:12202: /Users/almas/lode/opt/bin/ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -m64 -mmacosx-version-min=10.9 -isysroot /Applications/Xcode.app/Contents/Developer/Pl
Re: make fails on MacOS 10.13.4 with c++11 related issues
On 4/2/2018 5:44 AM, Ch g wrote: > Regarding your reply:To purge all modifications do "git fetch --all && > git reset --hard origin/master". > > > will "git reset --hard origin/master" undo changes already made in > custom branches? You could send your branches to gerrit as drafts to ensure safety, then reset your tree, then recreate branches and cherry-pick the drafts from gerrit back. -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make fails on MacOS 10.13.4 with c++11 related issues
On 02.04.2018 04:44, Ch g wrote: > Regarding your reply:To purge all modifications do "git fetch --all && git > reset --hard origin/master". > will "git reset --hard origin/master" undo changes already made in custom > branches? Yes. https://stackoverflow.com/questions/1628088/reset-local-repository-branch-to-be-just-like-remote-repository-head signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/uiconfig framework/inc framework/Library_fwl.mk framework/source framework/util include/vcl officecfg/Configuration_officecfg.mk officecfg/files.mk officecfg/r
dbaccess/uiconfig/dbapp/menubar/menubar.xml |1
framework/Library_fwl.mk |1
framework/inc/services.h |1
framework/source/register/registertemp.cxx |1
framework/source/uielement/notebookbarmenucontroller.cxx | 323
---
framework/source/uielement/toolbarmodemenucontroller.cxx | 41
framework/util/fwl.component |3
include/vcl/EnumContext.hxx |2
officecfg/Configuration_officecfg.mk |1
officecfg/files.mk |1
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 181
officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu | 452
+-
officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs | 78 -
officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs | 21
postprocess/CustomTarget_registry.mk |2
sc/uiconfig/scalc/menubar/menubar.xml|1
sd/uiconfig/sdraw/menubar/menubar.xml|1
sd/uiconfig/simpress/menubar/menubar.xml |1
sfx2/source/appl/appserv.cxx |6
sfx2/source/notebookbar/SfxNotebookBar.cxx | 20
solenv/clang-format/blacklist|2
starmath/uiconfig/smath/menubar/menubar.xml |1
sw/uiconfig/sglobal/menubar/menubar.xml |1
sw/uiconfig/swriter/menubar/menubar.xml |1
vcl/source/window/EnumContext.cxx|3
27 files changed, 525 insertions(+), 625 deletions(-)
New commits:
commit 5c573a2f7473bae7bb965ca36557cd1b0bf7b9c9
Author: Kshitij Pathania
Date: Mon Feb 12 03:27:50 2018 +0530
tdf#115131 made a common submenu for toolbars and notebookbars
Also added the submenu in base, maths and draw
Change-Id: I94850c09c08fd3848eabe2597679634f30fbc735
Reviewed-on: https://gerrit.libreoffice.org/49575
Tested-by: Jenkins
Reviewed-by: andreas_kainz
Reviewed-by: Szymon Kłos
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index d57aa9ce21da..480926d4e22a 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -86,6 +86,7 @@
+
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index bb683abf9f75..58e2864c4296 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
framework/source/uielement/newmenucontroller \
framework/source/uielement/toolbarmodemenucontroller \
framework/source/uielement/toolbarsmenucontroller \
-framework/source/uielement/notebookbarmenucontroller \
))
# vim: set noet sw=4 ts=4:
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 7e1166d81907..5c780c0c0adb 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -53,7 +53,6 @@ namespace framework{
#define IMPLEMENTATIONNAME_NEWMENUCONTROLLER
"com.sun.star.comp.framework.NewMenuController"
#define IMPLEMENTATIONNAME_TOOLBARMODEMENUCONTROLLER
"com.sun.star.comp.framework.ToolbarModeMenuController"
#define IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER
"com.sun.star.comp.framework.ToolBarsMenuController"
-#define IMPLEMENTATIONNAME_NOTEBOOKBARMENUCONTROLLER
"com.sun.star.comp.framework.NotebookbarMenuController"
#define IMPLEMENTATIONNAME_HELPONSTARTUP
"com.sun.star.comp.framework.HelpOnStartup"
#define IMPLEMENTATIONNAME_SHELLJOB
"com.sun.star.comp.framework.ShellJob"
#define IMPLEMENTATIONNAME_FWK_TASKCREATOR
"com.sun.star.comp.framework.TaskCreator"
diff --git a/framework/source/register/registertemp.cxx
b/framework/source/register/registertemp.cxx
index 80ca3da5ac77..c7a6000acbbc 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -64,7 +64,6 @@ COMPONENTGETFACTORY ( fwl,
IFFACTORY( ::framework::DispatchRecorderSupplier
) else
IFFACTORY( ::framework::ToolbarModeMenuController
) else
