CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-08-09 02:54:56 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 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdxcgv.cxx | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) New commits: commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371 Author: Andrés Maldonado AuthorDate: Fri May 24 17:59:13 2019 +0200 Commit: Thorsten Behrens CommitDate: Sun Sep 8 02:21:36 2019 +0200 tdf#125520 Fix OLE objects drag&drop with 'Insert as Copy' Change-Id: Ia4e6038c95d1388bdf7f9984b7cf4a69aead87a1 Reviewed-on: https://gerrit.libreoffice.org/73026 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 31d4cf2163f0..a65d38c8738d 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -743,8 +743,17 @@ std::unique_ptr SdrExchangeView::CreateMarkedObjModel() const if(nullptr == pNewObj) { -// not cloned yet, use default way -pNewObj = pObj->CloneSdrObject(*pNewModel); +// not cloned yet +if (pObj->GetObjIdentifier() == OBJ_OLE2) +{ +// tdf#125520 +pNewObj = pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject()); +} +else +{ +// use default way +pNewObj = pObj->CloneSdrObject(*pNewModel); +} } if(pNewObj) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg
dev/null |binary icon-themes/breeze/cmd/32/accepttrackedchangetonext.png |binary icon-themes/breeze/cmd/32/rejecttrackedchangetonext.png |binary icon-themes/breeze/cmd/lc_accepttrackedchangetonext.png |binary icon-themes/breeze/cmd/lc_rejecttrackedchangetonext.png |binary icon-themes/breeze/cmd/sc_accepttrackedchangetonext.png |binary icon-themes/breeze/cmd/sc_rejecttrackedchangetonext.png |binary icon-themes/breeze/links.txt | 12 ++- icon-themes/breeze/sfx2/res/chevron.png |binary icon-themes/breeze_dark/cmd/32/accepttrackedchangetonext.png |binary icon-themes/breeze_dark/cmd/32/rejecttrackedchangetonext.png |binary icon-themes/breeze_dark/cmd/lc_accepttrackedchangetonext.png |binary icon-themes/breeze_dark/cmd/lc_rejecttrackedchangetonext.png |binary icon-themes/breeze_dark/cmd/sc_accepttrackedchangetonext.png |binary icon-themes/breeze_dark/cmd/sc_rejecttrackedchangetonext.png |binary icon-themes/breeze_dark/sfx2/res/chevron.png |binary icon-themes/breeze_svg/cmd/32/accepttrackedchangetonext.svg |1 icon-themes/breeze_svg/cmd/32/firstpage.svg |1 icon-themes/breeze_svg/cmd/32/rejecttrackedchangetonext.svg |1 icon-themes/breeze_svg/cmd/lc_accepttrackedchangetonext.svg |1 icon-themes/breeze_svg/cmd/lc_firstpage.svg |1 icon-themes/breeze_svg/cmd/lc_rejecttrackedchangetonext.svg |1 icon-themes/breeze_svg/cmd/sc_accepttrackedchangetonext.svg |1 icon-themes/breeze_svg/cmd/sc_firstpage.svg |1 icon-themes/breeze_svg/cmd/sc_rejecttrackedchangetonext.svg |1 icon-themes/breeze_svg/fpicker/res/fp011.svg |1 icon-themes/breeze_svg/sfx2/res/chevron.svg |1 27 files changed, 15 insertions(+), 8 deletions(-) New commits: commit 294222866f4d39e200cf365bac77de76b2ae9841 Author: rizmut AuthorDate: Sun Sep 8 05:37:24 2019 +0700 Commit: Rizal Muttaqin CommitDate: Sun Sep 8 01:39:24 2019 +0200 Breeze: Fix for tdf#127415 & tdf#127326 - Add custom chevron (related to tdf#125296 enhancement) Change-Id: I6ca6282b39bfea0c74383bd1c744142544493be8 Reviewed-on: https://gerrit.libreoffice.org/78755 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/breeze/cmd/32/accepttrackedchangetonext.png b/icon-themes/breeze/cmd/32/accepttrackedchangetonext.png new file mode 100644 index ..9ef6ffe6ff4e Binary files /dev/null and b/icon-themes/breeze/cmd/32/accepttrackedchangetonext.png differ diff --git a/icon-themes/breeze/cmd/32/firstpage.png b/icon-themes/breeze/cmd/32/firstpage.png deleted file mode 100644 index 4d1005f4944c.. Binary files a/icon-themes/breeze/cmd/32/firstpage.png and /dev/null differ diff --git a/icon-themes/breeze/cmd/32/rejecttrackedchangetonext.png b/icon-themes/breeze/cmd/32/rejecttrackedchangetonext.png new file mode 100644 index ..55734c7ee20d Binary files /dev/null and b/icon-themes/breeze/cmd/32/rejecttrackedchangetonext.png differ diff --git a/icon-themes/breeze/cmd/lc_accepttrackedchangetonext.png b/icon-themes/breeze/cmd/lc_accepttrackedchangetonext.png new file mode 100644 index ..dcdec608dc85 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_accepttrackedchangetonext.png differ diff --git a/icon-themes/breeze/cmd/lc_firstpage.png b/icon-themes/breeze/cmd/lc_firstpage.png deleted file mode 100644 index 73839f96c2d7.. Binary files a/icon-themes/breeze/cmd/lc_firstpage.png and /dev/null differ diff --git a/icon-themes/breeze/cmd/lc_rejecttrackedchangetonext.png b/icon-themes/breeze/cmd/lc_rejecttrackedchangetonext.png new file mode 100644 index ..173d5db93279 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_rejecttrackedchangetonext.png differ diff --git a/icon-themes/breeze/cmd/sc_accepttrackedchangetonext.png b/icon-themes/breeze/cmd/sc_accepttrackedchangetonext.png new file mode 100644 index ..827183bcc1cb Binary files /dev/null and b/icon-themes/breeze/cmd/sc_accepttrackedchangetonext.png differ diff --git a/icon-themes/breeze/cmd/sc_rejecttrackedchangetonext.png b/icon-themes/breeze/cmd/sc_rejecttrackedchangetonext.png new file mode 100644 index ..edcb7597f26f Binary files /dev/null and b/icon-themes/breeze/cmd/sc_rejecttrackedchangetonext.png differ diff --git a/icon-themes/breeze/cmd/sc_firstpage.png b/icon-themes/breeze/fpicker/res/fp011.png similarity index 100% rename from icon-themes/breeze/cmd/sc_firstpage.png rename to icon-themes/breeze/fpicker/res/fp011.png diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 5834a247763c..1f76a58cd581 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1220,12 +1220,15 @@ cmd/sc_lastpage.png cmd/sc_la
[Libreoffice-commits] online.git: test/httpwstest.cpp
test/httpwstest.cpp |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 0189fb10fb00b7a0baeede8a3eb6ea191515d5af Author: Tomaž Vajngerl AuthorDate: Sat Sep 7 19:15:01 2019 +0200 Commit: Tomaž Vajngerl CommitDate: Sat Sep 7 19:15:09 2019 +0200 fix HTTPWSTest::testInactiveClient test failure Change-Id: I0974e289ecb48354fbc038dafe92b74da38fb25c diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp index 523972fd0..33ae52b91 100644 --- a/test/httpwstest.cpp +++ b/test/httpwstest.cpp @@ -1409,7 +1409,8 @@ void HTTPWSTest::testInactiveClient() token == "viewinfo:" || token == "editor:" || token == "context:" || -token == "window:"); +token == "window:" || +token == "tableselected:"); // End when we get state changed. return (token != "statechanged:"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 61b757f31f25cda6d595f64226181c7a82ce8d7f Author: rizmut AuthorDate: Sat Sep 7 16:23:39 2019 +0700 Commit: Rizal Muttaqin CommitDate: Sat Sep 7 17:18:02 2019 +0200 tdf#125368, Make KJ SVG icons available in the app Change-Id: I023cd3ce765d0e620d22c95b7091efc1ede8ce9b Reviewed-on: https://gerrit.libreoffice.org/78741 Reviewed-by: Heiko Tietze Tested-by: Rizal Muttaqin diff --git a/configure.ac b/configure.ac index 4033d6f8fe87..e6081bb94e8b 100644 --- a/configure.ac +++ b/configure.ac @@ -1575,7 +1575,7 @@ AC_ARG_WITH(theme, AS_HELP_STRING([--with-theme="theme1 theme2..."], [Choose which themes to include. By default those themes with an '*' are included. Possible choices: *breeze, *breeze_dark, *breeze_svg, *colibre, *colibre_svg, *elementary, - *elementary_svg, *karasa_jaga, *sifr, *sif_svg, *sifr_dark, *tango.]), + *elementary_svg, *karasa_jaga, *karasa_jaga_svg, *sifr, *sif_svg, *sifr_dark, *tango.]), ,) libo_FUZZ_ARG_WITH(helppack-integration, @@ -11485,14 +11485,14 @@ dnl === AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then -with_theme="breeze breeze_dark breeze_svg colibre colibre_svg elementary elementary_svg karasa_jaga sifr sifr_svg sifr_dark tango" +with_theme="breeze breeze_dark breeze_svg colibre colibre_svg elementary elementary_svg karasa_jaga karasa_jaga_svg sifr sifr_svg sifr_dark tango" fi WITH_THEMES="" if test "x$with_theme" != "xno"; then for theme in $with_theme; do case $theme in - breeze|breeze_dark|breeze_svg|colibre|colibre_svg|elementary|elementary_svg|karasa_jaga|sifr|sifr_svg|sifr_dark|tango) real_theme="$theme" ;; + breeze|breeze_dark|breeze_svg|colibre|colibre_svg|elementary|elementary_svg|karasa_jaga|karasa_jaga_svg|sifr|sifr_svg|sifr_dark|tango) real_theme="$theme" ;; default) real_theme=colibre ;; *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; esac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga icon-themes/karasa_jaga_svg
dev/null|binary icon-themes/elementary/cmd/32/accepttrackedchangetonext.png |binary icon-themes/elementary/cmd/32/dismantle.png |binary icon-themes/elementary/cmd/32/rejecttrackedchangetonext.png |binary icon-themes/elementary/cmd/32/substract.png |binary icon-themes/elementary/cmd/lc_accepttrackedchangetonext.png |binary icon-themes/elementary/cmd/lc_dismantle.png |binary icon-themes/elementary/cmd/lc_rejecttrackedchangetonext.png |binary icon-themes/elementary/cmd/sc_accepttrackedchangetonext.png |binary icon-themes/elementary/cmd/sc_dismantle.png |binary icon-themes/elementary/cmd/sc_rejectalltrackedchanges.png |binary icon-themes/elementary/cmd/sc_rejecttrackedchange.png |binary icon-themes/elementary/cmd/sc_rejecttrackedchangetonext.png |binary icon-themes/elementary/extensions/res/update/ui/onlineupdate_16.png |binary icon-themes/elementary/extensions/res/update/ui/onlineupdate_26.png |binary icon-themes/elementary/fpicker/res/fp011.png|binary icon-themes/elementary/links.txt| 14 - icon-themes/elementary_svg/cmd/32/accepttrackedchangetonext.svg |1 icon-themes/elementary_svg/cmd/32/dismantle.svg |1 icon-themes/elementary_svg/cmd/32/firstpage.svg |1 icon-themes/elementary_svg/cmd/32/rejecttrackedchangetonext.svg |1 icon-themes/elementary_svg/cmd/32/substract.svg |2 icon-themes/elementary_svg/cmd/lc_accepttrackedchangetonext.svg |1 icon-themes/elementary_svg/cmd/lc_dismantle.svg |1 icon-themes/elementary_svg/cmd/lc_firstpage.svg |1 icon-themes/elementary_svg/cmd/lc_rejecttrackedchangetonext.svg |1 icon-themes/elementary_svg/cmd/sc_accepttrackedchangetonext.svg |1 icon-themes/elementary_svg/cmd/sc_dismantle.svg |1 icon-themes/elementary_svg/cmd/sc_firstpage.svg |2 icon-themes/elementary_svg/cmd/sc_rejectalltrackedchanges.svg |2 icon-themes/elementary_svg/cmd/sc_rejecttrackedchange.svg |2 icon-themes/elementary_svg/cmd/sc_rejecttrackedchangetonext.svg |1 icon-themes/elementary_svg/extensions/res/update/ui/onlineupdate_16.svg |2 icon-themes/elementary_svg/extensions/res/update/ui/onlineupdate_26.svg |2 icon-themes/elementary_svg/fpicker/res/fp011.svg|1 icon-themes/karasa_jaga/cmd/32/accepttrackedchangetonext.png|binary icon-themes/karasa_jaga/cmd/32/bg/spelling.png |binary icon-themes/karasa_jaga/cmd/32/bg/spellonline.png |binary icon-themes/karasa_jaga/cmd/32/rejecttrackedchangetonext.png|binary icon-themes/karasa_jaga/cmd/32/spelling.png |binary icon-themes/karasa_jaga/cmd/32/spellonline.png |binary icon-themes/karasa_jaga/cmd/32/switchcontroldesignmode.png |binary icon-themes/karasa_jaga/cmd/lc_accepttrackedchangetonext.png|binary icon-themes/karasa_jaga/cmd/lc_numberformatstandard.png |binary icon-themes/karasa_jaga/cmd/lc_rejecttrackedchangetonext.png|binary icon-themes/karasa_jaga/cmd/lc_switchcontroldesignmode.png |binary icon-themes/karasa_jaga/cmd/sc_accepttrackedchangetonext.png|binary icon-themes/karasa_jaga/cmd/sc_deleteallannotation.png |binary icon-themes/karasa_jaga/cmd/sc_grow.png |binary icon-themes/karasa_jaga/cmd/sc_hideallnotes.png |binary icon-themes/karasa_jaga/cmd/sc_numberformatstandard.png |binary icon-themes/karasa_jaga/cmd/sc_rejecttrackedchangetonext.png|binary icon-themes/karasa_jaga/cmd/sc_showallnotes.png |binary icon-themes/karasa_jaga/cmd/sc_shrink.png |binary icon-themes/karasa_jaga/cmd/sc_spelling.png |binary icon-themes/karasa_jaga/cmd/sc_spellonline.png |binary icon-themes/karasa_jaga_svg/cmd/32/accepttrackedchangetonext.svg|1 icon-themes/karasa_jaga_svg/cmd/32/bg/spelling.svg |2 icon-themes/karasa_jaga_svg/cmd/32/bg/spellonline.svg |2 icon-themes/karasa_jaga_svg/cmd/32/km/bold.svg | 120 -- icon-themes/karasa_jaga_svg/cmd/32/km/italic.svg| 94 --- icon-themes/karasa_jaga_svg/cmd/32/r
Re: JunitTest_bean_complex - odk example DocumentLoader failed
Hi, Thanks for the tip, with SAL_USE_VCLPLUGIN=gtk3 DocumentLoader passes! But, JunitTest_bean_complex does not pass with any plugin, as can be seen in logs.tar.gz, in the attachment file! Regards, Vladimir Koković, DP senior(69) Serbia, Belgrade, 7.sep 2019 On 6.9.19. 17:28, Michael Stahl wrote: On 06.09.19 17:15, gmail Vladimir Koković wrote: Hi, Thanks for the suggestion, but it's like we're talking about two different things. On my LO local installation as of today, DocumentLoader can't pass! [...] CE> QObject::setParent: Cannot set parent, new parent is in a different thread CE> soffice.bin: /mnt/sdd1/home/src/libreoffice-vk/libreoffice/vcl/qt5/Qt5Clipboard.cxx:44: static com::sun::star::uno::Reference Qt5Clipboard::create(const rtl::OUString&): Assertion `QApplication::clipboard()->thread() == qApp->thread()' failed. that's the problem, looks like the KDE5/Qt5 code has a threading problem there that wasn't found previously? try to set SAL_USE_VCLPLUGIN=gtk3 or =gen to work around that for now... logs.tar.gz Description: application/gzip ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unoxml/source
unoxml/source/dom/node.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 694784687e502f2e68fde5c2e5d7fb860517cbf8 Author: Arkadiy Illarionov AuthorDate: Sat Sep 7 15:09:33 2019 +0300 Commit: Arkadiy Illarionov CommitDate: Sat Sep 7 14:54:03 2019 +0200 tdf#39593 use isUnoTunnelId in unoxml Change-Id: I8f29df9763030ff69791bf978a359f36d553dda4 Reviewed-on: https://gerrit.libreoffice.org/78742 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 7171e6c2f791..cdeab8e2d419 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -993,9 +993,7 @@ namespace DOM ::sal_Int64 SAL_CALL CNode::getSomething(Sequence< ::sal_Int8 > const& rId) { -if ((rId.getLength() == 16) && -(0 == memcmp(getUnoTunnelId().getConstArray(), -rId.getConstArray(), 16))) +if (isUnoTunnelId(rId)) { return ::sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(this) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source sd/source svx/source vcl/quartz
dbaccess/source/ui/dlg/RelationDlg.cxx |2 +- sd/source/ui/func/futext.cxx |4 ++-- svx/source/gallery2/galtheme.cxx | 12 ++-- vcl/quartz/salbmp.cxx |2 +- 4 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 483ba975b40d99c931c22a63fc85e190922406a7 Author: Noel Grandin AuthorDate: Fri Sep 6 16:20:33 2019 +0200 Commit: Noel Grandin CommitDate: Sat Sep 7 14:05:50 2019 +0200 remove some unnecessary casts Change-Id: I16aa2cdc3e92c3ea2661ebf0a528f72cbe193df9 Reviewed-on: https://gerrit.libreoffice.org/78716 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 31a672f79454..19cb52e7276c 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -65,7 +65,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent, get(m_pPB_OK, "ok"); // Copy connection -m_pConnData.reset( static_cast(pConnectionData->NewInstance()) ); +m_pConnData.reset( pConnectionData->NewInstance() ); m_pConnData->CopyFrom( *pConnectionData ); Init(m_pConnData); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index fdb04d4a7894..7005684dc8a0 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1283,9 +1283,9 @@ void FuText::ReceiveRequest(SfxRequest& rReq) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); -if( dynamic_cast< const SdrTextObj *>( pObj ) != nullptr) +if( auto pTextObj = dynamic_cast( pObj )) { -mxTextObj.reset( static_cast< SdrTextObj* >( pObj ) ); +mxTextObj.reset( pTextObj ); } } } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index b053b3e6a8d4..e02802525313 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -521,11 +521,11 @@ void GalleryTheme::Actualize( const Link& rActualize std::unique_ptr pNewObj; if ( SgaObjKind::Inet == pEntry->eObjKind ) -pNewObj.reset(static_cast(new SgaObjectINet( aGraphic, aURL ))); +pNewObj.reset(new SgaObjectINet( aGraphic, aURL )); else if ( aGraphic.IsAnimated() ) -pNewObj.reset(static_cast(new SgaObjectAnim( aGraphic, aURL ))); +pNewObj.reset(new SgaObjectAnim( aGraphic, aURL )); else -pNewObj.reset(static_cast(new SgaObjectBmp( aGraphic, aURL ))); +pNewObj.reset(new SgaObjectBmp( aGraphic, aURL )); if( !InsertObject( *pNewObj ) ) pEntry->mbDelete = true; @@ -1066,13 +1066,13 @@ bool GalleryTheme::InsertURL(const INetURLObject& rURL, sal_uInt32 nInsertPos) if( nImportRet != GalleryGraphicImportRet::IMPORT_NONE ) { if ( aGraphic.IsAnimated() ) -pNewObj.reset(static_cast(new SgaObjectAnim( aGraphic, rURL ))); +pNewObj.reset(new SgaObjectAnim( aGraphic, rURL )); else -pNewObj.reset(static_cast(new SgaObjectBmp( aGraphic, rURL ))); +pNewObj.reset(new SgaObjectBmp( aGraphic, rURL )); } #if HAVE_FEATURE_AVMEDIA else if( ::avmedia::MediaWindow::isMediaURL( rURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), ""/*TODO?*/ ) ) -pNewObj.reset(static_cast(new SgaObjectSound( rURL ))); +pNewObj.reset(new SgaObjectSound( rURL )); #endif if( pNewObj && InsertObject( *pNewObj, nInsertPos ) ) bRet = true; diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index fea2f5c42314..ee6598f7e0b6 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -296,7 +296,7 @@ bool QuartzSalBitmap::AllocateUserData() if (!alloc) { SAL_WARN( "vcl.quartz", "bad_alloc: " << mnWidth << "x" << mnHeight << " (" << mnBytesPerRow * mnHeight << " bytes)"); -m_pUserBuffer.reset( static_cast(nullptr) ); +m_pUserBuffer.reset(); mnBytesPerRow = 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/comphelper
connectivity/source/drivers/ado/AColumns.cxx |3 ++- connectivity/source/drivers/ado/AGroups.cxx |3 ++- connectivity/source/drivers/ado/AIndexes.cxx |3 ++- connectivity/source/drivers/ado/AKeys.cxx|3 ++- connectivity/source/drivers/ado/ATable.cxx |2 +- connectivity/source/drivers/ado/ATables.cxx |3 ++- connectivity/source/drivers/ado/AUsers.cxx |3 ++- connectivity/source/drivers/ado/AViews.cxx |3 ++- include/comphelper/types.hxx | 10 -- 9 files changed, 15 insertions(+), 18 deletions(-) New commits: commit c1e1806c9c01d2ac2f62f95dd79cbb2037bc87af Author: Arkadiy Illarionov AuthorDate: Sat Sep 7 01:14:48 2019 +0300 Commit: Arkadiy Illarionov CommitDate: Sat Sep 7 12:34:16 2019 +0200 tdf#39593 drop comphelper::getImplementation Replace with comphelper::getUnoTunnelImplementation. Change-Id: I96277aa9c17532ea6e2781dbc3305b2dbaa4e5c2 Reviewed-on: https://gerrit.libreoffice.org/78733 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index ef010cfb4062..e9dc7720fc99 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,7 @@ Reference< XPropertySet > OColumns::createDescriptor() // XAppend sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { -OAdoColumn* pColumn = getImplementation( descriptor ); +OAdoColumn* pColumn = getUnoTunnelImplementation( descriptor ); Reference< XPropertySet > xColumn; if ( pColumn == nullptr ) { diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 506aead14f7d..211f34f6bebe 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,7 @@ Reference< XPropertySet > OGroups::createDescriptor() // XAppend sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { -OAdoGroup* pGroup = getImplementation(descriptor); +OAdoGroup* pGroup = getUnoTunnelImplementation(descriptor); if ( pGroup == nullptr ) m_pCatalog->getConnection()->throwGenericSQLException( STR_INVALID_GROUP_DESCRIPTOR_ERROR,static_cast(this) ); diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 46cd1c1a4b86..616cd863ada4 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,7 @@ Reference< XPropertySet > OIndexes::createDescriptor() // XAppend sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { -OAdoIndex* pIndex = getImplementation(descriptor); +OAdoIndex* pIndex = getUnoTunnelImplementation(descriptor); if ( pIndex == nullptr ) m_pConnection->throwGenericSQLException( STR_INVALID_INDEX_DESCRIPTOR_ERROR,static_cast(this) ); diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index e306f918a726..19027e79ffb6 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -57,7 +58,7 @@ Reference< XPropertySet > OKeys::createDescriptor() // XAppend sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { -OAdoKey* pKey = getImplementation( descriptor ); +OAdoKey* pKey = getUnoTunnelImplementation( descriptor ); if ( pKey == nullptr) m_pConnection->throwGenericSQLException( STR_INVALID_KEY_DESCRIPTOR_ERROR,static_cast(this) ); diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 807dbb19055c..209255598476 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -164,7 +164,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); bool bError = true; -OAdoColumn* pColumn = ::comphelper::getImplementation(descriptor); +OAdoColumn* pColumn = comphelper::getUnoTunnelImplementation(descriptor); if(pColumn != nullptr) { WpADOColumns aColumns = m_aTable.get_Columns(); diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/screenshotannotationdlg.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit b9b39acea7ec3867b0d911128148b03bf24a66ca Author: Andrea Gelmini AuthorDate: Sat Sep 7 09:16:16 2019 +0200 Commit: Julien Nabet CommitDate: Sat Sep 7 10:39:08 2019 +0200 Fix typos Change-Id: Ia6760e685e7f38458a8c78e6304d06d0e7222805 Reviewed-on: https://gerrit.libreoffice.org/78740 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 2ed79d7a221f..c7ea3c1d3282 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -172,7 +172,7 @@ private: // all detected children ControlDataCollection maAllChildren; -// hilighted/selected children +// highlighted/selected children ControlDataEntry* mpHilighted; std::set< ControlDataEntry* > maSelected; @@ -515,7 +515,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer( PaintControlDataEntry(*rCandidate, COL_LIGHTRED, fLineWidthEntries, fTransparence * 0.2); } -// paint hilighted entry +// paint highlighted entry if (mpHilighted && bPaintHilight) { static const double fLineWidthHilight(7.0); @@ -533,7 +533,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintPictureElement() { if (mpPicture && mpVirtualBufferDevice) { -// reset image in buffer, use dimmed version and allow hilight +// reset image in buffer, use dimmed version and allow highlight RepaintToBuffer(true, true); // copy new content to picture control (hard paint) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - connectivity/source
connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 2454cbd3d810679b0703b0764abf2d05b01c89e7 Author: Tamas Bunth AuthorDate: Thu Sep 5 14:31:35 2019 +0200 Commit: Tamás Bunth CommitDate: Sat Sep 7 10:30:13 2019 +0200 mysqlc: Support connection to utf8mb4 server This charset is backward compatible with 'normal' utf-8. Change-Id: I4407894bf9029b9c56eb0d2530796e85bd226591 Reviewed-on: https://gerrit.libreoffice.org/78654 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tamás Bunth diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx index e6149975be9c..56be89aaf4e7 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx @@ -88,6 +88,8 @@ void OConnection::construct(const rtl::OUString& url, const Sequencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits