desktop/source/lib/init.cxx | 1 sd/source/ui/dlg/tpaction.cxx | 3 +- sd/source/ui/inc/tpaction.hxx | 1 sd/uiconfig/simpress/ui/interactiondialog.ui | 18 ++++++++++++--- sfx2/source/control/unoctitm.cxx | 1 sw/source/core/access/accpara.cxx | 2 - sw/source/filter/html/htmltab.cxx | 2 - sw/source/filter/ww8/ww8par5.cxx | 2 - sw/source/uibase/app/docst.cxx | 2 - sw/source/uibase/uno/SwXDocumentSettings.cxx | 2 - sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx | 2 - sw/source/writerfilter/rtftok/rtfsprm.cxx | 2 - vcl/jsdialog/enabled.cxx | 2 + 13 files changed, 29 insertions(+), 11 deletions(-)
New commits: commit 729e333c90d48baf80177971cffedeb1d131d1d0 Author: Hubert Figuière <[email protected]> AuthorDate: Thu Aug 15 06:28:26 2024 -0400 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Aug 18 11:05:06 2024 +0200 LOKit: Enable the "Interaction..." command for Impress. Also enable the dialog for JSDialogs Fix the layout of the dialog. Signed-off-by: Hubert Figuière <[email protected]> Change-Id: I4581da34921eb355ce8f59d7bfdf2f7d5d7493f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171961 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 1857275268b1..563ee52ef695 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3992,6 +3992,7 @@ static void doc_iniUnoCommands () u".uno:DistributeVertCenter"_ustr, u".uno:DistributeVertDistance"_ustr, u".uno:DistributeVertTop"_ustr, + u".uno:AnimationEffects"_ustr, }; util::URL aCommandURL; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 5364193d38d1..ef31f2e71ff3 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -71,8 +71,9 @@ constexpr OUStringLiteral pStarDrawXMLContent( u"content.xml" ); SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView) : SfxSingleTabDialogController(pParent, pAttr, u"modules/simpress/ui/interactiondialog.ui"_ustr, u"InteractionDialog"_ustr) + , m_xContent(m_xBuilder->weld_container(u"content"_ustr)) { - std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, *pAttr); + std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(m_xContent.get(), this, *pAttr); // formerly in PageCreated static_cast<SdTPAction*>( xNewPage.get() )->SetView( pView ); diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 596adc20ba7a..d2d370602716 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -38,6 +38,7 @@ class SdDrawDocument; */ class SdActionDlg final : public SfxSingleTabDialogController { + std::unique_ptr<weld::Container> m_xContent; public: SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView); }; diff --git a/sd/uiconfig/simpress/ui/interactiondialog.ui b/sd/uiconfig/simpress/ui/interactiondialog.ui index 0214891c17a2..eb49c79fe437 100644 --- a/sd/uiconfig/simpress/ui/interactiondialog.ui +++ b/sd/uiconfig/simpress/ui/interactiondialog.ui @@ -18,6 +18,21 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> + <child> + <object class="GtkBox" id="content"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> @@ -75,9 +90,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> <action-widgets> diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index fc068a90b20c..c8457853f418 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1306,6 +1306,7 @@ constexpr auto handlers = frozen::make_unordered_map<std::u16string_view, Payloa { u"DistributeVertCenter", EnabledPayload }, { u"DistributeVertDistance", EnabledPayload }, { u"DistributeVertTop", EnabledPayload }, + { u"AnimationEffects", EnabledPayload }, { u"ParaLeftToRight", ParaDirectionPayload }, { u"ParaRightToLeft", ParaDirectionPayload }, diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 39a06e325d7d..cc5eae96e86d 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -176,6 +176,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/simpress/ui/customanimationtimingtab.ui" || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui" || rUIFile == u"modules/simpress/ui/headerfootertab.ui" + || rUIFile == u"modules/simpress/ui/interactiondialog.ui" + || rUIFile == u"modules/simpress/ui/interactionpage.ui" // swriter || rUIFile == u"modules/swriter/ui/bulletsandnumbering.ui" || rUIFile == u"modules/swriter/ui/captionoptions.ui" commit 149c51daed056e256aefc3402d79010a1040f590 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Aug 17 19:34:32 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Aug 18 11:04:54 2024 +0200 cid#1556978 COPY_INSTEAD_OF_MOVE and cid#1556976 COPY_INSTEAD_OF_MOVE cid#1556965 COPY_INSTEAD_OF_MOVE cid#1556956 COPY_INSTEAD_OF_MOVE cid#1556953 COPY_INSTEAD_OF_MOVE cid#1556946 COPY_INSTEAD_OF_MOVE cid#1556934 COPY_INSTEAD_OF_MOVE cid#1556897 COPY_INSTEAD_OF_MOVE Change-Id: I6cf90b385042e7ca7d07138c28c0e95f97de8f61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171983 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 921b83af5f6c..2e69e8f7fff3 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1636,7 +1636,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( rPropVal.Value <<= fRatio; rPropVal.Handle = -1; rPropVal.State = beans::PropertyState_DEFAULT_VALUE; - pValues[ aValues.getLength() - 1 ] = rPropVal; + pValues[ aValues.getLength() - 1 ] = std::move(rPropVal); } return aValues; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 2a9faed4fb63..b7a4d6357a42 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -4977,7 +4977,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust, aTableOptions)); m_xTable = xCurTable; - xSaveStruct.reset(new TableSaveStruct(xCurTable)); + xSaveStruct.reset(new TableSaveStruct(std::move(xCurTable))); // Is pending on the first GetNextToken, needs to be re-read on each construction SaveState( HtmlTokenId::NONE ); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 73125adf4188..c845941ad324 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3139,7 +3139,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr ) { SwFormToken aToken(TOKEN_TEXT); aToken.sText = sDelimiter; - *aIt = aToken; + *aIt = std::move(aToken); } aForm.SetPattern(nLevel, std::move(aPattern)); } diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 05348aa6e805..60757bafdbf9 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -1014,7 +1014,7 @@ void SwDocShell::Edit( pDlg->StartExecuteAsync([bIsDefaultPage, bNew, nFamily, nSlot, nNewStyleUndoId, pApplyStyleHelper=std::move(pApplyStyleHelper), - pRequest, xTmp, this](sal_Int32 nResult){ + pRequest=std::move(pRequest), xTmp, this](sal_Int32 nResult){ if (RET_OK == nResult) pApplyStyleHelper->apply(); diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 850210dfdfe8..6ccf8849482b 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -487,7 +487,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf assert (! pPrinter->isDisposed() ); // set printer only once; in _postSetValues mpPrinter.disposeAndClear(); - mpPrinter = pPrinter; + mpPrinter = std::move(pPrinter); } } diff --git a/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx index 8f6eb4a3bc08..3b4f909e3843 100644 --- a/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx +++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx @@ -1537,7 +1537,7 @@ OOXMLValue::Pointer_t fakeNoBorder() OOXMLPropertySet::Pointer_t pProps( new OOXMLPropertySet ); OOXMLValue::Pointer_t pVal = OOXMLIntegerValue::Create(0); pProps->add(NS_ooxml::LN_CT_Border_val, pVal, OOXMLProperty::ATTRIBUTE); - OOXMLValue::Pointer_t pValue( new OOXMLPropertySetValue( pProps )); + OOXMLValue::Pointer_t pValue( new OOXMLPropertySetValue(std::move(pProps))); return pValue; } } diff --git a/sw/source/writerfilter/rtftok/rtfsprm.cxx b/sw/source/writerfilter/rtftok/rtfsprm.cxx index 50035c086e23..c2ae83dcd6c8 100644 --- a/sw/source/writerfilter/rtftok/rtfsprm.cxx +++ b/sw/source/writerfilter/rtftok/rtfsprm.cxx @@ -463,7 +463,7 @@ void RTFSprms::ensureCopyBeforeWrite() for (auto& rSprm : *m_pSprms) pClone->push_back( std::make_pair(rSprm.first, RTFValue::Pointer_t(rSprm.second->Clone()))); - m_pSprms = pClone; + m_pSprms = std::move(pClone); } }
