From a8babea4ce7f07f969e58594ab5a5afc2d190e69 Mon Sep 17 00:00:00 2001 From: Regina Henschel Date: Sat, 3 Jan 2026 16:19:51 +0100 Subject: [PATCH] tdf#131124 Handle ExtrudedCustomShape and FontWork ShellMode::ExtrudedCustomShape and ShellMode::FontWork were missing in the switch. Thus mxShapes and mxShape in the Export dialog were empty and maSize was zero. Change-Id: If4c2137ce85a0aef0613d9d79979cc9a58b5c115 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196456 Tested-by: Jenkins Reviewed-by: Regina Henschel --- .../tdf131124_Extruded_Shape_Selection.odt | Bin 0 -> 10676 bytes .../data/tdf131124_Fontwork_Selection.odt | Bin 0 -> 13849 bytes sw/qa/extras/uiwriter/uiwriter11.cxx | 28 ++++++++++++++++++ sw/source/uibase/uno/unotxvw.cxx | 2 ++ 4 files changed, 30 insertions(+) create mode 100644 sw/qa/extras/uiwriter/data/tdf131124_Extruded_Shape_Selection.odt create mode 100644 sw/qa/extras/uiwriter/data/tdf131124_Fontwork_Selection.odt diff --git a/sw/qa/extras/uiwriter/data/tdf131124_Extruded_Shape_Selection.odt b/sw/qa/extras/uiwriter/data/tdf131124_Extruded_Shape_Selection.odt new file mode 100644 index 0000000000000000000000000000000000000000..5d2d0ef7bd1ad969c488d8ae23eca4b830c18a16 GIT binary patch literal 10676 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 b;%{CnpyaF9FJkb|7uGX0=Ks=|3GsgbS7Gu> literal 0 HcmV?d00001 diff --git a/sw/qa/extras/uiwriter/data/tdf131124_Fontwork_Selection.odt b/sw/qa/extras/uiwriter/data/tdf131124_Fontwork_Selection.odt new file mode 100644 index 0000000000000000000000000000000000000000..8b3090d1ae65ebc9cdd69f2ce32473563dfbfd87 GIT binary patch literal 13849 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ǞL@- zzG)^ye}^V7HnZeB)I20TzkrbQQVF+AIOk}eR&u8b;9oM1t7W4>XfpZaNdG+_AxjkY zCXERC*#!ALEOHZe3POC!PEiAal-MyKpYCuHblzIqO~hDka+&k^Wq^`fUUnYn6Z__1vfs zhWt!!;&I8nhs-j=-Umr<<)A&3X2Ld4gt&{!e%Pfi!)u9)TVEvTe5x9xdNSh8kpYuo z$R;1mftR&$%m*{+rX-c*Tym4PZ)pxy-^|$G=n288-Z)m3iWV;3-6|g)M(3sW^19L1 z12tCqWlfT>3Owg$I{{fIE;DKEzReW2Ab1EDB&>^4s4x%2Fhgp2l+8WiQf(rGXBCC; z=nh`tP&OHOvP_8K?(XyHjl07E&wv-FgFkN#{x1bF{&?6Q+PXWr@msq)!9@6$I|zg` zQaW(&{c$_x#V$uQX#&|%jRQ}deVsZwIU17>QSymdt+oUNed1wGKfq8;j?S9Tuq=qC zj>>IN3l3cH%@K>Hc2^N7=yf*cLFtAKyO6S3O@#)Z1a5HM5UQ^}MHI~UW4J+?Mpa@`W;0?! z5S_%&skZEr>u`4@%8_g}8U~*n3%3T?9}u&0w})%JR-pk|D=X?MER1^uyzV-dw+SMZ ztZ4`Zei&AU$P(g4IbWGFsd>9_7s^n;h6HjG#0GvwTSS|TpA|xxflw6;etUQ5izqtB zC9s5j7hi^%ANFCTiO`=|Y{|c^Urs>s5I1|x7$3)`3K*7ByNNY zZitQgl>|m4thSdEBGS9@=0e)e`fB&JXS9>bh3qHnj!hH?4zkv>5>8MJs@%>eB`$B! zQt?A#2`vR-!`HH9h~ZfmzYNQmsY6B|lA2px(U9}8Hq2CD`5_;sh&~kj>iE&{?luYV z=@6=iXbGoARL?k>uxrHA7aI7@=yP++>?D2{$`=xdPZ%RM-CjiUS!dcQcsS@!>o-!} z+7@|mp))5JINx`$i8Hjk%;RTfS7)K7C=O{p77n6BVXLs$OS2#FI@RHE=U#&J^)lXd z^o1Zyh1mrlgI%B~QYO9k3hX(eS9tlJFJ>Pw63>p-do>1Lb^|IR_6;rIs(3mdrI-TuiBa1 z9C|BPHG6NZOL2?KF?r;6eAjP{?DT>#w(>lX`LQ1TXIw$^UZaUZ%*ytq=kDq=_U{y5 zUE?8@`D@B`{)G>YY8n6HPx_s1a$X-)Bu{wFsquIp~3W;NVu3IxR8>}M)f+Kn+~kGXQ& z_0}IN9(+#gOTv_VarL98Ge7N9X%`?5d*v#;%ONu&9-0x~_u`s2MvC28cjb&OuSxQ9 za*Sd_k&dxG*d@!=%9qZQ2SRoZ3jWlSz&Wh#!`hM5BePPOrSlescA!SxPk~GeD{2!D z@DFNfx0d>WqLem9h@0Qaz7X!;6UD`M`(r%kTG5iRs;9fQPq2V!BfdD{y$jCvbW|T- zfE-DC5ZraIWNW3f@Y)z=e5U~yUZBqe!N~+m6^DXv?9ecTjP*W7!d!y+2=Qa z{G0x?{`}$kQw;d84J*I9dj2M<*Wo|S_1fd}hx1Pw_wSYeXlVI+9{MWb|J~m54{87G z`>*ARzcajlQ}ZkL-|a4ccKyTmuXOA#jT{#VX_O-TQ)6Zo5UUzPaU81+}x zz#pzZSNUI))qiuvWBvQo^`Eo+k@{cnl;4p3Z+hVc6O@S1!-X8Aq)KYZGA6951J literal 0 HcmV?d00001 diff --git a/sw/qa/extras/uiwriter/uiwriter11.cxx b/sw/qa/extras/uiwriter/uiwriter11.cxx index cc642e56d600..dfe2c60ffee5 100644 --- a/sw/qa/extras/uiwriter/uiwriter11.cxx +++ b/sw/qa/extras/uiwriter/uiwriter11.cxx @@ -397,6 +397,34 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest11, testTdf162120AutoRTL) getProperty(getRun(getParagraph(1), 1), u"WritingMode"_ustr)); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest11, testFontworkSelection) +{ + // Load a document with a Fontwork shape and select the shape + createSwDoc("tdf131124_Fontwork_Selection.odt"); + dispatchCommand(mxComponent, u".uno:JumpToNextFrame"_ustr, {}); + + // Make sure the CurrentSelection of the document is not empty. + uno::Reference xModel(mxComponent, uno::UNO_QUERY); + uno::Reference xSelections(xModel->getCurrentSelection(), + uno::UNO_QUERY); + // Without fix, this test would have failed here + CPPUNIT_ASSERT(xSelections.is()); +} + +CPPUNIT_TEST_FIXTURE(SwUiWriterTest11, testExtrudedShapeSelection) +{ + // Load a document with an extruded custom shape and select the shape + createSwDoc("tdf131124_Extruded_Shape_Selection.odt"); + dispatchCommand(mxComponent, u".uno:JumpToNextFrame"_ustr, {}); + + // Make sure the CurrentSelection of the document is not empty. + uno::Reference xModel(mxComponent, uno::UNO_QUERY); + uno::Reference xSelections(xModel->getCurrentSelection(), + uno::UNO_QUERY); + // Without fix, this test would have failed here + CPPUNIT_ASSERT(xSelections.is()); +} + } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index d57845269f18..a002755973ea 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -321,6 +321,8 @@ uno::Any SwXTextView::getSelection() case ShellMode::DrawForm : case ShellMode::DrawText : case ShellMode::Bezier : + case ShellMode::ExtrudedCustomShape: + case ShellMode::FontWork: { uno::Reference< drawing::XShapes > xShCol = drawing::ShapeCollection::create( comphelper::getProcessComponentContext());