1 files changed, 12 insertions, 22 deletions
diff --git a/dbaccess/source/ui/app/DocumentInfoPreview.cxx b/dbaccess/source/ui/app/DocumentInfoPreview.cxx
index d112c7fb0427..890e19eb2dc2 100644
--- a/dbaccess/source/ui/app/DocumentInfoPreview.cxx
+++ b/dbaccess/source/ui/app/DocumentInfoPreview.cxx
@@ -34,7 +34,7 @@
 #include <vcl/svapp.hxx>
 #include <svl/itemset.hxx>
 #include <tools/datetime.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <unotools/localedatawrapper.hxx>
 
 #include <templwin.hrc>
@@ -103,28 +103,18 @@ void ODocumentInfoPreview::fill(
         }
     }
 
-    m_xEditView->SetSelection(ESelection(0, 0, 0, 0));
-}
-
-namespace
-{
-    ESelection InsertAtEnd(const EditEngine& rEditEngine)
-    {
-        const sal_uInt32 nPara = rEditEngine.GetParagraphCount() -1;
-        sal_Int32 nLastLen = rEditEngine.GetText(nPara).getLength();
-        return ESelection(nPara, nLastLen, nPara, nLastLen);
-    }
+    m_xEditView->SetSelection(ESelection(0, 0));
 }
 
 void ODocumentInfoPreview::insertEntry(
-    OUString const & title, OUString const & value)
+    std::u16string_view title, OUString const & value)
 {
-    if (!m_xEditEngine->GetText().isEmpty()) {
-        m_xEditEngine->QuickInsertText("\n\n", InsertAtEnd(*m_xEditEngine));
+    if (m_xEditEngine->HasText()) {
+        m_xEditEngine->QuickInsertText(u"\n\n"_ustr, ESelection::AtEnd());
     }
 
-    OUString caption(title + ":\n");
-    m_xEditEngine->QuickInsertText(caption, InsertAtEnd(*m_xEditEngine));
+    OUString caption(OUString::Concat(title) + ":\n");
+    m_xEditEngine->QuickInsertText(caption, ESelection::AtEnd());
 
     SfxItemSet aSet(m_xEditEngine->GetEmptyItemSet());
     aSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT));
@@ -133,7 +123,7 @@ void ODocumentInfoPreview::insertEntry(
     int nCaptionPara = m_xEditEngine->GetParagraphCount() - 2;
     m_xEditEngine->QuickSetAttribs(aSet, ESelection(nCaptionPara, 0, nCaptionPara, caption.getLength() - 1));
 
-    m_xEditEngine->QuickInsertText(value, InsertAtEnd(*m_xEditEngine));
+    m_xEditEngine->QuickInsertText(value, ESelection::AtEnd());
 }
 
 void ODocumentInfoPreview::insertNonempty(tools::Long id, OUString const & value)
@@ -152,10 +142,10 @@ void ODocumentInfoPreview::insertDateTime(
             value.Hours, value.Minutes, value.Seconds, value.NanoSeconds));
     if (aToolsDT.IsValidAndGregorian()) {
         const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
-        OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT));
-        buf.append(", ");
-        buf.append(rLocaleWrapper.getTime(aToolsDT));
-        insertEntry(SvtDocInfoTable_Impl::GetString(id), buf.makeStringAndClear());
+        OUString buf = rLocaleWrapper.getDate(aToolsDT) +
+            ", " +
+            rLocaleWrapper.getTime(aToolsDT);
+        insertEntry(SvtDocInfoTable_Impl::GetString(id), buf);
     }
 }