cui/source/options/optjava.cxx | 19 ++++++++++---- cui/source/options/optjava.hxx | 1 slideshow/source/engine/animationfactory.cxx | 2 - slideshow/source/engine/box2dtools.cxx | 6 +--- slideshow/source/inc/box2dtools.hxx | 36 +++++++++++++-------------- translations | 2 - 6 files changed, 37 insertions(+), 29 deletions(-)
New commits: commit 3bc2154ebf043da3cb2b29e30dac9fff5508a82a Author: Sarper Akdemir <[email protected]> AuthorDate: Mon Aug 17 12:56:44 2020 +0300 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Aug 17 14:19:03 2020 +0200 fix box2dtools build error for non debug builds Removed the asserts and moved the functions out of the box2DWorld class. Change-Id: Ifa58bceb2c64c1012e5d0e65bc12646312ab1c16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100856 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index bc1848f68435..7f5910cfb992 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -434,7 +434,7 @@ namespace slideshow::internal mbAnimationStarted = false; // Animation have ended for this body, make it static - mpBox2DWorld->makeBodyStatic( mpBox2DBody ); + box2d::utils::makeBodyStatic( mpBox2DBody ); if( !(mnFlags & AnimationFactory::FLAG_NO_SPRITE) ) mpShapeManager->leaveAnimationMode( mpShape ); diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx index c188234105d7..c02a967a5f87 100644 --- a/slideshow/source/engine/box2dtools.cxx +++ b/slideshow/source/engine/box2dtools.cxx @@ -367,9 +367,8 @@ Box2DBodySharedPtr box2DWorld::makeShapeDynamic(const slideshow::internal::Shape return makeBodyDynamic(pBox2DBody); } -Box2DBodySharedPtr box2DWorld::makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody) +Box2DBodySharedPtr makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody) { - assert(mpBox2DWorld); if (pBox2DBody->getType() != BOX2D_DYNAMIC_BODY) { pBox2DBody->setType(BOX2D_DYNAMIC_BODY); @@ -384,9 +383,8 @@ Box2DBodySharedPtr box2DWorld::makeShapeStatic(const slideshow::internal::ShapeS return makeBodyStatic(pBox2DBody); } -Box2DBodySharedPtr box2DWorld::makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody) +Box2DBodySharedPtr makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody) { - assert(mpBox2DWorld); if (pBox2DBody->getType() != BOX2D_STATIC_BODY) { pBox2DBody->setType(BOX2D_STATIC_BODY); diff --git a/slideshow/source/inc/box2dtools.hxx b/slideshow/source/inc/box2dtools.hxx index dacf24845b45..77543ea919e1 100644 --- a/slideshow/source/inc/box2dtools.hxx +++ b/slideshow/source/inc/box2dtools.hxx @@ -202,15 +202,6 @@ public: */ Box2DBodySharedPtr makeShapeDynamic(const slideshow::internal::ShapeSharedPtr& pShape); - /** Make the Box2D body a dynamic one - - A dynamic body will be affected by other bodies and the gravity. - - @param pBox2DBody - Pointer to the Box2D body - */ - Box2DBodySharedPtr makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody); - /** Make the Box2D body corresponding to the given shape a static one A static body will not be affected by other bodies and the gravity. @@ -220,15 +211,6 @@ public: */ Box2DBodySharedPtr makeShapeStatic(const slideshow::internal::ShapeSharedPtr& pShape); - /** Make the Box2D body a dynamic one - - A static body will not be affected by other bodies and the gravity. - - @param pBox2DBody - Pointer to the Box2D body - */ - Box2DBodySharedPtr makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody); - /// Create a static body from the given shape's bounding box Box2DBodySharedPtr createStaticBodyFromBoundingBox(const slideshow::internal::ShapeSharedPtr& rShape, @@ -322,6 +304,24 @@ public: /// @return type of the body box2DBodyType getType(); }; + +/** Make the Box2D body a dynamic one + + A dynamic body will be affected by other bodies and the gravity. + + @param pBox2DBody + Pointer to the Box2D body + */ +Box2DBodySharedPtr makeBodyDynamic(const Box2DBodySharedPtr& pBox2DBody); + +/** Make the Box2D body a static one + + A static body will not be affected by other bodies and the gravity. + + @param pBox2DBody + Pointer to the Box2D body + */ +Box2DBodySharedPtr makeBodyStatic(const Box2DBodySharedPtr& pBox2DBody); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ commit f7fe1e93da753d74485a13d46fe15fb198411932 Author: Stephan Bergmann <[email protected]> AuthorDate: Mon Aug 17 13:06:50 2020 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Aug 17 14:17:36 2020 +0200 Always display highlighted JRE's location ...when opening the Advanced options page and after adding a new JRE via the "Add..." button, not only after highlighting another JRE line. (I suspect this broke with 1aa246a8e8c7d974ab0f7bdfa16cda36cb700e03 "weld SvxJavaOptionsPage" towards LO 6.4.) Change-Id: I5f9b63e2d33a351eeef09712969b703f1e99ef7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100860 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 7c2738dfbff8..3cfb0e535b12 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <cassert> #include <memory> #include <config_java.h> @@ -145,11 +146,7 @@ IMPL_LINK(SvxJavaOptionsPage, CheckHdl_Impl, const weld::TreeView::iter_col&, rR IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, weld::TreeView&, void) { - // set installation directory info - OUString sLocation = m_xJavaList->get_selected_id(); - // tdf#80646 insert LTR mark after label - OUString sInfo = m_sInstallText + u"\u200E" + sLocation; - m_xJavaPathText->set_label(sInfo); + UpdateJavaPathText(); } IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl, weld::Button&, void) @@ -337,6 +334,7 @@ void SvxJavaOptionsPage::LoadJREs() if ( jfw_areEqualJavaInfo( pCmpInfo.get(), pSelectedJava.get() ) ) { HandleCheckEntry(i); + UpdateJavaPathText(); break; } ++i; @@ -375,6 +373,16 @@ void SvxJavaOptionsPage::HandleCheckEntry(int nCheckedRow) } } +void SvxJavaOptionsPage::UpdateJavaPathText() +{ + assert(m_xJavaList->get_selected_index() != -1); + // set installation directory info + OUString sLocation = m_xJavaList->get_selected_id(); + // tdf#80646 insert LTR mark after label + OUString sInfo = m_sInstallText + u"\u200E" + sLocation; + m_xJavaPathText->set_label(sInfo); +} + void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { #if HAVE_FEATURE_JAVA @@ -417,6 +425,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } HandleCheckEntry(nPos); + UpdateJavaPathText(); bStartAgain = false; } else if ( JFW_E_NOT_RECOGNIZED == eErr ) diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 0bfae107948f..d850986a45b0 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -98,6 +98,7 @@ private: void LoadJREs(); void AddJRE( JavaInfo const * _pInfo ); void HandleCheckEntry(int nCheckedRow); + void UpdateJavaPathText(); void AddFolder( const OUString& _rFolder ); void RequestRestart( svtools::RestartReason eReason ); commit fff00151fa68c2d85d5c8aa91f6304a9ea3aa32a Author: Christian Lohmaier <[email protected]> AuthorDate: Mon Aug 17 14:15:08 2020 +0200 Commit: Gerrit Code Review <[email protected]> CommitDate: Mon Aug 17 14:15:08 2020 +0200 Update git submodules * Update translations from branch 'master' to e8c9e70e057aec51c783b7230f1995020374d06f - update translations for master and force-fix errors using pocheck Change-Id: I9e806cc79950a35df80dc1ffeab84cd5f18dc861 diff --git a/translations b/translations index 1c00f748202e..e8c9e70e057a 160000 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 1c00f748202eb64ffa0be5ce38e57a47f6e5798a +Subproject commit e8c9e70e057aec51c783b7230f1995020374d06f _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
