diff options
Diffstat (limited to 'sw/source/ui/frmdlg/frmdlg.cxx')
| -rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 23d827a7aa..230dcf9baf 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -60,10 +60,10 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, Window* pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm, - USHORT nResType, - BOOL bFormat, - UINT16 nDefPage, + sal_Bool bNewFrm, + sal_uInt16 nResType, + sal_Bool bFormat, + sal_uInt16 nDefPage, const String* pStr) : SfxTabDialog(pViewFrame, pParent, SW_RES(nResType), &rCoreSet, pStr != 0), @@ -74,8 +74,8 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, m_pWrtShell(((SwView*)pViewFrame->GetViewShell())->GetWrtShellPtr()) { FreeResource(); - USHORT nHtmlMode = ::GetHtmlMode(m_pWrtShell->GetView().GetDocShell()); - m_bHTMLMode = static_cast< BOOL >(nHtmlMode & HTMLMODE_ON); + sal_uInt16 nHtmlMode = ::GetHtmlMode(m_pWrtShell->GetView().GetDocShell()); + m_bHTMLMode = static_cast< sal_Bool >(nHtmlMode & HTMLMODE_ON); // BspFont fuer beide Bsp-TabPages // @@ -86,7 +86,8 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, aTmp += *pStr; aTmp += ')'; } - AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0); + + AddTabPage(TP_FRM_STD, SwFrmPage::Create, 0); AddTabPage(TP_FRM_ADD, SwFrmAddPage::Create, 0); AddTabPage(TP_FRM_WRAP, SwWrapTabPage::Create, 0); AddTabPage(TP_FRM_URL, SwFrmURLPage::Create, 0); @@ -138,7 +139,7 @@ SwFrmDlg::~SwFrmDlg() { } -void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); switch ( nId ) @@ -158,13 +159,13 @@ void SwFrmDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) case TP_FRM_WRAP: ((SwWrapTabPage&)rPage).SetNewFrame(m_bNew); - ((SwWrapTabPage&)rPage).SetFormatUsed(m_bFormat, FALSE); + ((SwWrapTabPage&)rPage).SetFormatUsed(m_bFormat, sal_False); ((SwWrapTabPage&)rPage).SetShell(m_pWrtShell); break; case TP_COLUMN: { - ((SwColumnPage&)rPage).SetFrmMode(TRUE); + ((SwColumnPage&)rPage).SetFrmMode(sal_True); ((SwColumnPage&)rPage).SetFormatUsed(m_bFormat); const SwFmtFrmSize& rSize = (const SwFmtFrmSize&) |