[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests9/tdf95554.py | 40 +++ 1 file changed, 40 insertions(+) New commits: commit 44a783185e09dc7da374a556fad44bddf1c8a1ce Author: shubham656 AuthorDate: Mon Jun 28 02:13:03 2021 +0530 Commit: Xisco Fauli CommitDate: Tue Jul 13 12:18:03 2021 +0200 tdf#95554 Add UITest Change-Id: I38a9768fc94f26a593f51ce566da4111f5f3b78b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117961 Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli diff --git a/sc/qa/uitest/calc_tests9/tdf95554.py b/sc/qa/uitest/calc_tests9/tdf95554.py new file mode 100644 index ..67c55e9435f4 --- /dev/null +++ b/sc/qa/uitest/calc_tests9/tdf95554.py @@ -0,0 +1,40 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +from uitest.framework import UITestCase +from libreoffice.uno.propertyvalue import mkPropertyValues +from uitest.uihelper.calc import enter_text_to_cell + +class Tdf95554(UITestCase): + + def test_tdf95554(self): +with self.ui_test.create_doc_in_start_center("calc"): +xCalcDoc = self.xUITest.getTopFocusWindow() +gridwin = xCalcDoc.getChild("grid_window") + +enter_text_to_cell(gridwin, "A1", "A") +enter_text_to_cell(gridwin, "A2", "B") +enter_text_to_cell(gridwin, "A3", "C") +enter_text_to_cell(gridwin, "A4", "D") +enter_text_to_cell(gridwin, "A5", "E") +enter_text_to_cell(gridwin, "A6", "F") + +gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A1"})) +gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A3:A3", "EXTEND":"1"})) +gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A5:A5", "EXTEND":"1"})) +gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A6:A6", "EXTEND":"1"})) +self.xUITest.executeCommand(".uno:Copy") + +with self.ui_test.load_empty_file("writer") as writer_document: + +self.xUITest.getTopFocusWindow() +self.xUITest.executeCommand(".uno:PasteUnformatted") + +# Without the fix, the test breaks here with: +#AssertionError: 'A\n\nC\n\nE\nF' != 'A' + +self.assertEqual('A\n\nC\n\nE\nF', +writer_document.Text.String) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter.cxx | 19 +++ 1 file changed, 19 insertions(+) New commits: commit a72b6d2df5978c0f43e04432581f4bc62c2c6d8f Author: shubham656 AuthorDate: Wed Jul 7 04:15:54 2021 +0530 Commit: Xisco Fauli CommitDate: Tue Jul 13 11:10:46 2021 +0200 tdf#78150 Add UnitTest Change-Id: I2ec92c229fcb6d38fd78c520a48d0bd3b739a82e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118542 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 533c752349ea..ea8e797b5737 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -283,6 +283,7 @@ public: void testTdf89954(); void testTdf89720(); void testTdf88986(); +void testTdf78150(); void testTdf87922(); void testTdf77014(); void testTdf92648(); @@ -403,6 +404,7 @@ public: CPPUNIT_TEST(testTdf89954); CPPUNIT_TEST(testTdf89720); CPPUNIT_TEST(testTdf88986); +CPPUNIT_TEST(testTdf78150); CPPUNIT_TEST(testTdf87922); CPPUNIT_TEST(testTdf77014); CPPUNIT_TEST(testTdf92648); @@ -4292,6 +4294,23 @@ void SwUiWriterTest::testTdf88986() CPPUNIT_ASSERT(aSet.HasItem(SID_COLOR_TABLE)); } +void SwUiWriterTest::testTdf78150() +{ +SwDoc* pDoc = createSwDoc(); +SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); +pWrtShell->Insert("foobar"); + +CPPUNIT_ASSERT_EQUAL(OUString("foobar"), getParagraph(1)->getString()); + +dispatchCommand(mxComponent, ".uno:DelToStartOfWord", {}); + +// Without the fix, test fails with: +// equality assertion failed +// - Expected: +// - Actual : f +CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString()); +} + void SwUiWriterTest::testTdf87922() { // Create an SwDrawTextInfo. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/uicalc/data/tdf126685.ods |binary sc/qa/unit/uicalc/uicalc.cxx | 18 ++ 2 files changed, 18 insertions(+) New commits: commit d9d86730a6acbb7fe1c94d7bf8b58b81ab51b4a6 Author: shubham656 AuthorDate: Sun Jun 27 15:37:04 2021 +0530 Commit: Xisco Fauli CommitDate: Wed Jul 7 13:54:58 2021 +0200 tdf#126685 Add UnitTest Change-Id: I84feb90f63f947a20db06cc66dd0f610fa71e7ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117945 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/qa/unit/uicalc/data/tdf126685.ods b/sc/qa/unit/uicalc/data/tdf126685.ods new file mode 100644 index ..bb08e47635e2 Binary files /dev/null and b/sc/qa/unit/uicalc/data/tdf126685.ods differ diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx index d133876f6d04..3b3bdadbd4e2 100644 --- a/sc/qa/unit/uicalc/uicalc.cxx +++ b/sc/qa/unit/uicalc/uicalc.cxx @@ -824,6 +824,24 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf133326) CPPUNIT_ASSERT_EQUAL(static_cast(2), pDoc->GetTableCount()); } +CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf126685) +{ +ScModelObj* pModelObj = createDoc("tdf126685.ods"); + +ScDocument* pDoc = pModelObj->GetDocument(); +CPPUNIT_ASSERT(pDoc); + +dispatchCommand(mxComponent, ".uno:SelectAll", {}); // test should crash here without the fix +Scheduler::ProcessEventsToIdle(); + +CPPUNIT_ASSERT_EQUAL( +OUString("Control Height will change from 0.65 to 0.61 cm with 120dpi ..."), +pDoc->GetString(ScAddress(3, 1, 1))); +dispatchCommand(mxComponent, ".uno:Cut", {}); + +CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(3, 1, 1))); +} + CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119793) { ScModelObj* pModelObj = createDoc("tdf119793.ods"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_scanner.cxx | 77 ++ basic/qa/vba_tests/typename.vb| 14 ++ basic/qa/vba_tests/vartype.vb | 38 +++--- 3 files changed, 123 insertions(+), 6 deletions(-) New commits: commit 30ca77c43ba1c8f94d6f34eea763a3d3ca7e72f6 Author: shubham656 AuthorDate: Tue Jan 26 21:33:53 2021 +0530 Commit: Andreas Heinisch CommitDate: Wed Feb 17 15:34:22 2021 +0100 tdf#130677 Write new tests for literals Change-Id: I22607fdcaab840ca1512abf534712d36d4b5ee9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109964 Reviewed-by: Mike Kaganski Reviewed-by: Andreas Heinisch Tested-by: Jenkins diff --git a/basic/qa/cppunit/test_scanner.cxx b/basic/qa/cppunit/test_scanner.cxx index ed340755deba..5663c44d027e 100644 --- a/basic/qa/cppunit/test_scanner.cxx +++ b/basic/qa/cppunit/test_scanner.cxx @@ -1034,6 +1034,83 @@ void ScannerTest::testHexOctal() CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); // ERRCODE_BASIC_MATH_OVERFLOW CPPUNIT_ASSERT_EQUAL(1u, static_cast(errors)); + +// maximum for Hex & = SbxLONG +symbols = getSymbols("&"); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(2147483647.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); + +// minimum for Hex & = SbxLONG +symbols = getSymbols("&"); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(-2147483648.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); + +// overflow for Hex & = SbxLONG +symbols = getSymbols("&", errors); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); +// ERRCODE_BASIC_MATH_OVERFLOW +CPPUNIT_ASSERT_EQUAL(1u, static_cast(errors)); + +// maximum for Octal & = SbxLONG +symbols = getSymbols("&"); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(2147483647.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); + +// minimum for Octal & = SbxLONG +symbols = getSymbols("&", errors); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(-2147483648.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); + +// overflow for Octal & = SbxLONG +symbols = getSymbols("&", errors); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); +// ERRCODE_BASIC_MATH_OVERFLOW +CPPUNIT_ASSERT_EQUAL(1u, static_cast(errors)); + +/* test for leading zeros */ + +// = 65535 +symbols = getSymbols(""); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); + +// = 83 +symbols = getSymbols(""); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(83.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxINTEGER, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); + +symbols = getSymbols(""); +CPPUNIT_ASSERT_EQUAL(size_t(2), symbols.size()); +CPPUNIT_ASSERT_DOUBLES_EQUAL(2097151.0, symbols[0].number, 1E-12); +CPPUNIT_ASSERT_EQUAL(OUString(), symbols[0].text); +CPPUNIT_ASSERT_EQUAL(SbxLONG, symbols[0].type); +CPPUNIT_ASSERT_EQUAL(cr, symbols[1].text); } void ScannerTest::testTdf103104() diff --git a/basic/qa/vba_tests/typename.vb b/basic/qa/vba_tests/typename.vb index c8fa5330a8e8..4442cba55e98 100644 --- a/basic/qa/vba_tests/typename.vb +++ b/basic/qa/vba_tests/typename.vb @@ -25,6 +25,13 @@ Sub verify_testTypeName() Dim l1 As Long Dim s1 As String +Dim TestIntSign% +Dim TestLongSign& +Dim TestSingleSign! +Dim TestDoubleSign# +Dim TestCurrSign@ +Dim TestStrSign$ + TestUtil.AssertEqual(TypeName(s1), "String", "TypeName(s1)")
[Libreoffice-commits] core.git: solenv/sanitizers svx/uiconfig
solenv/sanitizers/ui/modules/swriter.false |4 svx/uiconfig/ui/sidebarpossize.ui | 12 2 files changed, 4 insertions(+), 12 deletions(-) New commits: commit c87723180ccfe11e63823ff8f17d9370d98188f8 Author: shubham656 AuthorDate: Fri Jan 15 00:44:09 2021 +0530 Commit: Caolán McNamara CommitDate: Tue Jan 26 14:01:27 2021 +0100 tdf#119931 Fix accessibility warnings Change-Id: I5d3e30fdb14e3753d52355eaaf60cd671b907a84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109308 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/solenv/sanitizers/ui/modules/swriter.false b/solenv/sanitizers/ui/modules/swriter.false index 75a03dcd3e9f..8777e8a326d6 100644 --- a/solenv/sanitizers/ui/modules/swriter.false +++ b/solenv/sanitizers/ui/modules/swriter.false @@ -8,3 +8,7 @@ sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom40'] button-no sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom50'] button-no-label sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom75'] button-no-label sw/uiconfig/swriter/ui/previewmenu.ui://GtkRadioMenuItem[@id='zoom100'] button-no-label +sw/uiconfig/swriter/ui/assignfieldsdialog.ui://GtkLabel[@id='addresselem'] orphan-label +sw/uiconfig/swriter/ui/assignfieldsdialog.ui://GtkLabel[@id='previewelem'] orphan-label +sw/uiconfig/swriter/ui/assignfieldsdialog.ui://GtkLabel[@id='matchelem'] orphan-label +sw/uiconfig/swriter/ui/assignfragment.ui://GtkLabel[@id='preview'] orphan-label diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui index d3064189b7de..f608be61a963 100644 --- a/svx/uiconfig/ui/sidebarpossize.ui +++ b/svx/uiconfig/ui/sidebarpossize.ui @@ -180,17 +180,6 @@ 3 - - -False -Transparency: -0 - - -0 -9 - - _Keep ratio @@ -614,7 +603,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source sw/source sw/uiconfig
include/svx/graphichelper.hxx |1 svx/source/core/graphichelper.cxx | 41 +++ svx/source/dialog/compressgraphicdialog.cxx | 41 +-- sw/source/ui/frmdlg/frmpage.cxx |7 ++ sw/source/uibase/inc/frmpage.hxx|2 sw/uiconfig/swriter/ui/picturepage.ui | 73 6 files changed, 127 insertions(+), 38 deletions(-) New commits: commit e7842148f5fa6f9af9312cb4b198a4a5340e3d9b Author: shubham656 AuthorDate: Sun Dec 27 03:41:24 2020 +0530 Commit: Jim Raykowski CommitDate: Thu Jan 14 07:32:01 2021 +0100 tdf#138843 Show image file type inside image properties dialog Change-Id: I77adc9c3cc9d3bd62f0f67345b7a025bcad2352a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108361 Tested-by: Jenkins Reviewed-by: Jim Raykowski diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index b582de4a2669..2f723b830493 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -32,6 +32,7 @@ class SVXCORE_DLLPUBLIC GraphicHelper public: static void GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ); +static OUString GetImageType(const Graphic& rGraphic); static OUString ExportGraphic(weld::Window* pWin, const Graphic& rGraphic, const OUString& rGraphicName); static void SaveShapeAsGraphic(weld::Window* pWin, const css::uno::Reference< css::drawing::XShape >& xShape); static short HasToSaveTransformedImage(weld::Widget* pWin); diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index fb483c5bfe54..8485b0e0df3b 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -123,6 +123,47 @@ void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic& rExtension = aExtension; } +OUString GraphicHelper::GetImageType(const Graphic& rGraphic) +{ +OUString aGraphicTypeString = SvxResId(STR_IMAGE_UNKNOWN); +auto pGfxLink = rGraphic.GetSharedGfxLink(); +if (pGfxLink) +{ +switch (pGfxLink->GetType()) +{ +case GfxLinkType::NativeGif: +aGraphicTypeString = SvxResId(STR_IMAGE_GIF); +break; +case GfxLinkType::NativeJpg: +aGraphicTypeString = SvxResId(STR_IMAGE_JPEG); +break; +case GfxLinkType::NativePng: +aGraphicTypeString = SvxResId(STR_IMAGE_PNG); +break; +case GfxLinkType::NativeTif: +aGraphicTypeString = SvxResId(STR_IMAGE_TIFF); +break; +case GfxLinkType::NativeWmf: +aGraphicTypeString = SvxResId(STR_IMAGE_WMF); +break; +case GfxLinkType::NativeMet: +aGraphicTypeString = SvxResId(STR_IMAGE_MET); +break; +case GfxLinkType::NativePct: +aGraphicTypeString = SvxResId(STR_IMAGE_PCT); +break; +case GfxLinkType::NativeSvg: +aGraphicTypeString = SvxResId(STR_IMAGE_SVG); +break; +case GfxLinkType::NativeBmp: +aGraphicTypeString = SvxResId(STR_IMAGE_BMP); +break; +default: +break; +} +} +return aGraphicTypeString; +} namespace { diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 856f7aa4e92a..4c244d8eacef 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -121,45 +122,9 @@ void CompressGraphicsDialog::Initialize() void CompressGraphicsDialog::Update() { -OUString aGraphicTypeString = SvxResId(STR_IMAGE_UNKNOWN); - auto pGfxLink = m_aGraphic.GetSharedGfxLink(); -if (pGfxLink) -{ -switch (pGfxLink->GetType()) -{ -case GfxLinkType::NativeGif: -aGraphicTypeString = SvxResId(STR_IMAGE_GIF); -break; -case GfxLinkType::NativeJpg: -aGraphicTypeString = SvxResId(STR_IMAGE_JPEG); -break; -case GfxLinkType::NativePng: -aGraphicTypeString = SvxResId(STR_IMAGE_PNG); -break; -case GfxLinkType::NativeTif: -aGraphicTypeString = SvxResId(STR_IMAGE_TIFF); -break; -case GfxLinkType::NativeWmf: -aGraphicTypeString = SvxResId(STR_IMAGE_WMF); -break; -case GfxLinkType::NativeMet: -aGraphicTypeString = SvxResId(STR_IMAGE_MET); -break; -case GfxLinkType::NativePct: -aGraphicTypeString = SvxResId(STR_IMAGE_PCT); -break; -
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests7/tdf124822.py | 37 -- sc/qa/unit/uicalc/uicalc.cxx | 21 +++ 2 files changed, 21 insertions(+), 37 deletions(-) New commits: commit 7a303569002bc7cf65ec5e470c4274c4ef03814c Author: shubham656 AuthorDate: Thu Dec 31 17:41:51 2020 +0530 Commit: Xisco Fauli CommitDate: Fri Jan 8 21:52:15 2021 +0100 tdf#124822 Move UItest to CppUnitTest Change-Id: Ifb9c68dc8b1e61f8c180e44948c9a8f037a22fec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108535 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/qa/uitest/calc_tests7/tdf124822.py b/sc/qa/uitest/calc_tests7/tdf124822.py deleted file mode 100644 index 8c438df79725.. --- a/sc/qa/uitest/calc_tests7/tdf124822.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -from uitest.framework import UITestCase -from uitest.uihelper.common import get_state_as_dict -from uitest.uihelper.common import select_pos -from uitest.uihelper.calc import enter_text_to_cell -from libreoffice.calc.document import get_cell_by_position -from libreoffice.uno.propertyvalue import mkPropertyValues -from uitest.uihelper.common import get_state_as_dict, type_text -from uitest.debug import sleep -import org.libreoffice.unotest -import pathlib - -def get_url_for_data_file(file_name): -return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri() - -# Bug 124822 - CRASH: cutting and undoing - -class tdf124822(UITestCase): - def test_tdf124822_crash_cut_undo(self): -calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf124822.xls")) -xCalcDoc = self.xUITest.getTopFocusWindow() -gridwin = xCalcDoc.getChild("grid_window") -document = self.ui_test.get_component() - -#Select all ( Ctrl + A ) ; Cut ( Ctrl + X );Undo -self.xUITest.executeCommand(".uno:selectAll") -self.xUITest.executeCommand(".uno:Cut") -self.xUITest.executeCommand(".uno:Undo") -#verify; no crashes -self.assertEqual(get_cell_by_position(document, 2, 0, 0).getString(), "X") -self.ui_test.close_doc() -# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/qa/uitest/data/tdf124822.xls b/sc/qa/unit/uicalc/data/tdf124822.xls similarity index 100% rename from sc/qa/uitest/data/tdf124822.xls rename to sc/qa/unit/uicalc/data/tdf124822.xls diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx index a004e2e2c800..a77a80d6e2d5 100644 --- a/sc/qa/unit/uicalc/uicalc.cxx +++ b/sc/qa/unit/uicalc/uicalc.cxx @@ -352,6 +352,27 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf83901) CPPUNIT_ASSERT_EQUAL(3.0, pDoc->GetValue(ScAddress(0, 1, 0))); } +CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf124822) +{ +ScModelObj* pModelObj = createDoc("tdf124822.xls"); + +ScDocument* pDoc = pModelObj->GetDocument(); +CPPUNIT_ASSERT(pDoc); + +CPPUNIT_ASSERT_EQUAL(OUString("X"), pDoc->GetString(ScAddress(0, 0, 2))); + +dispatchCommand(mxComponent, ".uno:SelectAll", {}); +dispatchCommand(mxComponent, ".uno:Cut", {}); +Scheduler::ProcessEventsToIdle(); + +CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 0, 2))); + +dispatchCommand(mxComponent, ".uno:Undo", {}); +Scheduler::ProcessEventsToIdle(); + +CPPUNIT_ASSERT_EQUAL(OUString("X"), pDoc->GetString(ScAddress(0, 0, 2))); +} + CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf138428) { mxComponent = loadFromDesktop("private:factory/scalc"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
include/svx/float3d.hxx |1 - svx/source/engine3d/float3d.cxx |2 -- svx/uiconfig/ui/docking3deffects.ui | 19 --- 3 files changed, 22 deletions(-) New commits: commit 5da3ae08596c2465532e662537f5292454a84a3e Author: shubham656 AuthorDate: Mon Dec 21 19:15:56 2020 +0530 Commit: Heiko Tietze CommitDate: Tue Jan 5 07:57:03 2021 +0100 tdf#131427 Remove button "Texture, Shadow and Color" in 3D Effects dialog Change-Id: I72146e7f3aac9b02c6fca2ae984e70e01d1c07fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108102 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index fb24c7fa1e2a..a48181d487fe 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -153,7 +153,6 @@ private: std::unique_ptr m_xBtnTexColor; std::unique_ptr m_xBtnTexReplace; std::unique_ptr m_xBtnTexModulate; -std::unique_ptr m_xBtnTexBlend; std::unique_ptr m_xBtnTexObjectX; std::unique_ptr m_xBtnTexParallelX; std::unique_ptr m_xBtnTexCircleX; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 8636cfc2baaa..8f5da0ce79e3 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -153,7 +153,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p , m_xBtnTexColor(m_xBuilder->weld_toggle_button("texcolor")) , m_xBtnTexReplace(m_xBuilder->weld_toggle_button("texreplace")) , m_xBtnTexModulate(m_xBuilder->weld_toggle_button("texmodulate")) -, m_xBtnTexBlend(m_xBuilder->weld_toggle_button("texblend")) , m_xBtnTexObjectX(m_xBuilder->weld_toggle_button("texobjx")) , m_xBtnTexParallelX(m_xBuilder->weld_toggle_button("texparallelx")) , m_xBtnTexCircleX(m_xBuilder->weld_toggle_button("texcirclex")) @@ -401,7 +400,6 @@ void Svx3DWin::dispose() m_xBtnTexColor.reset(); m_xBtnTexReplace.reset(); m_xBtnTexModulate.reset(); -m_xBtnTexBlend.reset(); m_xBtnTexObjectX.reset(); m_xBtnTexParallelX.reset(); m_xBtnTexCircleX.reset(); diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui index 9a057041eb3b..b771683be3d5 100644 --- a/svx/uiconfig/ui/docking3deffects.ui +++ b/svx/uiconfig/ui/docking3deffects.ui @@ -1678,7 +1678,6 @@ - @@ -1826,24 +1825,6 @@ 1 - - -True -True -True -Texture, Shadow and Color -start -True -image42 - - - - - -3 -1 - - True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sfx2/source
sfx2/source/dialog/mgetempl.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit e0c1dcd97edc1194e4445a45a815406446c1c7d7 Author: shubham656 AuthorDate: Tue Nov 24 02:09:30 2020 +0530 Commit: Xisco Fauli CommitDate: Tue Nov 24 11:40:37 2020 +0100 tdf#132860 Assign value to set_sensitive flag in m_xName Change-Id: I9438e1a18253d90ff26e71b3aab83e96468fb9d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106461 Tested-by: Jenkins Reviewed-by: Jim Raykowski (cherry picked from commit 1795cfde106c830bff513d3a9ff27d1759f9b227) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106441 Reviewed-by: Xisco Fauli diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 46536f3f4d8c..4ab0c2d2523c 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -123,6 +123,11 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::D { m_xName->set_can_focus(true); m_xName->set_editable(true); +m_xName->set_sensitive(true); +} +else +{ +m_xName->set_sensitive(false); } if ( pStyle->HasFollowSupport() && pPool ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/mgetempl.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 1795cfde106c830bff513d3a9ff27d1759f9b227 Author: shubham656 AuthorDate: Tue Nov 24 02:09:30 2020 +0530 Commit: Jim Raykowski CommitDate: Tue Nov 24 06:38:50 2020 +0100 tdf#132860 Assign value to set_sensitive flag in m_xName Change-Id: I9438e1a18253d90ff26e71b3aab83e96468fb9d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106461 Tested-by: Jenkins Reviewed-by: Jim Raykowski diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 46536f3f4d8c..4ab0c2d2523c 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -123,6 +123,11 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::D { m_xName->set_can_focus(true); m_xName->set_editable(true); +m_xName->set_sensitive(true); +} +else +{ +m_xName->set_sensitive(false); } if ( pStyle->HasFollowSupport() && pPool ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eae8454462854a95da45e00f84359858be01ab12 Author: shubham656 AuthorDate: Tue Nov 17 18:02:39 2020 +0530 Commit: Xisco Fauli CommitDate: Mon Nov 23 19:52:10 2020 +0100 tdf#126166 Change the command label for "uno:WordRightSel" Change-Id: I6d0690cdcabaee6fe898fa7fc09d2abcd4c3f3ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105979 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit a430547ed6f543fd5f0f5ed6a804f4b7bc976065) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106430 Reviewed-by: Xisco Fauli diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c420fc2f2359..2aea98007e00 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1139,7 +1139,7 @@ - Select to Word Right + Select to End of Word ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a430547ed6f543fd5f0f5ed6a804f4b7bc976065 Author: shubham656 AuthorDate: Tue Nov 17 18:02:39 2020 +0530 Commit: Heiko Tietze CommitDate: Mon Nov 23 12:51:02 2020 +0100 tdf#126166 Change the command label for "uno:WordRightSel" Change-Id: I6d0690cdcabaee6fe898fa7fc09d2abcd4c3f3ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105979 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index c420fc2f2359..2aea98007e00 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1139,7 +1139,7 @@ - Select to Word Right + Select to End of Word ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits