1 files changed, 18 insertions, 30 deletions

diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 6bd7766b04c2..f7c251055e18 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -35,16 +35,16 @@
 
 SvxPostItDialog::SvxPostItDialog(weld::Widget* pParent, const SfxItemSet& rCoreSet,
     bool bPrevNext)
-    : SfxDialogController(pParent, "cui/ui/comment.ui", "CommentDialog")
+    : SfxDialogController(pParent, u"cui/ui/comment.ui"_ustr, u"CommentDialog"_ustr)
     , m_rSet(rCoreSet)
-    , m_xLastEditFT(m_xBuilder->weld_label("lastedit"))
-    , m_xAltTitle(m_xBuilder->weld_label("alttitle"))
-    , m_xEditED(m_xBuilder->weld_text_view("edit"))
-    , m_xInsertAuthor(m_xBuilder->weld_widget("insertauthor"))
-    , m_xAuthorBtn(m_xBuilder->weld_button("author"))
-    , m_xOKBtn(m_xBuilder->weld_button("ok"))
-    , m_xPrevBtn(m_xBuilder->weld_button("previous"))
-    , m_xNextBtn(m_xBuilder->weld_button("next"))
+    , m_xLastEditFT(m_xBuilder->weld_label(u"lastedit"_ustr))
+    , m_xAltTitle(m_xBuilder->weld_label(u"alttitle"_ustr))
+    , m_xEditED(m_xBuilder->weld_text_view(u"edit"_ustr))
+    , m_xInsertAuthor(m_xBuilder->weld_widget(u"insertauthor"_ustr))
+    , m_xAuthorBtn(m_xBuilder->weld_button(u"author"_ustr))
+    , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
+    , m_xPrevBtn(m_xBuilder->weld_button(u"previous"_ustr))
+    , m_xNextBtn(m_xBuilder->weld_button(u"next"_ustr))
 {
     m_xPrevBtn->connect_clicked( LINK( this, SvxPostItDialog, PrevHdl ) );
     m_xNextBtn->connect_clicked( LINK( this, SvxPostItDialog, NextHdl ) );
@@ -52,30 +52,24 @@ SvxPostItDialog::SvxPostItDialog(weld::Widget* pParent, const SfxItemSet& rCoreS
     m_xOKBtn->connect_clicked( LINK( this, SvxPostItDialog, OKHdl ) );
 
     bool bNew = true;
-    sal_uInt16 nWhich = 0;
 
     m_xPrevBtn->set_visible(bPrevNext);
     m_xNextBtn->set_visible(bPrevNext);
 
-    nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
     OUString aAuthorStr, aDateStr;
 
-    if (m_rSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT)
+    if (m_rSet.GetItemState( SID_ATTR_POSTIT_AUTHOR ) >= SfxItemState::DEFAULT)
     {
         bNew = false;
-        const SvxPostItAuthorItem& rAuthor =
-            static_cast<const SvxPostItAuthorItem&>(m_rSet.Get(nWhich));
+        const SvxPostItAuthorItem& rAuthor = m_rSet.Get(SID_ATTR_POSTIT_AUTHOR);
         aAuthorStr = rAuthor.GetValue();
     }
     else
         aAuthorStr = SvtUserOptions().GetID();
 
-    nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
-
-    if (m_rSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT)
+    if (m_rSet.GetItemState( SID_ATTR_POSTIT_DATE ) >= SfxItemState::DEFAULT)
     {
-        const SvxPostItDateItem& rDate =
-            static_cast<const SvxPostItDateItem&>(m_rSet.Get( nWhich ));
+        const SvxPostItDateItem& rDate = m_rSet.Get( SID_ATTR_POSTIT_DATE );
         aDateStr = rDate.GetValue();
     }
     else
@@ -84,13 +78,10 @@ SvxPostItDialog::SvxPostItDialog(weld::Widget* pParent, const SfxItemSet& rCoreS
         aDateStr = rLocaleWrapper.getDate( Date( Date::SYSTEM ) );
     }
 
-    nWhich = m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT );
-
     OUString aTextStr;
-    if (m_rSet.GetItemState( nWhich ) >= SfxItemState::DEFAULT)
+    if (m_rSet.GetItemState( SID_ATTR_POSTIT_TEXT ) >= SfxItemState::DEFAULT)
     {
-        const SvxPostItTextItem& rText =
-            static_cast<const SvxPostItTextItem&>(m_rSet.Get( nWhich ));
+        const SvxPostItTextItem& rText = m_rSet.Get( SID_ATTR_POSTIT_TEXT );
         aTextStr = rText.GetValue();
     }
 
@@ -162,12 +153,9 @@ IMPL_LINK_NOARG(SvxPostItDialog, OKHdl, weld::Button&, void)
 {
     const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
     m_xOutSet.reset(new SfxItemSet(m_rSet));
-    m_xOutSet->Put( SvxPostItAuthorItem(SvtUserOptions().GetID(),
-                                        m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR ) ) );
-    m_xOutSet->Put( SvxPostItDateItem(rLocaleWrapper.getDate( Date( Date::SYSTEM ) ),
-                                       m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE ) ) );
-    m_xOutSet->Put( SvxPostItTextItem(m_xEditED->get_text(),
-                                      m_rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ) ) );
+    m_xOutSet->Put( SvxPostItAuthorItem(SvtUserOptions().GetID(), SID_ATTR_POSTIT_AUTHOR ) );
+    m_xOutSet->Put( SvxPostItDateItem(rLocaleWrapper.getDate( Date( Date::SYSTEM ) ), SID_ATTR_POSTIT_DATE ) );
+    m_xOutSet->Put( SvxPostItTextItem(m_xEditED->get_text(), SID_ATTR_POSTIT_TEXT ) );
     m_xDialog->response(RET_OK);
 }