[Libreoffice-commits] core.git: basegfx/test
basegfx/test/B2DPointTest.cxx | 46 -- 1 file changed, 27 insertions(+), 19 deletions(-) New commits: commit 486f997d257533b889bd5af4c85eb1e2f4c9c152 Author: Tomaž Vajngerl AuthorDate: Sat Jul 27 01:47:21 2019 +0900 Commit: Tomaž Vajngerl CommitDate: Sun Jul 28 05:27:18 2019 +0200 unit test for B2DPoint Change-Id: I86a9d555e4915658acf5829fbf7c8336255d6343 Reviewed-on: https://gerrit.libreoffice.org/76490 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/basegfx/test/B2DPointTest.cxx b/basegfx/test/B2DPointTest.cxx index 97c5c0714d32..77fa61d90b9d 100644 --- a/basegfx/test/B2DPointTest.cxx +++ b/basegfx/test/B2DPointTest.cxx @@ -19,30 +19,38 @@ #include #include +#include -namespace basegfx -{ -class b2dpoint : public CppUnit::TestFixture +class B2DPointTest : public CppUnit::TestFixture { public: -// insert your test code here. -// this is only demonstration code -void EmptyMethod() -{ -// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1); -} - -// Change the following lines only, if you add, remove or rename -// member functions of the current class, -// because these macros are need by auto register mechanism. - -CPPUNIT_TEST_SUITE(b2dpoint); -CPPUNIT_TEST(EmptyMethod); +void testCreation(); + +CPPUNIT_TEST_SUITE(B2DPointTest); +CPPUNIT_TEST(testCreation); CPPUNIT_TEST_SUITE_END(); -}; // class b2dpoint +}; + +void B2DPointTest::testCreation() +{ +basegfx::B2DPoint aPoint1(5.0, 2.0); +CPPUNIT_ASSERT_EQUAL(5.0, aPoint1.getX()); +CPPUNIT_ASSERT_EQUAL(2.0, aPoint1.getY()); + +basegfx::B2DPoint aPoint2 = { 5.0, 2.0 }; +CPPUNIT_ASSERT_EQUAL(5.0, aPoint2.getX()); +CPPUNIT_ASSERT_EQUAL(2.0, aPoint2.getY()); -} // namespace basegfx +std::vector aPointVector{ +{ 5.0, 2.0 }, +{ 4.0, 3.0 }, +}; +CPPUNIT_ASSERT_EQUAL(5.0, aPointVector[0].getX()); +CPPUNIT_ASSERT_EQUAL(2.0, aPointVector[0].getY()); +CPPUNIT_ASSERT_EQUAL(4.0, aPointVector[1].getX()); +CPPUNIT_ASSERT_EQUAL(3.0, aPointVector[1].getY()); +} -CPPUNIT_TEST_SUITE_REGISTRATION(basegfx::b2dpoint); +CPPUNIT_TEST_SUITE_REGISTRATION(B2DPointTest); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppCheck Report Failure
The cppcheck job failed with message: "Failed to run cppcheck." Note: The script generating this report was run at : 2019-28-07 01:05:16 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh cppcheck-report.log.gz Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sfx2/source
sfx2/source/doc/objmisc.cxx | 29 - 1 file changed, 28 insertions(+), 1 deletion(-) New commits: commit 600ad1356e5bdb57d4c67a3a3c6e26ca9d5b8896 Author: Caolán McNamara AuthorDate: Fri Jul 26 13:25:31 2019 +0100 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:26:57 2019 +0200 decode url escape codes and check each path segment Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1 Reviewed-on: https://gerrit.libreoffice.org/76378 Reviewed-by: Stephan Bergmann Tested-by: Jenkins (cherry picked from commit 7942929685fafb0f9c82feb8da7279e5103c87f0) Reviewed-on: https://gerrit.libreoffice.org/76451 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index ee4265b24562..59d3098115b1 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include @@ -1349,7 +1351,32 @@ namespace // don't allow LibreLogo to be used with our mouseover/etc dom-alike events bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) { -return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); +if (!rScriptURL.startsWith("vnd.sun.star.script:")) +return false; + +// ensure URL Escape Codes are decoded +css::uno::Reference uri( + css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL)); +css::uno::Reference sfUri(uri, css::uno::UNO_QUERY); + +if (!sfUri.is()) +return false; + +OUString sScript = sfUri->getName(); + +// check if any path portion matches LibreLogo and ban it if it does +sal_Int32 nIndex = 0; +do +{ +OUString aToken = sScript.getToken(0, '/', nIndex); +if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) +{ +return true; +} +} +while (nIndex >= 0); + +return false; } ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/qa sc/source
sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py | 191 ++ sc/source/ui/inc/checklistmenu.hxx|7 sc/source/ui/inc/gridwin.hxx |4 sc/source/ui/view/gridwin.cxx | 17 + 4 files changed, 218 insertions(+), 1 deletion(-) New commits: commit 27671492ade3eeabefdb57a75e7d16f7cbab22d7 Author: Serge Krot AuthorDate: Tue Mar 5 17:03:31 2019 +0100 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:26:37 2019 +0200 tdf#117276 sc: autofilter was unexpected reset with OK pressed Change-Id: I53331434bb4d5e2f13e9f2ab5b768e9880aecca8 Reviewed-on: https://gerrit.libreoffice.org/68765 Tested-by: Jenkins Reviewed-by: Thorsten Behrens tdf#126306: ignore Top10, Empty and NonEmpty in fix for tdf#117276 Regression from 4e7e3670c31329d60f5cc782abc4568c2aba33a7 Change-Id: I034f4f087580aa7c54b92909736af712047251a6 Reviewed-on: https://gerrit.libreoffice.org/75304 Tested-by: Jenkins Reviewed-by: Eike Rathke Reviewed-on: https://gerrit.libreoffice.org/76350 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py new file mode 100644 index ..6d01a4b1fd61 --- /dev/null +++ b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py @@ -0,0 +1,191 @@ +# -*- 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.calc import enter_text_to_cell +from libreoffice.calc.document import get_sheet_from_doc +from uitest.debug import sleep +from libreoffice.uno.propertyvalue import mkPropertyValues +from libreoffice.calc.document import get_row +from uitest.path import get_srcdir_url + + +def get_url_for_data_file(file_name): +return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name + +def is_row_hidden(doc, index): +row = get_row(doc, index) +val = row.getPropertyValue("IsVisible") +return not val + +#Bug 117276 - Autofilter settings being reset in some cases + +class tdf117276_autofilter_reset(UITestCase): +def get_values_count_in_AutoFilter(self, xGridWindow, columnIndex, buttonName = "cancel"): +# open filter pop-up window +self.assertIsNotNone(xGridWindow) +xGridWindow.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", "COL": columnIndex, "ROW": "0"})) +xFloatWindow = self.xUITest.getFloatWindow() +self.assertIsNotNone(xFloatWindow) + +# get check list +xCheckListMenu = xFloatWindow.getChild("check_list_menu") +self.assertIsNotNone(xCheckListMenu) + +xTreeList = xCheckListMenu.getChild("check_list_box") +self.assertIsNotNone(xTreeList) + +valuesCount = len(xTreeList.getChildren()) + +# close pop-up window +xButton = xFloatWindow.getChild(buttonName) +self.assertIsNotNone(xButton) +xButton.executeAction("CLICK", tuple()) + +return valuesCount + +def openAutoFilterAndCloseIt(self, xGridWindow, columnIndex, buttonName): +self.get_values_count_in_AutoFilter(xGridWindow, columnIndex, buttonName) + +def check_state(self, document, xGridWindow): +self.assertFalse(is_row_hidden(document, 0)) # column headers +self.assertTrue(is_row_hidden(document, 1)) +self.assertTrue(is_row_hidden(document, 2)) +self.assertTrue(is_row_hidden(document, 3)) +self.assertTrue(is_row_hidden(document, 4)) +self.assertFalse(is_row_hidden(document, 5)) + +self.assertEqual(1, self.get_values_count_in_AutoFilter(xGridWindow, "0")) +self.assertEqual(2, self.get_values_count_in_AutoFilter(xGridWindow, "1")) + +def test_run(self): +self.ui_test.create_doc_in_start_center("calc") +document = self.ui_test.get_component() +calcDoc = self.xUITest.getTopFocusWindow() +xGridWindow = calcDoc.getChild("grid_window") + +#self.ui_test.execute_dialog_through_command(".uno:Insert") # insert sheet +#xDialog = self.xUITest.getTopFocusWindow() +#xOKButton = xDialog.getChild("ok") +#xOKButton.executeAction("CLICK", tuple()) + +# 1. prepare document +#|A | B | +# - +# 1 | HEADER-A | HEADER-B | +# - +# 2 | Unique a2 | common value for B2:B4 | +# 3 | Unique a3 | common value for B2:B4 | +# 4 | Unique a4 | common value for B2:B4 | +# 5 | Unique a5 | Unique b5
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - dbaccess/source
dbaccess/source/core/api/TableDeco.cxx |2 +- dbaccess/source/core/inc/TableDeco.hxx |7 --- 2 files changed, 5 insertions(+), 4 deletions(-) New commits: commit 5e3dea3aff3ca9771b24f25b1d1344ade89084aa Author: Xisco Fauli AuthorDate: Wed May 29 11:19:57 2019 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:25:09 2019 +0200 tdf#114596 dbaccess: fix mysterious dataloss bug (part 2) Same problem as in 96ae2a3300811897c24cccb20f8c2faf382483df Regression from 497e40ad03c27837978551ba15491c3fb2a0bf53 Change-Id: I00e7bf3559e688e7fbc5429ace2b5c18221c9890 Reviewed-on: https://gerrit.libreoffice.org/73146 Reviewed-by: Michael Stahl Tested-by: Jenkins (cherry picked from commit 58f121ef2e680697e10453add43bab9b771d153a) Reviewed-on: https://gerrit.libreoffice.org/73153 (cherry picked from commit ebae54a6fde07a08e0b666b56dbd654691e5c416) Reviewed-on: https://gerrit.libreoffice.org/76310 Reviewed-by: Michael Weghorn Tested-by: Michael Weghorn Reviewed-by: Thorsten Behrens diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index a57883ba2ba2..c80f6974be9e 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -553,7 +553,7 @@ void ODBTableDecorator::refreshColumns() OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions ); m_xColumnMediator = pMediator; pCol->setMediator( pMediator ); -m_pColumns = pCol; +m_pColumns.reset(pCol); } else m_pColumns->reFill(aVector); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 5a964e79401d..52d6fb05e0bb 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -71,10 +71,11 @@ namespace dbaccess css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; css::uno::Reference< css::util::XNumberFormatsSupplier > m_xNumberFormats; -// +// mutable sal_Int32 m_nPrivileges; -// -rtl::Reference<::connectivity::sdbcx::OCollection> m_pColumns; +// +// note: this thing uses the ref-count of "this", see OCollection::acquire()! +std::unique_ptr<::connectivity::sdbcx::OCollection> m_pColumns; // IColumnFactory virtual OColumn*createColumn(const OUString& _rName) const override; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sd/source
sd/source/filter/ppt/pptin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aac97943fd78a1251755628abf419b41c3d4ff9b Author: Noel Grandin AuthorDate: Thu Jun 6 13:31:52 2019 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:24:16 2019 +0200 tdf#125556 URL fragment leaked from one object.. to another when importing Powerpoint ppt file regression from commit 4245454d0c3d6df2d0e0a75aed6f22f0a26ce3e2 Date: Wed Feb 28 15:50:29 2018 +0200 loplugin:useuniqueptr in SdrPowerPointImport Change-Id: I5f415dfa1f6125629b9f3be1d799cb596c64c605 Reviewed-on: https://gerrit.libreoffice.org/73607 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit 3309893de4e99a7d89fb1e9b4616631b1f040df0) Reviewed-on: https://gerrit.libreoffice.org/76309 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index cb0e17d450b5..9b45a7b84416 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -392,9 +392,9 @@ bool ImplSdPPTImport::Import() nPropCount /= 6;// 6 properties per hyperlink -SdHyperlinkEntry aHyperlink; for ( i = 0; i < nPropCount; i++ ) { +SdHyperlinkEntry aHyperlink; aHyperlink.nIndex = 0; aPropItem.ReadUInt32( nType ); if ( nType != VT_I4 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 3 commits - external/libgpg-error sw/source
external/libgpg-error/UnpackedTarball_libgpg-error.mk |1 external/libgpg-error/libgpg-error_gawk5.patch| 114 ++ external/libgpg-error/w32-build-fixes.patch |2 sw/source/core/layout/fly.cxx |2 sw/source/core/layout/ssfrm.cxx |2 sw/source/core/unocore/unoframe.cxx |2 6 files changed, 121 insertions(+), 2 deletions(-) New commits: commit 7aea534459b293d3553b7bdf0a89b8fbc6c6e0da Author: nd101 AuthorDate: Wed Jul 3 09:41:06 2019 +0800 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:23:56 2019 +0200 Fix libgpg-error compilation error with gawk5 This is an adaptation of upstream patch https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9bb19072fbdf plus a fix to Makefile.in Change-Id: I5bf946cf93e5849b8a3428064ab86f6255be97da Reviewed-on: https://gerrit.libreoffice.org/75022 Reviewed-by: Mike Kaganski Tested-by: Mike Kaganski (cherry picked from commit af3b993ebea2f653fabba981d4c22b9aa779b32a) Reviewed-on: https://gerrit.libreoffice.org/75075 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 87215115618de0c12d287a300fc5fde993886089) Reviewed-on: https://gerrit.libreoffice.org/76308 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk index ad2145a96aa7..ea99c3c3c076 100644 --- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL) $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0)) $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \ + external/libgpg-error/libgpg-error_gawk5.patch \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \ $(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \ diff --git a/external/libgpg-error/libgpg-error_gawk5.patch b/external/libgpg-error/libgpg-error_gawk5.patch new file mode 100644 index ..3be76a4538a8 --- /dev/null +++ b/external/libgpg-error/libgpg-error_gawk5.patch @@ -0,0 +1,114 @@ +--- src/Makefile.am src/Makefile.am~ +@@ -266,7 +266,7 @@ + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +--- src/mkerrcodes.awk src/mkerrcodes.awk~ +@@ -81,7 +81,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkerrcodes1.awk src/mkerrcodes1.awk~ +@@ -81,7 +81,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkerrcodes2.awk src/mkerrcodes2.awk~ +@@ -91,7 +91,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkerrnos.awk src/mkerrnos.awk~ +@@ -83,7 +83,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +--- src/mkstrtable.awk src/mkstrtable.awk~ +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print "" pos[i] ","; +@@ -158,7 +158,7 @@ + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pk
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - include/sfx2 sc/source sfx2/source
include/sfx2/objsh.hxx |2 + sc/source/ui/docshell/externalrefmgr.cxx | 52 --- sfx2/source/doc/objmisc.cxx |6 --- sfx2/source/notify/eventsupplier.cxx | 18 +++--- 4 files changed, 49 insertions(+), 29 deletions(-) New commits: commit f21ddcfd6fb234209c24160892d532c4733ac026 Author: Caolán McNamara AuthorDate: Tue Jul 23 15:31:05 2019 +0100 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:23:11 2019 +0200 expand LibreLogo check to global events Reviewed-on: https://gerrit.libreoffice.org/76189 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 4a66c7eda6ccde26a42c4e31725248c59940255d) Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f Reviewed-on: https://gerrit.libreoffice.org/76305 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index d04758567c80..ed09fc6e2acb 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -404,6 +404,8 @@ public: */ boolAdjustMacroMode(); +static bool UnTrustedScript(const OUString& rScriptURL); + SvKeyValueIterator* GetHeaderAttributes(); voidClearHeaderAttributesForSourceViewHack(); voidSetHeaderAttributesForSourceViewHack(); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 8594e9522e48..ee4265b24562 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1346,16 +1346,12 @@ namespace } } -namespace { - // don't allow LibreLogo to be used with our mouseover/etc dom-alike events -bool UnTrustedScript(const OUString& rScriptURL) +bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) { return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); } -} - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) { diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 78667a1d8036..2656e9c213ec 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -207,18 +207,24 @@ void SfxEvents_Impl::Execute( uno::Any const & aEventData, const document::Docum else if (aType == "Service" || aType == "Script") { -if ( !aScript.isEmpty() ) +bool bAllowed = false; +util::URL aURL; +if (!aScript.isEmpty()) { -SfxViewFrame* pView = pDoc ? -SfxViewFrame::GetFirst( pDoc ) : -SfxViewFrame::Current(); - uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); -util::URL aURL; aURL.Complete = aScript; xTrans->parseStrict( aURL ); +bAllowed = !SfxObjectShell::UnTrustedScript(aURL.Complete); +} + +if (bAllowed) +{ +SfxViewFrame* pView = pDoc ? +SfxViewFrame::GetFirst( pDoc ) : +SfxViewFrame::Current(); + uno::Reference < frame::XDispatchProvider > xProv; commit ba5ac72ab90db35342ee7210ba64e7e7caf19d48 Author: Eike Rathke AuthorDate: Thu Jul 11 15:50:07 2019 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:22:56 2019 +0200 Postpone loading of all external references, including INDIRECT() ... which can be constructed with an arbitrary URI text string not an svExternal* token type, until link updates are allowed. Change-Id: I2ce4de415ff99ace04c083c36c1383d76a4ef40d Reviewed-on: https://gerrit.libreoffice.org/75422 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit b824b23860b2cf533d4f2428d4a750bd72576181) Reviewed-on: https://gerrit.libreoffice.org/76304 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 1dc2be93efc9..0960231fdaf1 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -132,11 +132,12 @@ struct UpdateFormulaCell { void operator() (ScFormulaCell* pCell) const { -// Check to make sure the cell really contains ocExternalRef. +// Check to make sure the cell really contains svExternal*. // External names, external cell and range references all have a -// ocExternalRef token. +/
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - include/formula sc/inc sc/source
include/formula/errorcodes.hxx |4 +++ sc/inc/globstr.hrc |1 sc/source/core/data/global.cxx |3 ++ sc/source/core/tool/interpr7.cxx | 35 +-- sc/source/ui/docshell/externalrefmgr.cxx | 23 ++-- 5 files changed, 48 insertions(+), 18 deletions(-) New commits: commit 225a229650dc01350ceb70eb45fc88989ed9dc43 Author: Mike Kaganski AuthorDate: Tue Jul 9 18:44:42 2019 +1000 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:22:40 2019 +0200 Postpone filter detection until link update is allowed Change-Id: I85b2185e550f2a133ceb485241ef513b40593e34 Reviewed-on: https://gerrit.libreoffice.org/75301 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 03c708bf085f91480c014d7fa31e7a317b2c7b8f) Reviewed-on: https://gerrit.libreoffice.org/76303 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 48ae556cf485..1dc2be93efc9 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2154,6 +2154,15 @@ void insertRefCellByIterator( } } +bool IsLinkUpdateAllowedInDoc(const ScDocument& rDoc) +{ +SfxObjectShell* pDocShell = rDoc.GetDocumentShell(); +if (!pDocShell) +return false; + +return pDocShell->GetEmbeddedObjectContainer().getUserAllowsLinkUpdate(); +} + } void ScExternalRefManager::insertRefCell(sal_uInt16 nFileId, const ScAddress& rCell) @@ -2365,13 +2374,8 @@ ScDocument* ScExternalRefManager::getInMemorySrcDocument(sal_uInt16 nFileId) return nullptr; // Do not load document until it was allowed -SfxObjectShell* pDocShell = mpDoc->GetDocumentShell(); -if ( pDocShell ) -{ -const comphelper::EmbeddedObjectContainer& rContainer = pDocShell->GetEmbeddedObjectContainer(); -if ( !rContainer.getUserAllowsLinkUpdate() ) -return nullptr; -} +if (!IsLinkUpdateAllowedInDoc(*mpDoc)) +return nullptr; ScDocument* pSrcDoc = nullptr; ScDocShell* pShell = static_cast(SfxObjectShell::GetFirst(checkSfxObjectShell, false)); @@ -2616,6 +2620,11 @@ void ScExternalRefManager::maybeLinkExternalFile( sal_uInt16 nFileId, bool bDefe aFilter = pFileData->maFilterName; aOptions = pFileData->maFilterOptions; } + +// Filter detection may access external links; defer it until we are allowed +if (!bDeferFilterDetection) +bDeferFilterDetection = !IsLinkUpdateAllowedInDoc(*mpDoc); + // If a filter was already set (for example, loading the cached table), // don't call GetFilterName which has to access the source file. // If filter detection is deferred, the next successful loadSrcDocument() commit c7746e1811f99df12a75c6bff09ebc56d2a2a190 Author: Eike Rathke AuthorDate: Thu Jul 19 17:39:02 2018 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:22:22 2019 +0200 Related: tdf#118735 introduce FormulaError::LinkFormulaNeedingCheck (Err:540) To indicate why the result isn't available ("External content disabled") and in future maybe signal to the formula cell that it could keep the hybrid string result, see source code comment. Change-Id: Ic5d336b8489e8776f7b640b7e46815e71d0a82a4 Reviewed-on: https://gerrit.libreoffice.org/57738 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit da9a6f426b61937d9cda17f5be3f82d2e15e6ecd) Reviewed-on: https://gerrit.libreoffice.org/76302 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx index d4324a998db0..7afce495b6de 100644 --- a/include/formula/errorcodes.hxx +++ b/include/formula/errorcodes.hxx @@ -83,6 +83,9 @@ enum class FormulaError : sal_uInt16 MatrixSize = 538, // Bad inline array content, non-value/non-string. BadArrayContent = 539, +// Interpreter: signal result not available because updating links is not +// allowed (yet) and tell to try hybrid string as result. +LinkFormulaNeedingCheck = 540, // Interpreter: NA() not available condition, not a real error NotAvailable = 0x7fff @@ -171,6 +174,7 @@ inline bool isPublishedFormulaError( FormulaError nErr ) return false; case FormulaError::MatrixSize: +case FormulaError::LinkFormulaNeedingCheck: return true; case FormulaError::NotAvailable: diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 326c9f01c455..09caaf80423c 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -510,6 +510,7 @@ #define STR_TEXTNC_("STR_TEXT", "Text") #define STR_QUERY_PIVOTTABLE_DELTAB NC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet(s
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/inc sc/source
sc/inc/formulacell.hxx |2 ++ sc/source/core/data/formulacell.cxx |5 + sc/source/core/tool/interpr7.cxx| 26 -- 3 files changed, 31 insertions(+), 2 deletions(-) New commits: commit 0cbf9ce40e1e8de3658cd22770b8f701e7b47e62 Author: Eike Rathke AuthorDate: Wed Jul 18 18:02:58 2018 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:21:51 2019 +0200 Related: tdf#118735 WEBSERVICE preserve the hybrid string result, if possible Possible only for constant literal URI arguments, as otherwise we wouldn't know whether the hybrid string result actually matches the call, and possible only for the very first recalc as the hybrid string result will be replaced by the calculated result. However, executing an initial recalc is necessary to add the (then determined and maybe calculated) URI to the link manager after having loaded a document. Change-Id: I67738c13ecce54b43ebb52ea8a8282aebee5f03a Reviewed-on: https://gerrit.libreoffice.org/57696 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit d2e5283f0caeb87e316040e2db1aade8cc408f62) Reviewed-on: https://gerrit.libreoffice.org/76301 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 78eb1f6265b8..af781894b299 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -396,6 +396,8 @@ public: svl::SharedString GetResultString() const; +bool HasHybridStringResult() const; + /* Sets the shared code array to error state in addition to the cell result */ void SetErrCode( FormulaError n ); diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index b43e908352ed..4e64de30c000 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -2485,6 +2485,11 @@ svl::SharedString ScFormulaCell::GetResultString() const return aResult.GetString(); } +bool ScFormulaCell::HasHybridStringResult() const +{ +return aResult.GetType() == formula::svHybridCell && !aResult.GetString().isEmpty(); +} + void ScFormulaCell::SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ) { aResult.SetMatrix(nCols, nRows, pMat, pUL); diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index 7b11e6faddab..fcd579a8419b 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -320,6 +320,7 @@ void ScInterpreter::ScWebservice() ScWebServiceLink* pLink = lcl_GetWebServiceLink(mpLinkManager, aURI); bool bWasError = (pMyFormulaCell && pMyFormulaCell->GetRawError() != FormulaError::NONE); +bool bLinkFormulaNeedingCheck = false; if (!pLink) { @@ -335,7 +336,8 @@ void ScInterpreter::ScWebservice() //if the document was just loaded, but the ScDdeLink entry was missing, then //don't update this link until the links are updated in response to the users //decision -if (!pDok->HasLinkFormulaNeedingCheck()) +bLinkFormulaNeedingCheck = pDok->HasLinkFormulaNeedingCheck(); +if (!bLinkFormulaNeedingCheck) { pLink->Update(); } @@ -360,7 +362,27 @@ void ScInterpreter::ScWebservice() if (pLink->HasResult()) PushString(pLink->GetResult()); else -PushError(FormulaError::NoValue); +{ +// If this formula cell is recalculated just after load and the +// expression is exactly WEBSERVICE("literal_URI") (i.e. no other +// calculation involved, not even a cell reference) and a cached +// result is set as hybrid string then use that as result value to +// prevent a #VALUE! result due to the "Automatic update of +// external links has been disabled." +// This will work only once, as the new formula cell result won't +// be a hybrid anymore. +if (bLinkFormulaNeedingCheck && pMyFormulaCell && pMyFormulaCell->GetCode()->GetCodeLen() == 2 && +pMyFormulaCell->HasHybridStringResult()) +{ +formula::FormulaToken const * const * pRPN = pMyFormulaCell->GetCode()->GetCode(); +if (pRPN[0]->GetType() == formula::svString && pRPN[1]->GetOpCode() == ocWebservice) +PushString( pMyFormulaCell->GetResultString()); +else +PushError(FormulaError::NoValue); +} +else +PushError(FormulaError::NoValue); +} pDok->EnableIdle(bOldEnabled); mpLinkManager->CloseCachedComps(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.free
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 2 commits - include/sfx2 sfx2/source
include/sfx2/objsh.hxx |2 ++ sfx2/source/doc/objmisc.cxx | 33 - sfx2/source/notify/eventsupplier.cxx | 18 -- 3 files changed, 42 insertions(+), 11 deletions(-) New commits: commit 9323b4ff84ffcd33ced656d5277982add00a9b17 Author: Caolán McNamara AuthorDate: Fri Jul 26 13:25:31 2019 +0100 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:16:26 2019 +0200 decode url escape codes and check each path segment Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1 Reviewed-on: https://gerrit.libreoffice.org/76378 Reviewed-by: Stephan Bergmann Tested-by: Jenkins (cherry picked from commit 7942929685fafb0f9c82feb8da7279e5103c87f0) Reviewed-on: https://gerrit.libreoffice.org/76453 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 330c475efb8b..d500ce76211a 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -54,6 +54,8 @@ #include #include #include +#include +#include #include #include @@ -1464,7 +1466,32 @@ namespace // don't allow LibreLogo to be used with our mouseover/etc dom-alike events bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) { -return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); +if (!rScriptURL.startsWith("vnd.sun.star.script:")) +return false; + +// ensure URL Escape Codes are decoded +css::uno::Reference uri( + css::uri::UriReferenceFactory::create(comphelper::getProcessComponentContext())->parse(rScriptURL)); +css::uno::Reference sfUri(uri, css::uno::UNO_QUERY); + +if (!sfUri.is()) +return false; + +OUString sScript = sfUri->getName(); + +// check if any path portion matches LibreLogo and ban it if it does +sal_Int32 nIndex = 0; +do +{ +OUString aToken = sScript.getToken(0, '/', nIndex); +if (aToken.startsWithIgnoreAsciiCase("LibreLogo")) +{ +return true; +} +} +while (nIndex >= 0); + +return false; } ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, commit 20465aeb082ea239239f598d42041c35b55598d6 Author: Caolán McNamara AuthorDate: Tue Jul 23 15:31:05 2019 +0100 Commit: Thorsten Behrens CommitDate: Sun Jul 28 00:16:09 2019 +0200 expand LibreLogo check to global events Reviewed-on: https://gerrit.libreoffice.org/76189 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 4a66c7eda6ccde26a42c4e31725248c59940255d) Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f (cherry picked from commit e5702eefdfe6d44a92fdfb3c6a3ff47fec83ee49) Reviewed-on: https://gerrit.libreoffice.org/76452 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 24b1d82862f9..83b5eb654618 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -409,6 +409,8 @@ public: */ boolAdjustMacroMode(); +static bool UnTrustedScript(const OUString& rScriptURL); + SvKeyValueIterator* GetHeaderAttributes(); voidClearHeaderAttributesForSourceViewHack(); voidSetHeaderAttributesForSourceViewHack(); diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3016315cd17b..330c475efb8b 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1461,16 +1461,12 @@ namespace } } -namespace { - // don't allow LibreLogo to be used with our mouseover/etc dom-alike events -bool UnTrustedScript(const OUString& rScriptURL) +bool SfxObjectShell::UnTrustedScript(const OUString& rScriptURL) { return rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo"); } -} - ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const css::uno::Any* pCaller ) { diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index a2796becd1f8..63d9cb909345 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -213,18 +213,24 @@ void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEven else if (aType == "Service" || aType == "Script") { -if ( !aScript.isEmpty() ) +bool bAllowed = false; +util::URL aURL; +if (!aScript.isEmpty()) { -SfxViewFrame* pView = pDoc ? -SfxViewFrame::GetFirst( pDoc
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - desktop/qa desktop/source
Rebased ref, commits from common ancestor: commit eb72b17cf376958fc378119d9fc74cd493804d0e Author: Michael Meeks AuthorDate: Thu Jul 25 19:02:47 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 14:19:49 2019 -0400 clipboard: repair unit test so that it runs in the lok mode. SwTransferable::AddSupportedFormats needs the kit to be active. Change-Id: Id84210eb2e526785f35dfae609d861c310885314 diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 7ad2f1e45817..39be487931f3 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog() void DesktopLOKTest::testComplexSelection() { +// needed for SwTransferable to cope with the selection. +comphelper::LibreOfficeKit::setActive(); + // Start with a blank text file and add contents. LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); static const OString aText("hello world"); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index f40a1db78a0f..6be51b3fc5b0 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -878,7 +878,6 @@ ITiledRenderable* getTiledRenderable(LibreOfficeKitDocument* pThis) * we also need to ensure that this works for the first view which * has no clear 'createView' called for it (unfortunately). */ - rtl::Reference forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis) { ITiledRenderable* pDoc = getTiledRenderable(pThis); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |4 +++- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |6 -- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 1eae11e288b879e4b770fe714c3229fd3bd7d8ec Author: Damjan Jovanovic AuthorDate: Sat Jul 27 19:55:19 2019 + Commit: Damjan Jovanovic CommitDate: Sat Jul 27 19:55:19 2019 + Fix detection of Java versions > 1.8 Patch by: me diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 84dfedfaedd9..46456bc2be2b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -75,6 +75,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems +"/lib/server/libjvm.so", // > 1.8 "/bin/classic/libjvm.so", // fallback for older for IBM Java "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java #endif @@ -102,7 +103,8 @@ char const* const* OtherInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/classic", "/lib/" JFW_PLUGIN_ARCH "/jrockit", "/lib/" JFW_PLUGIN_ARCH "/native_threads", -"/lib/" JFW_PLUGIN_ARCH +"/lib/" JFW_PLUGIN_ARCH, +"/lib" // > 1.8 #endif }; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 2f636561ad07..a0ecb2508864 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -75,7 +75,8 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", -"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so" +"/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", +"/lib/server/libjvm.so" // > 1.8 #endif }; *size = sizeof(ar) / sizeof (char*); @@ -89,7 +90,8 @@ char const* const* SunInfo::getLibraryPaths(int* size) "/lib/" JFW_PLUGIN_ARCH "/client", "/lib/" JFW_PLUGIN_ARCH "/native_threads", -"/lib/" JFW_PLUGIN_ARCH +"/lib/" JFW_PLUGIN_ARCH, +"/lib" // > 1.8 }; *size = sizeof(ar) / sizeof (char*); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svtools sw/source sw/uiconfig
include/svtools/ctrlbox.hxx |1 sw/source/ui/config/optpage.cxx | 324 +++ sw/source/uibase/inc/optpage.hxx | 38 +-- sw/uiconfig/swriter/ui/optfonttabpage.ui | 191 +- 4 files changed, 279 insertions(+), 275 deletions(-) New commits: commit 62a803532f0cb8f777037d0915c1e69166963fd2 Author: Caolán McNamara AuthorDate: Sat Jul 27 20:11:37 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 21:58:18 2019 +0200 dispose printer if we created it old code for ~this broken by... commit 40df5fc0e30c0aa32157c645db8b5256dc8afcc3 Author: Caolán McNamara Date: Tue Jul 9 12:34:12 2013 +0100 mem leaks in writer font options tabpage some addled thinking there leading to it getting removed with commit 1bf97d99e7529f1a69688522ac271636059a3391 Date: Sat Jun 25 23:03:53 2016 +0200 loplugin:singlevalfields in sw(part1) Change-Id: I6d36fa614fb8d4ede41fc5d391f945c949a79409 Reviewed-on: https://gerrit.libreoffice.org/76483 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 751bc0a638c7..8402c24e0930 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -502,6 +502,7 @@ SwStdFontTabPage::SwStdFontTabPage(TabPageParent pParent, const SfxItemSet& rSet , m_bSetLabelDefault(true) , m_bIdxDefault(false) , m_bSetIdxDefault(true) +, m_bDisposePrinter(false) , m_bListHeightDefault(false) , m_bLabelHeightDefault(false) , m_bIndexHeightDefault(false) @@ -554,7 +555,10 @@ void SwStdFontTabPage::dispose() m_xTitleHeightLB.reset(); m_xStandardHeightLB.reset(); m_pFontList.reset(); -m_pPrt.clear(); +if (m_bDisposePrinter) +m_pPrt.disposeAndClear(); +else +m_pPrt.clear(); SfxTabPage::dispose(); } @@ -732,6 +736,12 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) const SfxPoolItem* pItem; +if (m_bDisposePrinter) +{ +m_pPrt.disposeAndClear(); +m_bDisposePrinter = false; +} + if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_PRINTER, false, &pItem)) { m_pPrt = static_cast(static_cast(pItem)->GetValue()); @@ -742,6 +752,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) svl::Items{} ); m_pPrt = VclPtr::Create(std::move(pPrinterSet)); +m_bDisposePrinter = true; } m_pFontList.reset(new FontList( m_pPrt )); // #i94536# prevent duplication of font entries when 'reset' button is pressed diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 34cada22ccbd..0a6f191ae32e 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -142,6 +142,7 @@ class SwStdFontTabPage : public SfxTabPage boolm_bSetLabelDefault :1; boolm_bIdxDefault :1; boolm_bSetIdxDefault :1; +boolm_bDisposePrinter :1; boolm_bListHeightDefault:1; boolm_bLabelHeightDefault :1; commit e3841601872bf062bdd7fde22c5bce0c13b7 Author: Caolán McNamara AuthorDate: Sat Jul 27 19:51:12 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 21:58:06 2019 +0200 weld SwStdFontTabPage Change-Id: I9bf2177b9d95949815431789093b1fa6c30e2dee Reviewed-on: https://gerrit.libreoffice.org/76482 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 4263ff807978..06c97e2ccff3 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -478,6 +478,7 @@ public: void set_value(int nValue); void save_value() { nSavedValue = get_value(); } int get_saved_value() const { return nSavedValue; } +bool get_value_changed_from_saved() const { return get_value() != get_saved_value(); } private: SvtFontSizeBox(const SvtFontSizeBox&) = delete; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index f2ece9023500..751bc0a638c7 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -490,61 +490,55 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) } // Tabpage Standardfonts -SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent, - const SfxItemSet& rSet ) : -SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , &rSet), -m_pPrt(nullptr), -m_pFontConfig(nullptr), -m_pWrtShell(nullptr), -m_eLanguage( GetAppLanguage() ), - -m_bListDefault(false), -m_bSetListDefault(true), -m_bLabelDefault(false), -m_bSetLabelDefault(true), -m_bIdxDefault(false), -m_bSetIdxDefault(true), - -
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/config/optpage.cxx | 193 +++--- sw/source/uibase/inc/optpage.hxx | 51 +++ sw/uiconfig/swriter/ui/viewoptionspage.ui |8 - 3 files changed, 107 insertions(+), 145 deletions(-) New commits: commit 4288fa0856f28813c76c30b5ff6a0c946a4db5f3 Author: Caolán McNamara AuthorDate: Sat Jul 27 16:41:05 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 21:08:38 2019 +0200 weld SwContentOptPage Change-Id: Ib7ccc4fc1a611f0f8e57e85008c2a96861762442 Reviewed-on: https://gerrit.libreoffice.org/76479 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 0dbd6a86a8e3..f2ece9023500 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -94,50 +94,42 @@ void drawRect(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, // Tools->Options->Writer->View // Tools->Options->Writer/Web->View -SwContentOptPage::SwContentOptPage( vcl::Window* pParent, - const SfxItemSet& rCoreSet ) : -SfxTabPage(pParent, "ViewOptionsPage", - "modules/swriter/ui/viewoptionspage.ui", &rCoreSet) +SwContentOptPage::SwContentOptPage(TabPageParent pParent, const SfxItemSet& rCoreSet) +: SfxTabPage(pParent, "modules/swriter/ui/viewoptionspage.ui", "ViewOptionsPage", &rCoreSet) +, m_xCrossCB(m_xBuilder->weld_check_button("helplines")) +, m_xHMetric(m_xBuilder->weld_combo_box("hrulercombobox")) +, m_xVRulerCBox(m_xBuilder->weld_check_button("vruler")) +, m_xVRulerRightCBox(m_xBuilder->weld_check_button("vrulerright")) +, m_xVMetric(m_xBuilder->weld_combo_box("vrulercombobox")) +, m_xSmoothCBox(m_xBuilder->weld_check_button("smoothscroll")) +, m_xGrfCB(m_xBuilder->weld_check_button("graphics")) +, m_xTableCB(m_xBuilder->weld_check_button("tables")) +, m_xDrwCB(m_xBuilder->weld_check_button("drawings")) +, m_xFieldNameCB(m_xBuilder->weld_check_button("fieldcodes")) +, m_xPostItCB(m_xBuilder->weld_check_button("comments")) +, m_xSettingsFrame(m_xBuilder->weld_frame("settingsframe")) +, m_xSettingsLabel(m_xBuilder->weld_label("settingslabel")) +, m_xMetricLabel(m_xBuilder->weld_label("measureunitlabel")) +, m_xMetricLB(m_xBuilder->weld_combo_box("measureunit")) +, m_xShowInlineTooltips(m_xBuilder->weld_check_button("changestooltip")) +, m_xFieldHiddenCB(m_xBuilder->weld_check_button("hiddentextfield")) +, m_xFieldHiddenParaCB(m_xBuilder->weld_check_button("hiddenparafield")) { -get (m_pCrossCB, "helplines"); - -get (m_pHMetric, "hrulercombobox"); -get (m_pVRulerCBox, "vruler"); -get (m_pVRulerRightCBox, "vrulerright"); -get (m_pVMetric, "vrulercombobox"); -get (m_pSmoothCBox, "smoothscroll"); - -get (m_pGrfCB, "graphics"); -get (m_pTableCB, "tables"); -get (m_pDrwCB, "drawings"); -get (m_pFieldNameCB, "fieldcodes"); -get (m_pPostItCB, "comments"); - -get(m_pFieldHiddenCB, "hiddentextfield"); -get(m_pFieldHiddenParaCB, "hiddenparafield"); - -get (m_pSettingsFrame, "settingsframe"); -get (m_pSettingsLabel, "settingslabel"); -get (m_pMetricLabel, "measureunitlabel"); -get (m_pMetricLB, "measureunit"); - -get (m_pShowInlineTooltips,"changestooltip"); - /* This part is visible only with Writer/Web->View dialogue. */ const SfxPoolItem* pItem; if (! (SfxItemState::SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem ) && static_cast(pItem)->GetValue() & HTMLMODE_ON)) { -m_pSettingsFrame->Hide(); -m_pSettingsLabel->Hide(); -m_pMetricLabel->Hide(); -m_pMetricLB->Hide(); +m_xSettingsFrame->hide(); +m_xSettingsLabel->hide(); +m_xMetricLabel->hide(); +m_xMetricLB->hide(); } SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsVerticalTextEnabled() ) -m_pVRulerRightCBox->Hide(); -m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl )); +m_xVRulerRightCBox->hide(); +m_xVRulerCBox->connect_toggled(LINK(this, SwContentOptPage, VertRulerHdl )); for (size_t i = 0; i < SwFieldUnitTable::Count(); ++i) { @@ -157,18 +149,15 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, // only use these metrics // a horizontal ruler has not the 'line' unit // there isn't 'line' unit in HTML format -if ( eFUnit != FieldUnit::LINE ) +if (eFUnit != FieldUnit::LINE) { - sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric ); - m_pMetricLB->SetEntryData( nPos, reinterpret_cast(static_cast(eFUnit)) ); - m_pHMetric->InsertEntry( sMetric ); - m_pHMetric->SetEntryData( nPos, reinterpret_cast(
[Libreoffice-commits] core.git: Branch 'ref/for/master' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'ref/for/master'
New branch 'ref/for/master' available with the following commits: commit eb72b17cf376958fc378119d9fc74cd493804d0e Author: Michael Meeks Date: Thu Jul 25 19:02:47 2019 +0100 clipboard: repair unit test so that it runs in the lok mode. SwTransferable::AddSupportedFormats needs the kit to be active. Change-Id: Id84210eb2e526785f35dfae609d861c310885314 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - 46 commits - cui/source cui/uiconfig desktop/qa desktop/source editeng/source extensions/test extras/source include/editeng include/Lib
Rebased ref, commits from common ancestor: commit 0ce7a1d3f4c387594a26427281efee57bbc56974 Author: Michael Meeks AuthorDate: Thu Jul 25 19:02:47 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 14:17:32 2019 -0400 clipboard: repair unit test so it runs in the lok mode. SwTransferable::AddSupportedFormats needs the kit to be active. Change-Id: Id84210eb2e526785f35dfae609d861c310885314 diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 7ad2f1e45817..39be487931f3 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog() void DesktopLOKTest::testComplexSelection() { +// needed for SwTransferable to cope with the selection. +comphelper::LibreOfficeKit::setActive(); + // Start with a blank text file and add contents. LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); static const OString aText("hello world"); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index f40a1db78a0f..6be51b3fc5b0 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -878,7 +878,6 @@ ITiledRenderable* getTiledRenderable(LibreOfficeKitDocument* pThis) * we also need to ensure that this works for the first view which * has no clear 'createView' called for it (unfortunately). */ - rtl::Reference forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis) { ITiledRenderable* pDoc = getTiledRenderable(pThis); commit 612b60785b6d71b455f0351fd78c22b32677e5ae Author: Ashod Nakashian AuthorDate: Mon Jul 22 19:00:23 2019 -0400 Commit: Michael Meeks CommitDate: Sat Jul 27 14:17:31 2019 -0400 clipboard: log before erasing Change-Id: I6d59cdd31c62bbc7db81ccb8985745f68d19cd28 diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 9ed05bc2c383..8b7577f3bf63 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -51,8 +51,8 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId) auto it = gClipboards.get()->find(nViewId); if (it != gClipboards.get()->end()) { +SAL_INFO("lok", "Releasing clip: " << it->second.get() << " for destroyed " << nViewId); gClipboards.get()->erase(it); -SAL_INFO("lok", "Released clip: " << it->second.get() << " for destroyed " << nViewId); } } } commit 8d0c65b8c647e801dfe74921f61e5ba3dedb47f7 Author: Michael Meeks AuthorDate: Tue Jul 23 09:49:11 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 14:17:30 2019 -0400 clipboard: check for null. Change-Id: I07060035a9744642c98d4a0946695408dc0f6b42 diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 2c155c121d91..9ed05bc2c383 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -37,7 +37,6 @@ rtl::Reference LOKClipboardFactory::getClipboardForCurView() return xClip; } -/// FIXME: should really copy and stash its content for a bit. void LOKClipboardFactory::releaseClipboardForView(int nViewId) { osl::MutexGuard aGuard(gMutex); @@ -47,7 +46,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId) gClipboards.get()->clear(); SAL_INFO("lok", "Released all clipboards on doc destroy\n"); } -else +else if (gClipboards.get()) { auto it = gClipboards.get()->find(nViewId); if (it != gClipboards.get()->end()) commit fd0f3a34de1c0cdcdf5eeb71499ae6ad43c5eb28 Author: Michael Meeks AuthorDate: Mon Jul 22 09:48:46 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 14:17:29 2019 -0400 lok: share more of the clipboard mime-type handling code. Change-Id: I98fc9fa0fd1b5afa00c33b642d2d504eab0b62ba diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index c85ac029406c..2c155c121d91 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -189,20 +189,7 @@ LOKTransferable::LOKTransferable(const size_t nInCount, const char** pInMimeType m_aFlavors = css::uno::Sequence(nInCount); for (size_t i = 0; i < nInCount; ++i) { -OUString aMimeType = OUString::fromUtf8(pInMimeTypes[i]); - -// cf. sot/source/base/exchange.cxx for these two exceptional types. -if (aMimeType.startsWith("text/plain")) -{ -aMimeType = "text/plain;charset=utf-16"; -m_aFlavors[i].DataType = cppu::UnoType::get(); -} -else if (aMimeType == "application/x-libreoffice-tsvc") -m_aFlavors[i].DataType = cppu::UnoType::get(); -else -m_aFlavors[i].DataType = cppu::UnoType>::get(); -m_aFlavors[i].MimeType = aMimeType; -m_aFlavor
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic ooo_custom_images/industrial
default_images/sw/imglst/sc20175.png |binary default_images/sw/imglst/sc20186.png |binary default_images/sw/imglst/sch20175.png |binary default_images/sw/imglst/sch20186.png |binary ooo_custom_images/classic/classic_images.tar.gz|binary ooo_custom_images/industrial/sw/imglst/sc20175.png |binary ooo_custom_images/industrial/sw/imglst/sc20186.png |binary 7 files changed New commits: commit cde3abc07c361395d2641bbf1c6eb12858e287f4 Author: Matthias Seidel AuthorDate: Sat Jul 27 17:10:59 2019 + Commit: Matthias Seidel CommitDate: Sat Jul 27 17:10:59 2019 + Use correct icons for navigation up/down diff --git a/default_images/sw/imglst/sc20175.png b/default_images/sw/imglst/sc20175.png index b2c0c5e13911..86f642613bee 100644 Binary files a/default_images/sw/imglst/sc20175.png and b/default_images/sw/imglst/sc20175.png differ diff --git a/default_images/sw/imglst/sc20186.png b/default_images/sw/imglst/sc20186.png index 1d5658794522..5c75626e9525 100644 Binary files a/default_images/sw/imglst/sc20186.png and b/default_images/sw/imglst/sc20186.png differ diff --git a/default_images/sw/imglst/sch20175.png b/default_images/sw/imglst/sch20175.png index 06e01b67bbb8..2d766045efde 100644 Binary files a/default_images/sw/imglst/sch20175.png and b/default_images/sw/imglst/sch20175.png differ diff --git a/default_images/sw/imglst/sch20186.png b/default_images/sw/imglst/sch20186.png index a3fd98dc2a86..5c117bed0372 100644 Binary files a/default_images/sw/imglst/sch20186.png and b/default_images/sw/imglst/sch20186.png differ diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index 12106f894804..f83fa028b17d 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ diff --git a/ooo_custom_images/industrial/sw/imglst/sc20175.png b/ooo_custom_images/industrial/sw/imglst/sc20175.png index 0c8f07b3ffce..262f8f1e9eeb 100644 Binary files a/ooo_custom_images/industrial/sw/imglst/sc20175.png and b/ooo_custom_images/industrial/sw/imglst/sc20175.png differ diff --git a/ooo_custom_images/industrial/sw/imglst/sc20186.png b/ooo_custom_images/industrial/sw/imglst/sc20186.png index 3b6f27174155..52dea32d84f9 100644 Binary files a/ooo_custom_images/industrial/sw/imglst/sc20186.png and b/ooo_custom_images/industrial/sw/imglst/sc20186.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/ui/config/optpage.cxx| 189 +++-- sw/source/uibase/inc/optpage.hxx | 37 +++--- sw/uiconfig/swriter/ui/opttablepage.ui | 72 3 files changed, 150 insertions(+), 148 deletions(-) New commits: commit cc1c0f25046a6e3c6bd09122407970cd5aa602b4 Author: Caolán McNamara AuthorDate: Sat Jul 27 16:14:10 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 18:45:02 2019 +0200 weld SwTableOptionsTabPage Change-Id: I84af37e1dddf4c246b13311d31843d06bf473ac4 Reviewed-on: https://gerrit.libreoffice.org/76477 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 1fe20a7f38dc..0dbd6a86a8e3 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1043,60 +1043,39 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet) m_nFontGroup = sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue() ); } -SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : -SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", &rSet), -m_pWrtShell(nullptr), -m_bHTMLMode(false) -{ -get(m_pHeaderCB,"header"); -get(m_pRepeatHeaderCB,"repeatheader"); -get(m_pDontSplitCB,"dontsplit"); -get(m_pBorderCB,"border"); -get(m_pNumFormattingCB,"numformatting"); -get(m_pNumFormatFormattingCB,"numfmtformatting"); -get(m_pNumAlignmentCB,"numalignment"); -get(m_pRowMoveMF,"rowmove"); -get(m_pColMoveMF,"colmove"); -get(m_pRowInsertMF,"rowinsert"); -get(m_pColInsertMF,"colinsert"); -get(m_pFixRB,"fix"); -get(m_pFixPropRB,"fixprop"); -get(m_pVarRB,"var"); - -Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); -m_pNumFormattingCB->SetClickHdl(aLnk); -m_pNumFormatFormattingCB->SetClickHdl(aLnk); -m_pHeaderCB->SetClickHdl(aLnk); +SwTableOptionsTabPage::SwTableOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet) +: SfxTabPage(pParent, "modules/swriter/ui/opttablepage.ui", "OptTablePage", &rSet) +, m_pWrtShell(nullptr) +, m_bHTMLMode(false) +, m_xHeaderCB(m_xBuilder->weld_check_button("header")) +, m_xRepeatHeaderCB(m_xBuilder->weld_check_button("repeatheader")) +, m_xDontSplitCB(m_xBuilder->weld_check_button("dontsplit")) +, m_xBorderCB(m_xBuilder->weld_check_button("border")) +, m_xNumFormattingCB(m_xBuilder->weld_check_button("numformatting")) +, m_xNumFormatFormattingCB(m_xBuilder->weld_check_button("numfmtformatting")) +, m_xNumAlignmentCB(m_xBuilder->weld_check_button("numalignment")) +, m_xRowMoveMF(m_xBuilder->weld_metric_spin_button("rowmove", FieldUnit::CM)) +, m_xColMoveMF(m_xBuilder->weld_metric_spin_button("colmove", FieldUnit::CM)) +, m_xRowInsertMF(m_xBuilder->weld_metric_spin_button("rowinsert", FieldUnit::CM)) +, m_xColInsertMF(m_xBuilder->weld_metric_spin_button("colinsert", FieldUnit::CM)) +, m_xFixRB(m_xBuilder->weld_radio_button("fix")) +, m_xFixPropRB(m_xBuilder->weld_radio_button("fixprop")) +, m_xVarRB(m_xBuilder->weld_radio_button("var")) +{ +Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); +m_xNumFormattingCB->connect_clicked(aLnk); +m_xNumFormatFormattingCB->connect_clicked(aLnk); +m_xHeaderCB->connect_clicked(aLnk); } SwTableOptionsTabPage::~SwTableOptionsTabPage() { -disposeOnce(); -} - -void SwTableOptionsTabPage::dispose() -{ -m_pHeaderCB.clear(); -m_pRepeatHeaderCB.clear(); -m_pDontSplitCB.clear(); -m_pBorderCB.clear(); -m_pNumFormattingCB.clear(); -m_pNumFormatFormattingCB.clear(); -m_pNumAlignmentCB.clear(); -m_pRowMoveMF.clear(); -m_pColMoveMF.clear(); -m_pRowInsertMF.clear(); -m_pColInsertMF.clear(); -m_pFixRB.clear(); -m_pFixPropRB.clear(); -m_pVarRB.clear(); -SfxTabPage::dispose(); } VclPtr SwTableOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { -return VclPtr::Create(pParent.pParent, *rAttrSet); +return VclPtr::Create(pParent, *rAttrSet); } bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -1104,22 +1083,22 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) bool bRet = false; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); -if(m_pRowMoveMF->IsModified()) -pModOpt->SetTableHMove( static_cast(m_pRowMoveMF->Denormalize( m_pRowMoveMF->GetValue(FieldUnit::TWIP; +if (m_xRowMoveMF->get_value_changed_from_saved()) +pModOpt->SetTableHMove( static_cast(m_xRowMoveMF->denormalize( m_xRowMoveMF->get_value(FieldUnit::TWIP; -if(m_pColMoveMF->IsModified()) -pModOpt->SetTableVMove( static_cast(m_pColMoveMF->Denormalize( m_pColMoveMF->GetValue(FieldUnit::TWIP))
[Libreoffice-commits] core.git: 2 commits - sw/source sw/uiconfig
sw/source/ui/config/optpage.cxx | 314 +++- sw/source/uibase/inc/optpage.hxx| 63 ++--- sw/uiconfig/swriter/ui/optcomparison.ui | 18 - sw/uiconfig/swriter/ui/optformataidspage.ui |6 4 files changed, 170 insertions(+), 231 deletions(-) New commits: commit 3125a3c7a559c507c149849674c1aee4ad56be93 Author: Caolán McNamara AuthorDate: Sat Jul 27 15:52:29 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 18:44:46 2019 +0200 weld SwShdwCursorOptionsTabPage Change-Id: Ibbfeb0763d7103bce3e99edb1889e6e9e6c636fa Reviewed-on: https://gerrit.libreoffice.org/76476 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 3cf60750e370..1fe20a7f38dc 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1260,34 +1260,27 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) m_pWrtShell = pWrtSh->GetValue(); } -SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage( vcl::Window* pParent, -const SfxItemSet& rSet ) - : SfxTabPage(pParent, "OptFormatAidsPage", -"modules/swriter/ui/optformataidspage.ui", &rSet), -m_pWrtShell( nullptr ) -{ -get(m_pParaCB, "paragraph"); -get(m_pSHyphCB, "hyphens"); -get(m_pSpacesCB, "spaces"); -get(m_pHSpacesCB, "nonbreak"); -get(m_pTabCB, "tabs"); -get(m_pBreakCB, "break"); -get(m_pCharHiddenCB, "hiddentext"); - -get(m_pDirectCursorFrame, "directcrsrframe"); -get(m_pOnOffCB, "cursoronoff"); - -get(m_pFillMarginRB, "fillmargin"); -get(m_pFillIndentRB, "fillindent"); -get(m_pFillTabRB, "filltab"); -get(m_pFillTabAndSpaceRB, "filltabandspace"); -get(m_pFillSpaceRB, "fillspace"); - -get(m_pCursorProtFrame, "crsrprotframe"); -get(m_pCursorInProtCB, "cursorinprot"); - -get(m_pMathBaselineAlignmentCB, "mathbaseline"); - +SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet) +: SfxTabPage(pParent, "modules/swriter/ui/optformataidspage.ui", "OptFormatAidsPage", &rSet) +, m_pWrtShell(nullptr) +, m_xParaCB(m_xBuilder->weld_check_button("paragraph")) +, m_xSHyphCB(m_xBuilder->weld_check_button("hyphens")) +, m_xSpacesCB(m_xBuilder->weld_check_button("spaces")) +, m_xHSpacesCB(m_xBuilder->weld_check_button("nonbreak")) +, m_xTabCB(m_xBuilder->weld_check_button("tabs")) +, m_xBreakCB(m_xBuilder->weld_check_button("break")) +, m_xCharHiddenCB(m_xBuilder->weld_check_button("hiddentext")) +, m_xDirectCursorFrame(m_xBuilder->weld_frame("directcrsrframe")) +, m_xOnOffCB(m_xBuilder->weld_check_button("cursoronoff")) +, m_xFillMarginRB(m_xBuilder->weld_radio_button("fillmargin")) +, m_xFillIndentRB(m_xBuilder->weld_radio_button("fillindent")) +, m_xFillTabRB(m_xBuilder->weld_radio_button("filltab")) +, m_xFillTabAndSpaceRB(m_xBuilder->weld_radio_button("filltabandspace")) +, m_xFillSpaceRB(m_xBuilder->weld_radio_button("fillspace")) +, m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe")) +, m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot")) +, m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline")) +{ const SfxPoolItem* pItem = nullptr; sal_uInt8 eMode = SwFillMode::FILL_TAB; bool bIsOn = false; @@ -1298,66 +1291,40 @@ SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage( vcl::Window* pParent, eMode = aOpt.GetMode(); bIsOn = aOpt.IsOn(); } -m_pOnOffCB->Check( bIsOn ); +m_xOnOffCB->set_active( bIsOn ); -m_pFillIndentRB->Check( FILL_INDENT == eMode ); -m_pFillMarginRB->Check( FILL_MARGIN == eMode ); -m_pFillTabRB->Check( FILL_TAB == eMode ); -m_pFillSpaceRB->Check( FILL_SPACE == eMode ); -m_pFillTabAndSpaceRB->Check( FILL_TAB_SPACE == eMode ); +m_xFillIndentRB->set_active( FILL_INDENT == eMode ); +m_xFillMarginRB->set_active( FILL_MARGIN == eMode ); +m_xFillTabRB->set_active( FILL_TAB == eMode ); +m_xFillSpaceRB->set_active( FILL_SPACE == eMode ); +m_xFillTabAndSpaceRB->set_active( FILL_TAB_SPACE == eMode ); if(SfxItemState::SET != rSet.GetItemState(SID_HTML_MODE, false, &pItem ) || !(static_cast(pItem)->GetValue() & HTMLMODE_ON)) return; -m_pTabCB->Hide(); -m_pCharHiddenCB->Hide(); -//m_pFieldHiddenCB->Hide(); -//m_pFieldHiddenParaCB->Hide(); +m_xTabCB->hide(); +m_xCharHiddenCB->hide(); -m_pDirectCursorFrame->Hide(); -m_pOnOffCB->Hide(); -m_pFillMarginRB->Hide(); -m_pFillIndentRB->Hide(); -m_pFillTabRB->Hide(); -m_pFillSpaceRB->Hide(); -m_pFillTabAndSpaceRB->Hide(); - -m_pCursorProtFrame->Hide(); -m_pCursorInProtCB->Hide(); +m_xDirectCursorFrame->hide(); +
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/sw jvmfwk/distributions jvmfwk/plugins ooo_custom_images/classic
default_images/sw/res/point.png |binary default_images/sw/res/point_h.png |binary jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |6 +- jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |7 ++- jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml|6 +- jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml|6 +- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |4 +++- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx |1 + ooo_custom_images/classic/classic_images.tar.gz |binary 9 files changed, 25 insertions(+), 5 deletions(-) New commits: commit ff76cb4e0f3f8d0164570638742f140aa5b728ef Author: Damjan Jovanovic AuthorDate: Sat Jul 27 15:50:09 2019 + Commit: Damjan Jovanovic CommitDate: Sat Jul 27 15:50:09 2019 + Add support for the AdoptOpenJDK Java distribution (https://adoptopenjdk.net/). Closes #i128157# Add support for AdoptOpenJDK JVM's. Patch by: me diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index cbbc8d21c08d..80dd762cabb6 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -23,7 +23,7 @@ http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - 2012-10-06 + 2019-07-27 @@ -44,6 +44,9 @@ 1.5.0 + +1.8.0 + @@ -53,5 +56,6 @@ vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 63eb024a9a5e..5bc909c3f265 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -23,7 +23,7 @@ http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - 2013-01-01 + 2019-07-27 @@ -35,10 +35,15 @@ 1.7.0 + +1.8.0 + + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index f1f5fa284911..94268509cae6 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -23,7 +23,7 @@ http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - 2011-01-07 + 2019-07-27 @@ -32,10 +32,14 @@ 1.5.0 + +1.8.0 + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index a0257444ae34..92c6d1988c87 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -23,7 +23,7 @@ http://openoffice.org/2004/java/framework/1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - 2012-10-06 + 2019-07-27 @@ -35,11 +35,15 @@ 1.5.0 + +1.8.0 + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll + vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 5c0f0164675d..24b1835695e2 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -120,6 +120,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc.")); rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); +rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("AdoptOpenJDK")); if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True || sVendor1.equals(pInfo->sVendor) == sal_True || sVendor2.equals(pInfo->sVendor) == sal_True @@ -128,7 +129,8 @@ S
[Libreoffice-commits] core.git: sw/source
sw/source/ui/config/optpage.cxx | 112 --- sw/source/uibase/inc/optpage.hxx | 27 - 2 files changed, 60 insertions(+), 79 deletions(-) New commits: commit 9bd022c6eeb8db1214dd50071d69a6a7c5aa925d Author: Caolán McNamara AuthorDate: Sat Jul 27 15:20:15 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 17:23:52 2019 +0200 weld SwTestTabPage Change-Id: Id22064118d09660860514645033fce944c2f1abd Reviewed-on: https://gerrit.libreoffice.org/76474 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 21b351ffd2f5..4e6838961647 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2272,49 +2272,31 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, Button*, void) #ifdef DBG_UTIL -SwTestTabPage::SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) -: SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", &rCoreSet) +SwTestTabPage::SwTestTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet) +: SfxTabPage( pParent, "modules/swriter/ui/opttestpage.ui", "OptTestPage", &rCoreSet) , bAttrModified( false ) +, m_xTest1CBox(m_xBuilder->weld_check_button("unused")) +, m_xTest2CBox(m_xBuilder->weld_check_button("dynamic")) +, m_xTest3CBox(m_xBuilder->weld_check_button("nocalm")) +, m_xTest4CBox(m_xBuilder->weld_check_button("wysiwygdbg")) +, m_xTest5CBox(m_xBuilder->weld_check_button("noidle")) +, m_xTest6CBox(m_xBuilder->weld_check_button("noscreenadj")) +, m_xTest7CBox(m_xBuilder->weld_check_button("winformat")) +, m_xTest8CBox(m_xBuilder->weld_check_button("noscroll")) +, m_xTest9CBox(m_xBuilder->weld_check_button("DrawingLayerNotLoading")) +, m_xTest10CBox(m_xBuilder->weld_check_button("AutoFormatByInput")) { -get(m_pTest1CBox, "unused"); -get(m_pTest2CBox, "dynamic"); -get(m_pTest3CBox, "nocalm"); -get(m_pTest4CBox, "wysiwygdbg"); -get(m_pTest5CBox, "noidle"); -get(m_pTest6CBox, "noscreenadj"); -get(m_pTest7CBox, "winformat"); -get(m_pTest8CBox, "noscroll"); -get(m_pTest9CBox, "DrawingLayerNotLoading"); -get(m_pTest10CBox, "AutoFormatByInput"); - Init(); - } SwTestTabPage::~SwTestTabPage() { -disposeOnce(); -} - -void SwTestTabPage::dispose() -{ -m_pTest1CBox.clear(); -m_pTest2CBox.clear(); -m_pTest3CBox.clear(); -m_pTest4CBox.clear(); -m_pTest5CBox.clear(); -m_pTest6CBox.clear(); -m_pTest7CBox.clear(); -m_pTest8CBox.clear(); -m_pTest9CBox.clear(); -m_pTest10CBox.clear(); -SfxTabPage::dispose(); } VclPtr SwTestTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { -return VclPtr::Create(pParent.pParent, *rAttrSet); +return VclPtr::Create(pParent, *rAttrSet); } boolSwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) @@ -2323,16 +2305,16 @@ boolSwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) if ( bAttrModified ) { SwTestItem aTestItem; -aTestItem.bTest1=m_pTest1CBox->IsChecked(); -aTestItem.bTest2=m_pTest2CBox->IsChecked(); -aTestItem.bTest3=m_pTest3CBox->IsChecked(); -aTestItem.bTest4=m_pTest4CBox->IsChecked(); -aTestItem.bTest5=m_pTest5CBox->IsChecked(); -aTestItem.bTest6=m_pTest6CBox->IsChecked(); -aTestItem.bTest7=m_pTest7CBox->IsChecked(); -aTestItem.bTest8=m_pTest8CBox->IsChecked(); -aTestItem.bTest9=m_pTest9CBox->IsChecked(); -aTestItem.bTest10=m_pTest10CBox->IsChecked(); +aTestItem.bTest1=m_xTest1CBox->get_active(); +aTestItem.bTest2=m_xTest2CBox->get_active(); +aTestItem.bTest3=m_xTest3CBox->get_active(); +aTestItem.bTest4=m_xTest4CBox->get_active(); +aTestItem.bTest5=m_xTest5CBox->get_active(); +aTestItem.bTest6=m_xTest6CBox->get_active(); +aTestItem.bTest7=m_xTest7CBox->get_active(); +aTestItem.bTest8=m_xTest8CBox->get_active(); +aTestItem.bTest9=m_xTest9CBox->get_active(); +aTestItem.bTest10=m_xTest10CBox->get_active(); rCoreSet->Put(aTestItem); } return bAttrModified; @@ -2346,36 +2328,36 @@ void SwTestTabPage::Reset( const SfxItemSet* ) if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_SWTEST , false, reinterpret_cast(&pTestAttr) )) { -m_pTest1CBox->Check(pTestAttr->bTest1); -m_pTest2CBox->Check(pTestAttr->bTest2); -m_pTest3CBox->Check(pTestAttr->bTest3); -m_pTest4CBox->Check(pTestAttr->bTest4); -m_pTest5CBox->Check(pTestAttr->bTest5); -m_pTest6CBox->Check(pTestAttr->bTest6); -m_pTest7CBox->Check(pTestAttr->bTest7); -m_pTest8CBox->Check(pTestAttr->bTest8); -m_pTest9CBox->Check(pTest
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/pt/DocumentList.xml | 21 + 1 file changed, 21 insertions(+) New commits: commit 556613397794e6f5864434bc216fef998865abd6 Author: Marco A.G.Pinto AuthorDate: Thu Jul 25 09:05:16 2019 +0200 Commit: Aron Budea CommitDate: Sat Jul 27 17:20:10 2019 +0200 [pt_PT] Added 21 autocorrect words Change-Id: I170c1e74819738f0206333f0b81cdb1cdb49244e Reviewed-on: https://gerrit.libreoffice.org/76281 Tested-by: Jenkins Reviewed-by: Aron Budea diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index 0c0e3635f240..8550c34c3ae5 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -397,6 +397,8 @@ + + @@ -510,6 +512,8 @@ + + @@ -593,6 +597,8 @@ + + @@ -1212,6 +1218,7 @@ + http://"/> https://"/> @@ -1283,6 +1290,8 @@ + + @@ -1315,6 +1324,8 @@ + + @@ -1569,6 +1580,8 @@ + + @@ -1882,6 +1895,8 @@ + + @@ -1948,6 +1963,8 @@ + + @@ -2027,6 +2044,8 @@ + + @@ -2181,6 +2200,8 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optsave.cxx | 348 ++--- cui/source/options/optsave.hxx | 47 ++--- cui/uiconfig/ui/optsavepage.ui | 13 - 3 files changed, 188 insertions(+), 220 deletions(-) New commits: commit 5d78e7dc8ece62c731ee81f5dc60a0309121dcff Author: Caolán McNamara AuthorDate: Sat Jul 27 15:12:06 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 17:09:10 2019 +0200 weld SvxSaveTabPage Change-Id: I89b81ff408d2dc855fe7b780a62e85f3a2a06215 Reviewed-on: https://gerrit.libreoffice.org/76472 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index eb86ee50a908..64faac98f389 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -70,52 +70,47 @@ SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( false ) // class SvxSaveTabPage -- -SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : -SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ), -pImpl( new SvxSaveTabPage_Impl ) +SvxSaveTabPage::SvxSaveTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet) +: SfxTabPage( pParent, "cui/ui/optsavepage.ui", "OptSavePage", &rCoreSet ) +, pImpl(new SvxSaveTabPage_Impl) +, m_xLoadUserSettingsCB(m_xBuilder->weld_check_button("load_settings")) +, m_xLoadDocPrinterCB(m_xBuilder->weld_check_button("load_docprinter")) +, m_xDocInfoCB(m_xBuilder->weld_check_button("docinfo")) +, m_xBackupCB(m_xBuilder->weld_check_button("backup")) +, m_xAutoSaveCB(m_xBuilder->weld_check_button("autosave")) +, m_xAutoSaveEdit(m_xBuilder->weld_spin_button("autosave_spin")) +, m_xMinuteFT(m_xBuilder->weld_label("autosave_mins")) +, m_xUserAutoSaveCB(m_xBuilder->weld_check_button("userautosave")) +, m_xRelativeFsysCB(m_xBuilder->weld_check_button("relative_fsys")) +, m_xRelativeInetCB(m_xBuilder->weld_check_button("relative_inet")) +, m_xODFVersionLB(m_xBuilder->weld_combo_box("odfversion")) +, m_xWarnAlienFormatCB(m_xBuilder->weld_check_button("warnalienformat")) +, m_xDocTypeLB(m_xBuilder->weld_combo_box("doctype")) +, m_xSaveAsFT(m_xBuilder->weld_label("saveas_label")) +, m_xSaveAsLB(m_xBuilder->weld_combo_box("saveas")) +, m_xODFWarningFI(m_xBuilder->weld_widget("odfwarning_image")) +, m_xODFWarningFT(m_xBuilder->weld_label("odfwarning_label")) { -get(aLoadUserSettingsCB, "load_settings"); -get(aLoadDocPrinterCB, "load_docprinter"); - -get(aDocInfoCB, "docinfo"); -get(aBackupCB, "backup"); -get(aAutoSaveCB, "autosave"); -get(aAutoSaveEdit, "autosave_spin"); -get(aMinuteFT, "autosave_mins"); -get(aUserAutoSaveCB, "userautosave"); -get(aRelativeFsysCB, "relative_fsys"); -get(aRelativeInetCB, "relative_inet"); - -get(aODFVersionLB, "odfversion"); -get(aWarnAlienFormatCB, "warnalienformat"); -get(aDocTypeLB, "doctype"); -get(aSaveAsFT, "saveas_label"); -get(aSaveAsLB, "saveas"); -get(aODFWarningFI, "odfwarning_image"); -get(aODFWarningFT, "odfwarning_label"); - - -aODFVersionLB->SetEntryData(0, reinterpret_cast(2 )); // 1.0/1.1 -aODFVersionLB->SetEntryData(1, reinterpret_cast(4 )); // 1.2 -aODFVersionLB->SetEntryData(2, reinterpret_cast(8 )); // 1.2 Extended (compatibility mode) -aODFVersionLB->SetEntryData(3, reinterpret_cast(0x7fff)); // 1.2 Extended (recommended) - -aDocTypeLB->SetEntryData(0, reinterpret_cast(APP_WRITER) ); -aDocTypeLB->SetEntryData(1, reinterpret_cast(APP_WRITER_WEB) ); -aDocTypeLB->SetEntryData(2, reinterpret_cast(APP_WRITER_GLOBAL)); -aDocTypeLB->SetEntryData(3, reinterpret_cast(APP_CALC) ); -aDocTypeLB->SetEntryData(4, reinterpret_cast(APP_IMPRESS) ); -aDocTypeLB->SetEntryData(5, reinterpret_cast(APP_DRAW) ); -aDocTypeLB->SetEntryData(6, reinterpret_cast(APP_MATH) ); - -aAutoSaveCB->SetClickHdl( LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ) ); -aAutoSaveEdit->SetMaxTextLen( 2 ); +m_xODFVersionLB->set_id(0, OUString::number(2 )); // 1.0/1.1 +m_xODFVersionLB->set_id(1, OUString::number(4 )); // 1.2 +m_xODFVersionLB->set_id(2, OUString::number(8 )); // 1.2 Extended (compatibility mode) +m_xODFVersionLB->set_id(3, OUString::number(0x7fff)); // 1.2 Extended (recommended) + +m_xDocTypeLB->set_id(0, OUString::number(APP_WRITER) ); +m_xDocTypeLB->set_id(1, OUString::number(APP_WRITER_WEB) ); +m_xDocTypeLB->set_id(2, OUString::number(APP_WRITER_GLOBAL)); +m_xDocTypeLB->set_id(3, OUString::number(APP_CALC) ); +m_xDocTypeLB->set_id(4, OUString::number(APP_IMPRESS) ); +m_xDocTypeLB->set_id(5, OUString::number(APP_DRAW) ); +m_xDocType
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a24e2a390a3fb7e1cbb729edca12c656f1b26956 Author: Andrea Gelmini AuthorDate: Sat Jul 27 09:01:31 2019 +0200 Commit: Gerrit Code Review CommitDate: Sat Jul 27 16:53:00 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix typo Change-Id: Ib92a4ba3f7b5dc41930e788c061c70fc74ab18f7 Reviewed-on: https://gerrit.libreoffice.org/76467 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 6880ed4b7339..1a500fb0a28a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6880ed4b733994558cd6d906850624a6fdc94321 +Subproject commit 1a500fb0a28a0acdf9e2fa9d034a1ef0341a8dd2 ___ 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/python/python_handler.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1a500fb0a28a0acdf9e2fa9d034a1ef0341a8dd2 Author: Andrea Gelmini AuthorDate: Sat Jul 27 09:01:31 2019 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sat Jul 27 16:53:00 2019 +0200 Fix typo Change-Id: Ib92a4ba3f7b5dc41930e788c061c70fc74ab18f7 Reviewed-on: https://gerrit.libreoffice.org/76467 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/sbasic/python/python_handler.xhp b/source/text/sbasic/python/python_handler.xhp index 31b59f06c..1f9e9ce35 100644 --- a/source/text/sbasic/python/python_handler.xhp +++ b/source/text/sbasic/python/python_handler.xhp @@ -36,8 +36,8 @@ Inside the control properties pane of the Dialog Editor, use the Events tab to replace macro assignments by component assignments, and type in the intended method names: Set Dump to file dialog button component method name to _dump2File - Optionnally define txtTracelog key pressed and mouse button pressed events component method names as _openHelp - Optionnally define Ok button receiving focus event component method name as onOkHasfocus + Optionally define txtTracelog key pressed and mouse button pressed events component method names as _openHelp + Optionally define Ok button receiving focus event component method name as onOkHasfocus Events assigned actions should mention the vnd.sun.star.UNO: protocol. Creating the handler ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/sddlgfact.hxx | 32 1 file changed, 32 deletions(-) New commits: commit 0954817e403b826547035af47958af85189479d3 Author: Caolán McNamara AuthorDate: Thu Jul 25 17:24:18 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 16:33:08 2019 +0200 drop newly unused DECL_ABSTDLG_BASE and IMPL_ABSTDLG_BASE Change-Id: I7288052dce03aa1cd1642b5de1e47508f4d47341 Reviewed-on: https://gerrit.libreoffice.org/76338 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index bc46df3fd38c..7b05f8dc7290 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -41,38 +41,6 @@ #include #include -#define DECL_ABSTDLG_BASE(Class,DialogClass)\ -ScopedVclPtr pDlg; \ -public: \ -explicit Class(DialogClass* p) \ -: pDlg(p) \ -{ \ -} \ -virtual std::vector getAllPageUIXMLDescriptions() const override; \ -virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override; \ -virtual BitmapEx createScreenshot() const override; \ -virtual OString GetScreenshotId() const override; \ -virtual ~Class() override; \ -virtual short Execute() override; \ -virtual bool StartExecuteAsync(AsyncContext &ctx) override; - -#define IMPL_ABSTDLG_BASE(Class)\ -std::vector Class::getAllPageUIXMLDescriptions() const { return pDlg->getAllPageUIXMLDescriptions(); } \ -bool Class::selectPageByUIXMLDescription(const OString& rUIXMLDescription) { return pDlg->selectPageByUIXMLDescription(rUIXMLDescription); } \ -BitmapEx Class::createScreenshot() const { return pDlg->createScreenshot();} \ -OString Class::GetScreenshotId() const { return pDlg->GetScreenshotId();} \ -Class::~Class() \ -{ \ -} \ -short Class::Execute() \ -{ \ -return pDlg->Execute(); \ -} \ -bool Class::StartExecuteAsync(AsyncContext &ctx) \ -{ \ -return pDlg->StartExecuteAsync(ctx);\ -} - //namespace sd { //class MorphDlg; //class CopyDlg; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/sddlgfact.cxx |2 -- sd/source/ui/dlg/sddlgfact.hxx |6 -- 2 files changed, 8 deletions(-) New commits: commit c18cab5451b677ff548de9634e3a25fa312a6b55 Author: Caolán McNamara AuthorDate: Thu Jul 25 17:23:36 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 16:32:52 2019 +0200 drop newly unused SdVclAbstractDialog_Impl Change-Id: I3c8435f3428f1222e1adb4768af697df6aaaf828 Reviewed-on: https://gerrit.libreoffice.org/76337 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 611ddb0307e8..55ad1c25556d 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -44,8 +44,6 @@ #include #include "PhotoAlbumDialog.hxx" -IMPL_ABSTDLG_BASE(SdVclAbstractDialog_Impl); - short AbstractSvxBulletAndPositionDlg_Impl::Execute() { return m_xDlg->run(); diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 4932d5c8fa28..bc46df3fd38c 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -98,12 +98,6 @@ public: virtual bool IsSlideScope() override; }; - -class SdVclAbstractDialog_Impl : public VclAbstractDialog -{ -DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog) -}; - class SdAbstractGenericDialog_Impl : public VclAbstractDialog { std::unique_ptr m_xDlg; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx svx/source
cui/source/options/opthtml.cxx | 197 ++--- cui/source/options/opthtml.hxx | 38 +++ cui/uiconfig/ui/opthtmlpage.ui |2 include/svx/txencbox.hxx | 13 ++ svx/source/dialog/txencbox.cxx | 21 +++- 5 files changed, 131 insertions(+), 140 deletions(-) New commits: commit 2aff82411b905d55774057ed6e74b8cd45dc570b Author: Caolán McNamara AuthorDate: Sat Jul 27 12:16:41 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 15:48:39 2019 +0200 weld OfaHtmlTabPage Change-Id: I10ee46d19047da9a3e3d8b0f99866568a12aa0f1 Reviewed-on: https://gerrit.libreoffice.org/76471 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 23a628c3231c..0cb16f175367 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -23,28 +23,26 @@ #include -OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : -SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) +OfaHtmlTabPage::OfaHtmlTabPage(TabPageParent pParent, const SfxItemSet& rSet) +: SfxTabPage(pParent, "cui/ui/opthtmlpage.ui", "OptHtmlPage", &rSet) +, m_xSize1NF(m_xBuilder->weld_spin_button("size1")) +, m_xSize2NF(m_xBuilder->weld_spin_button("size2")) +, m_xSize3NF(m_xBuilder->weld_spin_button("size3")) +, m_xSize4NF(m_xBuilder->weld_spin_button("size4")) +, m_xSize5NF(m_xBuilder->weld_spin_button("size5")) +, m_xSize6NF(m_xBuilder->weld_spin_button("size6")) +, m_xSize7NF(m_xBuilder->weld_spin_button("size7")) +, m_xNumbersEnglishUSCB(m_xBuilder->weld_check_button("numbersenglishus")) +, m_xUnknownTagCB(m_xBuilder->weld_check_button("unknowntag")) +, m_xIgnoreFontNamesCB(m_xBuilder->weld_check_button("ignorefontnames")) +, m_xStarBasicCB(m_xBuilder->weld_check_button("starbasic")) +, m_xStarBasicWarningCB(m_xBuilder->weld_check_button("starbasicwarning")) +, m_xPrintExtensionCB(m_xBuilder->weld_check_button("printextension")) +, m_xSaveGrfLocalCB(m_xBuilder->weld_check_button("savegrflocal")) +, m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset"))) { -get(aSize1NF,"size1"); -get(aSize2NF,"size2"); -get(aSize3NF,"size3"); -get(aSize4NF,"size4"); -get(aSize5NF,"size5"); -get(aSize6NF,"size6"); -get(aSize7NF,"size7"); -get(aNumbersEnglishUSCB,"numbersenglishus"); -get(aUnknownTagCB,"unknowntag"); -get(aIgnoreFontNamesCB,"ignorefontnames"); -get(aStarBasicCB,"starbasic"); -get(aStarBasicWarningCB,"starbasicwarning"); -get(aPrintExtensionCB,"printextension"); -get(aSaveGrfLocalCB,"savegrflocal"); -get(aCharSetLB,"charset"); -aCharSetLB->SetStyle(aCharSetLB->GetStyle() | WB_SORT); - // replace placeholder with UI string from language list -OUString aText( aNumbersEnglishUSCB->GetText()); +OUString aText(m_xNumbersEnglishUSCB->get_label()); OUString aPlaceholder("%ENGLISHUSLOCALE"); sal_Int32 nPos; if ((nPos = aText.indexOf( aPlaceholder)) != -1) @@ -53,88 +51,67 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) if (!rStr.isEmpty()) { aText = aText.replaceAt( nPos, aPlaceholder.getLength(), rStr); -aNumbersEnglishUSCB->SetText( aText); +m_xNumbersEnglishUSCB->set_label( aText); } } -aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl)); +m_xStarBasicCB->connect_toggled(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl)); // initialize the characterset listbox -aCharSetLB->FillWithMimeAndSelectBest(); +m_xCharSetLB->FillWithMimeAndSelectBest(); } OfaHtmlTabPage::~OfaHtmlTabPage() { -disposeOnce(); -} - -void OfaHtmlTabPage::dispose() -{ -aSize1NF.clear(); -aSize2NF.clear(); -aSize3NF.clear(); -aSize4NF.clear(); -aSize5NF.clear(); -aSize6NF.clear(); -aSize7NF.clear(); -aNumbersEnglishUSCB.clear(); -aUnknownTagCB.clear(); -aIgnoreFontNamesCB.clear(); -aStarBasicCB.clear(); -aStarBasicWarningCB.clear(); -aPrintExtensionCB.clear(); -aSaveGrfLocalCB.clear(); -aCharSetLB.clear(); -SfxTabPage::dispose(); } VclPtr OfaHtmlTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { -return VclPtr::Create(pParent.pParent, *rAttrSet); +return VclPtr::Create(pParent, *rAttrSet); } bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); -if(aSize1NF->IsValueChangedFromSaved()) -rHtmlOpt.SetFontSize(0, static_cast(aSize1NF->GetValue())); -if(aSize2NF->IsValueChangedFromSaved()) -rHtmlOpt.SetFontSize(1, static_cast(aSize2NF->GetValue())); -if(aSize3NF->IsValueChangedFromSaved()) -rHtmlOpt.SetFontSi
[Libreoffice-commits] core.git: canvas/source include/vcl starmath/inc
canvas/source/vcl/canvashelper.cxx | 16 include/vcl/outdev.hxx |1 + include/vcl/window.hxx |2 +- starmath/inc/edit.hxx |2 +- 4 files changed, 7 insertions(+), 14 deletions(-) New commits: commit 67950f00989dff4640ba83e540673375a2c60a13 Author: Chris Sherlock AuthorDate: Mon Jul 15 19:14:36 2019 +1000 Commit: Michael Meeks CommitDate: Sat Jul 27 15:23:30 2019 +0200 tdf#74702: vcl add OutputDevice::Flush() to remove GetOutDevType() Change-Id: I3e8775845e471517945876a48696747a46e5270a Reviewed-on: https://gerrit.libreoffice.org/75616 Tested-by: Jenkins Reviewed-by: Michael Meeks diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 47ea98d4b3c4..f423ad5b0318 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -1158,19 +1158,11 @@ namespace vclcanvas void CanvasHelper::flush() const { -if( mpOutDevProvider && mpOutDevProvider->getOutDev().GetOutDevType() == OUTDEV_WINDOW ) -{ -// TODO(Q3): Evil downcast. And what's more, Window::Flush is -// not even const. Wah. -static_cast(mpOutDevProvider->getOutDev()).Flush(); -} +if (mpOutDevProvider) +mpOutDevProvider->getOutDev().Flush(); -if( mp2ndOutDevProvider && mp2ndOutDevProvider->getOutDev().GetOutDevType() == OUTDEV_WINDOW ) -{ -// TODO(Q3): Evil downcast. And what's more, Window::Flush is -// not even const. Wah. - static_cast(mp2ndOutDevProvider->getOutDev()).Flush(); -} +if (mp2ndOutDevProvider) +mp2ndOutDevProvider->getOutDev().Flush(); } } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index b18150cefd38..3151abbe1e9c 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -539,6 +539,7 @@ public: ///@{ public: +virtual voidFlush() {} virtual voidDrawOutDev( const Point& rDestPt, const Size& rDestSize, diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index e1a91e9e1e35..bdc4ea3d0019 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1063,7 +1063,7 @@ public: voidValidate(); boolHasPaintEvent() const; voidUpdate(); -voidFlush(); +voidFlush() override; // toggles new docking support, enabled via toolkit voidEnableDocking( bool bEnable = true ); diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 45d130b0c658..2c732cccaa70 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -115,7 +115,7 @@ public: void SelPrevMark(); static bool HasMark(const OUString &rText); -void Flush(); +void Flush() override; void DeleteEditView(); bool HandleWheelCommands(const CommandEvent& rCEvt); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: CppCheck Report Failure
Hello, Since I reproduced this cppcheck git updated today, I created a bugtracker on cppcheck (see https://trac.cppcheck.net/attachment/ticket/9236/) Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/lok-clipboard' - 7 commits - desktop/qa desktop/source sc/source sw/source vcl/source
Rebased ref, commits from common ancestor: commit 6368723bd902e9cb46ecf2da822be71492a0ca7c Author: Michael Meeks AuthorDate: Thu Jul 25 19:02:47 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 08:46:43 2019 -0400 clipboard: repair unit test so they run in the lok mode. SwTransferable::AddSupportedFormats needs the kit to be active. Change-Id: Id84210eb2e526785f35dfae609d861c310885314 diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 7ad2f1e45817..39be487931f3 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2635,6 +2635,9 @@ void DesktopLOKTest::testShowHideDialog() void DesktopLOKTest::testComplexSelection() { +// needed for SwTransferable to cope with the selection. +comphelper::LibreOfficeKit::setActive(); + // Start with a blank text file and add contents. LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); static const OString aText("hello world"); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 37f7899be01f..6e2ca6d37a07 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -878,7 +878,6 @@ ITiledRenderable* getTiledRenderable(LibreOfficeKitDocument* pThis) * we also need to ensure that this works for the first view which * has no clear 'createView' called for it (unfortunately). */ - rtl::Reference forceSetClipboardForCurrentView(LibreOfficeKitDocument *pThis) { ITiledRenderable* pDoc = getTiledRenderable(pThis); commit 3171f6712ef926d6ba0eedd93d535a1ddef2cd94 Author: Ashod Nakashian AuthorDate: Mon Jul 22 19:00:23 2019 -0400 Commit: Michael Meeks CommitDate: Sat Jul 27 08:46:42 2019 -0400 clipboard: log before erasing Change-Id: I6d59cdd31c62bbc7db81ccb8985745f68d19cd28 diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 7eefd09370d1..f44f4e9fed81 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -51,8 +51,8 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId) auto it = gClipboards.get()->find(nViewId); if (it != gClipboards.get()->end()) { +SAL_INFO("lok", "Releasing clip: " << it->second.get() << " for destroyed " << nViewId); gClipboards.get()->erase(it); -SAL_INFO("lok", "Released clip: " << it->second.get() << " for destroyed " << nViewId); } } } commit a7ca968aaf45750d72bcd3245d3267c065b1f525 Author: Michael Meeks AuthorDate: Tue Jul 23 09:49:11 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 08:46:41 2019 -0400 clipboard: check for null. Change-Id: I07060035a9744642c98d4a0946695408dc0f6b42 diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 3285965c846f..7eefd09370d1 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -37,7 +37,6 @@ rtl::Reference LOKClipboardFactory::getClipboardForCurView() return xClip; } -/// FIXME: should really copy and stash its content for a bit. void LOKClipboardFactory::releaseClipboardForView(int nViewId) { osl::MutexGuard aGuard(gMutex); @@ -47,7 +46,7 @@ void LOKClipboardFactory::releaseClipboardForView(int nViewId) gClipboards.get()->clear(); SAL_INFO("lok", "Released all clipboards on doc destroy\n"); } -else +else if (gClipboards.get()) { auto it = gClipboards.get()->find(nViewId); if (it != gClipboards.get()->end()) commit 8c58c0f34a105fdde33e74f9e933d0b962ca70a5 Author: Michael Meeks AuthorDate: Mon Jul 22 09:48:46 2019 +0100 Commit: Michael Meeks CommitDate: Sat Jul 27 08:46:40 2019 -0400 lok: share more of the clipboard mime-type handling code. Change-Id: I98fc9fa0fd1b5afa00c33b642d2d504eab0b62ba diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx index 17a9c5c54e4f..3285965c846f 100644 --- a/desktop/source/lib/lokclipboard.cxx +++ b/desktop/source/lib/lokclipboard.cxx @@ -189,20 +189,7 @@ LOKTransferable::LOKTransferable(const size_t nInCount, const char** pInMimeType m_aFlavors = css::uno::Sequence(nInCount); for (size_t i = 0; i < nInCount; ++i) { -OUString aMimeType = OUString::fromUtf8(pInMimeTypes[i]); - -// cf. sot/source/base/exchange.cxx for these two exceptional types. -if (aMimeType.startsWith("text/plain")) -{ -aMimeType = "text/plain;charset=utf-16"; -m_aFlavors[i].DataType = cppu::UnoType::get(); -} -else if (aMimeType == "application/x-libreoffice-tsvc") -m_aFlavors[i].DataType = cppu::UnoType::get(); -else -m_aFlavors[i].DataType = cppu::UnoType>::get(); -m_aFlavors[i].MimeType = aMimeType; -m_aFlavo
[Libreoffice-commits] core.git: 2 commits - cui/source sc/inc
cui/source/options/optbasic.cxx | 108 cui/source/options/optbasic.hxx | 15 ++--- sc/inc/scmod.hxx|2 3 files changed, 53 insertions(+), 72 deletions(-) New commits: commit 7360ddd34aa446e6439c733ef0f819a58d709744 Author: Caolán McNamara AuthorDate: Sat Jul 27 11:46:17 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 14:11:45 2019 +0200 cid#1401328 Uncaught exception Change-Id: I1c4bdd4afec30d7d52054d8c9bd4958191c480f8 Reviewed-on: https://gerrit.libreoffice.org/76470 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index a82ac9337b12..363a9dd2a354 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -87,7 +87,7 @@ class SAL_DLLPUBLIC_RTTI ScModule: public SfxModule, public SfxListener, public ScMessagePool* m_pMessagePool; // there is no global InputHandler anymore, each View has its own ScInputHandler* m_pRefInputHandler; -std::unique_ptrm_pViewCfg; +std::unique_ptr> m_pViewCfg; std::unique_ptr> m_pDocCfg; std::unique_ptr> m_pAppCfg; std::unique_ptrm_pDefaultsCfg; commit bee82941206bfae3f57a3008babec7c16b129b5d Author: Caolán McNamara AuthorDate: Fri Jul 26 17:33:06 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 14:11:30 2019 +0200 weld SvxBasicIDEOptionsPage Change-Id: I3f5a7fe106075194e90e0da6f6538882024adec1 Reviewed-on: https://gerrit.libreoffice.org/76454 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 688b4e7e4f83..56a52fbcd45c 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -22,49 +22,36 @@ #include #include -SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) -: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) +SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet) +: SfxTabPage(pParent, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet) +, m_xCodeCompleteChk(m_xBuilder->weld_check_button("codecomplete_enable")) +, m_xAutocloseProcChk(m_xBuilder->weld_check_button("autoclose_proc")) +, m_xAutocloseParenChk(m_xBuilder->weld_check_button("autoclose_paren")) +, m_xAutocloseQuotesChk(m_xBuilder->weld_check_button("autoclose_quotes")) +, m_xAutoCorrectChk(m_xBuilder->weld_check_button("autocorrect")) +, m_xUseExtendedTypesChk(m_xBuilder->weld_check_button("extendedtypes_enable")) { -get(pCodeCompleteChk, "codecomplete_enable"); -get(pAutocloseProcChk, "autoclose_proc"); -get(pAutocloseParenChk, "autoclose_paren"); -get(pAutocloseQuotesChk, "autoclose_quotes"); -get(pAutoCorrectChk, "autocorrect"); -get(pUseExtendedTypesChk, "extendedtypes_enable"); - LoadConfig(); } SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage() { -disposeOnce(); -} - -void SvxBasicIDEOptionsPage::dispose() -{ -pCodeCompleteChk.clear(); -pAutocloseProcChk.clear(); -pAutocloseParenChk.clear(); -pAutocloseQuotesChk.clear(); -pAutoCorrectChk.clear(); -pUseExtendedTypesChk.clear(); -SfxTabPage::dispose(); } void SvxBasicIDEOptionsPage::LoadConfig() { -pCodeCompleteChk->Check( officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get() ); -pCodeCompleteChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::CodeComplete::isReadOnly() ); -pAutocloseProcChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get() ); -pAutocloseProcChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::isReadOnly() ); -pAutocloseQuotesChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get() ); -pAutocloseQuotesChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::isReadOnly() ); -pAutocloseParenChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get() ); -pAutocloseParenChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::isReadOnly() ); -pAutoCorrectChk->Check( officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::get() ); -pAutoCorrectChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::isReadOnly() ); -pUseExtendedTypesChk->Check( officecfg::Office::BasicIDE::Autocomplete::UseExtended::get() ); -pUseExtendedTypesChk->Enable( !officecfg::Office::BasicIDE::Autocomplete::UseExtended::isReadOnly() ); +m_xCodeCompleteChk->set_active( officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get() ); +m_xCodeCompleteChk->set_sensitive( !officecfg::Office::BasicIDE::Autocomplete::CodeComplete::isReadOnly() ); +m_xAutocloseProcChk->set_active( officecfg::Offic
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig
cui/source/inc/optasian.hxx | 45 +++- cui/source/options/optaccessibility.cxx | 80 ++- cui/source/options/optaccessibility.hxx | 18 +-- cui/source/options/optasian.cxx | 169 ++-- cui/uiconfig/ui/optasianpage.ui | 21 +-- 5 files changed, 142 insertions(+), 191 deletions(-) New commits: commit 31bdf49b8c96f408d7b02c9925633eb419f65211 Author: Caolán McNamara AuthorDate: Fri Jul 26 20:32:10 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:52:26 2019 +0200 weld SvxAsianLayoutPage Change-Id: I0bea0026177dcb056edd073cdd9c51e76273d169 Reviewed-on: https://gerrit.libreoffice.org/76456 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index c6999c279460..1aaeafa583df 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -21,41 +21,34 @@ #include #include -#include -#include -#include -#include #include + struct SvxAsianLayoutPage_Impl; class SvxAsianLayoutPage : public SfxTabPage { -VclPtr m_pCharKerningRB; -VclPtr m_pCharPunctKerningRB; - -VclPtr m_pNoCompressionRB; -VclPtr m_pPunctCompressionRB; -VclPtr m_pPunctKanaCompressionRB; - -VclPtr m_pLanguageFT; -VclPtr m_pLanguageLB; -VclPtr m_pStandardCB; - -VclPtr m_pStartFT; -VclPtrm_pStartED; -VclPtr m_pEndFT; -VclPtrm_pEndED; -VclPtr m_pHintFT; - std::unique_ptr pImpl; -DECL_LINK(LanguageHdl, ListBox&, void); -DECL_LINK(ChangeStandardHdl, Button*, void); -DECL_LINK(ModifyHdl, Edit&, void); +std::unique_ptr m_xCharKerningRB; +std::unique_ptr m_xCharPunctKerningRB; +std::unique_ptr m_xNoCompressionRB; +std::unique_ptr m_xPunctCompressionRB; +std::unique_ptr m_xPunctKanaCompressionRB; +std::unique_ptr m_xLanguageFT; +std::unique_ptr m_xLanguageLB; +std::unique_ptr m_xStandardCB; +std::unique_ptr m_xStartFT; +std::unique_ptr m_xStartED; +std::unique_ptr m_xEndFT; +std::unique_ptr m_xEndED; +std::unique_ptr m_xHintFT; + +DECL_LINK(LanguageHdl, weld::ComboBox&, void); +DECL_LINK(ChangeStandardHdl, weld::ToggleButton&, void); +DECL_LINK(ModifyHdl, weld::Entry&, void); public: -SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); +SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet ); virtual ~SvxAsianLayoutPage() override; -virtual void dispose() override; static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 8c4dc9e90e0d..883bcbb984a7 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -102,81 +102,60 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( static LanguageType eLastUsedLanguageTypeForForbiddenCharacters(USHRT_MAX); -SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ) : -SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet), -pImpl(new SvxAsianLayoutPage_Impl) +SvxAsianLayoutPage::SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet) +: SfxTabPage(pParent, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet) +, pImpl(new SvxAsianLayoutPage_Impl) +, m_xCharKerningRB(m_xBuilder->weld_radio_button("charkerning")) +, m_xCharPunctKerningRB(m_xBuilder->weld_radio_button("charpunctkerning")) +, m_xNoCompressionRB(m_xBuilder->weld_radio_button("nocompression")) +, m_xPunctCompressionRB(m_xBuilder->weld_radio_button("punctcompression")) +, m_xPunctKanaCompressionRB(m_xBuilder->weld_radio_button("punctkanacompression")) +, m_xLanguageFT(m_xBuilder->weld_label("languageft")) +, m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language"))) +, m_xStandardCB(m_xBuilder->weld_check_button("standard")) +, m_xStartFT(m_xBuilder->weld_label("startft")) +, m_xStartED(m_xBuilder->weld_entry("start")) +, m_xEndFT(m_xBuilder->weld_label("endft")) +, m_xEndED(m_xBuilder->weld_entry("end")) +, m_xHintFT(m_xBuilder->weld_label("hintft")) { -get(m_pCharKerningRB, "charkerning"); -get(m_pCharPunctKerningRB, "charpunctkerning"); -get(m_pNoCompressionRB, "nocompression"); -get(m_pPunctCompressionRB, "punctcompression"); -get(m_pPunctKanaCompressionRB, "punctkanacompression"); -get(m_pLanguageFT, "languageft"); -get(m_pLanguageLB, "language"); -get(m_pStandardCB, "standard"); -get(m_pStartFT, "startft"); -get(m_pStartED, "start"); -get(m_pEndFT, "endft"); -get(m_pEndED, "end"); -get(m_pHintFT, "hintft"); +LanguageHdl(*m_xLanguageLB->get_widget()); +m_xLanguageLB->connect_changed(LINK(this, SvxAsianLayoutPage, L
[Libreoffice-commits] core.git: 2 commits - cui/source include/vcl sd/source vcl/source vcl/unx
cui/source/options/optopencl.cxx | 46 ++--- cui/source/options/optopencl.hxx | 12 ++- include/vcl/weld.hxx |2 + sd/source/ui/dlg/RemoteDialogClientBox.cxx |3 + vcl/source/app/salvtables.cxx | 20 +--- vcl/unx/gtk3/gtk3gtkinst.cxx |6 +++ 6 files changed, 46 insertions(+), 43 deletions(-) New commits: commit e171aec015212aa295e5e1831474b8af636e477b Author: Caolán McNamara AuthorDate: Fri Jul 26 20:44:53 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:51:24 2019 +0200 weld SvxOpenCLTabPage Change-Id: I8cc47aa63daa76794f1ec2e4fc7b64a1a0a18564 Reviewed-on: https://gerrit.libreoffice.org/76457 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index ba1ea2de7294..5131714e18c8 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include -#include #include #include #include @@ -27,7 +25,6 @@ #include #include #include -#include #include "optHeaderTabListbox.hxx" #include @@ -40,39 +37,28 @@ #include #include "optopencl.hxx" -SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : -SfxTabPage(pParent, "OptOpenCLPage", "cui/ui/optopenclpage.ui", &rSet), -maConfig(OpenCLConfig::get()) +SvxOpenCLTabPage::SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet) +: SfxTabPage(pParent, "cui/ui/optopenclpage.ui", "OptOpenCLPage", &rSet) +, maConfig(OpenCLConfig::get()) +, mxUseOpenCL(m_xBuilder->weld_check_button("useopencl")) +, mxOclUsed(m_xBuilder->weld_label("openclused")) +, mxOclNotUsed(m_xBuilder->weld_label("openclnotused")) { -get(mpUseOpenCL, "useopencl"); -get(mpOclUsed,"openclused"); -get(mpOclNotUsed,"openclnotused"); - -mpUseOpenCL->Check(maConfig.mbUseOpenCL); - mpUseOpenCL->Enable(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly()); +mxUseOpenCL->set_active(maConfig.mbUseOpenCL); + mxUseOpenCL->set_sensitive(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly()); bool bCLUsed = openclwrapper::GPUEnv::isOpenCLEnabled(); -mpOclUsed->Show(bCLUsed); -mpOclNotUsed->Show(!bCLUsed); +mxOclUsed->set_visible(bCLUsed); +mxOclNotUsed->set_visible(!bCLUsed); } SvxOpenCLTabPage::~SvxOpenCLTabPage() { -disposeOnce(); -} - -void SvxOpenCLTabPage::dispose() -{ -mpUseOpenCL.clear(); -mpOclUsed.clear(); -mpOclNotUsed.clear(); - -SfxTabPage::dispose(); } -VclPtr SvxOpenCLTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxOpenCLTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) { -return VclPtr::Create(pParent.pParent, *rAttrSet); +return VclPtr::Create(pParent, *rAttrSet); } bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) @@ -80,8 +66,8 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* ) bool bModified = false; std::shared_ptr batch(comphelper::ConfigurationChanges::create()); -if (mpUseOpenCL->IsValueChangedFromSaved()) -maConfig.mbUseOpenCL = mpUseOpenCL->IsChecked(); +if (mxUseOpenCL->get_state_changed_from_saved()) +maConfig.mbUseOpenCL = mxUseOpenCL->get_active(); if (maConfig != OpenCLConfig::get()) { @@ -105,8 +91,8 @@ void SvxOpenCLTabPage::Reset( const SfxItemSet* ) { maConfig = OpenCLConfig::get(); -mpUseOpenCL->Check(maConfig.mbUseOpenCL); -mpUseOpenCL->SaveValue(); +mxUseOpenCL->set_active(maConfig.mbUseOpenCL); +mxUseOpenCL->save_state(); } diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index cc07698e50ca..ddb74e07643a 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -22,23 +22,19 @@ #include #include -#include -#include class SvxOpenCLTabPage : public SfxTabPage { private: OpenCLConfig maConfig; -VclPtr mpUseOpenCL; - -VclPtr mpOclUsed; -VclPtr mpOclNotUsed; +std::unique_ptr mxUseOpenCL; +std::unique_ptr mxOclUsed; +std::unique_ptr mxOclNotUsed; public: -SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); +SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SvxOpenCLTabPage() override; -virtual void dispose() override; static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); commit f9fee27333e97e2251fc9b9b56072abc77a227fd Author: Caolán McNamara AuthorDate: Fri Jul 26 10:54:05 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:51:02 2019 +0200 enable setting a highlight bg (cherry picked from commit 9b618c846835abb1fe664b5951dffb3c133380fe)
[Libreoffice-commits] core.git: extras/source sd/inc sd/qa sd/source sd/uiconfig sd/UIConfig_simpress.mk
extras/source/glade/libreoffice-catalog.xml.in |4 sd/UIConfig_simpress.mk|1 sd/inc/sdabstdlg.hxx |2 sd/inc/strings.hrc |2 sd/qa/unit/dialogs-test.cxx|3 sd/source/filter/html/pubdlg.cxx |6 sd/source/ui/dlg/RemoteDialog.cxx | 54 - sd/source/ui/dlg/RemoteDialog.hxx | 18 sd/source/ui/dlg/RemoteDialogClientBox.cxx | 622 + sd/source/ui/dlg/RemoteDialogClientBox.hxx | 89 -- sd/source/ui/dlg/sddlgfact.cxx |4 sd/source/ui/dlg/sddlgfact.hxx |2 sd/source/ui/inc/pubdlg.hxx|6 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |7 sd/source/ui/view/drviews2.cxx |2 sd/source/ui/view/outlnvs2.cxx |2 sd/uiconfig/simpress/ui/clientboxfragment.ui | 79 ++ sd/uiconfig/simpress/ui/remotedialog.ui| 61 + 18 files changed, 243 insertions(+), 721 deletions(-) New commits: commit a341f12325813dafa9be80a70fc90144a144a742 Author: Caolán McNamara AuthorDate: Thu Jul 25 17:21:54 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:50:34 2019 +0200 weld RemoteDialog Change-Id: I4d3b9f7629137bc9b94f5c0426ae6fc956a97511 Reviewed-on: https://gerrit.libreoffice.org/76336 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 3cf70cfc456f..dff39e5a6c9d 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -292,10 +292,6 @@ generic-name="Writer Navigator ToolBox" parent="GtkToolbar" icon-name="widget-gtk-toolbar"/> - - diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index 5f85b4c8a7bc..b5e62f9b67d8 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -105,6 +105,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/annotationmenu \ sd/uiconfig/simpress/ui/annotationtagmenu \ + sd/uiconfig/simpress/ui/clientboxfragment \ sd/uiconfig/simpress/ui/currentmastermenu \ sd/uiconfig/simpress/ui/customanimationspanel \ sd/uiconfig/simpress/ui/customanimationproperties \ diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index eef454057185..ce5ed49ee656 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -186,7 +186,7 @@ public: virtual VclPtr CreateSdParagraphTabDlg(weld::Window* pWindow, const SfxItemSet* pAttr) = 0; virtual VclPtr CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector &rPageNames, SdCustomShowList* pCSList ) = 0; -virtual VclPtr CreateRemoteDialog( vcl::Window* pWindow ) = 0; +virtual VclPtr CreateRemoteDialog(weld::Window* pWindow) = 0; virtual VclPtr CreateSdPresLayoutTemplateDlg(SfxObjectShell* pDocSh, weld::Window* pParent, bool bBackgroundDlg, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool) = 0; virtual VclPtr CreateSdPresLayoutDlg(weld::Window* pParent, ::sd::DrawDocShell* pDocShell, const SfxItemSet& rInAttrs) = 0; virtual VclPtr CreateSdTabTemplateDlg(weld::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView) = 0; diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 6aa554df0c9f..17e0912d4cec 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -356,8 +356,6 @@ #define STR_POOLSHEET_TOTAL NC_("STR_POOLSHEET_TOTAL", "Total line" ) #define STR_POOLSHEET_FIRST_COLUMN NC_("STR_POOLSHEET_FIRST_COLUMN", "First column" ) #define STR_POOLSHEET_LAST_COLUMN NC_("STR_POOLSHEET_LAST_COLUMN", "Last column" ) -#define STR_ENTER_PIN NC_("STR_ENTER_PIN", "Enter PIN:") -#define STR_DEAUTHORISE_CLIENT NC_("STR_DEAUTHORISE_CLIENT", "Remove client authorisation") #define STR_SHRINK_FONT_SIZE NC_("STR_SHRINK_FONT_SIZE", "Shrink font size") #define STR_GROW_FONT_SIZE NC_("STR_GROW_FONT_SIZE", "Grow font size") diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 529fc6f87ffd..21cf07a005cb 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 31 --- 1 file changed, 24 insertions(+), 7 deletions(-) New commits: commit a905fed5ba72bc22098910d960e7a502365df9ef Author: Caolán McNamara AuthorDate: Fri Jul 26 10:47:01 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:49:46 2019 +0200 factor out setting widget bg Change-Id: I9f958e62df9efb00d5225ec485076fe8edbc2744 (cherry picked from commit e1252cc0bd300bf873325c598a7e5ad940061055) Reviewed-on: https://gerrit.libreoffice.org/76448 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index a472537c2bfd..a846b16d6e17 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1388,6 +1388,7 @@ private: sal_uInt16 m_nLastMouseButton; sal_uInt16 m_nLastMouseClicks; ImplSVEvent* m_pFocusEvent; +GtkCssProvider* m_pBgCssProvider; gulong m_nFocusInSignalId; gulong m_nMnemonicActivateSignalId; gulong m_nFocusOutSignalId; @@ -1579,6 +1580,24 @@ private: } } +void set_background(const OUString* pColor) +{ +GtkStyleContext *pWidgetContext = gtk_widget_get_style_context(GTK_WIDGET(m_pWidget)); +if (m_pBgCssProvider) +{ +gtk_style_context_remove_provider(pWidgetContext, GTK_STYLE_PROVIDER(m_pBgCssProvider)); +m_pBgCssProvider = nullptr; +} +if (!pColor) +return; +m_pBgCssProvider = gtk_css_provider_new(); +OUString aBuffer = "* { background-color: #" + *pColor + "; }"; +OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8); +gtk_css_provider_load_from_data(m_pBgCssProvider, aResult.getStr(), aResult.getLength(), nullptr); +gtk_style_context_add_provider(pWidgetContext, GTK_STYLE_PROVIDER(m_pBgCssProvider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); +} + public: GtkInstanceWidget(GtkWidget* pWidget, GtkInstanceBuilder* pBuilder, bool bTakeOwnership) : m_pWidget(pWidget) @@ -1590,6 +1609,7 @@ public: , m_nLastMouseButton(0) , m_nLastMouseClicks(0) , m_pFocusEvent(nullptr) +, m_pBgCssProvider(nullptr) , m_nFocusInSignalId(0) , m_nMnemonicActivateSignalId(0) , m_nFocusOutSignalId(0) @@ -2081,13 +2101,8 @@ public: virtual void set_stack_background() override { -GtkStyleContext *pWidgetContext = gtk_widget_get_style_context(GTK_WIDGET(m_pWidget)); -GtkCssProvider *pProvider = gtk_css_provider_new(); -OUString aBuffer = "* { background-color: #" + Application::GetSettings().GetStyleSettings().GetWindowColor().AsRGBHexString() + "; }"; -OString aResult = OUStringToOString(aBuffer, RTL_TEXTENCODING_UTF8); -gtk_css_provider_load_from_data(pProvider, aResult.getStr(), aResult.getLength(), nullptr); -gtk_style_context_add_provider(pWidgetContext, GTK_STYLE_PROVIDER(pProvider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); +OUString sColor = Application::GetSettings().GetStyleSettings().GetWindowColor().AsRGBHexString(); +set_background(&sColor); } virtual ~GtkInstanceWidget() override @@ -2121,6 +2136,8 @@ public: if (m_nSizeAllocateSignalId) g_signal_handler_disconnect(m_pWidget, m_nSizeAllocateSignalId); +set_background(nullptr); + if (m_pMouseEventBox && m_pMouseEventBox != m_pWidget) { // put things back they way we found them ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/window.hxx|3 --- vcl/source/window/dlgctrl.cxx | 10 -- vcl/source/window/legacyaccessibility.cxx | 20 ++-- 3 files changed, 2 insertions(+), 31 deletions(-) New commits: commit 7c84ce6960cbb9fccad20ad4d816b08b32e9567c Author: Caolán McNamara AuthorDate: Fri Jul 26 17:07:05 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:45:49 2019 +0200 drop empty GetParentLabeledBy and GetParentLabelFor members Change-Id: I92b36874879f89ef4dc862d61da58edd64867e92 Reviewed-on: https://gerrit.libreoffice.org/76450 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 39c0fb4fd4e1..e1a91e9e1e35 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1264,9 +1264,6 @@ public: boolIsAccessibilityEventsSuppressed( bool bTraverseParentPath = true ); voidSetAccessibilityEventsSuppressed(bool bSuppressed); -// Deprecated - can use SetAccessibleRelationLabelFor/By nowadays -vcl::Window*GetParentLabelFor( const vcl::Window* pLabel ) const; -vcl::Window*GetParentLabeledBy( const vcl::Window* pLabeled ) const; KeyEventGetActivationKey() const; protected: diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index dbbe5641d272..6721455ff94c 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -1107,16 +1107,6 @@ vcl::Window* Window::ImplFindDlgCtrlWindow( vcl::Window* pWindow ) return ::ImplFindDlgCtrlWindow( this, pWindow, nIndex, nFormStart, nFormEnd ); } -vcl::Window* Window::GetParentLabelFor( const vcl::Window* ) const -{ -return nullptr; -} - -vcl::Window* Window::GetParentLabeledBy( const vcl::Window* ) const -{ -return nullptr; -} - KeyEvent Window::GetActivationKey() const { KeyEvent aKeyEvent; diff --git a/vcl/source/window/legacyaccessibility.cxx b/vcl/source/window/legacyaccessibility.cxx index 11914595fb4c..9a17eb4874a2 100644 --- a/vcl/source/window/legacyaccessibility.cxx +++ b/vcl/source/window/legacyaccessibility.cxx @@ -101,7 +101,6 @@ namespace vcl { Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const { -Window* pWindow = nullptr; Window* pFrameWindow = ImplGetFrameWindow(); WinBits nFrameStyle = pFrameWindow->GetStyle(); @@ -110,15 +109,9 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const ) return nullptr; -if ( mpWindowImpl->mpRealParent ) -pWindow = mpWindowImpl->mpRealParent->GetParentLabelFor( this ); - -if( pWindow ) -return pWindow; - sal_Unicode nAccel = getAccel( GetText() ); -pWindow = ImplGetLabelFor( pFrameWindow, GetType(), const_cast(this), nAccel ); +Window* pWindow = ImplGetLabelFor( pFrameWindow, GetType(), const_cast(this), nAccel ); if( ! pWindow && mpWindowImpl->mpRealParent ) pWindow = ImplGetLabelFor( mpWindowImpl->mpRealParent, GetType(), const_cast(this), nAccel ); return pWindow; @@ -181,17 +174,8 @@ static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Windo Window* Window::getLegacyNonLayoutAccessibleRelationLabeledBy() const { -Window* pWindow = nullptr; Window* pFrameWindow = ImplGetFrameWindow(); -if ( mpWindowImpl->mpRealParent ) -{ -pWindow = mpWindowImpl->mpRealParent->GetParentLabeledBy( this ); - -if( pWindow ) -return pWindow; -} - // #i62723#, #104191# checkboxes and radiobuttons are not supposed to have labels if( GetType() == WindowType::CHECKBOX || GetType() == WindowType::RADIOBUTTON ) return nullptr; @@ -202,7 +186,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabeledBy() const // #i100833# MT 2010/02: Group box and fixed lines can also label a fixed text. // See tools/options/print for example. -pWindow = ImplGetLabeledBy( pFrameWindow, GetType(), const_cast(this) ); +Window* pWindow = ImplGetLabeledBy( pFrameWindow, GetType(), const_cast(this) ); if( ! pWindow && mpWindowImpl->mpRealParent ) pWindow = ImplGetLabeledBy( mpWindowImpl->mpRealParent, GetType(), const_cast(this) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/window.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0320d14a7655b4adce3ff2d7fc453917c96f8f21 Author: Caolán McNamara AuthorDate: Fri Jul 26 15:53:02 2019 +0100 Commit: Caolán McNamara CommitDate: Sat Jul 27 12:45:36 2019 +0200 devirtualize these now nothing overrides them Change-Id: Iae9a832b1a198a02c916c1e5eab893c166cdf615 Reviewed-on: https://gerrit.libreoffice.org/76387 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c1ac276f6327..39c0fb4fd4e1 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1265,8 +1265,8 @@ public: voidSetAccessibilityEventsSuppressed(bool bSuppressed); // Deprecated - can use SetAccessibleRelationLabelFor/By nowadays -virtual vcl::Window*GetParentLabelFor( const vcl::Window* pLabel ) const; -virtual vcl::Window*GetParentLabeledBy( const vcl::Window* pLabeled ) const; +vcl::Window*GetParentLabelFor( const vcl::Window* pLabel ) const; +vcl::Window*GetParentLabeledBy( const vcl::Window* pLabeled ) const; KeyEventGetActivationKey() const; protected: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff io/test javaunohelper/com libreofficekit/source lotuswordpro/source nlpsolver/ThirdParty offapi/com
include/xmloff/ProgressBarHelper.hxx |2 +- include/xmloff/XMLCharContext.hxx |2 +- include/xmloff/xmlimppr.hxx |6 +++--- io/test/testconnection.cxx |2 +- javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |2 +- libreofficekit/source/gtk/lokdocview.cxx |2 +- lotuswordpro/source/filter/lwpfribsection.cxx |2 +- nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java |2 +- offapi/com/sun/star/embed/XEmbedObjectFactory.idl |2 +- offapi/com/sun/star/form/PropertyBrowserController.idl |4 ++-- offapi/com/sun/star/form/XFormsSupplier2.idl |2 +- offapi/com/sun/star/form/binding/BindableIntegerValueRange.idl |2 +- 12 files changed, 15 insertions(+), 15 deletions(-) New commits: commit fdd35ea841f319c48e1978dfead703d6cb0996ff Author: Andrea Gelmini AuthorDate: Sat Jul 27 10:44:52 2019 +0200 Commit: Julien Nabet CommitDate: Sat Jul 27 11:49:10 2019 +0200 Fix typos Change-Id: I380856ca45c835e732fdf080a522caab4534db5b Reviewed-on: https://gerrit.libreoffice.org/76346 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index 75f2e6f60aaa..c593b5023a5d 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -56,7 +56,7 @@ public: void End() { if (xStatusIndicator.is()) xStatusIndicator->end(); } // set the new reference and returns the new value which gives the -// Progress Bar the sam position as before +// Progress Bar the same position as before void ChangeReference(sal_Int32 nNewReference); sal_Int32 GetReference() { return nReference; } diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 282421458820..64598e21a1d7 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -52,7 +52,7 @@ public: virtual ~XMLCharContext() override; // EndElement is called before a context will be destructed, but -// after a elements context has been parsed. It may be used for actions +// after an elements context has been parsed. It may be used for actions // that require virtual methods. The default is to do nothing. virtual void EndElement() override; diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 4b557ca0a580..d77d434b3ab5 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -78,7 +78,7 @@ public: SvXMLImport& rImport); virtual ~SvXMLImportPropertyMapper() override; -// Add a ImportPropertyMapper at the end of the import mapper chain. +// Add an ImportPropertyMapper at the end of the import mapper chain. // The added mapper MUST not be used outside the Mapper chain any longer, // because its PropertyMapper will be replaced. void ChainImportMapper( @@ -142,7 +142,7 @@ public: ContextID_Index_Pair* pSpecialContextIds ); /** implementation helper for FillPropertySet: fill an XMultiPropertySet. - * If unsuccessul, set return value. */ + * If unsuccessful, set return value. */ static bool FillMultiPropertySet_( const ::std::vector & rProperties, const css::uno::Reference< css::beans::XMultiPropertySet> & rMultiPropSet, @@ -154,7 +154,7 @@ public: ContextID_Index_Pair* pSpecialContextIds ); /** implementation helper for FillPropertySet: fill an XTolerantMultiPropertySet. - * If unsuccessul, set return value. */ + * If unsuccessful, set return value. */ static bool FillTolerantMultiPropertySet_( const ::std::vector & rProperties, const css::uno::Reference< css::beans::XTolerantMultiPropertySet> & rTolPropSet, diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 87fada6cfcbc..35bc697c9a76 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -200,7 +200,7 @@ int SAL_CALL main( int argc, char * argv[] ) testConnection( OUString("pipe,name=bla") , rAcceptorPipe , rConnector ); printf( " Done\n" ); -// check, if errornous strings make any problem +// check, if erroneous strings make any problem rAcceptor.set( xMgr->createInstance("com.sun.star.connection.Acceptor"), UNO_QUERY ); diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/Inte
[Libreoffice-commits] core.git: editeng/source
editeng/source/items/paraitem.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 8fe85c248d0d45e180db6668b8ac5840c8dc6b1e Author: Andrea Gelmini AuthorDate: Sat Jul 27 10:23:21 2019 +0200 Commit: Andrea Gelmini CommitDate: Sat Jul 27 11:48:54 2019 +0200 Removed duplicated include Change-Id: I565305df6127afa9560f1b036724596a0b9acdc8 Reviewed-on: https://gerrit.libreoffice.org/76469 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 283ae8fab51b..2194b3ed9e5a 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sw/qa
sfx2/source/sidebar/SidebarController.cxx |2 +- sw/qa/uitest/writer_dialogs/openDialogs.py |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 6022d521ed58625c7a9517787208948ef64cfe68 Author: Andrea Gelmini AuthorDate: Sat Jul 27 09:12:46 2019 +0200 Commit: Andrea Gelmini CommitDate: Sat Jul 27 10:08:31 2019 +0200 Fix typos Change-Id: I389c9aaa5788bf26398e0639c0f11f9dfbe4e3da Reviewed-on: https://gerrit.libreoffice.org/76374 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 95eba02296e6..22b022bf09ee 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -1254,7 +1254,7 @@ void SidebarController::UpdateDeckOpenState() if (comphelper::LibreOfficeKit::isActive()) { -// Sidebar wide enought to render the menu; enable it. +// Sidebar wide enough to render the menu; enable it. mpTabBar->EnableMenuButton(true); if (const SfxViewShell* pViewShell = mpViewFrame->GetViewShell()) diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py b/sw/qa/uitest/writer_dialogs/openDialogs.py index b0643e8474f1..442d0eef9095 100644 --- a/sw/qa/uitest/writer_dialogs/openDialogs.py +++ b/sw/qa/uitest/writer_dialogs/openDialogs.py @@ -87,7 +87,7 @@ dialogs = [ # {"command": ".uno:ThesaurusDialog", "closeButton": "cancel"}, # fails in CI, but works fine locally {"command": ".uno:Hyphenate", "closeButton": "ok", "skipTestOK": True}, -# do not test the OK buttong twice +# do not test the OK button twice {"command": ".uno:ChineseConversion", "closeButton": "cancel"}, # {"command": ".uno:WordCountDialog", "closeButton": "close"}, # tested in sw/qa/uitest/writer_tests/wordCount.py ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviewse.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit fbf897a7b561e26d7f95d210b6f51b9ed86d8f01 Author: Andrea Gelmini AuthorDate: Sat Jul 27 08:55:22 2019 +0200 Commit: Andrea Gelmini CommitDate: Sat Jul 27 10:03:05 2019 +0200 Removed duplicated include Change-Id: Ifa2745d724f343f5c99adc577136ca13937d7737 Reviewed-on: https://gerrit.libreoffice.org/76468 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index d825e4fc0c84..9b2b0e8f5fa7 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -29,7 +29,6 @@ #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com wizards/source
wizards/com/sun/star/wizards/agenda/AgendaDocument.py| 2 +- wizards/com/sun/star/wizards/agenda/TemplateConsts.py| 2 +- wizards/com/sun/star/wizards/common/NumberFormatter.java | 2 +- wizards/com/sun/star/wizards/common/PropertySetHelper.java | 6 +++--- wizards/com/sun/star/wizards/common/UCB.py | 2 +- wizards/com/sun/star/wizards/common/strings.hrc | 2 +- wizards/com/sun/star/wizards/query/QueryWizard.java | 2 +- wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java | 2 +- wizards/com/sun/star/wizards/report/IReportDocument.java | 4 ++-- wizards/com/sun/star/wizards/report/ReportWizard.java| 2 +- wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java| 4 ++-- wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 4 ++-- wizards/com/sun/star/wizards/text/TextDocument.py| 2 +- wizards/source/access2base/L10N.xba | 2 +- wizards/source/access2base/Utils.xba | 6 +++--- wizards/source/depot/Lang_it.xba | 2 +- wizards/source/euro/Writer.xba | 2 +- wizards/source/importwizard/FilesModul.xba | 2 +- wizards/source/tutorials/TutorialsDialog.xdl | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) New commits: commit 16e15bd404e0042aaceba3bd2ed75ac6fe333922 Author: Andrea Gelmini AuthorDate: Fri Jul 12 17:56:42 2019 +0200 Commit: Andrea Gelmini CommitDate: Sat Jul 27 10:02:06 2019 +0200 Fix typo Change-Id: I309ce0b4aade85a510836be0d04bf66c916a464a Reviewed-on: https://gerrit.libreoffice.org/75507 Reviewed-by: Julien Nabet Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py index a980e60d4959..567a1f1ae434 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py @@ -629,7 +629,7 @@ class ItemsTable(object): self.agenda.template, name, self.section) self.agenda.textSectionHandler.breakLinkOfTextSection( self.section) -# we need to get a instance after linking +# we need to get an instance after linking ItemsTable.table = self.agenda.getTable(name) self.section = self.agenda.getSection(name) diff --git a/wizards/com/sun/star/wizards/agenda/TemplateConsts.py b/wizards/com/sun/star/wizards/agenda/TemplateConsts.py index 18791f06d21a..2593c2ce3407 100644 --- a/wizards/com/sun/star/wizards/agenda/TemplateConsts.py +++ b/wizards/com/sun/star/wizards/agenda/TemplateConsts.py @@ -25,7 +25,7 @@ class TemplateConsts: ''' section name prefix for sections that contain items. this is also used as table name prefix, since each items section -must contain a table whos name is identical name to the section's name. +must contain a table whose name is identical name to the section's name. ''' SECTION_ITEMS = "AGENDA_ITEMS" ''' diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index 9a6ca217e6c9..b2220e1cca19 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -152,7 +152,7 @@ public class NumberFormatter } else { -// TODO: throws a exception in a try catch environment, very helpful? +// TODO: throws an exception in a try catch environment, very helpful? throw new Exception(); } } diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.java b/wizards/com/sun/star/wizards/common/PropertySetHelper.java index 0fb0959a0f18..7de45668eb26 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.java +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.java @@ -133,7 +133,7 @@ public class PropertySetHelper } catch (com.sun.star.lang.IllegalArgumentException e) { -DebugHelper.writeInfo("can't convert a object to integer."); +DebugHelper.writeInfo("can't convert an object to integer."); } } return nValue; @@ -179,7 +179,7 @@ public class PropertySetHelper } catch (com.sun.star.lang.IllegalArgumentException e) { -De