Skip to content

C
core
Kaydet (Commit) 847c2ac5 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl
Dosyalara gözat
Seçenekler

refactor optload / optpage to use RenderContext 

Change-Id: I6b4897230963ecde335c5a04b1e34c8ca02d654c
üst adbd4969
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 168 deletions
sw/source/ui/config/optload.cxx
Dosyayı görüntüle @ 847c2ac5
......@@ -63,8 +63,7 @@ using namespace ::com::sun::star;
#include <svl/eitem.hxx>
SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptGeneralPage",
"modules/swriter/ui/optgeneralpage.ui", &rSet)
: SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet)
, m_pWrtShell(NULL)
, m_nLastTab(0)
, m_nOldLinkMode(MANUAL)
......@@ -107,7 +106,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
m_pMetricLB->SetSelectHdl(LINK(this, SwLoadOptPage, MetricHdl));
const SfxPoolItem* pItem;
if(SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem )
if (SfxItemState::SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem)
&& static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON)
{
m_pTabFT->Hide();
......@@ -382,8 +381,9 @@ SwCaptionOptDlg::SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet)
SetTabPage(SwCaptionOptPage::Create(get_content_area(), &rSet));
}
SwCaptionPreview::SwCaptionPreview( vcl::Window* pParent, WinBits nStyle )
: Window( pParent, nStyle )
SwCaptionPreview::SwCaptionPreview(vcl::Window* pParent, WinBits nStyle)
: Window(pParent, nStyle)
, mbFontInitialized(false)
{
Init();
}
......@@ -399,21 +399,30 @@ VCL_BUILDER_DECL_FACTORY(SwCaptionPreview)
void SwCaptionPreview::Init()
{
maDrawPos = Point( 4, 6 );
maDrawPos = Point(4, 6);
}
void SwCaptionPreview::ApplySettings(vcl::RenderContext& rRenderContext)
{
Wallpaper aBack(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
rRenderContext.SetBackground(aBack);
rRenderContext.SetFillColor(aBack.GetColor());
rRenderContext.SetLineColor(aBack.GetColor());
Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
SetBackground( aBack );
SetFillColor( aBack.GetColor() );
SetLineColor( aBack.GetColor() );
SetBorderStyle( WindowBorderStyle::MONO );
vcl::Font aFont(GetFont());
aFont.SetHeight(aFont.GetHeight() * 120 / 100 );
SetFont(aFont);
if (!mbFontInitialized)
{
maFont = vcl::Font(rRenderContext.GetFont());
maFont.SetHeight(maFont.GetHeight() * 120 / 100);
mbFontInitialized = true;
}
rRenderContext.SetFont(maFont);
SetBorderStyle(WindowBorderStyle::MONO);
}
void SwCaptionPreview::SetPreviewText( const OUString& rText )
void SwCaptionPreview::SetPreviewText(const OUString& rText)
{
if( rText != maText )
if (rText != maText)
{
maText = rText;
Invalidate();
......@@ -429,11 +438,11 @@ void SwCaptionPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle
{
Window::Paint(rRenderContext, rRect);
DrawRect( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
DrawText( Point( 4, 6 ), maText );
rRenderContext.DrawRect(Rectangle(Point(0, 0), GetSizePixel()));
rRenderContext.DrawText(Point(4, 6), maText);
}
SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet )
SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet)
, m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE))
, m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME))
......@@ -466,15 +475,12 @@ SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet
get(m_pCharStyleLB, "charstyle");
get(m_pApplyBorderCB, "applyborder");
Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
m_pPreview->SetBackground( aBack );
SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_ABB, m_sIllustration);
SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_TABLE, m_sTable);
SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText);
SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing);
SwWrtShell *pSh = ::GetActiveWrtShell();
SwWrtShell* pSh = ::GetActiveWrtShell();
// m_pFormatBox
sal_uInt16 nSelFmt = SVX_NUM_ARABIC;
......@@ -839,19 +845,19 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
m_pTextText->Enable(bEnable);
m_pTextEdit->Enable(bEnable);
DrawSample();
InvalidatePreview();
return 0;
}
IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl)
{
DrawSample();
InvalidatePreview();
return 0;
}
IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
{
DrawSample();
InvalidatePreview();
SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected();
bool bChecked = false;
......@@ -866,7 +872,7 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox )
return 0;
}
void SwCaptionOptPage::DrawSample()
void SwCaptionOptPage::InvalidatePreview()
{
OUString aStr;
......@@ -924,13 +930,13 @@ void SwCaptionOptPage::DrawSample()
}
aStr += m_pTextEdit->GetText();
}
m_pPreview->SetPreviewText( aStr );
m_pPreview->SetPreviewText(aStr);
}
// Description: ComboBox without Spaces
void CaptionComboBox::KeyInput(const KeyEvent& rEvt)
{
if( rEvt.GetKeyCode().GetCode() != KEY_SPACE )
if (rEvt.GetKeyCode().GetCode() != KEY_SPACE)
SwComboBox::KeyInput(rEvt);
}
......
sw/source/ui/config/optpage.cxx
Dosyayı görüntüle @ 847c2ac5
......@@ -1643,9 +1643,9 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt )
InitColors();
}
void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle &/*rRect*/)
void SwMarkPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle &/*rRect*/)
{
const Size aSz(GetOutputSizePixel());
const Size aSz(rRenderContext.GetOutputSizePixel());
// Page
aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
......@@ -1670,19 +1670,19 @@ void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangl
// draw shadow
Rectangle aShadow(aPage);
aShadow += Point(3, 3);
DrawRect( aShadow, m_aShadowCol, m_aTransCol );
DrawRect(rRenderContext, aShadow, m_aShadowCol, m_aTransCol);
// draw page
DrawRect( aPage, m_aBgCol, m_aLineCol );
DrawRect(rRenderContext, aPage, m_aBgCol, m_aLineCol);
// draw separator
Rectangle aPageSeparator(aPage);
aPageSeparator.SetSize(Size(2, aPageSeparator.GetHeight()));
aPageSeparator.Move(aPage.GetWidth() / 2 - 1, 0);
DrawRect( aPageSeparator, m_aLineCol, m_aTransCol );
DrawRect(rRenderContext, aPageSeparator, m_aLineCol, m_aTransCol);
PaintPage(aLeftPagePrtArea);
PaintPage(aRightPagePrtArea);
PaintPage(rRenderContext, aLeftPagePrtArea);
PaintPage(rRenderContext, aRightPagePrtArea);
Rectangle aLeftMark(Point(aPage.Left() + 2, aLeftPagePrtArea.Top() + 4), Size(aLeftPagePrtArea.Left() - 4, 2));
Rectangle aRightMark(Point(aRightPagePrtArea.Right() + 2, aRightPagePrtArea.Bottom() - 6), Size(aLeftPagePrtArea.Left() - 4, 2));
......@@ -1709,14 +1709,14 @@ void SwMarkPreview::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangl
default:
return;
}
DrawRect( aLeftMark, m_aMarkCol, m_aTransCol );
DrawRect( aRightMark, m_aMarkCol, m_aTransCol );
DrawRect(rRenderContext, aLeftMark, m_aMarkCol, m_aTransCol);
DrawRect(rRenderContext, aRightMark, m_aMarkCol, m_aTransCol);
}
void SwMarkPreview::PaintPage(const Rectangle &rRect)
void SwMarkPreview::PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect)
{
// draw PrintArea
DrawRect(rRect, m_aTransCol, m_aPrintAreaCol );
DrawRect(rRenderContext, rRect, m_aTransCol, m_aPrintAreaCol);
// draw Testparagraph
sal_uLong nLTxtBorder = 4;
......@@ -1739,18 +1739,18 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect)
aTextLine.SetSize(Size(aTextLine.GetWidth() / 2, aTextLine.GetHeight()));
if (aPage.IsInside(aTextLine))
DrawRect(aTextLine, m_aTxtCol, m_aTransCol );
DrawRect(rRenderContext, aTextLine, m_aTxtCol, m_aTransCol);
aTextLine.Move(0, nStep);
}
aTextLine.Move(0, -nStep);
}
void SwMarkPreview::DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor)
void SwMarkPreview::DrawRect(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor)
{
SetFillColor(rFillColor);
SetLineColor(rLineColor);
Window::DrawRect(rRect);
rRenderContext.SetFillColor(rFillColor);
rRenderContext.SetLineColor(rLineColor);
rRenderContext.DrawRect(rRect);
}
Size SwMarkPreview::GetOptimalSize() const
......
sw/source/uibase/inc/optload.hxx
Dosyayı görüntüle @ 847c2ac5
......@@ -95,10 +95,13 @@ class SwCaptionPreview : public vcl::Window
{
private:
OUString maText;
Point maDrawPos;
bool mbFontInitialized;
vcl::Font maFont;
Point maDrawPos;
public:
SwCaptionPreview( vcl::Window* pParent, WinBits nStyle );
SwCaptionPreview(vcl::Window* pParent, WinBits nStyle);
void Init();
virtual void ApplySettings(vcl::RenderContext& rRenderContext);
void SetPreviewText( const OUString& rText );
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
virtual Size GetOptimalSize() const SAL_OVERRIDE;
......@@ -130,25 +133,25 @@ private:
VclPtr<ListBox> m_pCharStyleLB;
VclPtr<CheckBox> m_pApplyBorderCB;
OUString m_sSWTable;
OUString m_sSWFrame;
OUString m_sSWGraphic;
OUString m_sOLE;
OUString m_sSWTable;
OUString m_sSWFrame;
OUString m_sSWGraphic;
OUString m_sOLE;
OUString m_sIllustration;
OUString m_sTable;
OUString m_sText;
OUString m_sDrawing;
OUString m_sIllustration;
OUString m_sTable;
OUString m_sText;
OUString m_sDrawing;
OUString m_sBegin;
OUString m_sEnd;
OUString m_sAbove;
OUString m_sBelow;
OUString m_sBegin;
OUString m_sEnd;
OUString m_sAbove;
OUString m_sBelow;
OUString m_sNone;
OUString m_sNone;
SwFldMgr *pMgr;
bool bHTMLMode;
SwFldMgr* pMgr;
bool bHTMLMode;
DECL_LINK(SelectHdl, void *);
DECL_LINK(ModifyHdl, void * = 0);
......@@ -156,12 +159,10 @@ private:
DECL_LINK(ShowEntryHdl, void *);
DECL_LINK(SaveEntryHdl, void *);
void DelUserData();
void SetOptions( const sal_uLong nPos,
const SwCapObjType eType,
const SvGlobalName *pOleId = 0);
void SaveEntry( SvTreeListEntry* pEntry );
void DrawSample();
void DelUserData();
void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0);
void SaveEntry(SvTreeListEntry* pEntry);
void InvalidatePreview();
public:
SwCaptionOptPage( vcl::Window* pParent,
......
sw/source/uibase/inc/optpage.hxx
Dosyayı görüntüle @ 847c2ac5
......@@ -67,17 +67,15 @@ class SwContentOptPage : public SfxTabPage
DECL_LINK(VertRulerHdl, CheckBox*);
DECL_LINK(AnyRulerHdl, CheckBox*);
public:
SwContentOptPage( vcl::Window* pParent,
const SfxItemSet& rSet );
virtual ~SwContentOptPage();
virtual void dispose() SAL_OVERRIDE;
SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwContentOptPage();
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
virtual void dispose() SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
};
// TabPage printer settings additions
......@@ -107,30 +105,27 @@ class SwAddPrinterTabPage : public SfxTabPage
VclPtr<CheckBox> m_pPaperFromSetupCB;
VclPtr<ListBox> m_pFaxLB;
OUString sNone;
OUString sNone;
bool bAttrModified;
bool bPreview;
bool bAttrModified;
bool bPreview;
DECL_LINK(AutoClickHdl, void *);
DECL_LINK(SelectHdl, void *);
DECL_LINK(AutoClickHdl, void *);
DECL_LINK(SelectHdl, void *);
public:
SwAddPrinterTabPage( vcl::Window* pParent,
const SfxItemSet& rSet );
SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwAddPrinterTabPage();
virtual void dispose() SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
void SetFax( const std::vector<OUString>& );
void SelectFax( const OUString& );
void SetPreview(bool bPrev);
virtual void PageCreated( const SfxAllItemSet& aSet) SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
void SetFax(const std::vector<OUString>& );
void SelectFax(const OUString& rString);
void SetPreview(bool bPrev);
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
class SwStdFontTabPage : public SfxTabPage
......@@ -150,17 +145,18 @@ class SwStdFontTabPage : public SfxTabPage
VclPtr<CheckBox> pDocOnlyCB ;
VclPtr<PushButton> pStandardPB;
OUString sShellStd;
OUString sShellTitle;
OUString sShellList;
OUString sShellLabel;
OUString sShellIndex;
VclPtr<SfxPrinter> pPrt;
FontList* pFontList;
SwStdFontConfig* pFontConfig;
SwWrtShell* pWrtShell;
LanguageType eLanguage;
OUString sShellStd;
OUString sShellTitle;
OUString sShellList;
OUString sShellLabel;
OUString sShellIndex;
VclPtr<SfxPrinter> pPrt;
FontList* pFontList;
SwStdFontConfig* pFontConfig;
SwWrtShell* pWrtShell;
LanguageType eLanguage;
// only defaults were there? they were signed with the boxes
bool bListDefault :1;
bool bSetListDefault :1;
......@@ -184,24 +180,25 @@ class SwStdFontTabPage : public SfxTabPage
OUString sScriptComplex;
DECL_LINK(StandardHdl, void *);
DECL_LINK( ModifyHdl, ComboBox * );
DECL_LINK( ModifyHeightHdl, FontSizeBox * );
DECL_LINK( LoseFocusHdl, ComboBox * );
DECL_LINK(ModifyHdl, ComboBox * );
DECL_LINK(ModifyHeightHdl, FontSizeBox * );
DECL_LINK(LoseFocusHdl, ComboBox * );
SwStdFontTabPage( vcl::Window* pParent,
const SfxItemSet& rSet );
SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwStdFontTabPage();
virtual void dispose() SAL_OVERRIDE;
virtual void dispose() SAL_OVERRIDE;
public:
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;}
virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE;
void SetFontMode(sal_uInt8 nGroup)
{
nFontGroup = nGroup;
}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
class SwTableOptionsTabPage : public SfxTabPage
......@@ -231,19 +228,17 @@ class SwTableOptionsTabPage : public SfxTabPage
DECL_LINK(CheckBoxHdl, void *);
public:
SwTableOptionsTabPage( vcl::Window* pParent,
const SfxItemSet& rSet );
SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwTableOptionsTabPage();
virtual void dispose() SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;}
virtual void PageCreated( const SfxAllItemSet& aSet) SAL_OVERRIDE;
void SetWrtShell(SwWrtShell* pSh) { pWrtShell = pSh; }
virtual void PageCreated( const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
......@@ -282,51 +277,54 @@ public:
virtual ~SwShdwCrsrOptionsTabPage();
virtual void dispose() SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; }
virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE;
void SetWrtShell(SwWrtShell* pSh)
{
m_pWrtShell = pSh;
}
virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE;
};
// mark preview
class SwMarkPreview : public vcl::Window
{
Size m_aInitialSize;
Size m_aInitialSize;
Color m_aBgCol; // background
Color m_aTransCol; // transparency
Color m_aMarkCol; // marks
Color m_aLineCol; // general lines
Color m_aShadowCol; // shadow
Color m_aTxtCol; // text
Color m_aPrintAreaCol; // frame for print area
Color m_aBgCol; // background
Color m_aTransCol; // transparency
Color m_aMarkCol; // marks
Color m_aLineCol; // general lines
Color m_aShadowCol; // shadow
Color m_aTxtCol; // text
Color m_aPrintAreaCol; // frame for print area
Rectangle aPage;
Rectangle aLeftPagePrtArea;
Rectangle aRightPagePrtArea;
Rectangle aPage;
Rectangle aLeftPagePrtArea;
Rectangle aRightPagePrtArea;
sal_uInt16 nMarkPos;
sal_uInt16 nMarkPos;
using OutputDevice::DrawRect;
void DrawRect(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor);
void DrawRect(vcl::RenderContext& rRenderContext, const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor);
void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
void PaintPage(const Rectangle &rRect);
void InitColors();
void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
void PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect);
void InitColors();
protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public:
SwMarkPreview(vcl::Window* pParent, WinBits nWinBits);
virtual ~SwMarkPreview();
SwMarkPreview(vcl::Window* pParent, WinBits nWinBits);
virtual ~SwMarkPreview();
inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; }
virtual Size GetOptimalSize() const SAL_OVERRIDE;
inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; }
inline void SetMarkPos(sal_uInt16 nPos) { nMarkPos = nPos; }
virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
// redlining options
......@@ -351,21 +349,21 @@ class SwRedlineOptionsTabPage : public SfxTabPage
OUString sAuthor;
OUString sNone;
DECL_LINK( AttribHdl, ListBox *pLB );
DECL_LINK(ChangedMaskPrevHdl, void * = 0);
DECL_LINK( ColorHdl, ColorListBox *pColorLB );
DECL_LINK(AttribHdl, ListBox* pLB);
DECL_LINK(ChangedMaskPrevHdl, void* = 0);
DECL_LINK(ColorHdl, ColorListBox* pColorLB);
static void InitFontStyle(SvxFontPrevWindow& rExampleWin);
static void InitFontStyle(SvxFontPrevWindow& rExampleWin);
public:
SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
SwRedlineOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwRedlineOptionsTabPage();
virtual void dispose() SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
// TabPage test settings for SW
......@@ -375,16 +373,14 @@ public:
class SwTestTabPage : public SfxTabPage
{
public:
SwTestTabPage( vcl::Window* pParent,
const SfxItemSet& rSet );
SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwTestTabPage();
virtual void dispose() SAL_OVERRIDE;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet );
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
private:
VclPtr<CheckBox> m_pTest1CBox;
......@@ -398,11 +394,10 @@ private:
VclPtr<CheckBox> m_pTest9CBox;
VclPtr<CheckBox> m_pTest10CBox;
bool bAttrModified;
void Init();
DECL_LINK(AutoClickHdl, void *);
bool bAttrModified;
void Init();
DECL_LINK(AutoClickHdl, void*);
};
#endif // DBG_UTIL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment