1 files changed, 10 insertions, 11 deletions

diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 5ebb87152684..4d00c32293d2 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -54,7 +54,7 @@ private:
 
     virtual void SAL_CALL disposing(css::lang::EventObject const &) override
     {
-        osl::MutexGuard g(editor_.m_mutex);
+        std::unique_lock g(editor_.m_mutex);
         editor_.m_notifier.clear();
     }
 
@@ -86,7 +86,6 @@ void SQLEditView::DisableInternalUndo()
 
 void SQLEditView::SetItemPoolFont(SfxItemPool* pItemPool)
 {
-    StyleSettings aStyleSettings = Application::GetSettings().GetStyleSettings();
     OUString sFontName(officecfg::Office::Common::Font::SourceViewFont::FontName::get().value_or(OUString()));
     if (sFontName.isEmpty())
     {
@@ -97,21 +96,21 @@ void SQLEditView::SetItemPoolFont(SfxItemPool* pItemPool)
     Size aFontSize(0, officecfg::Office::Common::Font::SourceViewFont::FontHeight::get());
     vcl::Font aAppFont(sFontName, aFontSize);
 
-    pItemPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
+    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
                                               "", PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW,
                                               EE_CHAR_FONTINFO));
-    pItemPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
+    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
                                               "", PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW,
                                               EE_CHAR_FONTINFO_CJK));
-    pItemPool->SetPoolDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
+    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
                                               "", PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW,
                                               EE_CHAR_FONTINFO_CTL));
 
-    pItemPool->SetPoolDefaultItem(
+    pItemPool->SetUserDefaultItem(
         SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT));
-    pItemPool->SetPoolDefaultItem(
+    pItemPool->SetUserDefaultItem(
         SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT_CJK));
-    pItemPool->SetPoolDefaultItem(
+    pItemPool->SetUserDefaultItem(
         SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT_CTL));
 }
 
@@ -146,7 +145,7 @@ void SQLEditView::SetDrawingArea(weld::DrawingArea* pDrawingArea)
         officecfg::Office::Common::Font::SourceViewFont::get(),
         css::uno::UNO_QUERY_THROW);
     {
-        osl::MutexGuard g(m_mutex);
+        std::unique_lock g(m_mutex);
         m_notifier = n;
     }
     css::uno::Sequence< OUString > s { "FontHeight", "FontName" };
@@ -158,7 +157,7 @@ SQLEditView::~SQLEditView()
 {
     css::uno::Reference< css::beans::XMultiPropertySet > n;
     {
-        osl::MutexGuard g(m_mutex);
+        std::unique_lock g(m_mutex);
         n = m_notifier;
     }
     if (n.is()) {
@@ -404,7 +403,7 @@ bool SQLEditView::Command(const CommandEvent& rCEvt)
         xContextMenu->set_visible("undo", false);
         xContextMenu->set_visible("specialchar", vcl::GetGetSpecialCharsFunction() != nullptr);
 
-        OString sCommand = xContextMenu->popup_at_rect(pPopupParent, aRect);
+        OUString sCommand = xContextMenu->popup_at_rect(pPopupParent, aRect);
 
         if (sCommand == "cut")
             pEditView->Cut();