[Libreoffice-commits] core.git: sw/UITest_writer_tests2.mk sw/UITest_writer_tests3.mk sw/UITest_writer_tests4.mk sw/UITest_writer_tests6.mk
sw/UITest_writer_tests2.mk |2 ++
sw/UITest_writer_tests3.mk |2 ++
sw/UITest_writer_tests4.mk |2 ++
sw/UITest_writer_tests6.mk |2 ++
4 files changed, 8 insertions(+)
New commits:
commit f7ec6a19dca9619bce038dd0aee88765a93255f6
Author: Miklos Vajna
AuthorDate: Mon Mar 20 20:05:27 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 21 07:16:08 2023 +
UITest_writer_tests{2,3,4,6}: enable oneprocess mode
Execution time changes:
- from 4m8,209s to 2m23,235s
- from 4m0,718s to 2m35,536s
- from 2m52,488s to 1m58,201s
- from 2m40,288s to 1m48,718s
for me.
Change-Id: I9e345d4b97ff888daa9b72598523eb45eaeca648
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149181
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/UITest_writer_tests2.mk b/sw/UITest_writer_tests2.mk
index 771508014d23..641d394578aa 100644
--- a/sw/UITest_writer_tests2.mk
+++ b/sw/UITest_writer_tests2.mk
@@ -14,3 +14,5 @@ $(eval $(call
gb_UITest_add_modules,writer_tests2,$(SRCDIR)/sw/qa/uitest,\
$(eval $(call gb_UITest_set_defs,writer_tests2, \
TDOC="$(SRCDIR)/sw/qa/uitest/data" \
))
+
+$(eval $(call gb_UITest_use_oneprocess,writer_tests2))
diff --git a/sw/UITest_writer_tests3.mk b/sw/UITest_writer_tests3.mk
index b68e7379c3a6..58126977f7f9 100644
--- a/sw/UITest_writer_tests3.mk
+++ b/sw/UITest_writer_tests3.mk
@@ -14,3 +14,5 @@ $(eval $(call
gb_UITest_add_modules,writer_tests3,$(SRCDIR)/sw/qa/uitest,\
$(eval $(call gb_UITest_set_defs,writer_tests3, \
TDOC="$(SRCDIR)/sw/qa/uitest/data" \
))
+
+$(eval $(call gb_UITest_use_oneprocess,writer_tests3))
diff --git a/sw/UITest_writer_tests4.mk b/sw/UITest_writer_tests4.mk
index e08e955fd1cd..4bc9e89ccf65 100644
--- a/sw/UITest_writer_tests4.mk
+++ b/sw/UITest_writer_tests4.mk
@@ -14,3 +14,5 @@ $(eval $(call
gb_UITest_add_modules,writer_tests4,$(SRCDIR)/sw/qa/uitest,\
$(eval $(call gb_UITest_set_defs,writer_tests4, \
TDOC="$(SRCDIR)/sw/qa/uitest/data" \
))
+
+$(eval $(call gb_UITest_use_oneprocess,writer_tests4))
diff --git a/sw/UITest_writer_tests6.mk b/sw/UITest_writer_tests6.mk
index 1b17cd262333..10e7112a1ce3 100644
--- a/sw/UITest_writer_tests6.mk
+++ b/sw/UITest_writer_tests6.mk
@@ -14,3 +14,5 @@ $(eval $(call
gb_UITest_add_modules,writer_tests6,$(SRCDIR)/sw/qa/uitest,\
$(eval $(call gb_UITest_set_defs,writer_tests6, \
TDOC="$(SRCDIR)/sw/qa/uitest/data" \
))
+
+$(eval $(call gb_UITest_use_oneprocess,writer_tests6))
[Libreoffice-commits] core.git: 3 commits - vcl/inc vcl/jsdialog vcl/source
vcl/inc/jsdialog/jsdialogbuilder.hxx |1
vcl/inc/salvtables.hxx | 54
vcl/jsdialog/executor.cxx| 22 +
vcl/jsdialog/jsdialogbuilder.cxx | 12
vcl/source/app/salvtables.cxx| 438 +--
5 files changed, 304 insertions(+), 223 deletions(-)
New commits:
commit b9484dfdc2545a1c8eb954b260b5e122d1ede56c
Author: Szymon Kłos
AuthorDate: Thu Mar 9 14:17:23 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 07:18:06 2023 +
Move SalInstanceScrolledWindow declaration to header file
Change-Id: I8848358cf04ad0298867903350476f1f3b38b7da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148608
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149160
Tested-by: Jenkins
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 1bbf37b4f7fb..3c421fc89c90 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -2108,4 +2108,58 @@ public:
virtual void set_image(const css::uno::Reference&
rImage) override;
};
+class SalInstanceScrolledWindow : public SalInstanceContainer, public virtual
weld::ScrolledWindow
+{
+private:
+VclPtr m_xScrolledWindow;
+Link m_aOrigVScrollHdl;
+Link m_aOrigHScrollHdl;
+bool m_bUserManagedScrolling;
+
+DECL_LINK(VscrollHdl, ScrollBar*, void);
+DECL_LINK(HscrollHdl, ScrollBar*, void);
+
+static void customize_scrollbars(ScrollBar& rScrollBar, const Color&
rButtonTextColor,
+ const Color& rBackgroundColor, const
Color& rShadowColor,
+ const Color& rFaceColor);
+
+public:
+SalInstanceScrolledWindow(VclScrolledWindow* pScrolledWindow,
SalInstanceBuilder* pBuilder,
+ bool bTakeOwnership, bool bUserManagedScrolling);
+
+virtual void hadjustment_configure(int value, int lower, int upper, int
step_increment,
+ int page_increment, int page_size)
override;
+virtual int hadjustment_get_value() const override;
+virtual void hadjustment_set_value(int value) override;
+virtual int hadjustment_get_upper() const override;
+virtual void hadjustment_set_upper(int upper) override;
+virtual int hadjustment_get_page_size() const override;
+virtual void hadjustment_set_page_size(int size) override;
+virtual void hadjustment_set_page_increment(int size) override;
+virtual void hadjustment_set_step_increment(int size) override;
+virtual void set_hpolicy(VclPolicyType eHPolicy) override;
+virtual VclPolicyType get_hpolicy() const override;
+
+virtual void vadjustment_configure(int value, int lower, int upper, int
step_increment,
+ int page_increment, int page_size)
override;
+virtual int vadjustment_get_value() const override;
+virtual void vadjustment_set_value(int value) override;
+virtual int vadjustment_get_upper() const override;
+virtual void vadjustment_set_upper(int upper) override;
+virtual int vadjustment_get_lower() const override;
+virtual void vadjustment_set_lower(int lower) override;
+virtual int vadjustment_get_page_size() const override;
+virtual void vadjustment_set_page_size(int size) override;
+virtual void vadjustment_set_page_increment(int size) override;
+virtual void vadjustment_set_step_increment(int size) override;
+
+virtual void set_vpolicy(VclPolicyType eVPolicy) override;
+virtual VclPolicyType get_vpolicy() const override;
+virtual int get_scroll_thickness() const override;
+virtual void set_scroll_thickness(int nThickness) override;
+virtual void customize_scrollbars(const Color& rBackgroundColor, const
Color& rShadowColor,
+ const Color& rFaceColor) override;
+virtual ~SalInstanceScrolledWindow() override;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 61fa56dd3223..4a31b3d2cd3d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2247,257 +2247,251 @@ public:
virtual int get_position() const override { return
m_xPaned->get_position(); }
};
+}
-class SalInstanceScrolledWindow : public SalInstanceContainer, public virtual
weld::ScrolledWindow
-{
-private:
-VclPtr m_xScrolledWindow;
-Link m_aOrigVScrollHdl;
-Link m_aOrigHScrollHdl;
-bool m_bUserManagedScrolling;
-
-DECL_LINK(VscrollHdl, ScrollBar*, void);
-DECL_LINK(HscrollHdl, ScrollBar*, void);
-
-static void customize_scrollbars(ScrollBar& rScrollBar, const Color&
rButtonTextColor,
- const Color& rBackgroundColor, const
Color& rShadowColor,
- const Color& rFaceColor)
-{
-rScrollB
Re: FYI: Compatibility of Gradients
Thanks for that - It is really insightful and rather complete. On Mon, Mar 20, 2023 at 4:44 PM Regina Henschel wrote: > Hi all, > > I've been working on importing and exporting gradients for Fontwork > shapes lately. In the process, I realized how incompatible gradients are > in Microsoft Office and LibreOffice. > > To get an overview, I wrote down a comparison. Since this might be of > interest to you as well, I put it in the wiki. > https://wiki.documentfoundation.org/User:Regina/Compatibility_of_Gradients > > Kind regards, > Regina >
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 8bc607225e6bc9ba343e2292f9185b6491108e44
Author: Miklos Vajna
AuthorDate: Tue Mar 21 08:17:46 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 21 08:17:28 2023 +
sw floattable, CppunitTest_sw_ooxmlexport9: assert the layout in
testTdf107889
The point is that the table is multi-page, which is preserved. The
detail that it's not in a fly is no longer true.
Change-Id: I63ee8182638a2f0118584f5e985abaf1c3d7e337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149188
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 9013dc83c126..da430214d75f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1156,10 +1156,18 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107033,
"tdf107033.docx")
}
#if HAVE_MORE_FONTS
-DECLARE_OOXMLEXPORT_TEST(testTdf107889, "tdf107889.docx")
-{
-// This was 1, multi-page table was imported as a floating one.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_TEST_FIXTURE(Test, testTdf107889)
+{
+SwModelTestBase::FlySplitGuard aGuard;
+auto verify = [this]() {
+// This was 1, multi-page table was imported as a non-split fly.
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//tab", 2);
+};
+createSwDoc("tdf107889.docx");
+verify();
+reload(mpFilter, "tdf107889.docx");
+verify();
}
#endif
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fd32093df9fdf5d46ed4def9fd8dada7d0d5e361
Author: Caolán McNamara
AuthorDate: Mon Mar 20 11:31:25 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 08:36:05 2023 +
tdf#154232 signal_drag_begin callback can delete current GtkTargetList
so fetch the up to date one on calling gtk_drag_begin_with_coordinates
==3221972== Invalid read of size 8
==3221972==at 0x23F281DA: gtk_drag_begin_internal (gtkdnd.c:1801)
==3221972==by 0x23F2886F: gtk_drag_begin_with_coordinates
(gtkdnd.c:1995)
==3221972==by 0x23845075: (anonymous
namespace)::GtkInstanceWidget::signal_motion(_GdkEventMotion const*)
(gtkinst.cxx:3139)
==3221972==by 0x23844F09: (anonymous
namespace)::GtkInstanceWidget::signalMotion(_GtkWidget*, _GdkEventMotion*,
void*) (gtkinst.cxx:3130)
==3221972==by 0x23C0FC56: _gtk_marshal_BOOLEAN__BOXED
(gtkmarshalers.c:84)
==3221972==by 0x1378C05F: g_closure_invoke (gclosure.c:832)
==3221972==by 0x137B8F65: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
==3221972==by 0x137A8ED5: g_signal_emit_valist (gsignal.c:3559)
==3221972==by 0x137A96F2: g_signal_emit (gsignal.c:3606)
==3221972==by 0x23EF1073: gtk_widget_event_internal.part.0.lto_priv.0
(gtkwidget.c:7812)
==3221972==by 0x23D825AD: UnknownInlinedFun (gtkmain.c:2588)
==3221972==by 0x23D825AD: propagate_event.lto_priv.0 (gtkmain.c:2691)
==3221972==by 0x23D83320: UnknownInlinedFun (gtkmain.c:1921)
==3221972==by 0x23D83320: gtk_main_do_event (gtkmain.c:1691)
==3221972== Address 0x2c7d8070 is 0 bytes inside a block of size 16 free'd
==3221972==at 0x48460E4: free (vg_replace_malloc.c:884)
==3221972==by 0x1383388C: g_free (gmem.c:229)
==3221972==by 0x1384E093: g_slice_free1 (gslice.c:1185)
==3221972==by 0x23CD7A08: gtk_drag_source_set (gtkdragsource.c:162)
==3221972==by 0x23ED1EAB: gtk_tree_view_enable_model_drag_source
(gtktreeview.c:14303)
==3221972==by 0x23877F41: (anonymous
namespace)::GtkInstanceTreeView::drag_source_set(std::__debug::vector<_GtkTargetEntry,
std::allocator<_GtkTargetEntry> > const&, GdkDragAction) (gtkinst.cxx:16279)
==3221972==by 0x238440B3: (anonymous
namespace)::GtkInstanceWidget::do_enable_drag_source(rtl::Reference
const&, unsigned char) (gtkinst.cxx:2707)
==3221972==by 0x23877E99: (anonymous
namespace)::GtkInstanceTreeView::enable_drag_source(rtl::Reference&,
unsigned char) (gtkinst.cxx:16270)
==3221972==by 0x36AAE6D2: SwContentTree::DragBeginHdl(bool&)
(content.cxx:1227)
==3221972==by 0x36AAE2CE: SwContentTree::LinkStubDragBeginHdl(void*,
bool&) (content.cxx:1180)
==3221972==by 0x238D38DA: Link::Call(bool&) const
(link.hxx:111)
==3221972==by 0x23878D2D: (anonymous
namespace)::GtkInstanceTreeView::do_signal_drag_begin(bool&) (gtkinst.cxx:16520)
Change-Id: Idffa33c6a549bf17a92eb56760ddfb7d5424b7ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149155
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 3177ec5272d2..5fe9ff9779fe 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3132,12 +3132,12 @@ private:
bool signal_motion(const GdkEventMotion* pEvent)
{
-GtkTargetList* pDragData = (m_eDragAction != 0 && m_nPressedButton !=
-1 && m_xDragSource.is()) ? gtk_drag_source_get_target_list(m_pWidget) :
nullptr;
+const bool bDragData = m_eDragAction != 0 && m_nPressedButton != -1 &&
m_xDragSource.is() && gtk_drag_source_get_target_list(m_pWidget);
bool bUnsetDragIcon(false);
-if (pDragData && gtk_drag_check_threshold(m_pWidget, m_nPressStartX,
m_nPressStartY, pEvent->x, pEvent->y) && !do_signal_drag_begin(bUnsetDragIcon))
+if (bDragData && gtk_drag_check_threshold(m_pWidget, m_nPressStartX,
m_nPressStartY, pEvent->x, pEvent->y) && !do_signal_drag_begin(bUnsetDragIcon))
{
GdkDragContext* pContext =
gtk_drag_begin_with_coordinates(m_pWidget,
-
pDragData,
+
gtk_drag_source_get_target_list(m_pWidget),
m_eDragAction,
m_nPressedButton,
const_cast(reinterpret_cast(pEvent)),
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9cb9bda78a7e47c4948e6ef2702f07460b22050a
Author: Caolán McNamara
AuthorDate: Mon Mar 20 11:31:25 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 08:36:25 2023 +
tdf#154232 signal_drag_begin callback can delete current GtkTargetList
so fetch the up to date one on calling gtk_drag_begin_with_coordinates
==3221972== Invalid read of size 8
==3221972==at 0x23F281DA: gtk_drag_begin_internal (gtkdnd.c:1801)
==3221972==by 0x23F2886F: gtk_drag_begin_with_coordinates
(gtkdnd.c:1995)
==3221972==by 0x23845075: (anonymous
namespace)::GtkInstanceWidget::signal_motion(_GdkEventMotion const*)
(gtkinst.cxx:3139)
==3221972==by 0x23844F09: (anonymous
namespace)::GtkInstanceWidget::signalMotion(_GtkWidget*, _GdkEventMotion*,
void*) (gtkinst.cxx:3130)
==3221972==by 0x23C0FC56: _gtk_marshal_BOOLEAN__BOXED
(gtkmarshalers.c:84)
==3221972==by 0x1378C05F: g_closure_invoke (gclosure.c:832)
==3221972==by 0x137B8F65: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
==3221972==by 0x137A8ED5: g_signal_emit_valist (gsignal.c:3559)
==3221972==by 0x137A96F2: g_signal_emit (gsignal.c:3606)
==3221972==by 0x23EF1073: gtk_widget_event_internal.part.0.lto_priv.0
(gtkwidget.c:7812)
==3221972==by 0x23D825AD: UnknownInlinedFun (gtkmain.c:2588)
==3221972==by 0x23D825AD: propagate_event.lto_priv.0 (gtkmain.c:2691)
==3221972==by 0x23D83320: UnknownInlinedFun (gtkmain.c:1921)
==3221972==by 0x23D83320: gtk_main_do_event (gtkmain.c:1691)
==3221972== Address 0x2c7d8070 is 0 bytes inside a block of size 16 free'd
==3221972==at 0x48460E4: free (vg_replace_malloc.c:884)
==3221972==by 0x1383388C: g_free (gmem.c:229)
==3221972==by 0x1384E093: g_slice_free1 (gslice.c:1185)
==3221972==by 0x23CD7A08: gtk_drag_source_set (gtkdragsource.c:162)
==3221972==by 0x23ED1EAB: gtk_tree_view_enable_model_drag_source
(gtktreeview.c:14303)
==3221972==by 0x23877F41: (anonymous
namespace)::GtkInstanceTreeView::drag_source_set(std::__debug::vector<_GtkTargetEntry,
std::allocator<_GtkTargetEntry> > const&, GdkDragAction) (gtkinst.cxx:16279)
==3221972==by 0x238440B3: (anonymous
namespace)::GtkInstanceWidget::do_enable_drag_source(rtl::Reference
const&, unsigned char) (gtkinst.cxx:2707)
==3221972==by 0x23877E99: (anonymous
namespace)::GtkInstanceTreeView::enable_drag_source(rtl::Reference&,
unsigned char) (gtkinst.cxx:16270)
==3221972==by 0x36AAE6D2: SwContentTree::DragBeginHdl(bool&)
(content.cxx:1227)
==3221972==by 0x36AAE2CE: SwContentTree::LinkStubDragBeginHdl(void*,
bool&) (content.cxx:1180)
==3221972==by 0x238D38DA: Link::Call(bool&) const
(link.hxx:111)
==3221972==by 0x23878D2D: (anonymous
namespace)::GtkInstanceTreeView::do_signal_drag_begin(bool&) (gtkinst.cxx:16520)
Change-Id: Idffa33c6a549bf17a92eb56760ddfb7d5424b7ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149101
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8697f7f7eb47..1841ebbaf7f4 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3120,12 +3120,12 @@ private:
bool signal_motion(const GdkEventMotion* pEvent)
{
-GtkTargetList* pDragData = (m_eDragAction != 0 && m_nPressedButton !=
-1 && m_xDragSource.is()) ? gtk_drag_source_get_target_list(m_pWidget) :
nullptr;
+const bool bDragData = m_eDragAction != 0 && m_nPressedButton != -1 &&
m_xDragSource.is() && gtk_drag_source_get_target_list(m_pWidget);
bool bUnsetDragIcon(false);
-if (pDragData && gtk_drag_check_threshold(m_pWidget, m_nPressStartX,
m_nPressStartY, pEvent->x, pEvent->y) && !do_signal_drag_begin(bUnsetDragIcon))
+if (bDragData && gtk_drag_check_threshold(m_pWidget, m_nPressStartX,
m_nPressStartY, pEvent->x, pEvent->y) && !do_signal_drag_begin(bUnsetDragIcon))
{
GdkDragContext* pContext =
gtk_drag_begin_with_coordinates(m_pWidget,
-
pDragData,
+
gtk_drag_source_get_target_list(m_pWidget),
m_eDragAction,
m_nPressedButton,
const_cast(reinterpret_cast(pEvent)),
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 38eaa71245954d0dd8805b2140039f126a8ea0e3 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:32:32 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 08:41:03 2023 + jsdialog: enabled spelling dialog Change-Id: I36c35e82aa17d8e6cb76dbb24f33344870c49629 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149172 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 116cc6a5b768..4e5c79c1bf9b 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -55,6 +55,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/queryduplicatedialog.ui" || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/specialcharacters.ui" +|| rUIFile == u"cui/ui/spellingdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" || rUIFile == u"cui/ui/transparencytabpage.ui"
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx|6
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |2
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |2
chart2/source/inc/Diagram.hxx | 15 +
chart2/source/inc/DiagramHelper.hxx| 16 -
chart2/source/model/main/Diagram.cxx | 85
+
chart2/source/model/template/BarChartTypeTemplate.cxx |6
chart2/source/model/template/StockChartTypeTemplate.cxx|2
chart2/source/tools/DiagramHelper.cxx | 94
--
chart2/source/tools/TitleHelper.cxx|4
chart2/source/view/main/ChartView.cxx |4
11 files changed, 113 insertions(+), 123 deletions(-)
New commits:
commit df12a23157f4515ba5e78c0bd293dfd1609de668
Author: Noel Grandin
AuthorDate: Thu Mar 16 09:32:07 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 21 08:44:53 2023 +
move getVertical/setVertical inside chart2::Diagram
Change-Id: Ide512e20fea94b1d7d038290d1c833f1d8cf42ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149164
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 657751ed3c23..7cc7c57e2862 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -1385,9 +1385,9 @@ void WrappedVerticalProperty::setPropertyValue( const
Any& rOuterValue, const Re
bool bFound = false;
bool bAmbiguous = false;
-bool bOldVertical = DiagramHelper::getVertical( xDiagram, bFound,
bAmbiguous );
+bool bOldVertical = xDiagram->getVertical( bFound, bAmbiguous );
if( bFound && ( bOldVertical != bNewVertical || bAmbiguous ) )
-DiagramHelper::setVertical( xDiagram, bNewVertical );
+xDiagram->setVertical( bNewVertical );
}
Any WrappedVerticalProperty::getPropertyValue( const Reference<
beans::XPropertySet >& /*xInnerPropertySet*/ ) const
@@ -1397,7 +1397,7 @@ Any WrappedVerticalProperty::getPropertyValue( const
Reference< beans::XProperty
{
bool bFound = false;
bool bAmbiguous = false;
-bool bVertical = DiagramHelper::getVertical( xDiagram, bFound,
bAmbiguous );
+bool bVertical = xDiagram->getVertical( bFound, bAmbiguous );
if( bFound )
m_aOuterValue <<= bVertical;
}
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index b0155174cd94..f415cd194386 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -242,7 +242,7 @@ DataPointItemConverter::DataPointItemConverter(
rtl::Reference< ChartType > xChartType( xDiagram->getChartTypeOfSeries(
xSeries ) );
bool bFound = false;
bool bAmbiguous = false;
-bool bSwapXAndY = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous
);
+bool bSwapXAndY = xDiagram->getVertical( bFound, bAmbiguous );
m_aAvailableLabelPlacements =
ChartTypeHelper::getSupportedLabelPlacements( xChartType, bSwapXAndY, xSeries );
m_bForbidPercentValue = ChartTypeHelper::getAxisType( xChartType, 0 ) !=
AxisType::CATEGORY;
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 929f1c7c48b9..b4097d21da41 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -215,7 +215,7 @@ TextLabelItemConverter::TextLabelItemConverter(
rtl::Reference< ChartType >
xChartType(xDiagram->getChartTypeOfSeries(xSeries));
bool bFound = false;
bool bAmbiguous = false;
-bool bSwapXAndY = DiagramHelper::getVertical(xDiagram, bFound, bAmbiguous);
+bool bSwapXAndY = xDiagram->getVertical(bFound, bAmbiguous);
maAvailableLabelPlacements =
ChartTypeHelper::getSupportedLabelPlacements(xChartType, bSwapXAndY, xSeries);
mbForbidPercentValue = ChartTypeHelper::getAxisType(xChartType, 0) !=
AxisType::CATEGORY;
diff --git a/chart2/source/inc/Diagram.hxx b/chart2/source/inc/Diagram.hxx
index 9ff0f94bb020..c24d10af9d83 100644
--- a/chart2/source/inc/Diagram.hxx
+++ b/chart2/source/inc/Diagram.hxx
@@ -300,6 +300,21 @@ public:
*/
void setStackMode(StackMode eStackMode);
+
+/** Sets the "SwapXAndYAxis" property at all coordinate systems found in
the
+given diagram.
+
+"vertical==true" for bar charts, "vertical==false" for column charts
+ */
+void setVer
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f2736b09046af9e9461fb13faae37b09ac941163 Author: Michael Stahl AuthorDate: Mon Mar 20 11:52:22 2023 +0100 Commit: Xisco Fauli CommitDate: Tue Mar 21 08:53:45 2023 + curl: upgrade to release 8.0.0 Fixes CVE-2023-27535. Also hopefully fixes excessive storage consumption during build: o build: drop the use of XC_AMEND_DISTCLEAN [62] Change-Id: I8792e95bc7634ee496488e80fec5a1310b24a31c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit bbe0d0534abe6480c4502ce8fb543a736d3399d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149105 Reviewed-by: Xisco Fauli diff --git a/download.lst b/download.lst index 5719657456f3..71eec4128749 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f -CURL_TARBALL := curl-7.88.1.tar.xz +CURL_SHA256SUM := 759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc +CURL_TARBALL := curl-8.0.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/accessibility/XAccessibleContext.idl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 660f73385562314e01abb4cef9d443b0c0f42b06 Author: Tor Lillqvist AuthorDate: Tue Mar 21 09:48:04 2023 +0200 Commit: Tor Lillqvist CommitDate: Tue Mar 21 09:10:53 2023 + There is no XAccessibleStateType What is meant is surely AccessibleStateType. Change-Id: I57903dd7e1eb9b0a3cac42a96633093569f770eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149194 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl index 84c8a21cfdea..6b1b16701717 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl @@ -152,10 +152,10 @@ interface XAccessibleContext : ::com::sun::star::uno::XInterface /** Returns the set of states that are currently active for this object. -See the documentation of XAccessibleStateType for a +See the documentation of AccessibleStateType for a description of the individual states. -@see XAccessibleStateType +@see AccessibleStateType */ hyper getAccessibleStateSet ();
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sc/qa sc/source
sc/qa/unit/data/ods/tdf117948_CollapseBeforeShape.ods |binary
sc/qa/unit/scshapetest.cxx| 112 ++
sc/source/filter/xml/xmlexprt.cxx | 47 ++-
3 files changed, 150 insertions(+), 9 deletions(-)
New commits:
commit 393d061a0e34917b1029f399b86058bd94a16d51
Author: Regina Henschel
AuthorDate: Sat Nov 7 01:08:53 2020 +0100
Commit: Thorsten Behrens
CommitDate: Tue Mar 21 09:25:26 2023 +
tdf#117948 Do not treat hidden rows as zero in ODF export
The object geometry in ODF file format has values so as if no hidden
columns or rows exists. But for rendering the object geometry has to
treat hidden rows and columns as zero. This patch changes the object
geometry temporarily to the 'no hidden columns and rows' mode for
export and restores the original geometry afterwards.
The patch considers hidden columns left from the shape and hidden rows
above the shape. So the object is shifted. Considering hidden columns
or rows in the area, which is covered by the shape, is still missing.
That would possibly require scaling.
cherry-pick from commit: 1cb6bb9576871ff5d56c9810ff1791abc3dd64fd
(tdf#117948 Do not treat hidden rows as zero in ODF export)
Change-Id: Icdb3f08404ca4d212d25a1967bfdc0bfc7186007
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105427
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149163
Tested-by: Gabor Kelemen
Reviewed-by: Thorsten Behrens
diff --git a/sc/qa/unit/data/ods/tdf117948_CollapseBeforeShape.ods
b/sc/qa/unit/data/ods/tdf117948_CollapseBeforeShape.ods
new file mode 100644
index ..bbc1af87cf07
Binary files /dev/null and
b/sc/qa/unit/data/ods/tdf117948_CollapseBeforeShape.ods differ
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index 55a2b0a8537c..f348854bb9e3 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
@@ -29,14 +30,18 @@ class ScShapeTest : public CalcUnoApiTest
{
public:
ScShapeTest();
+void saveAndReload(css::uno::Reference& xComponent,
+ const OUString& rFilter);
virtual void tearDown() override;
+void testTdf117948_CollapseBeforeShape();
void testFitToCellSize();
void testCustomShapeCellAnchoredRotatedShape();
void testFormSizeWithHiddenCol();
CPPUNIT_TEST_SUITE(ScShapeTest);
+CPPUNIT_TEST(testTdf117948_CollapseBeforeShape);
CPPUNIT_TEST(testFitToCellSize);
CPPUNIT_TEST(testCustomShapeCellAnchoredRotatedShape);
CPPUNIT_TEST(testFormSizeWithHiddenCol);
@@ -51,6 +56,21 @@ ScShapeTest::ScShapeTest()
{
}
+void ScShapeTest::saveAndReload(css::uno::Reference&
xComponent,
+const OUString& rFilter)
+{
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+css::uno::Sequence aArgs(1);
+aArgs[0].Name = "FilterName";
+aArgs[0].Value <<= rFilter; // e.g. "calc8"
+css::uno::Reference xStorable(xComponent,
css::uno::UNO_QUERY_THROW);
+xStorable->storeAsURL(aTempFile.GetURL(), aArgs);
+css::uno::Reference xCloseable(xComponent,
css::uno::UNO_QUERY_THROW);
+xCloseable->close(true);
+xComponent = loadFromDesktop(aTempFile.GetURL(),
"com.sun.star.sheet.SpreadsheetDocument");
+}
+
static OUString lcl_compareRectWithTolerance(const tools::Rectangle& rExpected,
const tools::Rectangle& rActual,
const sal_Int32 nTolerance)
@@ -74,6 +94,98 @@ static OUString lcl_compareRectWithTolerance(const
tools::Rectangle& rExpected,
return sErrors;
}
+static void lcl_AssertRectEqualWithTolerance(const OString& sInfo,
+ const tools::Rectangle& rExpected,
+ const tools::Rectangle& rActual,
+ const sal_Int32 nTolerance)
+{
+// Left
+OString sMsg = sInfo + " Left expected " +
OString::number(rExpected.Left()) + " actual "
+ + OString::number(rActual.Left()) + " Tolerance " +
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), labs(rExpected.Left() -
rActual.Left()) <= nTolerance);
+// Top
+sMsg = sInfo + " Top expected " + OString::number(rExpected.Top()) + "
actual "
+ + OString::number(rActual.Top()) + " Tolerance " +
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getStr(), labs(rExpected.Top() -
rActual.Top()) <= nTolerance);
+// Width
+sMsg = sInfo + " Width expected " + OString::number(rExpected.GetWidth())
+ " actual "
+ + OString::number(rActual.GetWidth()) + " Tolerance " +
OString::number(nTolerance);
+CPPUNIT_ASSERT_MESSAGE(sMsg.getS
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/inc vcl/jsdialog vcl/source
include/vcl/layout.hxx |1
vcl/inc/jsdialog/jsdialogbuilder.hxx | 22
vcl/jsdialog/jsdialogbuilder.cxx | 40 -
vcl/source/window/layout.cxx | 47 +++
4 files changed, 48 insertions(+), 62 deletions(-)
New commits:
commit 8f0a337afd8cf40a74e6668b4441903a1b49f4ae
Author: Szymon Kłos
AuthorDate: Thu Mar 9 15:43:15 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 09:35:41 2023 +
jsdialog: dump properties of scrolled window
Change-Id: Id6d072e951efec4c1de7641c94017c82840fa50b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148609
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149190
Tested-by: Jenkins
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 2296f8097a4a..f5090b24eac2 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -498,6 +498,7 @@ public:
//to override it
void setUserManagedScrolling(bool bUserManagedScrolling) {
m_bUserManagedScrolling = bUserManagedScrolling;}
void doSetAllocation(const Size &rAllocation, bool bRetryOnFailure);
+virtual void DumpAsPropertyTree(::tools::JsonWriter& rJsonWriter) override;
private:
virtual Size calculateRequisition() const override;
virtual void setAllocation(const Size &rAllocation) override;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 039cb2690a9d..c77a4a0d30e1 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2167,6 +2167,53 @@ void VclScrolledWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::R
nBorderWidth << " is larger than expected " << m_nBorderWidth);
}
+namespace {
+void lcl_dumpScrollbar(::tools::JsonWriter& rJsonWriter, ScrollBar& rScrollBar)
+{
+rJsonWriter.put("lower", rScrollBar.GetRangeMin());
+rJsonWriter.put("upper", rScrollBar.GetRangeMax());
+rJsonWriter.put("step_increment", rScrollBar.GetLineSize());
+rJsonWriter.put("page_increment", rScrollBar.GetPageSize());
+rJsonWriter.put("value", rScrollBar.GetThumbPos());
+rJsonWriter.put("page_size", rScrollBar.GetVisibleSize());
+}
+};
+
+void VclScrolledWindow::DumpAsPropertyTree(::tools::JsonWriter& rJsonWriter)
+{
+VclBin::DumpAsPropertyTree(rJsonWriter);
+
+{
+auto aVertical = rJsonWriter.startNode("vertical");
+
+ScrollBar& rScrollBar = getVertScrollBar();
+lcl_dumpScrollbar(rJsonWriter, rScrollBar);
+
+WinBits nWinBits = GetStyle();
+if (nWinBits & WB_VSCROLL)
+rJsonWriter.put("policy", "always");
+else if (nWinBits & WB_AUTOVSCROLL)
+rJsonWriter.put("policy", "auto");
+else
+rJsonWriter.put("policy", "never");
+}
+
+{
+auto aHorizontal = rJsonWriter.startNode("horizontal");
+
+ScrollBar& rScrollBar = getHorzScrollBar();
+lcl_dumpScrollbar(rJsonWriter, rScrollBar);
+
+WinBits nWinBits = GetStyle();
+if (nWinBits & WB_HSCROLL)
+rJsonWriter.put("policy", "always");
+else if (nWinBits & WB_AUTOHSCROLL)
+rJsonWriter.put("policy", "auto");
+else
+rJsonWriter.put("policy", "never");
+}
+}
+
void VclViewport::setAllocation(const Size &rAllocation)
{
vcl::Window *pChild = get_child();
commit 103e656e4f9e073354dc6a683889fd3fb922ecf2
Author: Szymon Kłos
AuthorDate: Tue Mar 7 13:09:20 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 09:35:30 2023 +
jsdialog: don't send full updates on tab change
All tabs are now sent with the first full message.
So client can switch between tabs by showing another
tabpage content. We don't need to send structure again.
Change-Id: I0f3dfc8be4816fba5813a83b41722407631edb73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148421
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149189
Tested-by: Jenkins
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 0864c3d7ab8a..19458a938c02 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -575,34 +575,12 @@ public:
class JSNotebook final : public JSWidget
{
-Link m_aLeavePageOverridenHdl;
-Link m_aEnterPageOverridenHdl;
-
-DECL_LINK(LeaveHdl, const OString&, bool);
-DECL_LINK(EnterHdl, const OString&, bool);
-
public:
JSNotebook(JSDialogSender* pSender, ::TabControl* pControl,
SalInstanceBuilder* pBuilder,
bool bTakeOwnership);
-virtual void set_current_page(int nPage) override;
-
-virtual void set_current_page(const OString& rIdent) override;
-
virtual void remove_page(const OString& rIdent) override;
-
virtual void insert_page(const OStri
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgdlg.cxx | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
New commits:
commit 4fd7d1a9e64ed256d442ef997c80bce92afe839b
Author: Caolán McNamara
AuthorDate: Tue Mar 21 08:42:14 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 09:53:47 2023 +
cid#1524485 'Constant' variable guards dead code
Change-Id: I3a4dfb0e35db481c94a1f5cb56f078cc9e060a73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149196
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b0bca101bdaa..04de401c4121 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -665,7 +665,6 @@ std::unique_ptr OfaViewTabPage::Create(
weld::Container* pPage, weld
bool OfaViewTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
-bool bMenuOptModified = false;
bool bDarkModeOptModified = false;
bool bRepaintWindows(false);
std::shared_ptr
xChanges(comphelper::ConfigurationChanges::create());
@@ -799,23 +798,8 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
xChanges->commit();
-if (bMenuOptModified || bDarkModeOptModified)
-{
-// Set changed settings to the application instance
-AllSettings aAllSettings = Application::GetSettings();
-
-if (bMenuOptModified)
-{
-StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
-aAllSettings.SetStyleSettings(aStyleSettings);
-}
-
-if (bDarkModeOptModified)
-MiscSettings::SetDarkMode(m_xAppearanceStyleLB->get_active());
-
-Application::MergeSystemSettings( aAllSettings );
-Application::SetSettings(aAllSettings);
-}
+if (bDarkModeOptModified)
+MiscSettings::SetDarkMode(m_xAppearanceStyleLB->get_active());
if ( bAppearanceChanged )
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/unx
vcl/unx/gtk3/gtkinst.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c4f29ffc62af42365c983f4dc3514b2f8633c095
Author: Caolán McNamara
AuthorDate: Mon Mar 20 11:31:25 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 09:53:58 2023 +
tdf#154232 signal_drag_begin callback can delete current GtkTargetList
so fetch the up to date one on calling gtk_drag_begin_with_coordinates
==3221972== Invalid read of size 8
==3221972==at 0x23F281DA: gtk_drag_begin_internal (gtkdnd.c:1801)
==3221972==by 0x23F2886F: gtk_drag_begin_with_coordinates
(gtkdnd.c:1995)
==3221972==by 0x23845075: (anonymous
namespace)::GtkInstanceWidget::signal_motion(_GdkEventMotion const*)
(gtkinst.cxx:3139)
==3221972==by 0x23844F09: (anonymous
namespace)::GtkInstanceWidget::signalMotion(_GtkWidget*, _GdkEventMotion*,
void*) (gtkinst.cxx:3130)
==3221972==by 0x23C0FC56: _gtk_marshal_BOOLEAN__BOXED
(gtkmarshalers.c:84)
==3221972==by 0x1378C05F: g_closure_invoke (gclosure.c:832)
==3221972==by 0x137B8F65: signal_emit_unlocked_R.isra.0 (gsignal.c:3796)
==3221972==by 0x137A8ED5: g_signal_emit_valist (gsignal.c:3559)
==3221972==by 0x137A96F2: g_signal_emit (gsignal.c:3606)
==3221972==by 0x23EF1073: gtk_widget_event_internal.part.0.lto_priv.0
(gtkwidget.c:7812)
==3221972==by 0x23D825AD: UnknownInlinedFun (gtkmain.c:2588)
==3221972==by 0x23D825AD: propagate_event.lto_priv.0 (gtkmain.c:2691)
==3221972==by 0x23D83320: UnknownInlinedFun (gtkmain.c:1921)
==3221972==by 0x23D83320: gtk_main_do_event (gtkmain.c:1691)
==3221972== Address 0x2c7d8070 is 0 bytes inside a block of size 16 free'd
==3221972==at 0x48460E4: free (vg_replace_malloc.c:884)
==3221972==by 0x1383388C: g_free (gmem.c:229)
==3221972==by 0x1384E093: g_slice_free1 (gslice.c:1185)
==3221972==by 0x23CD7A08: gtk_drag_source_set (gtkdragsource.c:162)
==3221972==by 0x23ED1EAB: gtk_tree_view_enable_model_drag_source
(gtktreeview.c:14303)
==3221972==by 0x23877F41: (anonymous
namespace)::GtkInstanceTreeView::drag_source_set(std::__debug::vector<_GtkTargetEntry,
std::allocator<_GtkTargetEntry> > const&, GdkDragAction) (gtkinst.cxx:16279)
==3221972==by 0x238440B3: (anonymous
namespace)::GtkInstanceWidget::do_enable_drag_source(rtl::Reference
const&, unsigned char) (gtkinst.cxx:2707)
==3221972==by 0x23877E99: (anonymous
namespace)::GtkInstanceTreeView::enable_drag_source(rtl::Reference&,
unsigned char) (gtkinst.cxx:16270)
==3221972==by 0x36AAE6D2: SwContentTree::DragBeginHdl(bool&)
(content.cxx:1227)
==3221972==by 0x36AAE2CE: SwContentTree::LinkStubDragBeginHdl(void*,
bool&) (content.cxx:1180)
==3221972==by 0x238D38DA: Link::Call(bool&) const
(link.hxx:111)
==3221972==by 0x23878D2D: (anonymous
namespace)::GtkInstanceTreeView::do_signal_drag_begin(bool&) (gtkinst.cxx:16520)
Change-Id: Idffa33c6a549bf17a92eb56760ddfb7d5424b7ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149100
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a55c01cf8934..08ed12f21065 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3122,12 +3122,12 @@ private:
bool signal_motion(const GdkEventMotion* pEvent)
{
-GtkTargetList* pDragData = (m_eDragAction != 0 && m_nPressedButton !=
-1 && m_xDragSource.is()) ? gtk_drag_source_get_target_list(m_pWidget) :
nullptr;
+const bool bDragData = m_eDragAction != 0 && m_nPressedButton != -1 &&
m_xDragSource.is() && gtk_drag_source_get_target_list(m_pWidget);
bool bUnsetDragIcon(false);
-if (pDragData && gtk_drag_check_threshold(m_pWidget, m_nPressStartX,
m_nPressStartY, pEvent->x, pEvent->y) && !do_signal_drag_begin(bUnsetDragIcon))
+if (bDragData && gtk_drag_check_threshold(m_pWidget, m_nPressStartX,
m_nPressStartY, pEvent->x, pEvent->y) && !do_signal_drag_begin(bUnsetDragIcon))
{
GdkDragContext* pContext =
gtk_drag_begin_with_coordinates(m_pWidget,
-
pDragData,
+
gtk_drag_source_get_target_list(m_pWidget),
m_eDragAction,
m_nPressedButton,
const_cast(reinterpret_cast(pEvent)),
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 53 ++---
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx| 61 ---
sw/source/filter/ww8/docxtableexport.cxx |2
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4
4 files changed, 83 insertions(+), 37 deletions(-)
New commits:
commit 3777923b34eb72ee2034ea0dbf13d1d6ab122025
Author: Miklos Vajna
AuthorDate: Mon Mar 20 12:14:53 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 21 10:06:59 2023 +
sw floattable: fix handling of nested non-floating tables at cell start
CppunitTest_sw_ooxmlexport8's testN779642 failed in the
SW_FORCE_FLY_SPLIT=1 case.
The bugdoc has a floating table, then an inner, non-floating table. The
conversion to floating tables was disabled by the
c1eebcdac9f2b289fd363399130c485ca5ff444c (tdf#79329 DOCX import: fix
missing outer table with floattable at cell start, 2016-11-08).
Given that SwFormatFlySplit doesn't need the delayed text frame
conversion, we can get rid of this workaround.
Fix a similar problem on the export side as well, where the positioning
properties of the outer table leaked into the inner table. Once both the
import and export are fixed, the test passes.
(cherry picked from commit 48818dd359fbf0f37e1b318de89ab2ea7d735f58)
Change-Id: I884ad38cbc247c885991b0faf0d37221b70a6ba7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149193
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 8cd6d4961f38..dbcd48aca0b6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -720,34 +720,41 @@ DECLARE_OOXMLEXPORT_TEST(testN793998, "n793998.docx")
CPPUNIT_ASSERT(nTextPortion + nTabPortion > nParagraph - nRightMargin);
}
-DECLARE_OOXMLEXPORT_TEST(testN779642, "n779642.docx")
+CPPUNIT_TEST_FIXTURE(Test, testN779642)
{
-uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
-
-// First problem: check that we have 2 tables, nesting caused the
-// creation of outer one to fail
-uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong number of imported tables",
sal_Int32(2), xTables->getCount());
-
-// Second problem: check that the outer table is in a frame, at the bottom
of the page
-uno::Reference
xTextTable(xTextTablesSupplier->getTextTables()->getByName("Table2"),
uno::UNO_QUERY);
-uno::Reference xAnchor(xTextTable->getAnchor(),
uno::UNO_QUERY);
-uno::Any aFrame = xAnchor->getPropertyValue("TextFrame");
-uno::Reference xFrame;
-aFrame >>= xFrame;
-sal_Int16 nValue;
-xFrame->getPropertyValue("VertOrient") >>= nValue;
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation",
text::VertOrientation::BOTTOM, nValue);
-xFrame->getPropertyValue("VertOrientRelation") >>= nValue;
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation relation",
text::RelOrientation::PAGE_PRINT_AREA, nValue);
-
-// tdf#106572 - perhaps not the best test to hijack since this file
-// produces an error in Word, but it nicely matches danger points,
-// and has a different first footer, so nice visual confirmation.
-discardDumpedLayout();
-xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-// There is no footer text on the first page.
-assertXPath(pXmlDoc, "/root/page[1]/footer/txt", 0);
+SwModelTestBase::FlySplitGuard aGuard;
+auto verify = [this]() {
+uno::Reference
xTextTablesSupplier(mxComponent, uno::UNO_QUERY);
+
+// First problem: check that we have 2 tables, nesting caused the
+// creation of outer one to fail
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong number of imported tables",
sal_Int32(2), xTables->getCount());
+
+// Second problem: check that the outer table is in a frame, at the
bottom of the page
+uno::Reference
xTextTable(xTextTablesSupplier->getTextTables()->getByName("Table2"),
uno::UNO_QUERY);
+uno::Reference xAnchor(xTextTable->getAnchor(),
uno::UNO_QUERY);
+uno::Any aFrame = xAnchor->getPropertyValue("TextFrame");
+uno::Reference xFrame;
+aFrame >>= xFrame;
+sal_Int16 nValue;
+xFrame->getPropertyValue("VertOrient") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation",
text::VertOrientation::BOTTOM, nValue);
+xFrame->getPropertyValue("VertOrientRelation") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong vertical orientation relation",
text::RelOrientation::PAGE_PRINT_AREA, nValue);
+
+// tdf#106572 - perhaps not the best test to hijack since this file
+// produce
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_filters_test4.cxx | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
New commits:
commit 53946b0698d63849266f465c16386dd8e9319f19
Author: Xisco Fauli
AuthorDate: Tue Mar 21 09:49:31 2023 +0100
Commit: Xisco Fauli
CommitDate: Tue Mar 21 10:57:02 2023 +
CppunitTest_sc_subsequent_filters_test4: simplify code a bit
Change-Id: I85f8a4859e741959f841b82e771d45e9a362cc20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149199
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/subsequent_filters_test4.cxx
b/sc/qa/unit/subsequent_filters_test4.cxx
index 21a918086304..98f66c600f47 100644
--- a/sc/qa/unit/subsequent_filters_test4.cxx
+++ b/sc/qa/unit/subsequent_filters_test4.cxx
@@ -984,15 +984,12 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4,
testColorScaleNumWithRefXLSX)
CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testTdf153514)
{
ScDocument aDoc;
-OUString aFullUrl =
m_directories.getURLFromSrc(u"sc/qa/unit/data/xml/tdf153514.xml");
-
-OUString aValidPath;
-osl::FileBase::getSystemPathFromFileURL(aFullUrl, aValidPath);
+OUString aPath = createFilePath(u"xml/tdf153514.xml");
ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters();
CPPUNIT_ASSERT(pOrcus);
-pOrcus->importODS_Styles(aDoc, aValidPath);
+pOrcus->importODS_Styles(aDoc, aPath);
ScStyleSheetPool* pStyleSheetPool = aDoc.GetStyleSheetPool();
ScStyleSheet* pStyleSheet;
@@ -1022,16 +1019,12 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testTdf153514)
CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testOrcusODSStyleInterface)
{
ScDocument aDoc;
-OUString aFullUrl =
m_directories.getURLFromSrc(u"sc/qa/unit/data/xml/styles.xml");
-
-/* This loop below trims file:// from the start because orcus doesn't
accept such a URL */
-OUString aValidPath;
-osl::FileBase::getSystemPathFromFileURL(aFullUrl, aValidPath);
+OUString aPath = createFilePath(u"xml/styles.xml");
ScOrcusFilters* pOrcus = ScFormatFilter::Get().GetOrcusFilters();
CPPUNIT_ASSERT(pOrcus);
-pOrcus->importODS_Styles(aDoc, aValidPath);
+pOrcus->importODS_Styles(aDoc, aPath);
ScStyleSheetPool* pStyleSheetPool = aDoc.GetStyleSheetPool();
/* Test cases for Style "Name1"
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-5+backports' - 41 commits - cui/source dbaccess/source download.lst extras/source filter/source framework/source helpcontent2 i18npool/
cui/source/customize/acccfg.cxx |8 dbaccess/source/ui/querydesign/JoinTableView.cxx|4 download.lst|4 extras/source/tipoftheday/expand_formula_bar.svg|1 extras/source/tipoftheday/toolbarmode.png |binary extras/source/tipoftheday/toolbarmode.svg |1 extras/source/toolbarmode/default.png |binary extras/source/toolbarmode/default.svg |1 extras/source/toolbarmode/notebookbar.png |binary extras/source/toolbarmode/notebookbar.svg |1 extras/source/toolbarmode/notebookbar_compact.png |binary extras/source/toolbarmode/notebookbar_compact.svg |1 extras/source/toolbarmode/notebookbar_groupedbar_compact.png|binary extras/source/toolbarmode/notebookbar_groupedbar_compact.svg|1 extras/source/toolbarmode/notebookbar_groupedbar_full.png |binary extras/source/toolbarmode/notebookbar_groupedbar_full.svg |1 extras/source/toolbarmode/notebookbar_groups.png|binary extras/source/toolbarmode/notebookbar_groups.svg|1 extras/source/toolbarmode/notebookbar_single.png|binary extras/source/toolbarmode/notebookbar_single.svg|1 extras/source/toolbarmode/sidebar.png |binary extras/source/toolbarmode/sidebar.svg | 270 extras/source/toolbarmode/single.png|binary extras/source/toolbarmode/single.svg|1 filter/source/pdf/impdialog.cxx | 104 filter/source/pdf/impdialog.hxx |8 filter/source/pdf/pdfexport.cxx |3 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 11 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl| 31 filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl |6 framework/source/accelerators/keymapping.cxx|1 helpcontent2|2 i18npool/source/localedata/data/hsb_DE.xml | 22 icon-themes/breeze/cmd/32/ar/jumpdownthislevel.png |binary icon-themes/breeze/cmd/32/ar/jumpupthislevel.png|binary icon-themes/breeze/cmd/32/jumpdownthislevel.png |binary icon-themes/breeze/cmd/32/jumpupthislevel.png |binary icon-themes/breeze/cmd/ar/lc_jumpdownthislevel.png |binary icon-themes/breeze/cmd/ar/lc_jumpupthislevel.png|binary icon-themes/breeze/cmd/ar/sc_jumpdownthislevel.png |binary icon-themes/breeze/cmd/ar/sc_jumpupthislevel.png|binary icon-themes/breeze/cmd/lc_jumpdownthislevel.png |binary icon-themes/breeze/cmd/lc_jumpupthislevel.png |binary icon-themes/breeze/cmd/sc_jumpdownthislevel.png |binary icon-themes/breeze/cmd/sc_jumpupthislevel.png |binary icon-themes/breeze/links.txt| 18 icon-themes/breeze_dark/cmd/32/ar/jumpdownthislevel.png |binary icon-themes/breeze_dark/cmd/32/ar/jumpupthislevel.png |binary icon-themes/breeze_dark/cmd/32/jumpdownthislevel.png|binary icon-themes/breeze_dark/cmd/32/jumpupthislevel.png |binary icon-themes/breeze_dark/cmd/ar/lc_jumpdownthislevel.png |binary icon-themes/breeze_dark/cmd/ar/lc_jumpupthislevel.png |binary icon-themes/breeze_dark/cmd/ar/sc_jumpdownthislevel.png |binary icon-themes/breeze_dark/cmd/ar/sc_jumpupthislevel.png |binary icon-themes/breeze_dark/cmd/lc_jumpdownthislevel.png|binary icon-themes/breeze_dark/cmd/lc_jumpupthislevel.png |binary icon-themes/breeze_dark/cmd/sc_jumpdownthislevel.png|binary icon-themes/breeze_dark/cmd/sc_jumpupthislevel.png |binary icon-themes/breeze_dark/links.txt | 18 icon-themes/breeze_dark_svg/cmd/32/ar/jumpdownthislevel.svg |1 icon-themes/breeze_dark_svg/cmd/32/ar/jumpupthislevel.svg |1 icon-themes/breeze_dark_svg/cmd/32/jumpdownthislevel.svg|1 icon-themes/breeze_dark_svg/cmd/32/jumpupthislevel.svg |1 icon-themes/breeze_dark_svg/cmd/ar/lc_jumpdownthislevel.svg |1 icon-themes/breeze_dark_svg/cmd/ar/lc_jumpupthislevel.svg |
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d64d7fe3819ca2a771a0c839122374fd9972f649 Author: Thorsten Behrens AuthorDate: Tue Mar 21 12:24:05 2023 +0100 Commit: Thorsten Behrens CommitDate: Tue Mar 21 12:25:09 2023 +0100 Bump version to 6.4.0.16 Change-Id: Ib19bb43fcae58bf20df1bf7a1f5863f9cd6215aa diff --git a/configure.ac b/configure.ac index d2938c0fe5bd..42df61c1050d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.15],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.16],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 3911b23c89da02eca92a0069bf1035155b7fddae
Author: Miklos Vajna
AuthorDate: Tue Mar 21 09:20:14 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 21 12:29:15 2023 +
sw floattable, CppunitTest_sw_ooxmlexport9: assert can-split in
testTdf109063
It should not be a problem if the table is in a frame, what matters is
that the frame is marked to split.
Change-Id: Ib289691dcdf78de494518a9afeac3ede9045ec1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149195
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index da430214d75f..c821953f1160 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -123,10 +123,22 @@ DECLARE_SW_ROUNDTRIP_TEST(testBadDocm, "bad.docm",
nullptr, DocmTest)
CPPUNIT_ASSERT_EQUAL(OUString("MS Word 2007 XML VBA"),
pTextDoc->GetDocShell()->GetMedium()->GetFilter()->GetName());
}
-DECLARE_OOXMLEXPORT_TEST(testTdf109063, "tdf109063.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf109063)
{
-// This was 1, near-page-width table was imported as a TextFrame.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
+SwModelTestBase::FlySplitGuard aGuard;
+auto verify = [this]() {
+// A near-page-width table should be allowed to split:
+uno::Reference xDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFrame(xDocument->getTextFrames()->getByName("Frame1"),
+ uno::UNO_QUERY);
+bool bIsSplitAllowed{};
+xFrame->getPropertyValue("IsSplitAllowed") >>= bIsSplitAllowed;
+CPPUNIT_ASSERT(bIsSplitAllowed);
+};
+createSwDoc("tdf109063.docx");
+verify();
+reload(mpFilter, "tdf109063.docx");
+verify();
}
CPPUNIT_TEST_FIXTURE(DocmTest, testTdf108269)
[Libreoffice-commits] core.git: vcl/inc vcl/jsdialog
vcl/inc/jsdialog/jsdialogbuilder.hxx |1 +
vcl/jsdialog/executor.cxx|7 +--
vcl/jsdialog/jsdialogbuilder.cxx |5 +
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 33f97ddd549b4ebd72b5fea327378667d55796ff
Author: Szymon Kłos
AuthorDate: Thu Mar 9 12:04:36 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 12:36:31 2023 +
jsdialog: set text for textview on every key press
for that we need to set text without sending back notification
to not disturb user in typing
we need to keep the selection at the same place
Signed-off-by: Szymon Kłos
Change-Id: Ib5c4a53e61dbc2cf28d450fb44fc5a2957ff57b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148533
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149191
Tested-by: Jenkins
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 19458a938c02..0c6cbaa48080 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -666,6 +666,7 @@ public:
JSTextView(JSDialogSender* pSender, ::VclMultiLineEdit* pTextView,
SalInstanceBuilder* pBuilder,
bool bTakeOwnership);
virtual void set_text(const OUString& rText) override;
+void set_text_without_notify(const OUString& rText);
virtual void replace_selection(const OUString& rText) override;
};
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 5598afa8ba19..e0d0cbb323f3 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -361,12 +361,15 @@ bool ExecuteAction(const std::string& nWindowId, const
OString& rWidget, StringM
}
}
-auto pTextView = dynamic_cast(pWidget);
+auto pTextView = dynamic_cast(pWidget);
if (pTextView)
{
if (sAction == "change")
{
-pTextView->set_text(rData["data"]);
+int rStartPos, rEndPos;
+pTextView->get_selection_bounds(rStartPos, rEndPos);
+pTextView->set_text_without_notify(rData["data"]);
+pTextView->select_region(rStartPos, rEndPos);
LOKTrigger::trigger_changed(*pTextView);
return true;
}
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 2d73c26613da..3cfe67c3b56c 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1752,6 +1752,11 @@ void JSTextView::set_text(const OUString& rText)
sendUpdate();
}
+void JSTextView::set_text_without_notify(const OUString& rText)
+{
+SalInstanceTextView::set_text(rText);
+}
+
void JSTextView::replace_selection(const OUString& rText)
{
SalInstanceTextView::replace_selection(rText);
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - cui/source vcl/jsdialog
cui/source/dialogs/SpellDialog.cxx | 30 +++---
cui/source/inc/SpellDialog.hxx |1 +
vcl/jsdialog/enabled.cxx |2 ++
3 files changed, 22 insertions(+), 11 deletions(-)
New commits:
commit ac46f272a4946a8f18a89ba08fa376a3e879b276
Author: Szymon Kłos
AuthorDate: Tue Mar 21 09:51:31 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 12:37:17 2023 +
jsdialog: enable spelling options dialog
and make it async
Change-Id: Idbf8661aa106d69e60ab6037052fd3d6dec28c06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149205
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index f443aa4f..34564c712ee7 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -225,6 +225,12 @@ SpellDialog::SpellDialog(SpellDialogChildWindow*
pChildWindow,
SpellDialog::~SpellDialog()
{
+if (m_xOptionsDlg)
+{
+m_xOptionsDlg->response(RET_CANCEL);
+m_xOptionsDlg.reset();
+}
+
if (m_pInitHdlEvent)
Application::RemoveUserEvent(m_pInitHdlEvent);
if (pImpl)
@@ -462,19 +468,21 @@ IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl,
weld::Toggleable&, void)
void SpellDialog::StartSpellOptDlg_Impl()
{
-SfxItemSetFixed aSet(
SfxGetpApp()->GetPool() );
-SfxSingleTabDialogController aDlg(m_xDialog.get(), &aSet,
"cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
+auto xSet =
std::make_shared>(
SfxGetpApp()->GetPool() );
+m_xOptionsDlg =
std::make_shared(m_xDialog.get(), xSet.get(),
"cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
-std::unique_ptr xPage =
SvxLinguTabPage::Create(aDlg.get_content_area(), &aDlg, &aSet);
+std::unique_ptr xPage =
SvxLinguTabPage::Create(m_xOptionsDlg->get_content_area(), m_xOptionsDlg.get(),
xSet.get());
static_cast(xPage.get())->HideGroups( GROUP_MODULES );
-aDlg.SetTabPage(std::move(xPage));
-if (RET_OK == aDlg.run())
-{
-InitUserDicts();
-const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
-if(pOutSet)
-OfaTreeOptionsDialog::ApplyLanguageOptions(*pOutSet);
-}
+m_xOptionsDlg->SetTabPage(std::move(xPage));
+weld::GenericDialogController::runAsync(m_xOptionsDlg, [this, xSet]
(sal_uInt32 nResult) {
+if (RET_OK == nResult)
+{
+InitUserDicts();
+const SfxItemSet* pOutSet = m_xOptionsDlg->GetOutputItemSet();
+if(pOutSet)
+OfaTreeOptionsDialog::ApplyLanguageOptions(*pOutSet);
+}
+});
}
namespace
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 3c6a7b229ebb..a7e6cd398e2f 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -165,6 +165,7 @@ private:
std::unique_ptr m_xClosePB;
std::unique_ptr m_xToolbar;
std::unique_ptr m_xSentenceEDWeld;
+std::shared_ptr m_xOptionsDlg;
DECL_LINK(ChangeHdl, weld::Button&, void);
DECL_LINK(DoubleClickChangeHdl, weld::TreeView&, bool);
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 4e5c79c1bf9b..935a81ba6e6d 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -44,6 +44,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/imagetabpage.ui"
|| rUIFile == u"cui/ui/macroselectordialog.ui"
|| rUIFile == u"cui/ui/numberingformatpage.ui"
+|| rUIFile == u"cui/ui/optlingupage.ui"
|| rUIFile == u"cui/ui/pageformatpage.ui"
|| rUIFile == u"cui/ui/paragalignpage.ui"
|| rUIFile == u"cui/ui/paraindentspacing.ui"
@@ -56,6 +57,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"cui/ui/similaritysearchdialog.ui"
|| rUIFile == u"cui/ui/specialcharacters.ui"
|| rUIFile == u"cui/ui/spellingdialog.ui"
+|| rUIFile == u"cui/ui/spelloptionsdialog.ui"
|| rUIFile == u"cui/ui/splitcellsdialog.ui"
|| rUIFile == u"cui/ui/textflowpage.ui"
|| rUIFile == u"cui/ui/transparencytabpage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 8c358c1616a16beb10752f0a60bbacccba15d6ea Author: Pranam Lashkari AuthorDate: Mon Mar 20 18:50:12 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 12:39:25 2023 + jsdialog: enable watermark dialog (writer) Change-Id: Ie1f5a299fd68bdfd21c04d1ef79514953a2ac5c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149168 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 935a81ba6e6d..6595cf7971c0 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -148,6 +148,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" +|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" || rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source sw/uiconfig vcl/jsdialog
sw/source/ui/frmdlg/column.cxx |2 +-
sw/uiconfig/swriter/ui/columndialog.ui | 20 +---
vcl/jsdialog/enabled.cxx |1 +
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit f50d009885c499e55db35571ace83f2ed7effbfe
Author: Pranam Lashkari
AuthorDate: Mon Mar 20 18:35:31 2023 +0530
Commit: Szymon Kłos
CommitDate: Tue Mar 21 12:59:32 2023 +
jsdialog: enable column dialog (writer)
Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 5692a906e279..c2a24ad18ef6 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -89,7 +89,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell&
rSh)
, m_bSectionChanged(false)
, m_bSelSectionChanged(false)
, m_bFrameChanged(false)
-, m_xContentArea(m_xDialog->weld_content_area())
+, m_xContentArea(m_xBuilder->weld_container("content"))
, m_xOkButton(m_xBuilder->weld_button("ok"))
{
SwRect aRect;
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui
b/sw/uiconfig/swriter/ui/columndialog.ui
index 5bf4d5d9d999..2162f1e5b2fd 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -17,6 +17,23 @@
False
vertical
12
+
+
+True
+False
+vertical
+12
+
+
+
+
+
+False
+True
+begin
+0
+
+
False
@@ -74,9 +91,6 @@
0
-
-
-
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 6595cf7971c0..7efb9de2bb84 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -128,6 +128,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/characterproperties.ui"
|| rUIFile == u"modules/swriter/ui/charurlpage.ui"
+|| rUIFile == u"modules/swriter/ui/columndialog.ui"
|| rUIFile == u"modules/swriter/ui/columnpage.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 41b7f70981cffb9a04b6b132317915ca51519eab Author: Pranam Lashkari AuthorDate: Mon Mar 20 17:47:17 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 13:02:59 2023 + jsdialog: enabled insert break(manual break) dialog(writer) Signed-off-by: Pranam Lashkari Change-Id: I65213cd8822e574eff333b96a8718ebff2946f5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149166 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7efb9de2bb84..c93e80eb17fd 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -137,6 +137,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui"
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e5005c76bd60a004f6025728e794ba3e4d0dfff1 Author: Michael Stahl AuthorDate: Tue Mar 21 10:46:46 2023 +0100 Commit: Michael Stahl CommitDate: Tue Mar 21 13:19:29 2023 + curl: upgrade to release 8.0.1 Apparently 8.0.0 had a serious regression. Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149204 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index 08dfd4c0078c..4f2a9169d40f 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc -CURL_TARBALL := curl-8.0.0.tar.xz +CURL_SHA256SUM := 0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 +CURL_TARBALL := curl-8.0.1.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 2e75e849e85da86ea33b447350b0e2f7eaede69e Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:36:45 2023 +0530 Commit: Szymon Kłos CommitDate: Tue Mar 21 13:22:52 2023 + jsdialog: enabled thesaurus dialog Change-Id: I01059e7a4aaffd5c4a2f5ccff55f83ed3db9bf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149173 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index c93e80eb17fd..529cffe1dfb7 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -60,6 +60,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/spelloptionsdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/thesaurus.ui" || rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui"
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 28b16870553f436b8dd0f74894896136057402a3
Author: Miklos Vajna
AuthorDate: Tue Mar 21 13:30:49 2023 +0100
Commit: Miklos Vajna
CommitDate: Tue Mar 21 13:50:20 2023 +
sw floattable, CppunitTest_sw_ooxmlimport2: assert the layout in
testTdf114217
The point is that the table is multi-page, which is preserved. The
detail that it's not in a fly is no longer true.
Change-Id: I8fa61391eb26b434cd7e8b8adb5012c4909e5553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149209
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index f723fe320492..09de11d4c0bb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -37,6 +37,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
class Test : public SwModelTestBase
{
@@ -667,9 +671,20 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121804)
CPPUNIT_TEST_FIXTURE(Test, testTdf114217)
{
+SwModelTestBase::FlySplitGuard aGuard;
+// The floating table was not split between page 1 and page 2.
createSwDoc("tdf114217.docx");
-// This was 1, multi-page table was imported as a floating one.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
+auto pPage1Fly = dynamic_cast(rPage1Objs[0]);
+CPPUNIT_ASSERT(pPage1Fly);
+auto pTab1 = dynamic_cast(pPage1Fly->GetLower());
+CPPUNIT_ASSERT(pTab1);
+CPPUNIT_ASSERT(pTab1->HasFollow());
}
CPPUNIT_TEST_FIXTURE(Test, testTdf119200)
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabview.cxx | 28
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit d82a734c07b85cbd7861699b7fa6d3ebbb3122f2
Author: Patrick Luby
AuthorDate: Mon Mar 20 16:48:30 2023 -0400
Commit: Caolán McNamara
CommitDate: Tue Mar 21 14:23:51 2023 +
tdf#152406 Disable anti-jitter code for scroll wheel events
After moving thousands of columns to the right via horizontal
scroll wheel or trackpad swipe events, most vertical scroll
wheel or trackpad swipe events will trigger the anti-jitter code
because nScrollPos and nPrevDragPos will be equal and nDelta
will be overriden and set to zero. So, only use the anti-jitter
code for mouse drag events.
Change-Id: I9a22b31e1e012a97a058ab36e040629a71f5d24f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149183
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 66ddcda2d223..9142393a9152 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1182,16 +1182,28 @@ void ScTabView::ScrollHdl(ScrollAdaptor* pScroll)
tools::Long nScrollPos = GetScrollBarPos( *pScroll ) +
nScrollMin;
nDelta = nScrollPos - nViewPos;
-if ( nScrollPos > nPrevDragPos )
-{
-if (nDelta<0) nDelta=0;
-}
-else if ( nScrollPos < nPrevDragPos )
+
+// tdf#152406 Disable anti-jitter code for scroll wheel events
+// After moving thousands of columns to the right via
+// horizontal scroll wheel or trackpad swipe events, most
+// vertical scroll wheel or trackpad swipe events will trigger
+// the anti-jitter code because nScrollPos and nPrevDragPos
+// will be equal and nDelta will be overriden and set to zero.
+// So, only use the anti-jitter code for mouse drag events.
+if ( eType == ScrollType::Drag )
{
-if (nDelta>0) nDelta=0;
+if ( nScrollPos > nPrevDragPos )
+{
+if (nDelta<0) nDelta=0;
+}
+else if ( nScrollPos < nPrevDragPos )
+{
+if (nDelta>0) nDelta=0;
+}
+else
+nDelta = 0;
}
-else
-nDelta = 0;
+
nPrevDragPos = nScrollPos;
}
break;
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |4 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 12 +--
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 12 +--
chart2/source/controller/dialogs/ChartTypeDialogController.cxx |4 -
chart2/source/controller/dialogs/DataBrowserModel.cxx |4 -
chart2/source/controller/dialogs/dlg_DataSource.cxx |6 -
chart2/source/controller/dialogs/tp_ChartType.cxx |4 -
chart2/source/controller/sidebar/ChartTypePanel.cxx | 10 +-
chart2/source/inc/Diagram.hxx | 18
chart2/source/inc/DiagramHelper.hxx | 17
chart2/source/model/main/ChartModel_Persistence.cxx |2
chart2/source/model/main/Diagram.cxx| 39
+-
chart2/source/tools/DiagramHelper.cxx | 38
-
13 files changed, 85 insertions(+), 85 deletions(-)
New commits:
commit cde0f27c84599d0d9894148e510254749f7e2784
Author: Noel Grandin
AuthorDate: Thu Mar 16 09:38:50 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 21 14:24:53 2023 +
move getTemplate inside chart2::Diagram
Change-Id: I05da4e4a9acb2683633eda42cf18d740913c2e37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149180
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 5ce060e9891f..fbb12b5d4a51 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1192,8 +1192,8 @@ uno::Reference< uno::XInterface > SAL_CALL
ChartDocumentWrapper::createInstance(
rtl::Reference< Diagram > xDiagram =
ChartModelHelper::findDiagram( xChartDoc );
ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme(
xDiagram );
rtl::Reference< ::chart::ChartTypeManager >
xTemplateManager = xChartDoc->getTypeManager();
-DiagramHelper::tTemplateWithServiceName
aTemplateWithService(
-DiagramHelper::getTemplateForDiagram( xDiagram,
xTemplateManager ));
+Diagram::tTemplateWithServiceName aTemplateWithService(
+xDiagram->getTemplate( xTemplateManager ));
if( aTemplateWithService.xChartTypeTemplate.is())
aTemplateWithService.xChartTypeTemplate->resetStyles2(
xDiagram );//#i109371#
xTemplate->changeDiagram( xDiagram );
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 7cc7c57e2862..8ef1429d7565 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -588,8 +588,8 @@ OUString SAL_CALL DiagramWrapper::getDiagramType()
}
rtl::Reference< ::chart::ChartTypeManager > xChartTypeManager =
xChartDoc->getTypeManager();
-DiagramHelper::tTemplateWithServiceName aTemplateAndService =
-DiagramHelper::getTemplateForDiagram( xDiagram, xChartTypeManager
);
+Diagram::tTemplateWithServiceName aTemplateAndService =
+xDiagram->getTemplate( xChartTypeManager );
aRet = lcl_getDiagramType( aTemplateAndService.sServiceName );
}
@@ -1455,8 +1455,8 @@ bool WrappedNumberOfLinesProperty::detectInnerValue(
uno::Any& rInnerValue ) con
if( !aSeriesVector.empty() )
{
rtl::Reference< ::chart::ChartTypeManager > xChartTypeManager =
xChartDoc->getTypeManager();
-DiagramHelper::tTemplateWithServiceName aTemplateAndService =
-DiagramHelper::getTemplateForDiagram( xDiagram,
xChartTypeManager );
+Diagram::tTemplateWithServiceName aTemplateAndService =
+xDiagram->getTemplate( xChartTypeManager );
if( aTemplateAndService.sServiceName ==
"com.sun.star.chart2.template.ColumnWithLine" )
{
try
@@ -1494,8 +1494,8 @@ void WrappedNumberOfLinesProperty::setPropertyValue(
const Any& rOuterValue, con
return;
rtl::Reference< ::chart::ChartTypeManager > xChartTypeManager =
xChartDoc->getTypeManager();
-DiagramHelper::tTemplateWithServiceName aTemplateAndService =
-DiagramHelper::getTemplateForDiagram( xDiagram, xChartTypeManager
);
+Diagram::tTemplateWithServiceName aTemplateAndService =
+xDiagram->getTemplate( xChartTypeManager );
rtl::Reference< ChartTypeTemplate > xTemplate;
if( aTemplateAndService.sServiceName ==
"com.sun.star.chart2.template.Colu
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f7e5c9bee73c9834312a78adb8d040ed78c6c0ef
Author: Caolán McNamara
AuthorDate: Tue Mar 21 12:58:54 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 14:32:57 2023 +
typo: then->them
Change-Id: Ieb864f70873f2baa1157114b99cfbec98fc84cc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149213
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index c77a4a0d30e1..8c102bd6004c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -402,7 +402,7 @@ void VclBox::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
sal_uInt16 VclBox::getDefaultAccessibleRole() const
{
#if defined(_WIN32)
-//fdo#74284 call Boxes Panels, keep then as "Filler" under
+//fdo#74284 call Boxes Panels, keep them as "Filler" under
//at least Linux seeing as that's what Gtk does for GtkBoxes
return css::accessibility::AccessibleRole::PANEL;
#else
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 5f5e1a3204b98b9e74bded50ba0eddd4fb371301
Author: Caolán McNamara
AuthorDate: Tue Mar 21 13:08:17 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 14:57:46 2023 +
gtk4: use PANEL a11y role for VclBox under gtk4
Change-Id: I0cd6bb9578c177947741bb6d8d21237faf41679d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149214
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 8c102bd6004c..6befd3399520 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -401,12 +401,17 @@ void VclBox::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
sal_uInt16 VclBox::getDefaultAccessibleRole() const
{
+// fdo#74284 call Boxes Panels, keep them as "Filler" under
+// at least Linux seeing as that's what Gtk3 did for GtkBoxes.
+// Though now with Gtk4 that uses GTK_ACCESSIBLE_ROLE_GROUP
+// which maps to ATSPI_ROLE_PANEL
#if defined(_WIN32)
-//fdo#74284 call Boxes Panels, keep them as "Filler" under
-//at least Linux seeing as that's what Gtk does for GtkBoxes
return css::accessibility::AccessibleRole::PANEL;
#else
-return css::accessibility::AccessibleRole::FILLER;
+static sal_uInt16 eRole = Application::GetToolkitName() == "gtk4" ?
+ css::accessibility::AccessibleRole::PANEL :
+ css::accessibility::AccessibleRole::FILLER;
+return eRole;
#endif
}
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - sd/qa xmloff/source
sd/qa/uitest/impress_tests/data/tdf153161_FlushToSave.odp |binary
sd/qa/uitest/impress_tests/tdf153161.py | 41 ++
xmloff/source/draw/shapeexport.cxx| 12
3 files changed, 53 insertions(+)
New commits:
commit cd69836ee9e98a4c6ceaa716da8838ddac842054
Author: Mike Kaganski
AuthorDate: Wed Jan 25 01:37:00 2023 +0300
Commit: Thorsten Behrens
CommitDate: Tue Mar 21 14:57:49 2023 +
tdf#153161: (Ab)use a call to XTextRange::getString to flush edits
Restore the call (without checking its returned value), removed in commit
d194474aabd699806cb3631bc8641dd0548b8026 ("tdf#151100: xText->getString()
may be empty for content needing export", 2022-09-22), side effects of
which obviously allow some object's changes to get flushed and saved.
Change-Id: I62f27cd056c32ad76f79a4862e2f4a0964eaadef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146106
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149142
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sd/qa/uitest/impress_tests/data/tdf153161_FlushToSave.odp
b/sd/qa/uitest/impress_tests/data/tdf153161_FlushToSave.odp
new file mode 100644
index ..1fd5c20c2a52
Binary files /dev/null and
b/sd/qa/uitest/impress_tests/data/tdf153161_FlushToSave.odp differ
diff --git a/sd/qa/uitest/impress_tests/tdf153161.py
b/sd/qa/uitest/impress_tests/tdf153161.py
new file mode 100644
index ..23ffdef879d1
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf153161.py
@@ -0,0 +1,41 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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 libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.framework import UITestCase
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class TestTdf153161(UITestCase):
+
+def testTdf153161(self):
+
+document =
self.ui_test.load_file(get_url_for_data_file('tdf153161_FlushToSave.odp'))
+oldText = document.DrawPages[0].getByIndex(1).String
+self.assertTrue(oldText.startswith('在没有版本控制系统的时期'))
+
+xImpressDoc = self.xUITest.getTopFocusWindow()
+xEditWin = xImpressDoc.getChild('impress_win')
+xEditWin.executeAction('SELECT', mkPropertyValues({'OBJECT':'Unnamed
Drawinglayer object 1'}))
+
+# Type something, getting into text editing mode (appending)
automatically
+xEditWin.executeAction('TYPE', mkPropertyValues({'TEXT': 'Foo Bar'}))
+xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
+self.xUITest.executeCommand('.uno:Save')
+self.xUITest.executeCommand('.uno:Reload')
+
+# Reload and check that the edit was saved
+document = self.ui_test.get_component()
+self.assertEqual(oldText + 'Foo Bar',
document.DrawPages[0].getByIndex(1).String)
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 61193072f84e..887c49e61a49 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -304,6 +304,18 @@ void XMLShapeExport::collectShapeAutoStyles(const
uno::Reference< drawing::XShap
uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY);
if (xText.is())
{
+try
+{
+// tdf#153161: it seems that the call to XTextRange::getString
flushes the changes
+// for some objects, that otherwise fail to get exported
correctly. Maybe at some
+// point it would make sense to find a better place for more
targeted flush.
+xText->getString();
+}
+catch (uno::RuntimeException const&)
+{
+// E.g., SwXTextFrame that contains only a table will throw;
this is not an error
+}
+
uno::Reference< beans::XPropertySetInfo > xPropSetInfo(
xPropSet->getPropertySetInfo() );
if( xPropSetInfo.is() &&
xPropSetInfo->hasPropertyByName("IsEmptyPresentationObject") )
[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/inc vcl/jsdialog
include/vcl/jsdialog/executor.hxx| 10 ++
include/vcl/weld.hxx |2 +
vcl/inc/jsdialog/jsdialogbuilder.hxx | 27
vcl/jsdialog/executor.cxx| 21
vcl/jsdialog/jsdialogbuilder.cxx | 57 +++
5 files changed, 117 insertions(+)
New commits:
commit b46defbc331c3c91553bc8967cdf48eacea87afd
Author: Szymon Kłos
AuthorDate: Fri Mar 10 13:53:04 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 15:00:32 2023 +
jsdialog: update Entry on replace_selection
Signed-off-by: Szymon Kłos
Change-Id: Ie0c3586fbf4bda1a9d68dceec61e08ff9f75bb97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148634
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149201
Tested-by: Jenkins
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 783aeaacfff7..6f59b7d5ca64 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -572,6 +572,7 @@ public:
bool bTakeOwnership);
virtual void set_text(const OUString& rText) override;
void set_text_without_notify(const OUString& rText);
+virtual void replace_selection(const OUString& rText) override;
};
class JSListBox final : public JSWidget
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index d623e9723a7e..9a0f61d90caa 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1488,6 +1488,12 @@ void JSEntry::set_text(const OUString& rText)
void JSEntry::set_text_without_notify(const OUString& rText) {
SalInstanceEntry::set_text(rText); }
+void JSEntry::replace_selection(const OUString& rText)
+{
+SalInstanceEntry::replace_selection(rText);
+sendUpdate();
+}
+
JSListBox::JSListBox(JSDialogSender* pSender, ::ListBox* pListBox,
SalInstanceBuilder* pBuilder,
bool bTakeOwnership)
: JSWidget(pSender, pListBox,
pBuilder,
commit 74e8476d23b72f06328dcbe183597847471771e1
Author: Szymon Kłos
AuthorDate: Fri Mar 10 10:03:49 2023 +0100
Commit: Szymon Kłos
CommitDate: Tue Mar 21 15:00:25 2023 +
jsdialog: add wrapper for ScrolledWindow
Change-Id: I59489e4cf1e5fb492272108e3a19afb4212753f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148610
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149200
diff --git a/include/vcl/jsdialog/executor.hxx
b/include/vcl/jsdialog/executor.hxx
index 9bccad3f1865..50f71272bb61 100644
--- a/include/vcl/jsdialog/executor.hxx
+++ b/include/vcl/jsdialog/executor.hxx
@@ -27,6 +27,16 @@ public:
static void trigger_changed(weld::IconView& rIconView) {
rIconView.signal_selection_changed(); }
+static void trigger_scrollv(weld::ScrolledWindow& rScrolledWindow)
+{
+rScrolledWindow.signal_vadjustment_changed();
+}
+
+static void trigger_scrollh(weld::ScrolledWindow& rScrolledWindow)
+{
+rScrolledWindow.signal_hadjustment_changed();
+}
+
static void trigger_toggled(weld::Toggleable& rButton) {
rButton.signal_toggled(); }
static void trigger_row_activated(weld::TreeView& rTreeView)
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 4acece25f052..d22fa5eb616e 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -404,6 +404,8 @@ public:
class VCL_DLLPUBLIC ScrolledWindow : virtual public Container
{
+friend class ::LOKTrigger;
+
Link m_aVChangeHdl;
Link m_aHChangeHdl;
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index 0c6cbaa48080..783aeaacfff7 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -40,6 +40,7 @@ class ComboBox;
class VclMultiLineEdit;
class SvTabListBox;
class IconView;
+class VclScrolledWindow;
namespace vcl
{
@@ -304,6 +305,8 @@ public:
virtual std::unique_ptr weld_tree_view(const OString& id)
override;
virtual std::unique_ptr weld_expander(const OString& id)
override;
virtual std::unique_ptr weld_icon_view(const OString& id)
override;
+virtual std::unique_ptr
+weld_scrolled_window(const OString& id, bool bUserManagedScrolling =
false) override;
virtual std::unique_ptr weld_radio_button(const
OString& id) override;
virtual std::unique_ptr weld_frame(const OString& id)
override;
virtual std::unique_ptr weld_menu_button(const OString&
id) override;
@@ -368,6 +371,14 @@ public:
{
}
+JSWidget(JSDialogSender* pSender, VclClass* pObject, SalInstanceBuilder*
pBuilder,
+ bool bTakeOwnership, bool bUserManagedScrolling)
+: BaseInstanceClass(pObject, pBuilder, bTakeOwnership,
bUserManagedScrolling)
+, m_bIsFreezed(false)
+, m_pSender(pSender)
+{
+}
+
JSWidget(JSDialogSender* pSender, VclClass* pObje
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xiescher.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 5ccbdcf182851375486386c0df8bb3f04cf2f9cd Author: Caolán McNamara AuthorDate: Tue Mar 21 13:29:23 2023 + Commit: Caolán McNamara CommitDate: Tue Mar 21 15:42:28 2023 + crashreporting: CreateEmbeddedObject might fail Change-Id: I0e1ccbea92343d18e5ff3a9af1f54ed5e0dd796b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149216 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 9647ca5565ba..718f464e0c9c 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1763,6 +1763,9 @@ rtl::Reference XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rD Reference< XEmbeddedObject > xEmbObj = pDocShell->GetEmbeddedObjectContainer(). CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aEmbObjName, &sBaseURL ); +if (!xEmbObj) +return xSdrObj; + /* Set the size to the embedded object, this prevents that font sizes of text objects are changed in the chart when the object is inserted into the draw page. */
[Libreoffice-commits] core.git: basegfx/source drawinglayer/inc drawinglayer/source include/basegfx svx/source
basegfx/source/tools/gradienttools.cxx | 76 +++
drawinglayer/inc/texture/texture.hxx|3
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 14 +
drawinglayer/source/texture/texture.cxx | 173 +---
include/basegfx/utils/gradienttools.hxx | 12 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 75 ++
6 files changed, 269 insertions(+), 84 deletions(-)
New commits:
commit 808c5bf66370f78f36e98887db0848ee7e55bb3a
Author: Armin Le Grand (allotropia)
AuthorDate: Tue Mar 21 13:13:15 2023 +0100
Commit: Armin Le Grand
CommitDate: Tue Mar 21 15:53:06 2023 +
MCGR: Model data changes for ColorSteps (II)
The biggest change here is to allow multiple ColorStops
with the same Offset. That allows to define gradients
with 'hard' color changes at any place using two
ColorStops with the same Offset and different Colors.
This required quite some adaptions, but works well.
Also removed in this context checking for all Colors
being the same to not mix up things. Also works well.
Also changed the need for having Start/EndColors AKA
ColorStops for 0.0 and 1.0 in place, instead 'imply'
the 1st ColorStop to also define the StartColor and
the last one the EndColor. This allows e.g. Gradient
definitions with two GradientStops at the same
Offset e.g. 0.5 with different colors to already
define a full Gradient.
Also added a tooling method to reverse ColorSteps,
which changes the order and mirrors the Offsets
(what even keeps an existing sort valid).
This is useful e.g. for GradientAxial which is the
only one where for decomposition the Gradient had
to be interpreted 'reverse' since it's defined
from center to edge, but for creating correct filled
polygons to represent this the inverse order had to
be used, creating polygons from edge to center.
This led to 'wild' code for this one of six cases
and prevented unifications with the other cases
(also made your brain flip).
Thus I adapted this now to use the reversed
ColorSteps consequently, and the same principle
loops than the other implementations to make things
easier for the future and to use common tooling.
Change-Id: If2943348d17d5b9cd165f4d78f22638a1dff5237
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149208
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/basegfx/source/tools/gradienttools.cxx
b/basegfx/source/tools/gradienttools.cxx
index d43f7899121a..6055143d5abd 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.cxx
@@ -264,6 +264,17 @@ namespace basegfx
namespace utils
{
+/* Tooling method to reverse ColorStops, including offsets.
+ When also mirroring offsets a valid sort keeps valid.
+*/
+void reverseColorStops(ColorStops& rColorStops)
+{
+// can use std::reverse, but also need to adapt offset(s)
+std::reverse(rColorStops.begin(), rColorStops.end());
+for (auto& candidate : rColorStops)
+candidate = ColorStop(1.0 - candidate.getStopOffset(),
candidate.getStopColor());
+}
+
/* Tooling method to convert UNO API data to ColorStops
This will try to extract ColorStop data from the given
Any, so if it's of type awt::Gradient2 that data will be
@@ -374,13 +385,8 @@ namespace basegfx
be removed)
- contains no ColorStops with offset > 1.0 (will
be removed)
- - contains no two ColorStops with identical offsets
- (will be removed, 1st one/smallest offset wins
- which is also given by sort tooling)
+ - ColorStops with identical offsets are now allowed
- will be sorted from lowest offset to highest
- - if all colors are the same, the content will
- be reduced to a single entry with offset 0.0
- (force to StartColor)
Some more notes:
- It can happen that the result is empty
@@ -404,8 +410,15 @@ namespace basegfx
if (1 == rColorStops.size())
{
// no gradient at all, but preserve given color
-// and force it to be the StartColor
-rColorStops[0] = ColorStop(0.0, rColorStops[0].getStopColor());
+// evtl. correct offset to be in valid range [0.0 .. 1.0]
+// NOTE: This does not move it to 0.0 or 1.0, it *can* still
+// be somewhere in-between what is allowed
+rColorStops[0] = ColorStop(
+std::max(0.0, std::min(1.0,
rColorStops[0].getStopOffset())),
+rColorStops[0].getStopColor());
+
+// done
+return;
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source
sc/source/filter/excel/xiescher.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit fa1760d0c7ac8b9fb2e88f7d6d7f9de14479cbf6 Author: Caolán McNamara AuthorDate: Tue Mar 21 13:29:23 2023 + Commit: Xisco Fauli CommitDate: Tue Mar 21 15:55:23 2023 + crashreporting: CreateEmbeddedObject might fail Change-Id: I0e1ccbea92343d18e5ff3a9af1f54ed5e0dd796b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149113 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 7940758bffc5..2838347b3f14 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1763,6 +1763,9 @@ rtl::Reference XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rD Reference< XEmbeddedObject > xEmbObj = pDocShell->GetEmbeddedObjectContainer(). CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aEmbObjName, &sBaseURL ); +if (!xEmbObj) +return xSdrObj; + /* Set the size to the embedded object, this prevents that font sizes of text objects are changed in the chart when the object is inserted into the draw page. */
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf153255.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 35 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 ++--
3 files changed, 46 insertions(+), 3 deletions(-)
New commits:
commit ed0372bac123b402fe3cd694a455e8328117752d
Author: László Németh
AuthorDate: Mon Mar 20 17:27:32 2023 +0100
Commit: László Németh
CommitDate: Tue Mar 21 15:57:27 2023 +
tdf#153255 DOCX import: fix footnote order
Simple unit test for tdf#152203 allowed to create
bad ordering algorithm by accident without noticing
the problem, which caused problem for most of the DOCX
files, where serialization in footnotes.xml doesn't follow
the order of the footnotes.
Regression from commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357
"tdf#76260 DOCX import: fix slow footnote import".
Follow-up to commit 09ae3c01940bbc25ffde51963683b04e3cb4bb6a
"tdf#152203 DOCX import: fix mixed footnotes/endnotes".
Change-Id: I0628d96e3b8ad4df38d26e9288b47d39b958c441
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149176
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153255.docx
b/sw/qa/extras/ooxmlexport/data/tdf153255.docx
new file mode 100644
index ..e9f2892d5670
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf153255.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index ffb48ecad109..0fd98a48f759 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1317,6 +1317,41 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152506)
CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg5"),
xLastButOne->getString().trim() );
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf153255)
+{
+loadAndSave("tdf153255.docx");
+xmlDocUniquePtr pXml = parseExport("word/footnotes.xml");
+CPPUNIT_ASSERT(pXml);
+
+uno::Reference xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference xFootnotes =
xFootnotesSupplier->getFootnotes();
+uno::Reference xLastFootnote(xFootnotes->getByIndex(5),
uno::UNO_QUERY);
+// This was "Footnote for pg2" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg 6"),
xLastFootnote->getString().trim() );
+
+uno::Reference xLastButOne(xFootnotes->getByIndex(4),
uno::UNO_QUERY);
+// This was "Footnote for pg 6" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg5"),
xLastButOne->getString().trim() );
+
+// check all the remaining footnotes
+
+uno::Reference xFootnote1(xFootnotes->getByIndex(0),
uno::UNO_QUERY);
+// This was "Footnote for pg3" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg1"),
xFootnote1->getString().trim() );
+
+uno::Reference xFootnote2(xFootnotes->getByIndex(1),
uno::UNO_QUERY);
+// This was "Footnote for pg5" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg2"),
xFootnote2->getString().trim() );
+
+uno::Reference xFootnote3(xFootnotes->getByIndex(2),
uno::UNO_QUERY);
+// This was "Footnote for pg4." (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg3"),
xFootnote3->getString().trim() );
+
+uno::Reference xFootnote4(xFootnotes->getByIndex(3),
uno::UNO_QUERY);
+// This was "Footnote for pg1" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg4."),
xFootnote4->getString().trim() );
+}
+
// skip test for macOS (missing fonts?)
#if !defined(MACOSX)
DECLARE_OOXMLEXPORT_TEST(testTdf146346, "tdf146346.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6f0c1dd0952f..ffcd883289bd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3755,15 +3755,23 @@ void DomainMapper_Impl::RemoveTemporaryFootOrEndnotes()
static void lcl_convertToNoteIndices(std::deque& rNoteIds,
sal_Int32& rFirstNoteIndex)
{
-// convert arbitrary footnote identifiers to 0, 1, 2...
-// indices, keeping their possible random order
+// rNoteIds contains XML footnote identifiers in the loaded order of the
footnotes
+// (the same order as in footnotes.xml), i.e. it maps temporary footnote
positions to the
+// identifiers. For example: Ids[0] = 100; Ids[1] = -1, Ids[2] = 5.
+// To copy the footnotes in their final place, create an array, which map
the (normalized)
+// footnote identifiers to the temporary footnote positions. Using the
previous example,
+// Pos[0] = 1; Pos[1] = 2; Pos[2] = 0 (where [0], [1], [2] are the
normalized
+// -1, 5 and 100 identifiers).
std::deque aSortedIds = rNoteIds;
std::sort(aSortedIds.begin(), aSortedIds.end());
std::map aMapIds;
+// normalize footnote identifiers
[Libreoffice-commits] core.git: sw/source sw/uiconfig vcl/jsdialog
sw/source/ui/frmdlg/column.cxx |2 +-
sw/uiconfig/swriter/ui/columndialog.ui | 20 +---
vcl/jsdialog/enabled.cxx |1 +
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 6c4464a14ce324100df4cf3934c3ddeeac82ab08
Author: Pranam Lashkari
AuthorDate: Mon Mar 20 18:35:31 2023 +0530
Commit: Pranam Lashkari
CommitDate: Tue Mar 21 17:03:01 2023 +
jsdialog: enable column dialog (writer)
Change-Id: I4b91d271d766d8efeaddc3c3775513184036c5f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149167
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
(cherry picked from commit f50d009885c499e55db35571ace83f2ed7effbfe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149235
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 8a82dd04d95c..338e8011ad20 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -89,7 +89,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell&
rSh)
, m_bSectionChanged(false)
, m_bSelSectionChanged(false)
, m_bFrameChanged(false)
-, m_xContentArea(m_xDialog->weld_content_area())
+, m_xContentArea(m_xBuilder->weld_container("content"))
, m_xOkButton(m_xBuilder->weld_button("ok"))
{
SwRect aRect;
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui
b/sw/uiconfig/swriter/ui/columndialog.ui
index 5bf4d5d9d999..2162f1e5b2fd 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -17,6 +17,23 @@
False
vertical
12
+
+
+True
+False
+vertical
+12
+
+
+
+
+
+False
+True
+begin
+0
+
+
False
@@ -74,9 +91,6 @@
0
-
-
-
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 9a3699301de1..fdb587c8b1e1 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -102,6 +102,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/characterproperties.ui"
|| rUIFile == u"modules/swriter/ui/charurlpage.ui"
+|| rUIFile == u"modules/swriter/ui/columndialog.ui"
|| rUIFile == u"modules/swriter/ui/columnpage.ui"
|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui"
[Libreoffice-commits] core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 11fc8254548d241a972a5f1483609497d8d93ea2 Author: Pranam Lashkari AuthorDate: Mon Mar 20 20:36:45 2023 +0530 Commit: Pranam Lashkari CommitDate: Tue Mar 21 17:03:16 2023 + jsdialog: enabled thesaurus dialog Change-Id: I01059e7a4aaffd5c4a2f5ccff55f83ed3db9bf38 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149173 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 2e75e849e85da86ea33b447350b0e2f7eaede69e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149237 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fdb587c8b1e1..a99417b50a27 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -59,6 +59,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/similaritysearchdialog.ui" || rUIFile == u"cui/ui/splitcellsdialog.ui" || rUIFile == u"cui/ui/textflowpage.ui" +|| rUIFile == u"cui/ui/thesaurus.ui" || rUIFile == u"cui/ui/transparencytabpage.ui" || rUIFile == u"cui/ui/twolinespage.ui" || rUIFile == u"cui/ui/widgettestdialog.ui"
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/controller/dialogs/DataBrowser.cxx| 14 -
chart2/source/controller/dialogs/DialogModel.cxx|2
chart2/source/controller/dialogs/ObjectNameProvider.cxx |4
chart2/source/controller/dialogs/tp_DataSource.cxx |3
chart2/source/controller/main/ChartController_Tools.cxx |2
chart2/source/controller/sidebar/ChartSeriesPanel.cxx |2
chart2/source/inc/DataSeries.hxx|8
chart2/source/inc/DataSeriesHelper.hxx | 10 -
chart2/source/inc/Diagram.hxx |4
chart2/source/inc/RegressionCurveHelper.hxx |5
chart2/source/model/main/DataSeries.cxx | 132 +++
chart2/source/model/main/Diagram.cxx| 19 ++
chart2/source/tools/DataSeriesHelper.cxx| 140
chart2/source/tools/RegressionCurveHelper.cxx | 18 --
chart2/source/view/charttypes/VSeriesPlotter.cxx| 10 -
15 files changed, 180 insertions(+), 193 deletions(-)
New commits:
commit 0f691fe670526c1c0ba5c9bab8dfe8209bfe698e
Author: Noel Grandin
AuthorDate: Thu Mar 16 11:04:21 2023 +0200
Commit: Noel Grandin
CommitDate: Tue Mar 21 17:25:46 2023 +
move getLabel inside chart2::DataSeries
Change-Id: I38baff5980d8cae5f63ee9163d667385837d249b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149198
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index ce7687162eb1..ab82a772ad02 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -651,11 +651,10 @@ void DataBrowser::RenewTable()
spHeader->SetColor( nColor );
spHeader->SetChartType( elemHeader.m_xChartType,
elemHeader.m_bSwapXAndYAxis );
spHeader->SetSeriesName(
-DataSeriesHelper::getDataSeriesLabel(
-elemHeader.m_xDataSeries,
-(elemHeader.m_xChartType.is() ?
+elemHeader.m_xDataSeries->getLabelForRole(
+elemHeader.m_xChartType.is() ?
elemHeader.m_xChartType->getRoleOfSequenceForSeriesLabel() :
- OUString("values-y";
+ OUString("values-y")));
// index is 1-based, as 0 is for the column that contains the
row-numbers
spHeader->SetRange( elemHeader.m_nStartColumn + 1,
elemHeader.m_nEndColumn + 1 );
spHeader->SetGetFocusHdl( aFocusLink );
@@ -1276,11 +1275,10 @@ void DataBrowser::RenewSeriesHeaders()
spHeader->SetColor( nColor );
spHeader->SetChartType( elemHeader.m_xChartType,
elemHeader.m_bSwapXAndYAxis );
spHeader->SetSeriesName(
-DataSeriesHelper::getDataSeriesLabel(
-elemHeader.m_xDataSeries,
-(elemHeader.m_xChartType.is() ?
+elemHeader.m_xDataSeries->getLabelForRole(
+elemHeader.m_xChartType.is() ?
elemHeader.m_xChartType->getRoleOfSequenceForSeriesLabel() :
- OUString( "values-y";
+ OUString( "values-y")));
spHeader->SetRange( elemHeader.m_nStartColumn + 1,
elemHeader.m_nEndColumn + 1 );
spHeader->SetGetFocusHdl( aFocusLink );
spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink );
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index f64e328f1d28..334fc0b1b0e2 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -434,7 +434,7 @@ std::vector< DialogModel::tSeriesWithChartTypeByName >
{
aResult.push_back(
::chart::DialogModel::tSeriesWithChartTypeByName(
-::chart::DataSeriesHelper::getDataSeriesLabel(
dataSeries, aRole ),
+dataSeries->getLabelForRole( aRole ),
std::make_pair( dataSeries, rxChartType )));
}
}
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index b1a023136706..2a2b2dcce89a 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -73,8 +73,8 @@ OUString lcl_getDataSeriesName( std::u16string_view
rObjectCID, const rtl::Refer
rtl::Reference< ChartType > xChartType(
xDiagram->getChartTypeOfSeries( xSeries ) );
if( xChartType.is() )
{
-aRet = ::chart::DataSeriesHelper::getDataSeriesLabel(
-xSeries, xChartType->getRoleOfSequenceForSeriesLabel() ) ;
+aRet = xSeries->getLabelForRole(
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - bin/lo-all-static-libs solenv/bin
bin/lo-all-static-libs|1 + solenv/bin/native-code.py |1 + 2 files changed, 2 insertions(+) New commits: commit 260be930139e2760882d20c9ea3c2b2db796cdf6 Author: Patrick Luby AuthorDate: Tue Mar 21 08:38:21 2023 -0400 Commit: Andras Timar CommitDate: Tue Mar 21 19:54:34 2023 + Partial fix: iOS missing text direction listbox in Format > Page Style > Page Add the static libraries that are required by the LibreOffice's CTL and CJK text layout features to the iOS app add link list. Reference-to: https://github.com/CollaboraOnline/online/issues/6050 Change-Id: I21fddbfd29a1d326b509840127bd136c327cd3d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149210 Reviewed-by: Patrick Luby Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index af4ff25f348b..839e21169e61 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -119,6 +119,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $WORKDIR/UnpackedTarball/libexttextcat/src/.libs/*.a \ $WORKDIR/UnpackedTarball/libmspub/src/lib/.libs/*.a \ $WORKDIR/UnpackedTarball/libmwaw/src/lib/.libs/*.a \ + $WORKDIR/UnpackedTarball/libnumbertext/src/.libs/*.a \ $WORKDIR/UnpackedTarball/libodfgen/src/.libs/*.a \ $WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \ $WORKDIR/UnpackedTarball/librevenge/src/*/.libs/*.a \ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 669bddc7b00d..3c569be67a15 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -311,6 +311,7 @@ core_constructor_list = [ "lingucomponent_LangGuess_get_implementation", "lingucomponent_Hyphenator_get_implementation", "lingucomponent_LanguageToolGrammarChecker_get_implementation", +"lingucomponent_NumberText_get_implementation", # package/source/xstor/xstor.component "package_OStorageFactory_get_implementation", # package/util/package2.component
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 24d2e8ea7a17ded531d19cba3f1cb30b17833eea
Author: Mike Kaganski
AuthorDate: Tue Mar 21 19:18:14 2023 +0300
Commit: Mike Kaganski
CommitDate: Tue Mar 21 20:13:36 2023 +
Simplify a bit
Also takes care of one place where dereferencing wasn't safe
Change-Id: I4ed67ad709610bea9cbed8184710f53d18d76d11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149225
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ffcd883289bd..37f7059118c8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6218,7 +6218,6 @@ void DomainMapper_Impl::handleToc
OUString sTemplate;
OUString sChapterNoSeparator;
OUString sFigureSequence;
-uno::Reference< beans::XPropertySet > xTOC;
OUString aBookmarkName;
// \a Builds a table of figures but does not include the
captions's label and number
@@ -6317,6 +6316,8 @@ void DomainMapper_Impl::handleToc
const OUString aTocTitle = extractTocTitle();
+uno::Reference xTOC;
+
if (m_xTextFactory.is() && ! m_aTextAppendStack.empty())
{
const auto& xTextAppend = GetTopTextAppend();
@@ -6352,13 +6353,17 @@ void DomainMapper_Impl::handleToc
}
m_bStartTOC = true;
+pContext->SetTOC(xTOC);
+m_bParaHadField = false;
-if (xTOC.is())
-xTOC->setPropertyValue(getPropertyName( PROP_TITLE ),
uno::Any(aTocTitle));
+if (!xTOC)
+return;
+
+xTOC->setPropertyValue(getPropertyName( PROP_TITLE ), uno::Any(aTocTitle));
if (!aBookmarkName.isEmpty())
xTOC->setPropertyValue(getPropertyName(PROP_TOC_BOOKMARK),
uno::Any(aBookmarkName));
-if( !bTableOfFigures && xTOC.is() )
+if (!bTableOfFigures)
{
xTOC->setPropertyValue( getPropertyName( PROP_LEVEL ), uno::Any(
nMaxLevel ) );
xTOC->setPropertyValue( getPropertyName( PROP_CREATE_FROM_OUTLINE ),
uno::Any( bFromOutline ));
@@ -6427,7 +6432,7 @@ void DomainMapper_Impl::handleToc
}
}
}
-else if (bTableOfFigures && xTOC.is())
+else // if (bTableOfFigures)
{
if (!sFigureSequence.isEmpty())
xTOC->setPropertyValue(getPropertyName(PROP_LABEL_CATEGORY),
@@ -6452,8 +6457,6 @@ void DomainMapper_Impl::handleToc
xLevelFormats->replaceByIndex( 1, uno::Any( aNewLevel ) );
}
}
-pContext->SetTOC( xTOC );
-m_bParaHadField = false;
}
uno::Reference DomainMapper_Impl::createSectionForRange(
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabview.cxx | 40 +++-
1 file changed, 19 insertions(+), 21 deletions(-)
New commits:
commit f2b97ecf340e1fd714c636060ae09382518a2b46
Author: Caolán McNamara
AuthorDate: Tue Mar 21 14:30:38 2023 +
Commit: Caolán McNamara
CommitDate: Tue Mar 21 20:21:36 2023 +
unmerge default and ScrollType::Drag cases for calc scrollbars
before:
commit 8c4e8818fe9f5ac1f6cdf908299cc109d67f1e50
Author: Caolán McNamara
Date: Thu Aug 4 16:38:47 2022 +0100
nDelta overwritten on all branches except default
the default case was different to the Drag case, and tdf#152406
uncovers a problem using the Drag case for scroll wheel, so undo
the merge of default of Drag.
Change-Id: I7471191d5e1f50f74563e8bcbcb82127d94edf2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149228
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 9142393a9152..dea6dbb7810d 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1170,7 +1170,6 @@ void ScTabView::ScrollHdl(ScrollAdaptor* pScroll)
if ( pScroll == aVScrollBottom.get() ) nDelta =
aViewData.VisibleCellsY( SC_SPLIT_BOTTOM );
if (nDelta==0) nDelta=1;
break;
-default: // added to avoid warnings
case ScrollType::Drag:
{
// only scroll in the correct direction, do not jitter around
hidden ranges
@@ -1182,31 +1181,30 @@ void ScTabView::ScrollHdl(ScrollAdaptor* pScroll)
tools::Long nScrollPos = GetScrollBarPos( *pScroll ) +
nScrollMin;
nDelta = nScrollPos - nViewPos;
-
-// tdf#152406 Disable anti-jitter code for scroll wheel events
-// After moving thousands of columns to the right via
-// horizontal scroll wheel or trackpad swipe events, most
-// vertical scroll wheel or trackpad swipe events will trigger
-// the anti-jitter code because nScrollPos and nPrevDragPos
-// will be equal and nDelta will be overriden and set to zero.
-// So, only use the anti-jitter code for mouse drag events.
-if ( eType == ScrollType::Drag )
+if ( nScrollPos > nPrevDragPos )
{
-if ( nScrollPos > nPrevDragPos )
-{
-if (nDelta<0) nDelta=0;
-}
-else if ( nScrollPos < nPrevDragPos )
-{
-if (nDelta>0) nDelta=0;
-}
-else
-nDelta = 0;
+if (nDelta<0) nDelta=0;
}
-
+else if ( nScrollPos < nPrevDragPos )
+{
+if (nDelta>0) nDelta=0;
+}
+else
+nDelta = 0;
nPrevDragPos = nScrollPos;
}
break;
+default:
+// Note tdf#152406 no anti-jitter code, unlike ScrollType::Drag,
+// for scroll wheel events.
+// After moving thousands of columns to the right via horizontal
+// scroll wheel or trackpad swipe events, most vertical scroll
+// wheel or trackpad swipe events would trigger the anti-jitter
+// code because nScrollPos and nPrevDragPos would be equal and
+// nDelta will be overriden and set to zero. So, only use the
+// anti-jitter code for mouse drag events.
+nDelta = GetScrollBarPos(*pScroll) - nViewPos;
+break;
}
if (nDelta)
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source
sc/source/ui/view/tabview.cxx | 28
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 12fdd2792c392a5b355110836faa40db5866e57e
Author: Patrick Luby
AuthorDate: Mon Mar 20 16:48:30 2023 -0400
Commit: Caolán McNamara
CommitDate: Tue Mar 21 20:21:47 2023 +
tdf#152406 Disable anti-jitter code for scroll wheel events
After moving thousands of columns to the right via horizontal
scroll wheel or trackpad swipe events, most vertical scroll
wheel or trackpad swipe events will trigger the anti-jitter code
because nScrollPos and nPrevDragPos will be equal and nDelta
will be overriden and set to zero. So, only use the anti-jitter
code for mouse drag events.
Change-Id: I9a22b31e1e012a97a058ab36e040629a71f5d24f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149183
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit d82a734c07b85cbd7861699b7fa6d3ebbb3122f2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149238
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 17a414a5f5e4..aad41a9c1236 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1182,16 +1182,28 @@ void ScTabView::ScrollHdl(ScrollAdaptor* pScroll)
tools::Long nScrollPos = GetScrollBarPos( *pScroll ) +
nScrollMin;
nDelta = nScrollPos - nViewPos;
-if ( nScrollPos > nPrevDragPos )
-{
-if (nDelta<0) nDelta=0;
-}
-else if ( nScrollPos < nPrevDragPos )
+
+// tdf#152406 Disable anti-jitter code for scroll wheel events
+// After moving thousands of columns to the right via
+// horizontal scroll wheel or trackpad swipe events, most
+// vertical scroll wheel or trackpad swipe events will trigger
+// the anti-jitter code because nScrollPos and nPrevDragPos
+// will be equal and nDelta will be overriden and set to zero.
+// So, only use the anti-jitter code for mouse drag events.
+if ( eType == ScrollType::Drag )
{
-if (nDelta>0) nDelta=0;
+if ( nScrollPos > nPrevDragPos )
+{
+if (nDelta<0) nDelta=0;
+}
+else if ( nScrollPos < nPrevDragPos )
+{
+if (nDelta>0) nDelta=0;
+}
+else
+nDelta = 0;
}
-else
-nDelta = 0;
+
nPrevDragPos = nScrollPos;
}
break;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5e8c5742bd87a71ffcb69a34ee8baf69ff295149 Author: Michael Stahl AuthorDate: Mon Mar 20 11:52:22 2023 +0100 Commit: Andras Timar CommitDate: Tue Mar 21 20:54:23 2023 + curl: upgrade to release 8.0.0 Fixes CVE-2023-27535. Also hopefully fixes excessive storage consumption during build: o build: drop the use of XC_AMEND_DISTCLEAN [62] Change-Id: I8792e95bc7634ee496488e80fec5a1310b24a31c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153 Tested-by: Jenkins Reviewed-by: Michael Stahl Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149211 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 87e91ede9118..e1ad51789623 100644 --- a/download.lst +++ b/download.lst @@ -37,8 +37,8 @@ export CPPUNIT_SHA256SUM := 89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_SHA256SUM := 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f -export CURL_TARBALL := curl-7.88.1.tar.xz +export CURL_SHA256SUM := 759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc +export CURL_TARBALL := curl-8.0.0.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 13658021cf7028369ee85a5478f5c0c9ed96c11a Author: Michael Stahl AuthorDate: Tue Mar 21 10:46:46 2023 +0100 Commit: Andras Timar CommitDate: Tue Mar 21 20:54:42 2023 + curl: upgrade to release 8.0.1 Apparently 8.0.0 had a serious regression. Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149212 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index e1ad51789623..4fc4aad6587a 100644 --- a/download.lst +++ b/download.lst @@ -37,8 +37,8 @@ export CPPUNIT_SHA256SUM := 89c5c6665337f56fd2db36bc3805a5619709d51fb136e5193707 export CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_SHA256SUM := 759690f9a375a720f8bcce9f953897b0d93f31eed9649b74f846d54bbf63bbcc -export CURL_TARBALL := curl-8.0.0.tar.xz +export CURL_SHA256SUM := 0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 +export CURL_TARBALL := curl-8.0.1.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15
[Libreoffice-commits] core.git: 2 commits - vcl/jsdialog
vcl/jsdialog/enabled.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 65758e25b16db552af7699facbe068e3d4aebc3a Author: Pranam Lashkari AuthorDate: Mon Mar 20 17:47:17 2023 +0530 Commit: Pranam Lashkari CommitDate: Tue Mar 21 22:11:43 2023 + jsdialog: enabled insert break(manual break) dialog(writer) Signed-off-by: Pranam Lashkari Change-Id: I65213cd8822e574eff333b96a8718ebff2946f5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149166 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 41b7f70981cffb9a04b6b132317915ca51519eab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149236 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 1dad92a7347c..54ffe823aecf 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -112,6 +112,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/footnoteareapage.ui" || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui" || rUIFile == u"modules/swriter/ui/indentpage.ui" +|| rUIFile == u"modules/swriter/ui/insertbreak.ui" || rUIFile == u"modules/swriter/ui/insertcaption.ui" || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui" || rUIFile == u"modules/swriter/ui/linenumbering.ui" commit e8d56d600f16e137acf765842273feeca5d98b37 Author: Pranam Lashkari AuthorDate: Mon Mar 20 18:50:12 2023 +0530 Commit: Pranam Lashkari CommitDate: Tue Mar 21 22:11:32 2023 + jsdialog: enable watermark dialog (writer) Change-Id: Ie1f5a299fd68bdfd21c04d1ef79514953a2ac5c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149168 Tested-by: Szymon Kłos Reviewed-by: Szymon Kłos (cherry picked from commit 8c358c1616a16beb10752f0a60bbacccba15d6ea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149234 Tested-by: Jenkins Reviewed-by: Pranam Lashkari diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index a99417b50a27..1dad92a7347c 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -124,6 +124,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/templatedialog8.ui" || rUIFile == u"modules/swriter/ui/textgridpage.ui" || rUIFile == u"modules/swriter/ui/translationdialog.ui" +|| rUIFile == u"modules/swriter/ui/watermarkdialog.ui" // sfx || rUIFile == u"sfx/ui/cmisinfopage.ui" || rUIFile == u"sfx/ui/custominfopage.ui"
[Libreoffice-commits] core.git: include/svx sc/inc sc/qa sc/source
include/svx/svdpool.hxx |1
include/svx/xpool.hxx |3
sc/inc/globstr.hrc |1
sc/inc/servuno.hxx |2
sc/qa/extras/scstylefamiliesobj.cxx |2
sc/source/core/data/stlpool.cxx |2
sc/source/core/data/stlsheet.cxx| 42
sc/source/ui/unoobj/servuno.cxx |4
sc/source/ui/unoobj/styleuno.cxx| 183 +++-
9 files changed, 212 insertions(+), 28 deletions(-)
New commits:
commit 6db5e15e5b91f34232e90225a723e0673ecfc2f0
Author: Maxim Monastirsky
AuthorDate: Fri Mar 17 14:50:25 2023 +0200
Commit: Maxim Monastirsky
CommitDate: Tue Mar 21 23:10:01 2023 +
sc drawstyles: Implement the styles family
Change-Id: I2af6072685e4c79cfe2f177c0aae27044f86d840
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149184
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx
index e61b6fe97005..3d2201edef5b 100644
--- a/include/svx/svdpool.hxx
+++ b/include/svx/svdpool.hxx
@@ -20,7 +20,6 @@
#pragma once
#include
-#include
class XLineAttrSetItem;
class XFillAttrSetItem;
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index e8fc6f5e7225..13f5fa3d7a7d 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SVX_XPOOL_HXX
#define INCLUDED_SVX_XPOOL_HXX
+#include
#include
#include
@@ -29,7 +30,7 @@
|*
\/
-class XOutdevItemPool : public SfxItemPool
+class SVXCORE_DLLPUBLIC XOutdevItemPool : public SfxItemPool
{
protected:
std::vector* mpLocalPoolDefaults;
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 95f7138c81c9..88eca11e5a89 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -443,6 +443,7 @@
#define STR_FORM_SCROLLBAR NC_("STR_FORM_SCROLLBAR",
"Scroll Bar")
#define STR_STYLE_FAMILY_CELL NC_("STR_STYLE_FAMILY_CELL",
"Cell Styles")
#define STR_STYLE_FAMILY_PAGE NC_("STR_STYLE_FAMILY_PAGE",
"Page Styles")
+#define STR_STYLE_FAMILY_GRAPHICS
NC_("STR_STYLE_FAMILY_GRAPHICS", "Drawing Styles")
#define STR_ERR_DATAPILOTSOURCE NC_("STR_ERR_DATAPILOTSOURCE",
"Pivot table source data is invalid.")
#define STR_OPTIONS_WARN_SEPARATORS
NC_("STR_OPTIONS_WARN_SEPARATORS", "Because the current formula separator
settings conflict with the locale, the formula separators have been reset to
their default values.")
#define STR_UNDO_INSERT_CURRENT_DATE
NC_("STR_UNDO_INSERT_CURRENT_DATE", "Insert Current Date")
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index b8a6d49fd172..b705f3ef01b4 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -32,7 +32,7 @@ public:
enum class Type
{
SHEET , URLFIELD , PAGEFIELD , PAGESFIELD , DATEFIELD , TIMEFIELD ,
TITLEFIELD , FILEFIELD ,
-SHEETFIELD , CELLSTYLE , PAGESTYLE ,
+SHEETFIELD , CELLSTYLE , PAGESTYLE , GRAPHICSTYLE ,
// sheet
AUTOFORMAT , AUTOFORMATS, CELLRANGES , FUNCTIONDESCRIPTIONS ,
GLOBALSHEETSETTINGS ,
RECENTFUNCTIONS ,
diff --git a/sc/qa/extras/scstylefamiliesobj.cxx
b/sc/qa/extras/scstylefamiliesobj.cxx
index 89ec9a2b46f7..72fb135bd56d 100644
--- a/sc/qa/extras/scstylefamiliesobj.cxx
+++ b/sc/qa/extras/scstylefamiliesobj.cxx
@@ -82,7 +82,7 @@ private:
ScStyleFamiliesObj::ScStyleFamiliesObj()
: UnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
-, XIndexAccess(2)
+, XIndexAccess(3)
, XNameAccess("CellStyles")
, XServiceInfo("ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies")
{
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 8f554896ff21..e7f6d26aa0c7 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -101,7 +101,7 @@ rtl::Reference ScStyleSheetPool::Create(
const OUString& rN
SfxStyleSearchBits nMaskP )
{
rtl::Reference pSheet = new ScStyleSheet( rName, *this,
eFamily, nMaskP );
-if ( eFamily == SfxStyleFamily::Para && ScResId(STR_STYLENAME_STANDARD) !=
rName )
+if ( eFamily != SfxStyleFamily::Page && ScResId(STR_STYLENAME_STANDARD) !=
rName )
pSheet->SetParent( ScResId(STR_STYLENAME_STANDARD) );
return pSheet;
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 4ee18ef0f0fb..665b806ba540 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -26,6 +26,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include
#include
#include
@@ -77,6 +81,7 @@ bool ScStyleSheet::HasParentSupport () const
switch ( GetFamily() )
{
case SfxStyleFamily::Para: bHasParentSup
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/drwlayer.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit f460bd163afb06dc2dccc877269106af38767484
Author: Maxim Monastirsky
AuthorDate: Sun Mar 19 19:52:09 2023 +0200
Commit: Maxim Monastirsky
CommitDate: Tue Mar 21 23:10:20 2023 +
sc drawstyles: Connect the styles pool to the draw layer
Change-Id: Ie87bb028264b74fd3e15e23a3ad60ab3c48bb14d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149202
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index e6203697a4e7..653571cabd38 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -72,6 +72,7 @@
#include
#include
#include
+#include
#include
#include
@@ -280,6 +281,8 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, OUString
_aName ) :
rPool.FreezeIdRanges(); // the pool is also used
directly
+SetStyleSheetPool(pDocument ? pDocument->GetStyleSheetPool() : new
ScStyleSheetPool(rPool, pDocument));
+
SdrLayerAdmin& rAdmin = GetLayerAdmin();
rAdmin.NewLayer("vorne",SC_LAYER_FRONT.get());
rAdmin.NewLayer("hinten", SC_LAYER_BACK.get());
@@ -292,9 +295,11 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, OUString
_aName ) :
ScModule* pScMod = SC_MOD();
Outliner& rOutliner = GetDrawOutliner();
rOutliner.SetCalcFieldValueHdl( LINK( pScMod, ScModule, CalcFieldValueHdl
) );
+
rOutliner.SetStyleSheetPool(static_cast(GetStyleSheetPool()));
Outliner& rHitOutliner = GetHitTestOutliner();
rHitOutliner.SetCalcFieldValueHdl( LINK( pScMod, ScModule,
CalcFieldValueHdl ) );
+
rHitOutliner.SetStyleSheetPool(static_cast(GetStyleSheetPool()));
// set FontHeight pool defaults without changing static SdrEngineDefaults
SfxItemPool* pOutlinerPool = rOutliner.GetEditTextObjectPool();
[Libreoffice-commits] core.git: framework/source sc/inc sc/sdi sc/source
framework/source/uielement/styletoolbarcontroller.cxx |3
sc/inc/globstr.hrc|1
sc/sdi/drawsh.sdi | 12 -
sc/sdi/drtxtob.sdi| 12 -
sc/sdi/tabvwsh.sdi|1
sc/source/ui/drawfunc/drawsh2.cxx |2
sc/source/ui/drawfunc/fusel.cxx |8 +
sc/source/ui/undo/undostyl.cxx| 16 +-
sc/source/ui/view/tabview3.cxx|2
sc/source/ui/view/tabvwsha.cxx| 143 +-
10 files changed, 164 insertions(+), 36 deletions(-)
New commits:
commit 1cfeb4bd8ce7f7727a81136bd3e2d6ebea976895
Author: Maxim Monastirsky
AuthorDate: Fri Mar 17 14:28:36 2023 +0200
Commit: Maxim Monastirsky
CommitDate: Tue Mar 21 23:10:39 2023 +
sc drawstyles: Handle style commands and undo
Change-Id: Ibd81f7aba9ef2efca89556c31cd9b09867419d0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149203
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/source/uielement/styletoolbarcontroller.cxx
b/framework/source/uielement/styletoolbarcontroller.cxx
index 31aed5336f10..3ff1e777eb6d 100644
--- a/framework/source/uielement/styletoolbarcontroller.cxx
+++ b/framework/source/uielement/styletoolbarcontroller.cxx
@@ -34,7 +34,8 @@ OUString MapFamilyToCommand( std::u16string_view rFamily )
return ".uno:CharStyle";
else if ( rFamily == u"PageStyles" )
return ".uno:PageStyle";
-else if ( rFamily == u"FrameStyles" )
+else if ( rFamily == u"FrameStyles" ||
+ rFamily == u"GraphicStyles" ) // In sc
return ".uno:FrameStyle";
else if ( rFamily == u"NumberingStyles" )
return ".uno:ListStyle";
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 88eca11e5a89..16fce3f32974 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -84,6 +84,7 @@
#define STR_UNDO_EDITCELLSTYLE NC_("STR_UNDO_EDITCELLSTYLE",
"Edit Cell Style")
#define STR_UNDO_APPLYPAGESTYLE NC_("STR_UNDO_APPLYPAGESTYLE",
"Apply Page Style")
#define STR_UNDO_EDITPAGESTYLE NC_("STR_UNDO_EDITPAGESTYLE",
"Edit Page Style")
+#define STR_UNDO_EDITGRAPHICSTYLE
NC_("STR_UNDO_EDITGRAPHICSTYLE", "Edit Drawing Style")
#define STR_UNDO_DETADDPRED NC_("STR_UNDO_DETADDPRED",
"Trace Precedents")
#define STR_UNDO_DETDELPRED NC_("STR_UNDO_DETDELPRED",
"Remove Precedent")
#define STR_UNDO_DETADDSUCC NC_("STR_UNDO_DETADDSUCC",
"Trace Dependents")
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index ccd5d69605d4..13f1d6b150df 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -35,18 +35,6 @@ interface TableDraw
SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; ]
// others:
SID_DRAW_CHART [ StateMethod = StateDisableItems; ]
-SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; ]
-SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; ]
-SID_STYLE_APPLY [ StateMethod = StateDisableItems; ]
-SID_STYLE_WATERCAN [ StateMethod = StateDisableItems; ]
-SID_STYLE_NEW_BY_EXAMPLE[ StateMethod = StateDisableItems; ]
-SID_STYLE_UPDATE_BY_EXAMPLE [ StateMethod = StateDisableItems; ]
-SID_STYLE_NEW [ StateMethod = StateDisableItems; ]
-SID_STYLE_EDIT [ StateMethod = StateDisableItems; ]
-SID_STYLE_DELETE[ StateMethod = StateDisableItems; ]
-SID_STYLE_HIDE [ StateMethod = StateDisableItems; ]
-SID_STYLE_SHOW [ StateMethod = StateDisableItems; ]
-
SID_TEXT_STANDARD [ ExecMethod = ExecDrawAttr; StateMethod =
NoState; ]
SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecDrawAttr; StateMethod =
NoState; ]
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index 5280430413bc..4670d216fba2 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -33,18 +33,6 @@ interface TableDrawText
// others:
SID_DRAW_CHART [ StateMethod = StateDisableItems; ]
SID_OPENDLG_FUNCTION[ StateMethod = StateDisableItems; ]
-SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; ]
-SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; ]
-SID_STYLE_APPLY [ StateMethod = StateDisableItems; ]
-SID_STYLE_WATERCAN [ StateMethod = StateDisableItems; ]
-SID_STYLE_NEW_BY_EXAMPLE[ StateMethod = StateDisableItems; ]
-SID_STYLE_UPDATE_BY_EXAMPLE [ StateMethod = StateDisableItems; ]
-SID_STYLE_NEW [ StateMethod = StateDisableItems; ]
-SID_STYLE_EDIT [ StateMethod = StateDisableItems; ]
-SID_STYLE_DELETE[ StateMethod = StateDisableItems; ]
-SID_STY
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/vba_tests/strconv.vb| 21 ++-
basic/source/runtime/methods.cxx | 210 ---
2 files changed, 124 insertions(+), 107 deletions(-)
New commits:
commit 458f2b8f69fbf0a220f18fbf250e4369fd0491cd
Author: Mike Kaganski
AuthorDate: Wed Mar 15 16:30:26 2023 +0300
Commit: Mike Kaganski
CommitDate: Wed Mar 22 04:31:07 2023 +
Refactor and fix VBA StrConv
This properly handles null bytes that are expected
when converting between byte strings and Unicode.
It properly handles TransliterationFlags, which are
not a bitset.
In vbProperCase, it uses the correct method to
lowercase the string, working not only with ASCII.
Change-Id: I04e8cdca66ef9863a6516b15205a2a543ed97680
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149224
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/qa/vba_tests/strconv.vb b/basic/qa/vba_tests/strconv.vb
index b0295df428b2..9b7dfaf21866 100644
--- a/basic/qa/vba_tests/strconv.vb
+++ b/basic/qa/vba_tests/strconv.vb
@@ -18,25 +18,30 @@ End Function
Sub verify_testStrConv()
On Error GoTo errorHandler
-TestUtil.AssertEqual(StrConv("abc EFG hij", vbUpperCase), "ABC EFG HIJ",
"StrConv(""abc EFG hij"", vbUpperCase)")
-TestUtil.AssertEqual(StrConv("abc EFG hij", vbLowerCase), "abc efg hij",
"StrConv(""abc EFG hij"", vbLowerCase)")
-TestUtil.AssertEqual(StrConv("abc EFG hij", vbProperCase), "Abc Efg Hij",
"StrConv(""abc EFG hij"", vbProperCase)")
+TestUtil.AssertEqual(StrConv("abc EFG hij αβγ ΔΕΖ ηθι", vbUpperCase),
"ABC EFG HIJ ΑΒΓ ΔΕΖ ΗΘΙ", "StrConv(""abc EFG hij αβγ ΔΕΖ ηθι"", vbUpperCase)")
+TestUtil.AssertEqual(StrConv("abc EFG hij αβγ ΔΕΖ ηθι", vbLowerCase),
"abc efg hij αβγ δεζ ηθι", "StrConv(""abc EFG hij αβγ ΔΕΖ ηθι"", vbLowerCase)")
+TestUtil.AssertEqual(StrConv("abc EFG hij αβγ ΔΕΖ ηθι", vbProperCase),
"Abc Efg Hij Αβγ Δεζ Ηθι", "StrConv(""abc EFG hij αβγ ΔΕΖ ηθι"", vbProperCase)")
' Converts narrow (single-byte) characters in string to wide
TestUtil.AssertEqual(StrConv("ABCDEVB¥ì¥¹¥¥å©", vbWide),
"ＡＢＣＤＥＶＢ￥ì￥¹￥￥å©", "StrConv(""ABCDEVB¥ì¥¹¥¥å©"", vbWide)")
+TestUtil.AssertEqual(StrConv("ABCDEVB¥ì¥¹¥¥å©", vbWide + vbLowerCase),
"ａｂｃｄｅｖｂ￥ì￥¹￥￥å©", "StrConv(""ABCDEVB¥ì¥¹¥¥å©"", vbWide + vbLowerCase)")
' Converts wide (double-byte) characters in string to narrow (single-byte)
characters
TestUtil.AssertEqual(StrConv("ＡＢＣＤ＠＄％２３＇？ＥＧ", vbNarrow), "ABCD@$%23'?EG",
"StrConv(""ＡＢＣＤ＠＄％２３＇？ＥＧ"", vbNarrow)")
+TestUtil.AssertEqual(StrConv("ＡＢＣＤ＠＄％２３＇？ＥＧ", vbNarrow + vbLowerCase),
"abcd@$%23'?eg", "StrConv(""ＡＢＣＤ＠＄％２３＇？ＥＧ"", vbNarrow + vbLowerCase)")
' Converts Hiragana characters in string to Katakana characters
TestUtil.AssertEqual(StrConv("かたかな", vbKatakana), "カタカナ",
"StrConv(""かたかな"", vbKatakana)")
+TestUtil.AssertEqual(StrConv("かたかな abc", vbKatakana + vbUpperCase +
vbWide), "カタカナ ＡＢＣ", "StrConv(""かたかな abc"", vbKatakana + vbUpperCase + vbWide)")
' Converts Katakana characters in string to Hiragana characters
TestUtil.AssertEqual(StrConv("カタカナ", vbHiragana), "かたかな",
"StrConv(""カタカナ"", vbHiragana)")
+TestUtil.AssertEqual(StrConv("カタカナ ＡＢＣ", vbLowerCase + vbNarrow), "ｶﾀｶﾅ
abc", "StrConv(""カタカナ ＡＢＣ"", vbLowerCase + vbNarrow)")
-' Assumes CP-1252 encoding associated with en-US locale used in unit tests.
Dim x() As Byte
-x = StrConv("ÉϺ£ÊÐABC", vbFromUnicode)
+Const Cp1252TestString = "ÉϺ£ÊÐABC"
+
+x = StrConv(Cp1252TestString, vbFromUnicode, &h0409)' CP-1252 encoding
associated with en-US locale
TestUtil.AssertEqual(UBound(x), 8, "UBound(x)")
TestUtil.AssertEqual(x(0), 201, "x(0)")
TestUtil.AssertEqual(x(1), 207, "x(1)")
@@ -47,7 +52,11 @@ Sub verify_testStrConv()
TestUtil.AssertEqual(x(6), 65, "x(6)")
TestUtil.AssertEqual(x(7), 66, "x(7)")
TestUtil.AssertEqual(x(8), 67, "x(8)")
-TestUtil.AssertEqual(StrConv(x, vbUnicode), "ÉϺ£ÊÐABC", "StrConv(x,
vbUnicode)")
+TestUtil.AssertEqual(StrConv(x, vbUnicode, &h0409), Cp1252TestString,
"StrConv(x, vbUnicode, &h0409)")
+
+x = StrConv(Cp1252TestString, vbUnicode, &h0409)
+TestUtil.AssertEqual(UBound(x), 35, "UBound(x)")
+TestUtil.AssertEqual(StrConv(x, vbFromUnicode, &h0409), Cp1252TestString,
"StrConv(x, vbFromUnicode, &h0409)")
Exit Sub
errorHandler:
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b6d9383d5b37..0b4f89d40115 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -59,6 +59,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -4084,6 +4085,40 @@ void SbRtl_QBColor(StarBASIC *, SbxArray & rPar, bool)
rPar.Get(0)->PutLong(nRGB);
}
+static std::vector byteArray2Vec(SbxArray* pArr)
+{
+std::vector result;
+if (pArr)
+{
+const sal_uInt32 nCount = pArr->Count();
+result.
Origin/master build fail
Hi, Since yesterday when I built from origin/master it always halted with the following messages: [BIN] sc [MOD] sc [BIN] postprocess [GAL] backgrounds [GAL] sounds [MOD] postprocess Aborted (core dumped) terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' make[1]: *** [/opt/git/libreoffice.core/solenv/gbuild/Gallery.mk:57: /opt/git/libreoffice.core/workdir/Gallery/sounds.done] Error 1 make[1]: *** Waiting for unfinished jobs Aborted (core dumped) terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' make[1]: *** [/opt/git/libreoffice.core/solenv/gbuild/Gallery.mk:57: /opt/git/libreoffice.core/workdir/Gallery/backgrounds.done] Error 1 make: *** [Makefile:289: build] Error 2 If I checked out tag libreoffice-7.5.1.2 it could build successfully, so I think it should not be caused by my building environment. Does anyone experience the same problem? Thanks, Franklin -- Franklin Weng Member, Certification Committee The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details:https://www.documentfoundation.org/imprint OpenPGP_signature Description: OpenPGP digital signature
[Libreoffice-commits] core.git: sw/qa
0 files changed New commits: commit dd490103342900a1bab2138555803e53a49894dd Author: Andrea Gelmini AuthorDate: Wed Mar 15 18:58:07 2023 +0100 Commit: Julien Nabet CommitDate: Wed Mar 22 05:35:19 2023 + Remove executable bits from odt Change-Id: I719c1a156dea095d391f94b42f78f2a8c99b0673 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148938 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/sw/qa/extras/uiwriter/data/tdf40142.odt b/sw/qa/extras/uiwriter/data/tdf40142.odt old mode 100755 new mode 100644
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabview.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30ab88edbbd60e62302a8d08a3cca39bfb0d45a5 Author: Andrea Gelmini AuthorDate: Tue Mar 21 23:08:25 2023 +0100 Commit: Julien Nabet CommitDate: Wed Mar 22 05:38:22 2023 + Fix typo Change-Id: Ibad12225523e0cbfbd5b09abad8f1b31c7d7264e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149274 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index dea6dbb7810d..69aef742b345 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1201,7 +1201,7 @@ void ScTabView::ScrollHdl(ScrollAdaptor* pScroll) // scroll wheel or trackpad swipe events, most vertical scroll // wheel or trackpad swipe events would trigger the anti-jitter // code because nScrollPos and nPrevDragPos would be equal and -// nDelta will be overriden and set to zero. So, only use the +// nDelta will be overridden and set to zero. So, only use the // anti-jitter code for mouse drag events. nDelta = GetScrollBarPos(*pScroll) - nViewPos; break;
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx|2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |2
chart2/source/controller/inc/SeriesOptionsItemConverter.hxx|3 -
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |4 +
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 13
++
chart2/source/inc/ChartModelHelper.hxx |5
--
chart2/source/inc/Diagram.hxx |7
---
chart2/source/inc/RegressionCurveHelper.hxx|2
chart2/source/model/main/Diagram.cxx | 21
--
chart2/source/tools/ChartModelHelper.cxx |8
---
chart2/source/tools/RegressionCurveHelper.cxx |4 -
11 files changed, 19 insertions(+), 52 deletions(-)
New commits:
commit 949c73f9c35d640c841f03d505e905aa2e1b7a3f
Author: Noel Grandin
AuthorDate: Thu Mar 16 11:37:03 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 22 05:57:16 2023 +
use more concrete types in chart2
Change-Id: I70042284e4549b3eef67866a35741b06305d720f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149229
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 8961c2731f71..6c0dbe7bce25 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -318,7 +318,7 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const
Reference< beans::XProp
void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue,
const Reference< beans::XPropertySet >& xInnerPropertySet ) const
{
-uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet,
uno::UNO_QUERY );
+rtl::Reference< ::chart::DataSeries > xDataSeries(
dynamic_cast<::chart::DataSeries*>(xInnerPropertySet.get()) );
sal_Int32 nChartAxisAssign = css::chart::ChartAxisAssign::PRIMARY_Y;
if( ! (rOuterValue >>= nChartAxisAssign) )
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 50d4b2c0edd2..79c45ea1d888 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -286,7 +286,7 @@ beans::PropertyState
WrappedSymbolTypeProperty::getPropertyState( const Referenc
m_spChart2ModelContact)
{
rtl::Reference< ::chart::Diagram > xDiagram(
m_spChart2ModelContact->getDiagram() );
-Reference< chart2::XDataSeries > xSeries( xInnerPropertyState,
uno::UNO_QUERY );
+rtl::Reference< ::chart::DataSeries > xSeries(
dynamic_cast(xInnerPropertyState.get()) );
rtl::Reference< ChartType > xChartType(
xDiagram->getChartTypeOfSeries( xSeries ) );
if( ChartTypeHelper::isSupportingSymbolProperties( xChartType, 2 ) )
return beans::PropertyState_DIRECT_VALUE;
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 886e6ec91b83..b55457ac5b30 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -27,6 +27,7 @@ namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart { class ChartModel; }
namespace chart { class BaseCoordinateSystem; }
+namespace chart { class DataSeries; }
namespace chart::wrapper
{
@@ -37,7 +38,7 @@ public:
SeriesOptionsItemConverter(
const rtl::Reference<::chart::ChartModel> & xChartModel,
css::uno::Reference< css::uno::XComponentContext > xContext,
-const css::uno::Reference< css::beans::XPropertySet > & rPropertySet,
+const rtl::Reference<::chart::DataSeries> & rPropertySet,
SfxItemPool& rItemPool );
virtual ~SeriesOptionsItemConverter() override;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index f415cd194386..e71646cf7a8f 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -234,8 +234,10 @@ DataPointItemConverter::DataPointItemConverter(
m_aConverters.emplace_back( new
CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize,
"ReferencePageSize"));
if( bDataSeries )
{
+assert(dynamic_cast(rPropertySet.get()));
m_aConverters.emplace_back( new Sta
[Libreoffice-commits] core.git: winaccessibility/inc winaccessibility/source
winaccessibility/inc/AccObjectWinManager.hxx|4 ++--
winaccessibility/source/service/AccObjectWinManager.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 02edbf7dc7cf1a3bcc1b943e79c027e3c144d544
Author: Michael Weghorn
AuthorDate: Tue Mar 21 19:32:11 2023 +0100
Commit: Michael Weghorn
CommitDate: Wed Mar 22 06:36:58 2023 +
tdf#154303 wina11y: Don't truncate 64-bit states
commit 8d8e6c84e512c1a8b33aac75965b84481d1a1d13
Date: Sun Jul 3 20:29:28 2022 +0200
[API CHANGE] Drop css::accessibility::XAccessibleStateSet
had introduced the use of a 64-bit integer with
bit flags for the accessible states.
However, `AccObjectWinManager::DecreaseState` and
`AccObjectWinManager::IncreaseState` were still using
unsigned short, resulting in truncation.
As one result, the `AccessibleEventId::STATE_CHANGED`
event with state `AccessibleStateType::VISIBLE`
from `OAccessibleMenuBaseComponent::SetVisible` would no
longer result in the `STATE_SYSTEM_INVISIBLE` being unset
and thus the the JAWS screen reader would no longer announce
the focused (but considered invisible) menu item.
Fix this by switching the param for those two methods to
sal_Int64 as well.
Change-Id: I714573e2691e82c6287a4b83f872f87568e46495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149255
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx
b/winaccessibility/inc/AccObjectWinManager.hxx
index 76e3e548fcdf..5c162dfed1ea 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -102,8 +102,8 @@ public:
LRESULT Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
-void DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short
pState );
-void IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short
pState );
+void DecreaseState(css::accessibility::XAccessible* pXAcc, sal_Int64
nState);
+void IncreaseState(css::accessibility::XAccessible* pXAcc, sal_Int64
nState);
void UpdateState( css::accessibility::XAccessible* pXAcc );
void SetValue( css::accessibility::XAccessible* pXAcc, css::uno::Any pAny
);
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx
b/winaccessibility/source/service/AccObjectWinManager.cxx
index de527270a8e0..b0ee01525de9 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -796,11 +796,11 @@ AccObjectWinManager::CreateAccEventListener(XAccessible*
pXAcc)
* @param pState Changed state.
* @return
*/
-void AccObjectWinManager::DecreaseState( XAccessible* pXAcc,unsigned short
pState )
+void AccObjectWinManager::DecreaseState(XAccessible* pXAcc, sal_Int64 nState)
{
AccObject* pAccObj = GetAccObjByXAcc( pXAcc );
if( pAccObj )
-pAccObj->DecreaseState( pState );
+pAccObj->DecreaseState(nState);
}
/**
@@ -811,11 +811,11 @@ void AccObjectWinManager::DecreaseState( XAccessible*
pXAcc,unsigned short pStat
* @param pState Changed state.
* @return
*/
-void AccObjectWinManager::IncreaseState( XAccessible* pXAcc,unsigned short
pState )
+void AccObjectWinManager::IncreaseState(XAccessible* pXAcc, sal_Int64 nState)
{
AccObject* pAccObj = GetAccObjByXAcc( pXAcc );
if( pAccObj )
-pAccObj->IncreaseState( pState );
+pAccObj->IncreaseState(nState);
}
void AccObjectWinManager::UpdateState( css::accessibility::XAccessible* pXAcc
)
