5 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/dialog/ThemeColorEditDialog.cxx b/svx/source/dialog/ThemeColorEditDialog.cxx
index 9ec24b8fa43d..b3845f162bd6 100644
--- a/svx/source/dialog/ThemeColorEditDialog.cxx
+++ b/svx/source/dialog/ThemeColorEditDialog.cxx
@@ -12,7 +12,7 @@
 
 namespace svx
 {
-ThemeColorEditDialog::ThemeColorEditDialog(weld::Window* pParent, model::ColorSet& rColorSet)
+ThemeColorEditDialog::ThemeColorEditDialog(weld::Window* pParent, const model::ColorSet& rColorSet)
     : GenericDialogController(pParent, u"svx/ui/themecoloreditdialog.ui"_ustr,
                               u"ThemeColorEditDialog"_ustr)
     , maColorSet(rColorSet)
diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx
index 84195ccd5543..964e540180c5 100644
--- a/svx/source/dialog/cuicharmap.cxx
+++ b/svx/source/dialog/cuicharmap.cxx
@@ -353,8 +353,8 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
         sal_UCS4 cChar = sGlyph.iterateCodePoints(&o3tl::temporary(sal_Int32(0)));
         const SfxItemPool* pPool = m_xOutputSet->GetPool();
         m_xOutputSet->Put( SfxStringItem( SID_CHARMAP, sGlyph ) );
-        m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyType(), aFont.GetFamilyName(),
-            aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) );
+        m_xOutputSet->Put( SvxFontItem( aFont.GetFamilyTypeMaybeAskConfig(), aFont.GetFamilyName(),
+            aFont.GetStyleName(), aFont.GetPitchMaybeAskConfig(), aFont.GetCharSet(), pPool->GetWhichIDFromSlotID(SID_ATTR_CHAR_FONT) ) );
         m_xOutputSet->Put( SfxStringItem( SID_FONT_NAME, aFont.GetFamilyName() ) );
         m_xOutputSet->Put( SfxInt32Item( SID_ATTR_CHAR, cChar ) );
     }
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index e1b420762f3b..4c2b5259c3d5 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -285,7 +285,7 @@ namespace
 {
 struct RegisteredCellHash
 {
-    size_t operator()(Cell* const pCell) const
+    size_t operator()(const Cell* pCell) const
     {
         return pCell->hashCode();
     }
@@ -293,7 +293,7 @@ struct RegisteredCellHash
 
 struct RegisteredCellEquals
 {
-    bool operator()(Cell* const pCell1, Cell* const pCell2) const
+    bool operator()(const Cell* pCell1, const Cell* pCell2) const
     {
         return *pCell1 == *pCell2;
     }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6d9d597e90d1..8e819010226a 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2354,7 +2354,7 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
     return aInfo;
 }
 
-static void lcl_SetSearchLabelWindow(const OUString& rStr, SfxViewFrame& rViewFrame)
+static void lcl_SetSearchLabelWindow(const OUString& rStr, const SfxViewFrame& rViewFrame)
 {
     css::uno::Reference< css::beans::XPropertySet > xPropSet(
             rViewFrame.GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW);
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 18539c449b5b..77e0971ab799 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -112,15 +112,15 @@ void WeldEditView::makeEditEngine()
 
     vcl::Font aAppFont(Application::GetSettings().GetStyleSettings().GetAppFont());
 
-    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
-                                              u""_ustr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW,
-                                              EE_CHAR_FONTINFO));
-    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
-                                              u""_ustr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW,
-                                              EE_CHAR_FONTINFO_CJK));
-    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyType(), aAppFont.GetFamilyName(),
-                                              u""_ustr, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW,
-                                              EE_CHAR_FONTINFO_CTL));
+    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyTypeMaybeAskConfig(),
+                                              aAppFont.GetFamilyName(), u""_ustr, PITCH_DONTKNOW,
+                                              RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO));
+    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyTypeMaybeAskConfig(),
+                                              aAppFont.GetFamilyName(), u""_ustr, PITCH_DONTKNOW,
+                                              RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CJK));
+    pItemPool->SetUserDefaultItem(SvxFontItem(aAppFont.GetFamilyTypeMaybeAskConfig(),
+                                              aAppFont.GetFamilyName(), u""_ustr, PITCH_DONTKNOW,
+                                              RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CTL));
 
     pItemPool->SetUserDefaultItem(
         SvxFontHeightItem(aAppFont.GetFontHeight() * 20, 100, EE_CHAR_FONTHEIGHT));