diff options
Diffstat (limited to 'extensions/source/propctrlr/selectlabeldialog.cxx')
| -rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index fabef68abf43..f0ba29207794 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -51,14 +51,14 @@ namespace pcr // OSelectLabelDialog OSelectLabelDialog::OSelectLabelDialog(weld::Window* pParent, Reference< XPropertySet > const & _xControlModel) - : GenericDialogController(pParent, "modules/spropctrlr/ui/labelselectiondialog.ui", "LabelSelectionDialog") + : GenericDialogController(pParent, u"modules/spropctrlr/ui/labelselectiondialog.ui"_ustr, u"LabelSelectionDialog"_ustr) , m_xControlModel(_xControlModel) , m_bLastSelected(false) , m_bHaveAssignableControl(false) - , m_xMainDesc(m_xBuilder->weld_label("label")) - , m_xControlTree(m_xBuilder->weld_tree_view("control")) + , m_xMainDesc(m_xBuilder->weld_label(u"label"_ustr)) + , m_xControlTree(m_xBuilder->weld_tree_view(u"control"_ustr)) , m_xScratchIter(m_xControlTree->make_iterator()) - , m_xNoAssignment(m_xBuilder->weld_check_button("noassignment")) + , m_xNoAssignment(m_xBuilder->weld_check_button(u"noassignment"_ustr)) { m_xControlTree->connect_changed(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_xControlTree->set_size_request(-1, m_xControlTree->get_height_rows(8)); @@ -70,7 +70,7 @@ namespace pcr nClassID = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); sDescription = sDescription.replaceAll("$controlclass$", - GetUIHeadlineName(nClassID, makeAny(m_xControlModel))); + GetUIHeadlineName(nClassID, Any(m_xControlModel))); OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); sDescription = sDescription.replaceAll("$controlname$", sName); m_xMainDesc->set_label(sDescription); @@ -92,8 +92,8 @@ namespace pcr // check which service the allowed components must support sal_Int16 nClassId = 0; try { nClassId = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); } catch(...) { } - m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(SERVICE_COMPONENT_GROUPBOX) : OUString(SERVICE_COMPONENT_FIXEDTEXT); - m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? OUString(RID_EXTBMP_GROUPBOX) : OUString(RID_EXTBMP_FIXEDTEXT); + m_sRequiredService = (FormComponentType::RADIOBUTTON == nClassId) ? SERVICE_COMPONENT_GROUPBOX : SERVICE_COMPONENT_FIXEDTEXT; + m_aRequiredControlImage = (FormComponentType::RADIOBUTTON == nClassId) ? RID_EXTBMP_GROUPBOX : RID_EXTBMP_FIXEDTEXT; // calc the currently set label control (so InsertEntries can calc m_xInitialSelection) Any aCurrentLabelControl( m_xControlModel->getPropertyValue(PROPERTY_CONTROLLABEL) ); @@ -208,7 +208,7 @@ namespace pcr // all requirements met -> insert m_xUserData.emplace_back(new Reference<XPropertySet>(xAsSet)); - OUString sId(OUString::number(reinterpret_cast<sal_Int64>(m_xUserData.back().get()))); + OUString sId(weld::toId(m_xUserData.back().get())); m_xControlTree->insert(&rContainerEntry, -1, &sDisplayName, &sId, nullptr, nullptr, false, m_xScratchIter.get()); m_xControlTree->set_image(*m_xScratchIter, m_aRequiredControlImage); @@ -232,7 +232,7 @@ namespace pcr bool bSelected = m_xControlTree->get_selected(xIter.get()); OUString sData = bSelected ? m_xControlTree->get_id(*xIter) : OUString(); if (!sData.isEmpty()) - m_xSelectedControl.set(*reinterpret_cast<Reference<XPropertySet>*>(sData.toInt64())); + m_xSelectedControl.set(*weld::fromId<Reference<XPropertySet>*>(sData)); m_xNoAssignment->set_active(sData.isEmpty()); } |