cui/uiconfig/ui/colorconfigwin.ui | 65 ++++++++++++++++++++++++++++++++++++++ sw/source/core/layout/fly.cxx | 11 ++---- 2 files changed, 69 insertions(+), 7 deletions(-)
New commits: commit afa42fcd26d9d8677b246fcc4485a11c50d5d67d Author: Xisco Fauli <[email protected]> AuthorDate: Mon Nov 25 11:52:57 2024 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Nov 25 14:20:29 2024 +0100 PVS: V547 Expression 'pOldSelFly' is always true. Since commit 142dc93d9ad793e036baa5573aea31cb6f416f57 Author: Michael Stahl <[email protected]> Date: Mon Oct 26 16:41:29 2020 +0100 (related: tdf#131679) sw: only unmark if this SwFlyFrame is marked Change-Id: Ia916161d336dad3d06e9df0c5747fda78dbd404c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177254 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index ae7fdfae4326..98e10b4d1c83 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -506,13 +506,10 @@ void SwFlyFrame::FinitDrawObj() if (SwFEShell *const pFEShell = dynamic_cast<SwFEShell*>(&rCurrentShell)) { // tdf#131679 move any cursor out of fly rCurrentShell.Imp()->GetDrawView()->UnmarkAll(); - if (pOldSelFly) - { - SwPaM const temp(ResolveFlyAnchor(*pOldSelFly->GetFormat())); - pFEShell->SetSelection(temp); - // could also call SetCursor() like SwFEShell::SelectObj() - // does, but that would access layout a bit much... - } + SwPaM const temp(ResolveFlyAnchor(*pOldSelFly->GetFormat())); + pFEShell->SetSelection(temp); + // could also call SetCursor() like SwFEShell::SelectObj() + // does, but that would access layout a bit much... } else { commit 93362fec3e5cb3a8e009d518bd1325fb750b3c0d Author: Caolán McNamara <[email protected]> AuthorDate: Mon Nov 25 11:16:43 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Nov 25 14:20:26 2024 +0100 fix: Gtk-CRITICAL gtk_label_set_label: assertion 'GTK_IS_LABEL (label)' failed Change-Id: I45cbfbef038653e1e99e9b2f8907a1739d6c2214 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177257 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui index 5baa136e7757..8196a72668e2 100644 --- a/cui/uiconfig/ui/colorconfigwin.ui +++ b/cui/uiconfig/ui/colorconfigwin.ui @@ -50,6 +50,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -83,6 +84,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -123,6 +125,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -156,6 +159,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -196,6 +200,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -231,6 +236,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -274,6 +280,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -314,6 +321,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -346,6 +354,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -381,6 +390,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -456,6 +466,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -491,6 +502,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -534,6 +546,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -574,6 +587,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -607,6 +621,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -647,6 +662,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -679,6 +695,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -711,6 +728,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -743,6 +761,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -775,6 +794,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -842,6 +862,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -874,6 +895,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -906,6 +928,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -938,6 +961,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -970,6 +994,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -987,6 +1012,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1019,6 +1045,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1051,6 +1078,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1083,6 +1111,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1115,6 +1144,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1147,6 +1177,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1179,6 +1210,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1229,6 +1261,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1272,6 +1305,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1297,6 +1331,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1350,6 +1385,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1407,6 +1443,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1489,6 +1526,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1522,6 +1560,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1555,6 +1594,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1588,6 +1628,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1621,6 +1662,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1654,6 +1696,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1687,6 +1730,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1720,6 +1764,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1753,6 +1798,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1805,6 +1851,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1837,6 +1884,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1869,6 +1917,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1901,6 +1950,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1933,6 +1983,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1965,6 +2016,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -1997,6 +2049,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2029,6 +2082,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2096,6 +2150,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2128,6 +2183,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2160,6 +2216,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2192,6 +2249,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2224,6 +2282,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2256,6 +2315,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2288,6 +2348,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2355,6 +2416,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2402,6 +2464,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2434,6 +2497,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child> @@ -2466,6 +2530,7 @@ <property name="halign">end</property> <property name="xalign">0</property> <property name="draw-indicator">True</property> + <property name="label" translatable="no"></property> <child> <placeholder/> </child>
