cui/source/inc/chardlg.hxx | 28 -------------------
cui/source/tabpages/chardlg.cxx | 57 ----------------------------------------
2 files changed, 85 deletions(-)
New commits:
commit c090ec8a12aaae4472eaafe617c04471f16dcdf6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 13 12:45:57 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 14 16:08:02 2018 +0200
drop now unused SvxCharBasePage
Change-Id: I8744b5c4d6f97b88f09d8c2455be0407c75c9b79
Reviewed-on: https://gerrit.libreoffice.org/60435
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index fa5c91c17b13..6aa68e1b4b5a 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -35,34 +35,6 @@
class SvxFontListItem;
class FontList;
-// class SvxCharBasePage -------------------------------------------------
-
-class SvxCharBasePage : public SfxTabPage
-{
-protected:
- VclPtr<SvxFontPrevWindow> m_pPreviewWin;
-
- bool m_bPreviewBackgroundToCharacter;
-
- SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString&
rUIXMLDescription, const SfxItemSet& rItemset);
-
- void SetPrevFontWidthScale( const SfxItemSet& rSet );
-
- inline SvxFont& GetPreviewFont();
- inline SvxFont& GetPreviewCJKFont();
- inline SvxFont& GetPreviewCTLFont();
-
-public:
- virtual ~SvxCharBasePage() override;
- virtual void dispose() override;
-
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
-
- virtual void ActivatePage( const SfxItemSet& rSet ) override;
-
-};
-
class CharBasePage : public SfxTabPage
{
protected:
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index e5cc4d203a44..3371b4daa695 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -143,73 +143,16 @@ inline bool StateToAttr( TriState aState )
return ( TRISTATE_TRUE == aState );
}
-// class SvxCharBasePage -------------------------------------------------
-
-inline SvxFont& SvxCharBasePage::GetPreviewFont()
-{
- return m_pPreviewWin->GetFont();
-}
-
-
-inline SvxFont& SvxCharBasePage::GetPreviewCJKFont()
-{
- return m_pPreviewWin->GetCJKFont();
-}
-
-
-inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
-{
- return m_pPreviewWin->GetCTLFont();
-}
-
-
-SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet& rItemset)
- : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset )
- , m_pPreviewWin(nullptr)
- , m_bPreviewBackgroundToCharacter( false )
-{
-}
-
-SvxCharBasePage::~SvxCharBasePage()
-{
- disposeOnce();
-}
-
-void SvxCharBasePage::dispose()
-{
- m_pPreviewWin.clear();
- SfxTabPage::dispose();
-}
-
-void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet )
-{
- m_pPreviewWin->SetFromItemSet( rSet, m_bPreviewBackgroundToCharacter );
-}
-
-void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet )
-{
- sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
- if (rSet.GetItemState(nWhich)>=SfxItemState::DEFAULT)
- {
- const SvxCharScaleWidthItem &rItem = static_cast<const
SvxCharScaleWidthItem&>( rSet.Get( nWhich ) );
- m_pPreviewWin->SetFontWidthScale( rItem.GetValue() );
- }
-}
-
namespace
{
-
void setPrevFontEscapement(SvxFont& _rFont,sal_uInt8 nProp, sal_uInt8
nEscProp, short nEsc )
{
_rFont.SetPropr( nProp );
_rFont.SetProprRel( nEscProp );
_rFont.SetEscapement( nEsc );
}
-
-
}
-
inline SvxFont& CharBasePage::GetPreviewFont()
{
return m_aPreviewWin.GetFont();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
