summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/inc/FontFeaturesDialog.hxx2
-rw-r--r--cui/source/inc/chardlg.hxx2
-rw-r--r--include/svx/fntctrl.hxx6
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx2
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx2
-rw-r--r--sc/source/ui/inc/condformatdlgentry.hxx6
-rw-r--r--svx/source/dialog/fntctrl.cxx52
-rw-r--r--sw/source/ui/config/optpage.cxx12
-rw-r--r--sw/source/uibase/inc/optpage.hxx8
9 files changed, 46 insertions, 46 deletions
diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx
index d30f92305067..93e5f7c4a76e 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -48,7 +48,7 @@ private:
OUString m_sFontName;
OUString m_sResultFontName;
- FontPrevWindow m_aPreviewWindow;
+ SvxFontPrevWindow m_aPreviewWindow;
std::unique_ptr<weld::ScrolledWindow> m_xContentWindow;
std::unique_ptr<weld::Container> m_xContentGrid;
std::unique_ptr<weld::CustomWeld> m_xPreviewWindow;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 15906a085657..7cf7f8e315ec 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -35,7 +35,7 @@ class FontList;
class SvxCharBasePage : public SfxTabPage
{
protected:
- FontPrevWindow m_aPreviewWin;
+ SvxFontPrevWindow m_aPreviewWin;
std::unique_ptr<weld::CustomWeld> m_xPreviewWin;
bool m_bPreviewBackgroundToCharacter;
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index f2489c750f3c..af085725dc3d 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -28,7 +28,7 @@
class SfxItemSet;
class FontPrevWin_Impl;
-class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public weld::CustomWidgetController
+class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow : public weld::CustomWidgetController
{
private:
std::unique_ptr<FontPrevWin_Impl> pImpl;
@@ -39,8 +39,8 @@ private:
SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
public:
- FontPrevWindow();
- virtual ~FontPrevWindow() override;
+ SvxFontPrevWindow();
+ virtual ~SvxFontPrevWindow() override;
SvxFont& GetFont();
const SvxFont& GetFont() const;
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index 1b9a5ea365fa..680632e8db51 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -89,7 +89,7 @@ namespace rptui
ConditionalExpressions m_aConditionalExpressions;
- FontPrevWindow m_aPreview;
+ SvxFontPrevWindow m_aPreview;
weld::Window* m_pDialog;
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Container> m_xContainer;
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 39170fcb9c77..4471ea81f80b 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -417,7 +417,7 @@ void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const SfxHint& rHint)
namespace {
-void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle, const ScDocument* pDoc, FontPrevWindow& rWdPreview)
+void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow& rWdPreview)
{
if (rLbStyle.get_active() == 0)
{
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index ed987a03c7ae..7110115355d6 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -99,7 +99,7 @@ public:
class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener
{
//cond format ui elements
- FontPrevWindow maWdPreview;
+ SvxFontPrevWindow maWdPreview;
std::unique_ptr<weld::ComboBox> mxLbCondType;
std::unique_ptr<formula::RefEdit> mxEdVal1;
std::unique_ptr<formula::RefEdit> mxEdVal2;
@@ -149,7 +149,7 @@ public:
class ScFormulaFrmtEntry : public ScCondFrmtEntry
{
- FontPrevWindow maWdPreview;
+ SvxFontPrevWindow maWdPreview;
std::unique_ptr<weld::Label> mxFtStyle;
std::unique_ptr<weld::ComboBox> mxLbStyle;
std::unique_ptr<weld::Widget> mxWdPreviewWin;
@@ -297,7 +297,7 @@ private:
DECL_LINK( StyleSelectHdl, weld::ComboBox&, void );
- FontPrevWindow maWdPreview;
+ SvxFontPrevWindow maWdPreview;
std::unique_ptr<weld::ComboBox> mxLbDateEntry;
std::unique_ptr<weld::Label> mxFtStyle;
std::unique_ptr<weld::ComboBox> mxLbStyle;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 96df4da9c639..d312d7ad5f49 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -140,7 +140,7 @@ bool CleanAndCheckEmpty(OUString& rText)
class FontPrevWin_Impl
{
- friend class FontPrevWindow;
+ friend class SvxFontPrevWindow;
SvxFont maFont;
VclPtr<Printer> mpPrinter;
@@ -502,7 +502,7 @@ static void SetPrevFontEscapement(SvxFont& rFont, sal_uInt8 nProp, sal_uInt8 nEs
rFont.SetEscapement(nEsc);
}
-void FontPrevWindow::ApplySettings(vcl::RenderContext& rRenderContext)
+void SvxFontPrevWindow::ApplySettings(vcl::RenderContext& rRenderContext)
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -513,7 +513,7 @@ void FontPrevWindow::ApplySettings(vcl::RenderContext& rRenderContext)
rRenderContext.SetBackground(rStyleSettings.GetWindowColor());
}
-void FontPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+void SvxFontPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
{
CustomWidgetController::SetDrawingArea(pDrawingArea);
Size aPrefSize(getPreviewStripSize(pDrawingArea->get_ref_device()));
@@ -537,47 +537,47 @@ void FontPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
Invalidate();
}
-FontPrevWindow::FontPrevWindow()
+SvxFontPrevWindow::SvxFontPrevWindow()
{
}
-FontPrevWindow::~FontPrevWindow()
+SvxFontPrevWindow::~SvxFontPrevWindow()
{
}
-SvxFont& FontPrevWindow::GetCTLFont()
+SvxFont& SvxFontPrevWindow::GetCTLFont()
{
return pImpl->maCTLFont;
}
-SvxFont& FontPrevWindow::GetCJKFont()
+SvxFont& SvxFontPrevWindow::GetCJKFont()
{
return pImpl->maCJKFont;
}
-SvxFont& FontPrevWindow::GetFont()
+SvxFont& SvxFontPrevWindow::GetFont()
{
pImpl->Invalidate100PercentFontWidth(); // because the user might change the size
return pImpl->maFont;
}
-const SvxFont& FontPrevWindow::GetFont() const
+const SvxFont& SvxFontPrevWindow::GetFont() const
{
return pImpl->maFont;
}
-void FontPrevWindow::SetPreviewText( const OUString& rString )
+void SvxFontPrevWindow::SetPreviewText( const OUString& rString )
{
pImpl->maText = rString;
pImpl->mbTextInited = true;
}
-void FontPrevWindow::SetFontNameAsPreviewText()
+void SvxFontPrevWindow::SetFontNameAsPreviewText()
{
pImpl->mbUseFontNameAsText = true;
}
-void FontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJKOutFont, const SvxFont& rCTLFont )
+void SvxFontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJKOutFont, const SvxFont& rCTLFont )
{
setFont(rNormalOutFont, pImpl->maFont);
setFont(rCJKOutFont, pImpl->maCJKFont);
@@ -587,37 +587,37 @@ void FontPrevWindow::SetFont( const SvxFont& rNormalOutFont, const SvxFont& rCJK
Invalidate();
}
-void FontPrevWindow::SetColor(const Color &rColor)
+void SvxFontPrevWindow::SetColor(const Color &rColor)
{
pImpl->mpColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::ResetColor()
+void SvxFontPrevWindow::ResetColor()
{
pImpl->mpColor.reset();
Invalidate();
}
-void FontPrevWindow::SetBackColor(const Color &rColor)
+void SvxFontPrevWindow::SetBackColor(const Color &rColor)
{
pImpl->mpBackColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::SetTextLineColor(const Color &rColor)
+void SvxFontPrevWindow::SetTextLineColor(const Color &rColor)
{
pImpl->mpTextLineColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::SetOverlineColor(const Color &rColor)
+void SvxFontPrevWindow::SetOverlineColor(const Color &rColor)
{
pImpl->mpOverlineColor.reset(new Color(rColor));
Invalidate();
}
-void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
+void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
{
rRenderContext.Push(PushFlags::ALL);
rRenderContext.SetMapMode(MapMode(MapUnit::MapTwip));
@@ -818,29 +818,29 @@ void FontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
rRenderContext.Pop();
}
-bool FontPrevWindow::IsTwoLines() const
+bool SvxFontPrevWindow::IsTwoLines() const
{
return pImpl->mbTwoLines;
}
-void FontPrevWindow::SetTwoLines(bool bSet)
+void SvxFontPrevWindow::SetTwoLines(bool bSet)
{
pImpl->mbTwoLines = bSet;
}
-void FontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
+void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
{
pImpl->mcStartBracket = cStart;
pImpl->mcEndBracket = cEnd;
}
-void FontPrevWindow::SetFontWidthScale( sal_uInt16 n )
+void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n )
{
if (pImpl->SetFontWidthScale(n))
Invalidate();
}
-void FontPrevWindow::AutoCorrectFontColor()
+void SvxFontPrevWindow::AutoCorrectFontColor()
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
Color aFontColor(rStyleSettings.GetWindowTextColor());
@@ -855,7 +855,7 @@ void FontPrevWindow::AutoCorrectFontColor()
pImpl->maCTLFont.SetColor(aFontColor);
}
-void FontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont )
+void SvxFontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont )
{
sal_uInt16 nWhich;
long nH;
@@ -871,7 +871,7 @@ void FontPrevWindow::SetFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxF
rFont.SetFontSize(Size(0, nH));
}
-void FontPrevWindow::SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont)
+void SvxFontPrevWindow::SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont)
{
sal_uInt16 nWhich;
LanguageType nLang;
@@ -882,7 +882,7 @@ void FontPrevWindow::SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFo
rFont.SetLanguage(nLang);
}
-void FontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBackgroundToCharacter)
+void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBackgroundToCharacter)
{
sal_uInt16 nWhich;
SvxFont& rFont = GetFont();
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index a980c99c737e..1126ec8d478c 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1568,15 +1568,15 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(weld::Container* pPage, weld::D
: SfxTabPage(pPage, pController, "modules/swriter/ui/optredlinepage.ui", "OptRedLinePage", &rSet)
, m_xInsertLB(m_xBuilder->weld_combo_box("insert"))
, m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertcolor"), pController->getDialog()))
- , m_xInsertedPreviewWN(new FontPrevWindow)
+ , m_xInsertedPreviewWN(new SvxFontPrevWindow)
, m_xInsertedPreview(new weld::CustomWeld(*m_xBuilder, "insertedpreview", *m_xInsertedPreviewWN))
, m_xDeletedLB(m_xBuilder->weld_combo_box("deleted"))
, m_xDeletedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"), pController->getDialog()))
- , m_xDeletedPreviewWN(new FontPrevWindow)
+ , m_xDeletedPreviewWN(new SvxFontPrevWindow)
, m_xDeletedPreview(new weld::CustomWeld(*m_xBuilder, "deletedpreview", *m_xDeletedPreviewWN))
, m_xChangedLB(m_xBuilder->weld_combo_box("changed"))
, m_xChangedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changedcolor"), pController->getDialog()))
- , m_xChangedPreviewWN(new FontPrevWindow)
+ , m_xChangedPreviewWN(new SvxFontPrevWindow)
, m_xChangedPreview(new weld::CustomWeld(*m_xBuilder, "changedpreview", *m_xChangedPreviewWN))
, m_xMarkPosLB(m_xBuilder->weld_combo_box("markpos"))
, m_xMarkColorLB(new ColorListBox(m_xBuilder->weld_menu_button("markcolor"), pController->getDialog()))
@@ -1776,7 +1776,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet* )
IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, weld::ComboBox&, rLB, void )
{
- FontPrevWindow *pPrev = nullptr;
+ SvxFontPrevWindow *pPrev = nullptr;
ColorListBox *pColorLB;
if (&rLB == m_xInsertLB.get())
@@ -1880,7 +1880,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, weld::ComboBox&, rLB, void )
IMPL_LINK(SwRedlineOptionsTabPage, ColorHdl, ColorListBox&, rListBox, void)
{
ColorListBox* pColorLB = &rListBox;
- FontPrevWindow *pPrev = nullptr;
+ SvxFontPrevWindow *pPrev = nullptr;
weld::ComboBox* pLB;
if (pColorLB == m_xInsertColorLB.get())
@@ -1960,7 +1960,7 @@ IMPL_LINK_NOARG(SwRedlineOptionsTabPage, ChangedMaskColorPrevHdl, ColorListBox&,
ChangedMaskPrev();
}
-void SwRedlineOptionsTabPage::InitFontStyle(FontPrevWindow& rExampleWin, const OUString& rText)
+void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin, const OUString& rText)
{
const AllSettings& rAllSettings = Application::GetSettings();
LanguageType eLangType = rAllSettings.GetUILanguageTag().getLanguageType();
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 0abb5f29b6db..13c5d6194aef 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -290,17 +290,17 @@ class SwRedlineOptionsTabPage : public SfxTabPage
{
std::unique_ptr<weld::ComboBox> m_xInsertLB;
std::unique_ptr<ColorListBox> m_xInsertColorLB;
- std::unique_ptr<FontPrevWindow> m_xInsertedPreviewWN;
+ std::unique_ptr<SvxFontPrevWindow> m_xInsertedPreviewWN;
std::unique_ptr<weld::CustomWeld> m_xInsertedPreview;
std::unique_ptr<weld::ComboBox> m_xDeletedLB;
std::unique_ptr<ColorListBox> m_xDeletedColorLB;
- std::unique_ptr<FontPrevWindow> m_xDeletedPreviewWN;
+ std::unique_ptr<SvxFontPrevWindow> m_xDeletedPreviewWN;
std::unique_ptr<weld::CustomWeld> m_xDeletedPreview;
std::unique_ptr<weld::ComboBox> m_xChangedLB;
std::unique_ptr<ColorListBox> m_xChangedColorLB;
- std::unique_ptr<FontPrevWindow> m_xChangedPreviewWN;
+ std::unique_ptr<SvxFontPrevWindow> m_xChangedPreviewWN;
std::unique_ptr<weld::CustomWeld> m_xChangedPreview;
std::unique_ptr<weld::ComboBox> m_xMarkPosLB;
@@ -314,7 +314,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage
DECL_LINK(ChangedMaskColorPrevHdl, ColorListBox&, void);
DECL_LINK(ColorHdl, ColorListBox&, void);
- static void InitFontStyle(FontPrevWindow& rExampleWin, const OUString& rText);
+ static void InitFontStyle(SvxFontPrevWindow& rExampleWin, const OUString& rText);
public:
SwRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
generated by cgit (git 2.34.1) at 2025-02-23 06:03:22 +0000