diff options
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/drwbassh.cxx | 12 | ||||
| -rw-r--r-- | vcl/jsdialog/enabled.cxx | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index e093bf7ff4f2..635bca3b5de9 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3709,6 +3709,8 @@ static void doc_iniUnoCommands () u".uno:Context"_ustr, u".uno:WrapText"_ustr, u".uno:ToggleMergeCells"_ustr, + u".uno:NameGroup"_ustr, + u".uno:ObjectTitleDescription"_ustr, u".uno:NumberFormatCurrency"_ustr, u".uno:NumberFormatPercent"_ustr, u".uno:NumberFormatDecimal"_ustr, diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 94ddb161ea88..69568b497e77 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -2665,7 +2665,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if(1 == mpDrawView->GetMarkedObjectCount()) { // #i68101# - SdrObject* pSelected = mpDrawView->GetMarkedObjectByIndex(0); + rtl::Reference<SdrObject> pSelected = mpDrawView->GetMarkedObjectByIndex(0); OSL_ENSURE(pSelected, "DrawViewShell::FuTemp03: nMarkCount, but no object (!)"); OUString aName(pSelected->GetName()); @@ -2683,7 +2683,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdPage* pPage = GetActualPage(); if (pPage) - pPage->notifyObjectRenamed(pSelected); + pPage->notifyObjectRenamed(pSelected.get()); } pDlg->disposeOnce(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); @@ -2703,7 +2703,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { if(1 == mpDrawView->GetMarkedObjectCount()) { - SdrObject* pSelected = mpDrawView->GetMarkedObjectByIndex(0); + rtl::Reference<SdrObject> pSelected = mpDrawView->GetMarkedObjectByIndex(0); OSL_ENSURE(pSelected, "DrawViewShell::FuTemp03: nMarkCount, but no object (!)"); OUString aTitle(pSelected->GetTitle()); OUString aDescription(pSelected->GetDescription()); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index be86988ce9fd..b267c6157b57 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -1001,6 +1001,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra aEvent.FeatureURL.Path == "InsertRowsAfter" || aEvent.FeatureURL.Path == "InsertColumnsBefore" || aEvent.FeatureURL.Path == "InsertColumnsAfter" || + aEvent.FeatureURL.Path == "NameGroup" || + aEvent.FeatureURL.Path == "ObjectTitleDescription" || aEvent.FeatureURL.Path == "MergeCells" || aEvent.FeatureURL.Path == "InsertObjectChart" || aEvent.FeatureURL.Path == "InsertSection" || diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index a0394cdb5598..01673532ecbd 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -607,7 +607,7 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq) if(1 == pSdrView->GetMarkedObjectCount()) { // #i68101# - SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0); + rtl::Reference<SdrObject> pSelected = pSdrView->GetMarkedObjectByIndex(0); assert(pSelected && "DrawViewShell::FuTemp03: nMarkCount, but no object (!)"); OUString aOrigName(pSelected->GetName()); @@ -628,8 +628,12 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq) // update accessibility sidebar object name if we modify the object name on the navigator bar if (!aNewName.isEmpty() && aOrigName != aNewName) { - if (SwNode* pSwNode = FindFrameFormat(pSelected)->GetAnchor().GetAnchorNode()) - pSwNode->resetAndQueueAccessibilityCheck(true); + auto pFrameFormat = FindFrameFormat(pSelected.get()); + if (pFrameFormat) + { + if (SwNode* pSwNode = pFrameFormat->GetAnchor().GetAnchorNode()) + pSwNode->resetAndQueueAccessibilityCheck(true); + } } } pDlg->disposeOnce(); @@ -647,7 +651,7 @@ void SwDrawBaseShell::Execute(SfxRequest& rReq) if(1 == pSdrView->GetMarkedObjectCount()) { - SdrObject* pSelected = pSdrView->GetMarkedObjectByIndex(0); + rtl::Reference<SdrObject> pSelected = pSdrView->GetMarkedObjectByIndex(0); assert(pSelected && "DrawViewShell::FuTemp03: nMarkCount, but no object (!)"); OUString aTitle(pSelected->GetTitle()); OUString aDescription(pSelected->GetDescription()); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fd05cc3ff569..ab0fbdbd7751 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -58,6 +58,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"cui/ui/numberingformatpage.ui" || rUIFile == u"cui/ui/numberingoptionspage.ui" || rUIFile == u"cui/ui/numberingpositionpage.ui" + || rUIFile == u"cui/ui/objectnamedialog.ui" + || rUIFile == u"cui/ui/objecttitledescdialog.ui" || rUIFile == u"cui/ui/optlingupage.ui" || rUIFile == u"cui/ui/pageformatpage.ui" || rUIFile == u"cui/ui/paragalignpage.ui" |