diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sw/source/ui | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sw/source/ui')
102 files changed, 412 insertions, 412 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 8f3caa04904f..e0d9c542c71b 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -124,7 +124,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl) return 0; } -SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) +SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) : SvxStandardDialog(pParent, "BreakDialog", "modules/swriter/ui/insertbreak.ui") , rSh(rS) , nKind(0) diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 44ea050e3b31..1df4d1bd0bae 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::sfx2; -SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, +SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pStr) : SfxTabDialog(0, pParent, "CharacterPropertiesDialog", "modules/swriter/ui/characterproperties.ui", &rCoreSet, pStr != 0) @@ -133,7 +133,7 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet) +SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "CharURLPage", "modules/swriter/ui/charurlpage.ui", &rCoreSet) , pINetItem(0) , bModified(false) @@ -278,7 +278,7 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) return bModified; } -SfxTabPage* SwCharURLPage::Create( Window* pParent, +SfxTabPage* SwCharURLPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwCharURLPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 8a6b14a84a26..f8ad84f64c01 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -101,7 +101,7 @@ class SwDropCapsPict : public Control public: - SwDropCapsPict(Window *pParent, WinBits nBits) + SwDropCapsPict(vcl::Window *pParent, WinBits nBits) : Control(pParent, nBits) , mpPage(NULL) , mnLines(0) @@ -130,7 +130,7 @@ public: void DrawPrev( const Point& rPt ); }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwDropCapsPict(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwDropCapsPict(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwDropCapsPict(pParent, WB_BORDER); } @@ -506,7 +506,7 @@ void SwDropCapsPict::_InitPrinter() } } -SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) +SwDropCapsDlg::SwDropCapsDlg(vcl::Window *pParent, const SfxItemSet &rSet ) : SfxSingleTabDialog(pParent, rSet) { SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), &rSet); @@ -514,7 +514,7 @@ SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) SetTabPage(pNewPage); } -SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) +SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "DropCapPage","modules/swriter/ui/dropcapspage.ui", &rSet) , bModified(false) , bFormat(true) @@ -575,7 +575,7 @@ int SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwDropCapsPage::Create(Window *pParent, +SfxTabPage* SwDropCapsPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwDropCapsPage(pParent, *rSet); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 251d905e9f29..b9ee893ab9e9 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -38,7 +38,7 @@ static const sal_uInt16 aPageRg[] = { 0 }; -SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) : +SwParagraphNumTabPage::SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", &rAttr), msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ), @@ -90,7 +90,7 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage() { } -SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, +SfxTabPage* SwParagraphNumTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SwParagraphNumTabPage(pParent, *rSet); diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 76106d3adeb3..58b4a43187b9 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -44,7 +44,7 @@ #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> -SwParaDlg::SwParaDlg(Window *pParent, +SwParaDlg::SwParaDlg(vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index fba43369a1a4..8891aff311fd 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -50,7 +50,7 @@ static long nTabs[] = 0, 100 }; -SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) +SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "ConditionPage", "modules/swriter/ui/conditionpage.ui", &rSet) , @@ -137,7 +137,7 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwCondCollPage(pParent, *rSet); } diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index de6538e72c4b..77031502a2ce 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -29,7 +29,7 @@ #include <svl/itemset.hxx> #include <sfx2/tabdlg.hxx> -SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet) +SwNumFmtDlg::SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog", "cui/ui/formatnumberdialog.ui") { diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 448eca502d41..66206a22dd5c 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -112,7 +112,7 @@ public: virtual ~SwAuthenticationSettingsDialog(); }; -SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) : +SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "MailConfigPage" , "modules/swriter/ui/mailconfigpage.ui", &rSet), m_pConfigItem( new SwMailMergeConfigItem ) @@ -138,7 +138,7 @@ SwMailConfigPage::~SwMailConfigPage() delete m_pConfigItem; } -SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwMailConfigPage(pParent, *rAttrSet); } @@ -351,7 +351,7 @@ void SwTestAccountSettingsDialog::Test() } } -SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet) +SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { // create TabPage diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 93b740343b65..29d8a8bbc6b4 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -91,7 +91,7 @@ struct SwCompatibilityOptPage_Impl SwCompatibilityItemList m_aList; }; -SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet) +SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptCompatPage", "modules/swriter/ui/optcompatpage.ui", &rSet) , m_pWrtShell(NULL) @@ -400,7 +400,7 @@ void SwCompatibilityOptPage::WriteOptions() pItem->m_bExpandWordSpace ); } -SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwCompatibilityOptPage( pParent, *rAttrSet ); } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 564ed0aeab88..b8fbe5713467 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; #include <svl/eitem.hxx> -SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) +SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet) , m_pWrtShell(NULL) @@ -125,7 +125,7 @@ SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) m_pShowStandardizedPageCount->SetClickHdl(aLink); } -SfxTabPage* SwLoadOptPage::Create( Window* pParent, +SfxTabPage* SwLoadOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwLoadOptPage(pParent, *rAttrSet ); @@ -350,7 +350,7 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl) return 0; } -SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) +SwCaptionOptDlg::SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "CaptionDialog", "modules/swriter/ui/captiondialog.ui") { @@ -358,13 +358,13 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) SetTabPage(SwCaptionOptPage::Create(get_content_area(), &rSet)); } -SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle ) +SwCaptionPreview::SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ) : Window( pParent, nStyle ) { Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwCaptionPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -409,7 +409,7 @@ void SwCaptionPreview::Paint( const Rectangle& rRect ) DrawText( Point( 4, 6 ), maText ); } -SwCaptionOptPage::SwCaptionOptPage( 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)) @@ -522,7 +522,7 @@ SwCaptionOptPage::~SwCaptionOptPage() delete pMgr; } -SfxTabPage* SwCaptionOptPage::Create( Window* pParent, +SfxTabPage* SwCaptionOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwCaptionOptPage(pParent, *rAttrSet ); @@ -888,7 +888,7 @@ void CaptionComboBox::KeyInput(const KeyEvent& rEvt) SwComboBox::KeyInput(rEvt); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCaptionComboBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCaptionComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5507ebf11137..9d7a6f408e65 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star; // Tools->Options->Writer->View // Tools->Options->Writer/Web->View -SwContentOptPage::SwContentOptPage( Window* pParent, +SwContentOptPage::SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage(pParent, "ViewOptionsPage", "modules/swriter/ui/viewoptionspage.ui", &rCoreSet) @@ -158,7 +158,7 @@ SwContentOptPage::~SwContentOptPage() { } -SfxTabPage* SwContentOptPage::Create( Window* pParent, +SfxTabPage* SwContentOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwContentOptPage(pParent, *rAttrSet); @@ -284,7 +284,7 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox) } // TabPage Printer additional settings -SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent, +SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PrintOptionsPage", "modules/swriter/ui/printoptionspage.ui", &rCoreSet) @@ -361,7 +361,7 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev) m_pPagesFrame->Enable(!bPreview); } -SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, +SfxTabPage* SwAddPrinterTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwAddPrinterTabPage( pParent, *rAttrSet ) ); @@ -506,7 +506,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) } // Tabpage Standardfonts -SwStdFontTabPage::SwStdFontTabPage( Window* pParent, +SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , &rSet), pPrt(0), @@ -587,7 +587,7 @@ SwStdFontTabPage::~SwStdFontTabPage() } } -SfxTabPage* SwStdFontTabPage::Create( Window* pParent, +SfxTabPage* SwStdFontTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwStdFontTabPage(pParent, *rAttrSet); @@ -1061,7 +1061,7 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet) SetFontMode(sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue())); } -SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : +SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", &rSet), pWrtShell(0), bHTMLMode(false) @@ -1091,7 +1091,7 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage() { } -SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, +SfxTabPage* SwTableOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwTableOptionsTabPage(pParent, *rAttrSet ); @@ -1259,7 +1259,7 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) SetWrtShell(pWrtSh->GetValue()); } -SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, +SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptFormatAidsPage", "modules/swriter/ui/optformataidspage.ui", &rSet), @@ -1325,7 +1325,7 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage() { } -SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SwShdwCrsrOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SwShdwCrsrOptionsTabPage( pParent, *rSet ); } @@ -1477,7 +1477,7 @@ static sal_uInt16 aDeletedAttrMap[] = { 0, 1, 2, 5, 6, 7, 8, 9, 10 }; static sal_uInt16 aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 }; // Preview of selection -SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) : +SwMarkPreview::SwMarkPreview( vcl::Window *pParent, WinBits nWinBits ) : Window(pParent, nWinBits), m_aTransCol( COL_TRANSPARENT ), @@ -1490,7 +1490,7 @@ SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) : SetMapMode(MAP_PIXEL); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwMarkPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwMarkPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwMarkPreview(pParent, 0); } @@ -1653,7 +1653,7 @@ namespace } } -SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, +SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptRedLinePage", "modules/swriter/ui/optredlinepage.ui" , &rSet) @@ -1687,7 +1687,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, pChangedPreviewWN->set_width_request(aPreviewSize.Width()); pMarkPreviewWN->set_width_request(aPreviewSize.Width()); - sAuthor = get<Window>("byauthor")->GetText(); + sAuthor = get<vcl::Window>("byauthor")->GetText(); for (sal_Int32 i = 0; i < pInsertLB->GetEntryCount(); ++i) { @@ -1728,7 +1728,7 @@ SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage() { } -SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SwRedlineOptionsTabPage( pParent, *rSet ); } @@ -2205,7 +2205,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.Invalidate(); } -SwCompareOptionsTabPage::SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) +SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", &rSet ) { get(m_pAutoRB,"auto"); @@ -2228,7 +2228,7 @@ SwCompareOptionsTabPage::~SwCompareOptionsTabPage() { } -SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwCompareOptionsTabPage( pParent, *rAttrSet ); } @@ -2333,7 +2333,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl) #ifdef DBG_UTIL -SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SwTestTabPage::SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", &rCoreSet) , bAttrModified( false ) { @@ -2352,7 +2352,7 @@ SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet) } -SfxTabPage* SwTestTabPage::Create( Window* pParent, +SfxTabPage* SwTestTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwTestTabPage(pParent, *rAttrSet); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 8580b271034e..9b72fd4ef8d1 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -72,7 +72,7 @@ class SwAddressControl_Impl : public Control using Window::SetData; public: - SwAddressControl_Impl(Window* pParent , WinBits nBits ); + SwAddressControl_Impl(vcl::Window* pParent , WinBits nBits ); virtual ~SwAddressControl_Impl(); void SetData(SwCSVData& rDBData); @@ -83,10 +83,10 @@ public: virtual void Resize() SAL_OVERRIDE; }; -SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, WinBits nBits ) : +SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits ) : Control(pParent, nBits), m_pScrollBar(new ScrollBar(this)), - m_pWindow(new Window(this, WB_DIALOGCONTROL)), + m_pWindow(new vcl::Window(this, WB_DIALOGCONTROL)), m_pData(0), m_nLineHeight(0), m_nCurrentDataSet(0), @@ -106,7 +106,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, WinBits nBits ) : m_pScrollBar->EnableDrag(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAddressControlImpl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressControlImpl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwAddressControl_Impl(pParent, WB_BORDER | WB_DIALOGCONTROL); } @@ -390,7 +390,7 @@ void SwAddressControl_Impl::Resize() } SwCreateAddressListDialog::SwCreateAddressListDialog( - Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) : + vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) : SfxModalDialog(pParent, "CreateAddressList", "modules/swriter/ui/createaddresslist.ui"), m_sAddressListFilterName( SW_RES( ST_FILTERNAME)), m_sURL(rURL), diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index f14461078e7c..393c5a79b71e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -74,7 +74,7 @@ class SwCreateAddressListDialog : public SfxModalDialog public: SwCreateAddressListDialog( - Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig); + vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig); virtual ~SwCreateAddressListDialog(); const OUString& GetURL() const { return m_sURL; } diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 7d3c7af83f3b..3a83b7ab97dd 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -27,7 +27,7 @@ #include <boost/scoped_ptr.hpp> SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( - Window* pParent, const SwCSVData& rOldData) + vcl::Window* pParent, const SwCSVData& rOldData) : SfxModalDialog(pParent, "CustomizeAddrListDialog", "modules/swriter/ui/customizeaddrlistdialog.ui") , m_pNewData( new SwCSVData(rOldData)) @@ -173,7 +173,7 @@ void SwCustomizeAddressListDialog::UpdateButtons() SwAddRenameEntryDialog::SwAddRenameEntryDialog( - Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader) : SfxModalDialog(pParent, rID, rUIXMLDescription) , m_rCSVHeader(rCSVHeader) diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index b11931d153a3..176debe9a26d 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -47,7 +47,7 @@ class SwCustomizeAddressListDialog : public SfxModalDialog void UpdateButtons(); public: - SwCustomizeAddressListDialog(Window* pParent, const SwCSVData& rOldData); + SwCustomizeAddressListDialog(vcl::Window* pParent, const SwCSVData& rOldData); virtual ~SwCustomizeAddressListDialog(); SwCSVData* GetNewData() { return m_pNewData;} @@ -61,7 +61,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog DECL_LINK(ModifyHdl_Impl, Edit*); protected: - SwAddRenameEntryDialog(Window* pParent, const OString& rID, + SwAddRenameEntryDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader); public: void SetFieldName(const OUString& rName) {m_pFieldNameED->SetText(rName);} @@ -72,7 +72,7 @@ public: class SwAddEntryDialog : public SwAddRenameEntryDialog { public: - SwAddEntryDialog(Window* pParent, const std::vector< OUString >& rCSVHeader) + SwAddEntryDialog(vcl::Window* pParent, const std::vector< OUString >& rCSVHeader) : SwAddRenameEntryDialog(pParent, "AddEntryDialog", "modules/swriter/ui/addentrydialog.ui", rCSVHeader) { @@ -82,7 +82,7 @@ public: class SwRenameEntryDialog : public SwAddRenameEntryDialog { public: - SwRenameEntryDialog(Window* pParent, const std::vector< OUString >& rCSVHeader) + SwRenameEntryDialog(vcl::Window* pParent, const std::vector< OUString >& rCSVHeader) : SwAddRenameEntryDialog(pParent, "RenameEntryDialog", "modules/swriter/ui/renameentrydialog.ui", rCSVHeader) { diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index e71ccc78fc22..060d1ceecbe3 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::rtl; -SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) : +SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) : SfxModalDialog(pParent, "TablePreviewDialog", "modules/swriter/ui/tablepreviewdialog.ui") { get(m_pDescriptionFI, "description"); diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index e32b1ef3808a..e99b7f457525 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -32,11 +32,11 @@ namespace com{ namespace sun{ namespace star{ class SwDBTablePreviewDialog : public SfxModalDialog { FixedText* m_pDescriptionFI; - Window* m_pBeamerWIN; + vcl::Window* m_pBeamerWIN; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame; public: - SwDBTablePreviewDialog(Window* pParent, + SwDBTablePreviewDialog(vcl::Window* pParent, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues ); virtual ~SwDBTablePreviewDialog(); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 6ad8133c4b84..0da4e9694aa9 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -297,7 +297,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton } SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( - Window* pParent, SwMailMergeConfigItem& rConfig) + vcl::Window* pParent, SwMailMergeConfigItem& rConfig) : SfxModalDialog(pParent, "SelectBlockDialog", "modules/swriter/ui/selectblockdialog.ui") , m_rConfig(rConfig) @@ -452,7 +452,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, RadioButton*, pButton) #define USER_DATA_NONE -4 SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( - Window* pParent, SwMailMergeConfigItem& rConfig, DialogType eType) + vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType eType) : SfxModalDialog(pParent, "AddressBlockDialog", "modules/swriter/ui/addressblockdialog.ui") , m_aTextFilter("<>") @@ -771,7 +771,7 @@ class SwAssignFieldsControl : public Control void MakeVisible( sal_Int32 nIndex ); public: - SwAssignFieldsControl(Window* pParent, WinBits nBits); + SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits); virtual ~SwAssignFieldsControl(); void Init(SwMailMergeConfigItem& rConfigItem); @@ -784,12 +784,12 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAssignFieldsControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAssignFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwAssignFieldsControl(pParent, WB_BORDER); } -SwAssignFieldsControl::SwAssignFieldsControl(Window* pParent, WinBits nBits) : +SwAssignFieldsControl::SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits) : Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP | WB_DIALOGCONTROL), m_aVScroll(this), m_aHeaderHB(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER), @@ -1104,7 +1104,7 @@ IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox) } SwAssignFieldsDialog::SwAssignFieldsDialog( - Window* pParent, SwMailMergeConfigItem& rConfigItem, + vcl::Window* pParent, SwMailMergeConfigItem& rConfigItem, const OUString& rPreview, bool bIsAddressBlock) : SfxModalDialog(pParent, "AssignFieldsDialog", "modules/swriter/ui/assignfieldsdialog.ui"), @@ -1187,7 +1187,7 @@ IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl) return 0; } -DDListBox::DDListBox(Window* pParent, WinBits nStyle) +DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , m_pParentDialog(NULL) { @@ -1202,7 +1202,7 @@ DDListBox::DDListBox(Window* pParent, WinBits nStyle) } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDDListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDDListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1237,7 +1237,7 @@ void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) } } -AddressMultiLineEdit::AddressMultiLineEdit(Window* pParent, WinBits nBits) +AddressMultiLineEdit::AddressMultiLineEdit(vcl::Window* pParent, WinBits nBits) : VclMultiLineEdit(pParent, nBits) , m_pParentDialog(NULL) { @@ -1251,7 +1251,7 @@ Size AddressMultiLineEdit::GetOptimalSize() const return LogicToPixel(Size(160, 60), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAddressMultiLineEdit(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAddressMultiLineEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index c3d0d5698c84..6824bed6f897 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -104,7 +104,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog using Window::SetSettings; public: - SwSelectAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig); + SwSelectAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig); virtual ~SwSelectAddressBlockDialog(); void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks, @@ -121,7 +121,7 @@ class DDListBox : public SvTreeListBox { SwCustomizeAddressBlockDialog* m_pParentDialog; public: - DDListBox(Window* pParent, const WinBits nStyle); + DDListBox(vcl::Window* pParent, const WinBits nStyle); void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); @@ -145,7 +145,7 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener protected: bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - AddressMultiLineEdit(Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); + AddressMultiLineEdit(vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); virtual ~AddressMultiLineEdit(); void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); @@ -226,7 +226,7 @@ private: void UpdateImageButtons_Impl(); public: - SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); + SwCustomizeAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); virtual ~SwCustomizeAddressBlockDialog(); void SetAddress(const OUString& rAddress); @@ -255,7 +255,7 @@ class SwAssignFieldsDialog : public SfxModalDialog DECL_LINK(AssignmentModifyHdl_Impl, void*); public: - SwAssignFieldsDialog(Window* pParent, + SwAssignFieldsDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfigItem, const OUString& rPreview, bool bIsAddressBlock); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 1a552481bafd..8fa98e1a8938 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -397,7 +397,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) return 0; } -SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) : +SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWizard) : SfxModalDialog(pParent, "MailBodyDialog", "modules/swriter/ui/mmmailbody.ui") { m_pWizard = _pWizard; diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index fa94bc1e0a07..d74b54224df9 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -103,7 +103,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(OKHdl, void *); public: - SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard); + SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* pWizard); virtual ~SwMailBodyDialog(); void SetBody(const OUString& rBody ) {m_pBodyMLE->SetText(rBody);} diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 9a66780a39e8..c770705dccc5 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -49,7 +49,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage PushButton* m_pUpPB; PushButton* m_pDownPB; - Window* m_pExampleContainerWIN; + vcl::Window* m_pExampleContainerWIN; ListBox* m_pZoomLB; diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 581ed8d7cfd4..f1ced0275ccb 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -120,7 +120,7 @@ class SwSaveWarningBox_Impl : public SwMessageAndEditDialog { DECL_LINK( ModifyHdl, Edit*); public: - SwSaveWarningBox_Impl(Window* pParent, const OUString& rFileName); + SwSaveWarningBox_Impl(vcl::Window* pParent, const OUString& rFileName); OUString GetFileName() const { @@ -133,7 +133,7 @@ class SwSendQueryBox_Impl : public SwMessageAndEditDialog bool bIsEmptyAllowed; DECL_LINK( ModifyHdl, Edit*); public: - SwSendQueryBox_Impl(Window* pParent, const OString& rID, + SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); void SetValue(const OUString& rSet) @@ -154,7 +154,7 @@ public: } }; -SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const OUString& rFileName) +SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(vcl::Window* pParent, const OUString& rFileName) : SwMessageAndEditDialog(pParent, "AlreadyExistsDialog", "modules/swriter/ui/alreadyexistsdialog.ui") { @@ -174,7 +174,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit) return 0; } -SwSendQueryBox_Impl::SwSendQueryBox_Impl(Window* pParent, const OString& rID, +SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : SwMessageAndEditDialog(pParent, rID, rUIXMLDescription) , bIsEmptyAllowed(true) @@ -196,7 +196,7 @@ class SwCopyToDialog : public SfxModalDialog Edit* m_pBCCED; public: - SwCopyToDialog(Window* pParent) + SwCopyToDialog(vcl::Window* pParent) : SfxModalDialog(pParent, "CCDialog", "modules/swriter/ui/ccdialog.ui") { @@ -348,7 +348,7 @@ bool SwMailMergeOutputPage::canAdvance() const IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) { - Window* aControls[] = + vcl::Window* aControls[] = { m_pSaveStartDocPB, m_pSaveAsOneRB, m_pSaveIndividualRB, @@ -364,7 +364,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) 0 }; SetUpdateMode(true); - Window** pControl = aControls; + vcl::Window** pControl = aControls; do { (*pControl)->Show(false); @@ -420,7 +420,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) } else { - Window* aMailControls[] = + vcl::Window* aMailControls[] = { m_pFromRB, m_pFromNF, m_pToFT, m_pToNF, m_pMailToFT, m_pMailToLB, m_pCopyToPB, @@ -429,7 +429,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) m_pAttachmentGroup, m_pSendAllRB, m_pSendDocumentsPB, 0 }; - Window** pMailControl = aMailControls; + vcl::Window** pMailControl = aMailControls; do { (*pMailControl)->Show(true); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index df8030ec5ca4..42256f407f22 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -188,7 +188,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: - SwSendMailDialog( Window* pParent, SwMailMergeConfigItem& ); + SwSendMailDialog( vcl::Window* pParent, SwMailMergeConfigItem& ); virtual ~SwSendMailDialog(); void AddDocument( SwMailDescriptor& rDesc ); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index ca442c0b786f..a587b1c9f21e 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -209,10 +209,10 @@ class SwSendWarningBox_Impl : public MessageDialog { VclMultiLineEdit *m_pDetailED; public: - SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails); + SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails); }; -SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails) +SwSendWarningBox_Impl::SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails) : MessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui") { get(m_pDetailED, "errors"); @@ -225,7 +225,7 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rD #define ITEMID_TASK 1 #define ITEMID_STATUS 2 -SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) : +SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& rConfigItem) : ModelessDialog /*SfxModalDialog*/(pParent, "SendMailsDialog", "modules/swriter/ui/mmsendmails.ui"), m_pTransferStatus(get<FixedText>("transferstatus")), m_pPaused(get<FixedText>("paused")), diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 2724e3556cda..949368c267d0 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -90,7 +90,7 @@ void SwAddressTable::setColSizes() SvSimpleTable::SetTabs(&nTabs_Impl[0], MAP_PIXEL); } -SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, +SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, const uno::Reference< sdbc::XConnection>& rConnection) : SfxModalDialog(pParent, "SelectTableDialog", "modules/swriter/ui/selecttabledialog.ui") , m_sName(SW_RES(ST_NAME)) diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 1668e81f48b3..729675e831b9 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -47,7 +47,7 @@ class SwSelectDBTableDialog : public SfxModalDialog DECL_LINK(PreviewHdl, PushButton*); public: - SwSelectDBTableDialog(Window* pParent, + SwSelectDBTableDialog(vcl::Window* pParent, const css::uno::Reference<css::sdbc::XConnection>& xConnection); virtual ~SwSelectDBTableDialog(); diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index 8b18722fb888..f33577268b82 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -23,7 +23,7 @@ #include "dialog.hrc" #include "abstract.hxx" -SwInsertAbstractDlg::SwInsertAbstractDlg(Window* pParent) +SwInsertAbstractDlg::SwInsertAbstractDlg(vcl::Window* pParent) : SfxModalDialog(pParent, "AbstractDialog", "modules/swriter/ui/abstractdialog.ui") { diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index b6e12153cc53..2370e35a6c4d 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -21,7 +21,7 @@ #include <svx/svxdlg.hxx> #include <sfx2/sfx.hrc> -SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet) +SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 5c498d4f1b3f..d8e8f93a1517 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -54,7 +54,7 @@ const sal_Int32 nDialogExtraDataLen = 11; // 12345678901 } -SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, +SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) : SfxModalDialog(pParent, "AsciiFilterDialog", "modules/swriter/ui/asciifilterdialog.ui") , m_bSaveLineStatus(true) diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 66a2362d46a5..d9760b6eb0ab 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -36,12 +36,12 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> -SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage * SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwDocStatPage(pParent, *rSet); } -SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) +SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", &rSet) diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 2938f272f2b9..97b445e1a3c2 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -106,7 +106,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) return aItem; } -bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, +bool SwMacroAssignDlg::INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ) { bool bRet = false; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 70f3f93f7e1a..b62e4223ccda 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -368,9 +368,9 @@ void AbstractSwFldDlg_Impl::ActivateDatabasePage() pDlg->ActivateDatabasePage(); } -Window* AbstractSwFldDlg_Impl::GetWindow() +vcl::Window* AbstractSwFldDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } void AbstractSwFldDlg_Impl::ShowReferencePage() @@ -563,9 +563,9 @@ void AbstractIndexMarkFloatDlg_Impl::ReInitDlg(SwWrtShell& rWrtShell) pDlg->ReInitDlg( rWrtShell); } -Window* AbstractIndexMarkFloatDlg_Impl::GetWindow() +vcl::Window* AbstractIndexMarkFloatDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } void AbstractAuthMarkFloatDlg_Impl::ReInitDlg(SwWrtShell& rWrtShell) @@ -573,14 +573,14 @@ void AbstractAuthMarkFloatDlg_Impl::ReInitDlg(SwWrtShell& rWrtShell) pDlg->ReInitDlg( rWrtShell); } -Window* AbstractAuthMarkFloatDlg_Impl::GetWindow() +vcl::Window* AbstractAuthMarkFloatDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } -Window* AbstractSwWordCountFloatDlg_Impl::GetWindow() +vcl::Window* AbstractSwWordCountFloatDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } void AbstractSwWordCountFloatDlg_Impl::UpdateCounts() @@ -641,13 +641,13 @@ sal_uInt16 AbstractMailMergeWizard_Impl::GetRestartPage() const return pDlg->GetRestartPage(); } -AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg(Window* pParent) +AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg(vcl::Window* pParent) { SwInsertAbstractDlg* pDlg = new SwInsertAbstractDlg( pParent); return new AbstractSwInsertAbstractDlg_Impl(pDlg); } -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&, sal_uInt32 nResId @@ -677,7 +677,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParen return 0; } -AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( Window* pParent, +AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) { @@ -685,7 +685,7 @@ AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( return new AbstractSwAsciiFilterDlg_Impl( pDlg ); } -VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Window *pParent, +VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) @@ -706,7 +706,7 @@ VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Wind return 0; } -AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg(Window *pParent, +AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) { SwBreakDlg* pDlg = new SwBreakDlg(pParent, rSh); @@ -719,7 +719,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& return new VclAbstractDialog_Impl(pDlg); } -SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw, +SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr) { @@ -733,7 +733,7 @@ AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg return new AbstractSwConvertTableDlg_Impl(pDlg); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) { Dialog* pDlg=NULL; switch ( nResId ) @@ -760,20 +760,20 @@ AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBCo return new AbstractSwInsertDBColAutoPilot_Impl( pDlg ); } -SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) +SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) { SfxTabDialog* pDlg = new SwFootNoteOptionDlg( pParent, rSh ); return new AbstractTabDialog_Impl( pDlg ); } -AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(Window *pParent, +AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton) { sw::DropDownFieldDialog* pDlg = new sw::DropDownFieldDialog(pParent, rSh, pField, bNextButton); return new AbstractDropDownFieldDialog_Impl( pDlg ); } -SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, +SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) { @@ -781,7 +781,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa return new AbstractTabDialog_Impl( pDlg ); } -AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, +AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) { SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pDBManager, bLabel); @@ -793,7 +793,7 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod () return SwLabDlg::UpdateFieldInformation; } -SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pParent, SwView& rVw, +SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet , sal_uInt8 nDialogMode, const OUString *pCollName, @@ -804,7 +804,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pP return new AbstractTabDialog_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( Window *pParent, SwWrtShell &rSh, int nResId ) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( vcl::Window *pParent, SwWrtShell &rSh, int nResId ) { Dialog* pDlg=NULL; switch ( nResId ) @@ -830,25 +830,25 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( Wind return 0; } -AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog ( Window *pParent, SwWrtShell &rSh ) +AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog ( vcl::Window *pParent, SwWrtShell &rSh ) { return new AbstractSplitTableDialog_Impl( new SwSplitTblDlg( pParent, rSh) ); } -AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) +AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) { SwSelGlossaryDlg* pDlg = new SwSelGlossaryDlg(pParent, rShortName); return new AbstractSwSelGlossaryDlg_Impl(pDlg); } -AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(Window* pParent, +AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt, const SwTableAutoFmt* pSelFmt) { SwAutoFormatDlg* pDlg = new SwAutoFormatDlg(pParent, pShell, bSetAutoFmt, pSelFmt); return new AbstractSwAutoFormatDlg_Impl(pDlg); } -SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) +SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -865,7 +865,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(Window* pPar return 0; } -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -882,20 +882,20 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pPare return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) { Dialog* pDlg = new SwTableWidthDlg(pParent, rFnc); return new VclAbstractDialog_Impl( pDlg ); } -SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, +SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) { SfxTabDialog* pDlg = new SwTableTabDlg(pParent, Pool, pItemSet, pSh); return new AbstractTabDialog_Impl(pDlg); } -AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) +AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) { SwFldDlg* pDlg = new SwFldDlg(pB, pCW, pParent); return new AbstractSwFldDlg_Impl(pDlg); @@ -918,7 +918,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& return 0; } -AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(Window* pParent, +AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) { @@ -926,20 +926,20 @@ AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDl return new AbstractSwRenameXNamedDlg_Impl( pDlg ); } -AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRedlineAcceptDlg(Window *pParent) +AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) { SwModalRedlineAcceptDlg* pDlg = new SwModalRedlineAcceptDlg( pParent ); return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, bool& rWithPrev) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(vcl::Window* pParent, bool& rWithPrev) { Dialog* pDlg = new SwMergeTblDlg( pParent, rWithPrev ); return new VclAbstractDialog_Impl( pDlg ); } SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OString &rDialogType, - SfxViewFrame *pFrame, Window *pParent, + SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm, bool bFmt, @@ -951,7 +951,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OSt } SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( - Window* pParent, + vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage, @@ -970,7 +970,7 @@ AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFram return new AbstractGlossaryDlg_Impl( pDlg ); } -AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pParent, +AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton) { SwFldInputDlg* pDlg = new SwFldInputDlg( pParent, rSh, pField, bNextButton ); @@ -978,13 +978,13 @@ AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pPa } AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( - Window * pParent, SwWrtShell &rSh, bool bEd ) + vcl::Window * pParent, SwWrtShell &rSh, bool bEd ) { SwInsFootNoteDlg* pDlg = new SwInsFootNoteDlg(pParent, rSh, bEd); return new AbstractInsFootNoteDlg_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *pParent ) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( vcl::Window *pParent ) { Dialog* pDlg = new SwTitlePageDlg( pParent ); if ( pDlg ) @@ -1005,14 +1005,14 @@ AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rV } AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog( - Window* pParent, SwWrtShell* pWrtSh) + vcl::Window* pParent, SwWrtShell* pWrtSh) { SwJavaEditDialog* pDlg = new SwJavaEditDialog(pParent, pWrtSh); return new AbstractJavaEditDialog_Impl( pDlg ); } AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nResId, - Window* pParent, SwWrtShell& rSh, + vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, @@ -1033,26 +1033,26 @@ AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nRe return 0; } -AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCreateFromDlg(Window* pParent) +AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCreateFromDlg(vcl::Window* pParent) { SwMailMergeCreateFromDlg* pDlg = new SwMailMergeCreateFromDlg(pParent); return new AbstractMailMergeCreateFromDlg_Impl(pDlg); } -AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(Window* pParent) +AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) { SwMailMergeFieldConnectionsDlg* pDlg = new SwMailMergeFieldConnectionsDlg( pParent ); return new AbstractMailMergeFieldConnectionsDlg_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) { Dialog* pDlg = new SwMultiTOXMarkDlg(pParent, rTOXMgr); return new VclAbstractDialog_Impl(pDlg); } SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rWrtSh ) { @@ -1075,7 +1075,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI } AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( - Window* pParent, const SfxItemSet& rSet, + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal) @@ -1084,14 +1084,14 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo return new AbstractMultiTOXTabDialog_Impl( pDlg ); } -AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) +AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) { SwEditRegionDlg* pDlg = new SwEditRegionDlg( pParent, rWrtSh ); return new AbstractEditRegionDlg_Impl( pDlg ); } AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) { SwInsertSectionTabDialog* pDlg = new SwInsertSectionTabDialog(pParent, rSet, rSh); return new AbstractInsertSectionTabDialog_Impl(pDlg); @@ -1100,7 +1100,7 @@ AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSecti AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew ) { @@ -1111,7 +1111,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew) { @@ -1122,7 +1122,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDialog( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo) { SwWordCountFloatDlg* pDlg = new SwWordCountFloatDlg( pBindings, pChild, pParent, pInfo ); @@ -1130,7 +1130,7 @@ AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDia } VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) + vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) { Dialog* pDlg = new SwIndexMarkModalDlg( pParent, rSh, pCurTOXMark ); return new VclAbstractDialog_Impl( pDlg ); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 634ea37220d5..1a037f71f160 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -72,7 +72,7 @@ class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg) virtual void UpdateCounts() SAL_OVERRIDE; virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg @@ -210,7 +210,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg virtual void Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE; virtual void ReInitDlg() SAL_OVERRIDE; virtual void ActivateDatabasePage() SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg @@ -336,7 +336,7 @@ class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg) virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwAuthMarkFloatDlg; @@ -344,7 +344,7 @@ class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg) virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwMailMergeWizard; @@ -375,38 +375,38 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory public: virtual ~SwAbstractDialogFactory_Impl() {} - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId ) SAL_OVERRIDE; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, - SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) SAL_OVERRIDE; - virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, + SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; - virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; + virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, + virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) SAL_OVERRIDE; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, const SwDBData& rData) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; - virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh, + virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE; - virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE; + virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) SAL_OVERRIDE; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, + virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, @@ -414,36 +414,36 @@ public: bool bDraw = false, const OString& sDefPage = OString() ) SAL_OVERRIDE; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; - virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; + virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; - virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, + virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE; + virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, + virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE; - virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) SAL_OVERRIDE; + virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) SAL_OVERRIDE; virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE; - virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, + virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE; - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) SAL_OVERRIDE; + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, bool& rWithPrev) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateTblMergeDialog(vcl::Window* pParent, bool& rWithPrev) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType, - SfxViewFrame *pFrame, Window *pParent, + SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, bool bFmt = false, const OString& sDefPage = OString(), const OUString* pFmtStr = 0) SAL_OVERRIDE; virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( - Window* pParent, + vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), @@ -452,51 +452,51 @@ public: virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) SAL_OVERRIDE; - virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent, + virtual AbstractFldInputDlg* CreateFldInputDlg(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( - Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ) SAL_OVERRIDE; + vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateTitlePageDlg ( vcl::Window * pParent ) SAL_OVERRIDE; virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE; virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) SAL_OVERRIDE; - virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, + virtual AbstractJavaEditDialog* CreateJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) SAL_OVERRIDE; virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, - Window* pParent, SwWrtShell& rSh, + vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE; - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) SAL_OVERRIDE; - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &) SAL_OVERRIDE; virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( - Window* pParent, const SfxItemSet& rSet, + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false) SAL_OVERRIDE; - virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; + virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true) SAL_OVERRIDE; virtual VclAbstractDialog * CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; + vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) SAL_OVERRIDE; diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx index 78ae502eb84f..00d277b135da 100644 --- a/sw/source/ui/dialog/swmessdialog.cxx +++ b/sw/source/ui/dialog/swmessdialog.cxx @@ -15,7 +15,7 @@ #include <vcl/msgbox.hxx> #include <vcl/vclmedit.hxx> -SwMessageAndEditDialog::SwMessageAndEditDialog(Window* pParent, const OString& rID, +SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ModalDialog(pParent, rID, rUIXMLDescription) { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 22fbf2220657..e5581ad0fa83 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -304,7 +304,7 @@ OUString SectRepr::GetSubRegion() const } // dialog edit regions -SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) +SwEditRegionDlg::SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ) : SfxModalDialog(pParent, "EditSectionDialog", "modules/swriter/ui/editsectiondialog.ui") , m_bSubRegionsFilled(false) @@ -1390,7 +1390,7 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ) } SwInsertSectionTabDialog::SwInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) : SfxTabDialog(pParent, "InsertSectionDialog", "modules/swriter/ui/insertsectiondialog.ui", &rSet) , rWrtSh(rSh) @@ -1490,7 +1490,7 @@ short SwInsertSectionTabDialog::Ok() } SwInsertSectionTabPage::SwInsertSectionTabPage( - Window *pParent, const SfxItemSet &rAttrSet) + vcl::Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, "SectionPage", "modules/swriter/ui/sectionpage.ui", &rAttrSet) , m_pWrtSh(0) @@ -1636,7 +1636,7 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* ) { } -SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent, +SfxTabPage* SwInsertSectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwInsertSectionTabPage(pParent, *rAttrSet); @@ -1794,7 +1794,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil return 0; } -SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent, +SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", &rAttrSet ) @@ -1976,7 +1976,7 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet ) RES_END_AT_TXTEND, false )); } -SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, +SfxTabPage* SwSectionFtnEndTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwSectionFtnEndTabPage(pParent, *rAttrSet); @@ -2039,7 +2039,7 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox ) } SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) : SfxTabDialog(pParent, "FormatSectionDialog", "modules/swriter/ui/formatsectiondialog.ui", &rSet) , rWrtSh(rSh) @@ -2084,7 +2084,7 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh); } -SwSectionIndentTabPage::SwSectionIndentTabPage(Window *pParent, const SfxItemSet &rAttrSet) +SwSectionIndentTabPage::SwSectionIndentTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, "IndentPage", "modules/swriter/ui/indentpage.ui", &rAttrSet) { get(m_pBeforeMF, "before"); @@ -2138,7 +2138,7 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) IndentModifyHdl(0); } -SfxTabPage* SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwSectionIndentTabPage(pParent, *rAttrSet); } diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 2ff4f41fcd73..2a7392eee793 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -109,7 +109,7 @@ void SwWordCountFloatDlg::showStandardizedPages(bool bShowStandardizedPages) SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo) : SfxModelessDialog(_pBindings, pChild, pParent, "WordCountDialog", "modules/swriter/ui/wordcount.ui") { diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 484787deba8b..5cdc698f750d 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -24,7 +24,7 @@ #include "dochdl.hrc" #include <vcl/layout.hxx> -SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const OUString &rShortName) +SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) : ModalDialog(pParent, "InsertAutoTextDialog", "modules/swriter/ui/insertautotextdialog.ui") { diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 3250894abcd8..1c56f3ad5166 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -116,7 +116,7 @@ namespace { static long lUserW = 5669; // 10 cm static long lUserH = 5669; // 10 cm -SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) +SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvFormatPage", "modules/swriter/ui/envformatpage.ui", &rSet) { @@ -438,7 +438,7 @@ void SwEnvFmtPage::SetMinMax() m_pSizeHeightField->Reformat(); } -SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwEnvFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwEnvFmtPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 39cb85d94609..1348c5bd31ce 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -43,7 +43,7 @@ class SwEnvFmtPage : public SfxTabPage std::vector<sal_uInt16> aIDs; - SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet); + SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( EditHdl, MenuButton * ); @@ -60,7 +60,7 @@ class SwEnvFmtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 395953508d8e..934f8bd63644 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::rtl; -SwEnvPreview::SwEnvPreview(Window* pParent, WinBits nStyle) +SwEnvPreview::SwEnvPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) { SetMapMode(MapMode(MAP_PIXEL)); @@ -58,7 +58,7 @@ Size SwEnvPreview::GetOptimalSize() const return LogicToPixel(Size(84 , 63), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwEnvPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwEnvPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwEnvPreview(pParent, 0); } @@ -131,7 +131,7 @@ void SwEnvPreview::Paint(const Rectangle &) DrawRect(Rectangle(Point(nStmpX, nStmpY), Size(nStmpW, nStmpH))); } -SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet, +SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) : SfxTabDialog(pParent, "EnvDialog", "modules/swriter/ui/envdialog.ui", &rSet) @@ -187,7 +187,7 @@ short SwEnvDlg::Ok() return nRet; } -SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) +SwEnvPage::SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvAddressPage", "modules/swriter/ui/envaddresspage.ui", &rSet) { @@ -304,7 +304,7 @@ void SwEnvPage::InitDatabaseBox() } } -SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwEnvPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 02b65703f3b3..b4976e7a6d14 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -29,7 +29,7 @@ #include "envprt.hrc" #include <boost/scoped_ptr.hpp> -SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) +SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvPrinterPage", "modules/swriter/ui/envprinterpage.ui", &rSet) , pPrt(NULL) @@ -127,7 +127,7 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) return 0; } -SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwEnvPrtPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index fdd5f1384b60..e6f427caa95d 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -46,7 +46,7 @@ class SwEnvPrtPage : public SfxTabPage Printer* pPrt; - SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet); + SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet); DECL_LINK(ClickHdl, void *); DECL_LINK(AlignHdl, void *); @@ -59,7 +59,7 @@ class SwEnvPrtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index e09c0141a40e..e9fdf5211dfa 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -89,7 +89,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) pPrtPage = (SwLabPrtPage*)&rPage; } -SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, +SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager_, bool bLabel) : SfxTabDialog(pParent, "LabelDialog", "modules/swriter/ui/labeldialog.ui", &rSet) @@ -225,7 +225,7 @@ Printer *SwLabDlg::GetPrt() return (NULL); } -SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) +SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardMediumPage", "modules/swriter/ui/cardmediumpage.ui", &rSet) , pDBManager(NULL) @@ -458,7 +458,7 @@ void SwLabPage::InitDatabaseBox() } } -SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwLabPage(pParent, *rSet); } @@ -561,7 +561,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, } } -SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) +SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardFormatPage", "modules/swriter/ui/cardformatpage.ui", &rSet) , pExampleFrame(0) @@ -594,7 +594,7 @@ SwVisitingCardPage::~SwVisitingCardPage() delete pExampleFrame; } -SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwVisitingCardPage(pParent, *rSet); } @@ -702,7 +702,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet) } } -SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) +SwPrivateDataPage::SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PrivateUserPage", "modules/swriter/ui/privateuserpage.ui", &rSet) { @@ -728,7 +728,7 @@ SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); } -SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwPrivateDataPage(pParent, *rSet); } @@ -795,7 +795,7 @@ void SwPrivateDataPage::Reset(const SfxItemSet* rSet) m_pMailED->SetText(aItem.aPrivMail); } -SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) +SwBusinessDataPage::SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "BusinessDataPage", "modules/swriter/ui/businessdatapage.ui", &rSet) { @@ -816,7 +816,7 @@ SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); } -SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwBusinessDataPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 94d61202645a..19fb1c086771 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans; #define ROUND(x) static_cast<long>((x) + .5) -SwLabPreview::SwLabPreview(Window* pParent) +SwLabPreview::SwLabPreview(vcl::Window* pParent) : Window(pParent, 0) , aGrayColor(COL_LIGHTGRAY) , aHDistStr(SW_RESSTR(STR_HDIST)) @@ -84,7 +84,7 @@ Size SwLabPreview::GetOptimalSize() const return LogicToPixel(Size(146 , 161), MapMode(MAP_APPFONT)); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwLabPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwLabPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwLabPreview(pParent); } @@ -286,7 +286,7 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem) Invalidate(); } -SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) +SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelFormatPage", "modules/swriter/ui/labelformatpage.ui", &rSet) , bModified(false) @@ -464,7 +464,7 @@ void SwLabFmtPage::ChangeMinMax() m_pPHeightField->Reformat(); } -SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwLabFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwLabFmtPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 0616008ecae8..b4b760621e82 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -24,7 +24,7 @@ #include <vcl/msgbox.hxx> class SwLabFmtPage; -class SwLabPreview : public Window +class SwLabPreview : public vcl::Window { Color aGrayColor; @@ -61,7 +61,7 @@ class SwLabPreview : public Window public: - SwLabPreview(Window* pParent); + SwLabPreview(vcl::Window* pParent); void UpdateItem(const SwLabItem& rItem); }; @@ -88,7 +88,7 @@ class SwLabFmtPage : public SfxTabPage SwLabItem aItem; - SwLabFmtPage(Window* pParent, const SfxItemSet& rSet); + SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabFmtPage(); DECL_LINK(ModifyHdl, void *); @@ -103,7 +103,7 @@ class SwLabFmtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 76d8e4a941a6..469085fb968a 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -28,7 +28,7 @@ #include <cmdid.h> #include <boost/scoped_ptr.hpp> -SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) +SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelOptionsPage", "modules/swriter/ui/labeloptionspage.ui", &rSet) , pPrinter(0) @@ -93,7 +93,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) return 0; } -SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwLabPrtPage( pParent, *rSet ); } diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 9a979586b2bf..109e30bc8544 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -44,7 +44,7 @@ class SwLabPrtPage : public SfxTabPage FixedText* m_pPrinterInfo; PushButton* m_pPrtSetup; - SwLabPrtPage(Window* pParent, const SfxItemSet& rSet); + SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabPrtPage(); DECL_LINK( CountHdl, Button * ); @@ -56,7 +56,7 @@ class SwLabPrtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 4ab290b2ebc1..b452f4e3cf74 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -127,7 +127,7 @@ void SwXSelChgLstnr_Impl::disposing( const EventObject& ) throw (RuntimeExcepti OSL_FAIL("disposing"); } -SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, +SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, @@ -627,14 +627,14 @@ uno::Reference<XResultSet> SwMailMergeDlg::GetResultSet() const return xResSetClone; } -SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(Window* pParent) +SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(vcl::Window* pParent) : ModalDialog(pParent, "MailMergeDialog", "modules/swriter/ui/mailmergedialog.ui") { get(m_pThisDocRB, "document"); } -SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(Window* pParent) +SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pParent) : ModalDialog(pParent, "MergeConnectDialog", "modules/swriter/ui/mergeconnectdialog.ui") { diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 38d5a79d1ae7..30cd7a34db76 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -47,7 +47,7 @@ class SwLabPage : public SfxTabPage bool m_bLabel; - SwLabPage(Window* pParent, const SfxItemSet& rSet); + SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet); DECL_LINK(AddrHdl, void *); DECL_LINK( DatabaseHdl, ListBox *pListBox ); @@ -64,7 +64,7 @@ class SwLabPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -86,7 +86,7 @@ class SwVisitingCardPage : public SfxTabPage { SvTreeListBox* m_pAutoTextLB; ListBox* m_pAutoTextGroupLB; - Window* m_pExampleWIN; + vcl::Window* m_pExampleWIN; OUString sTempURL; @@ -108,7 +108,7 @@ class SwVisitingCardPage : public SfxTabPage const OUString* pNames, const OUString* pValues ); - SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet); + SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwVisitingCardPage(); using TabPage::ActivatePage; @@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -147,14 +147,14 @@ class SwPrivateDataPage : public SfxTabPage Edit* m_pHomePageED; Edit* m_pMailED; - SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet); + SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSet); using TabPage::ActivatePage; using TabPage::DeactivatePage; public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -183,14 +183,14 @@ class SwBusinessDataPage : public SfxTabPage Edit* m_pHomePageED; Edit* m_pMailED; - SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet); + SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet); using TabPage::ActivatePage; using TabPage::DeactivatePage; public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 08cdc8817235..854d67dbe42f 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; // edit insert-field -sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS, +sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton) : SvxStandardDialog(pParent, "DropdownFieldDialog", "modules/swriter/ui/dropdownfielddialog.ui") diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index aa4021b2614f..2a0d93f2ec73 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -23,12 +23,12 @@ #include <vcl/builder.hxx> #include <vcl/help.hxx> -SwFldRefTreeListBox::SwFldRefTreeListBox(Window* pParent, WinBits nStyle) +SwFldRefTreeListBox::SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwFldRefTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwFldRefTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 4d92ac11fa05..216d32ae7392 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -27,7 +27,7 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: - SwFldRefTreeListBox(Window* pParent, WinBits nStyle); + SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle); }; #endif diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 2cbde87a6fc6..556b69ada489 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -33,7 +33,7 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet) +SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldDbPage", "modules/swriter/ui/flddbpage.ui", rCoreSet) , m_nOldFormat(0) @@ -246,7 +246,7 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDBPage::Create( Window* pParent, +SfxTabPage* SwFldDBPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldDBPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 08a7b0b464e3..6163cb9566d3 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -68,11 +68,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldDBPage(Window* pParent, const SfxItemSet& rSet); + SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldDBPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 3d6aad2d700a..04d551ffda27 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -47,7 +47,7 @@ using namespace nsSwDocInfoSubType; using namespace com::sun::star; -SwFldDokInfPage::SwFldDokInfPage(Window* pParent, const SfxItemSet& rCoreSet) +SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldDocInfoPage", "modules/swriter/ui/flddocinfopage.ui", rCoreSet) , pSelEntry(0) @@ -450,7 +450,7 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDokInfPage::Create( Window* pParent, +SfxTabPage* SwFldDokInfPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldDokInfPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index c80e25492904..596d3bc2d3b7 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -59,11 +59,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); + SwFldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet); virtual ~SwFldDokInfPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index d19672b9ef17..f88813a687c0 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -34,7 +34,7 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldDokPage::SwFldDokPage(Window* pParent, const SfxItemSet& rCoreSet ) +SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage(pParent, "FldDocumentPage", "modules/swriter/ui/flddocumentpage.ui", rCoreSet) , nOldSel(0) @@ -632,7 +632,7 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDokPage::Create( Window* pParent, +SfxTabPage* SwFldDokPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldDokPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 702ebdc5b09c..4e8abc27e2b0 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -61,11 +61,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); + SwFldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet); virtual ~SwFldDokPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index a663eba68771..b96eb21b582a 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet) +SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldFuncPage", "modules/swriter/ui/fldfuncpage.ui", rCoreSet) , nOldFormat(0) @@ -499,7 +499,7 @@ void SwFldFuncPage::UpdateSubType() // call MacroBrowser, fill Listbox with Macros IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) { - Window* pDefModalDlgParent = Application::GetDefDialogParent(); + vcl::Window* pDefModalDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";")); if (GetFldMgr().ChooseMacro(sMacro)) @@ -597,7 +597,7 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro) return rMacro; } -SfxTabPage* SwFldFuncPage::Create( Window* pParent, +SfxTabPage* SwFldFuncPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldFuncPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 06140a23f7e5..fb8cfa906969 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -83,11 +83,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); + SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldFuncPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index cd21a1275f2e..c5b2d204a083 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; -SwFldPage::SwFldPage(Window *pParent, const OString& rID, +SwFldPage::SwFldPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) , m_pCurFld(0) diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index dedbae5fcf2f..3416e97361ac 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -77,7 +77,7 @@ protected: using SfxTabPage::ActivatePage; public: - SwFldPage(Window *pParent, const OString& rID, + SwFldPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); virtual ~SwFldPage(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index f9f3fb479a62..704899267032 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -47,7 +47,7 @@ static sal_uInt16 nFldDlgFmtSel = 0; #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) +SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage(pParent, "FldRefPage", "modules/swriter/ui/fldrefpage.ui", rCoreSet) , maOutlineNodes() @@ -937,7 +937,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldRefPage::Create( Window* pParent, +SfxTabPage* SwFldRefPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldRefPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 93f8c75beb0d..27e5ab4fb22e 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -74,11 +74,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldRefPage(Window* pParent, const SfxItemSet& rSet); + SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldRefPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 536f0fee99bb..11b528b4f1f5 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> // carrier of the dialog -SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) +SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui") , m_pChildWin(pCW) , m_pBindings(pB) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 7205cc6ab317..3581bc3d8b80 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -38,7 +38,7 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) +SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage(pParent, "FldVarPage", "modules/swriter/ui/fldvarpage.ui", rCoreSet) , nOldFormat(0) @@ -1225,7 +1225,7 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldVarPage::Create( Window* pParent, +SfxTabPage* SwFldVarPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldVarPage( pParent, *rAttrSet ) ); @@ -1236,13 +1236,13 @@ sal_uInt16 SwFldVarPage::GetGroup() return GRP_VAR; } -SelectionListBox::SelectionListBox(Window* pParent, WinBits nStyle) +SelectionListBox::SelectionListBox(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) , bCallAddSelection(false) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSelectionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSelectionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 98ebece0702e..9d1a37f0a5a9 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -40,7 +40,7 @@ class SelectionListBox : public ListBox virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SelectionListBox(Window* pParent, WinBits nStyle); + SelectionListBox(vcl::Window* pParent, WinBits nStyle); // detect selection via Ctrl or Alt and evaluate with SelectHdl bool IsCallAddSelection() const {return bCallAddSelection;} @@ -90,11 +90,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldVarPage(Window* pParent, const SfxItemSet& rSet); + SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldVarPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index df9f54a66968..40d04832896b 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -31,7 +31,7 @@ #include <fldui.hrc> // edit field-insert -SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, +SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton ) : SvxStandardDialog( pParent, "InputFieldDialog", "modules/swriter/ui/inputfielddialog.ui") diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 5a2c8891a7fb..b3c1bae39a4d 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : +SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"), bNew(true), diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 5c1fb3ded31c..c13d8810777d 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -67,7 +67,7 @@ #include <svx/flagsdef.hxx> // the dialog's carrier -SwTemplateDlg::SwTemplateDlg(Window* pParent, +SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage, diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index d7f5ad88759c..647536aef16b 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -83,7 +83,7 @@ inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) return bRet; } -SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) +SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh) : SfxModalDialog(pParent, "ColumnDialog", "modules/swriter/ui/columndialog.ui") , rWrtShell(rSh) , pPageSet(0) @@ -162,7 +162,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) // create TabPage pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), pColPgSet); - pTabPage->get<Window>("applytoft")->Show(); + pTabPage->get<vcl::Window>("applytoft")->Show(); pTabPage->get(m_pApplyToLB, "applytolb"); m_pApplyToLB->Show(); @@ -393,7 +393,7 @@ void SwColumnPage::ResetColWidth() } // Now as TabPage -SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) +SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", &rSet) , pColMgr(0) , nFirstVis(0) @@ -622,7 +622,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) } // create TabPage -SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwColumnPage(pParent, *rSet); } @@ -1364,7 +1364,7 @@ void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt ) ValueSet::DataChanged( rDCEvt ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColumnValueSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColumnValueSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new ColumnValueSet(pParent); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index ec81b01e9f71..3c57f1d0b839 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -64,7 +64,7 @@ class SwSequenceOptionDialog : public SvxStandardDialog OUString aFldTypeName; public: - SwSequenceOptionDialog( Window *pParent, SwView &rV, + SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV, const OUString& rSeqFldType ); virtual ~SwSequenceOptionDialog(); virtual void Apply() SAL_OVERRIDE; @@ -91,7 +91,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText) return rText; } -SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : +SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ), m_sNone( SW_RESSTR(SW_STR_NONE) ), rView( rV ), @@ -413,7 +413,7 @@ SwCaptionDialog::~SwCaptionDialog() delete pMgr; } -SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, +SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV, const OUString& rSeqFldType ) : SvxStandardDialog( pParent, "CaptionOptionsDialog", "modules/swriter/ui/captionoptions.ui" ), rView( rV ), diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 3589b91c28f4..cd623185758a 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -45,7 +45,7 @@ // the dialog's carrier SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bNewFrm, const OString& sResType, diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 3ad6d4a6f1ee..cc148dc046a9 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -596,7 +596,7 @@ namespace } } -SwFrmPage::SwFrmPage(Window *pParent, const SfxItemSet &rSet) +SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FrmTypePage", "modules/swriter/ui/frmtypepage.ui", &rSet) , @@ -821,7 +821,7 @@ SwFrmPage::~SwFrmPage() { } -SfxTabPage* SwFrmPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFrmPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFrmPage( pParent, *rSet ); } @@ -2348,7 +2348,7 @@ void SwFrmPage::EnableVerticalPositioning( bool bEnable ) m_pVertRelationLB->Enable( bEnable ); } -SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) +SwGrfExtPage::SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "PicturePage", "modules/swriter/ui/picturepage.ui", &rSet) , pGrfDlg(0) @@ -2376,7 +2376,7 @@ SwGrfExtPage::~SwGrfExtPage() delete pGrfDlg; } -SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet *rSet ) +SfxTabPage* SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SwGrfExtPage( pParent, *rSet ); } @@ -2599,7 +2599,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl) } // example window -BmpWindow::BmpWindow(Window* pPar, WinBits nStyle) +BmpWindow::BmpWindow(vcl::Window* pPar, WinBits nStyle) : Window(pPar, nStyle) , bHorz(false) , bVert(false) @@ -2619,7 +2619,7 @@ Size BmpWindow::GetOptimalSize() const return LogicToPixel(Size(127 , 66), MapMode(MAP_APPFONT)); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBmpWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBmpWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new BmpWindow(pParent, 0); } @@ -2698,7 +2698,7 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp) } // set URL and ImageMap at frames -SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) : +SwFrmURLPage::SwFrmURLPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", &rSet) { get(pURLED,"url"); @@ -2794,7 +2794,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) return bModified; } -SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFrmURLPage( pParent, *rSet ); } @@ -2822,7 +2822,7 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) return 0; } -SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet) +SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", &rSet) , pWrtSh(0) , bHtmlMode(false) @@ -2859,7 +2859,7 @@ SwFrmAddPage::~SwFrmAddPage() { } -SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFrmAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFrmAddPage(pParent, *rSet); } diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 7b57568c25e8..17a363d88911 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -23,7 +23,7 @@ #include "pattern.hxx" #include "frmui.hrc" -SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) +SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index bc7348b8dd3d..b5201b62a553 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -29,7 +29,7 @@ #include "uiborder.hxx" #include "frmui.hrc" -SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : +SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : SfxSingleTabDialog(pParent, rSet) { diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 746d0fed4bd0..9d0b32a2efe3 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -50,7 +50,7 @@ static const sal_uInt16 aWrapPageRg[] = { 0 }; -SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode) +SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode) : SfxSingleTabDialog(pParent, rSet, "WrapDialog", "modules/swriter/ui/wrapdialog.ui") , pWrtShell(pSh) @@ -62,7 +62,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD SetTabPage(pNewPage); } -SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) +SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", &rSet) , nOldLeftMargin(0) , nOldRightMargin(0) @@ -134,7 +134,7 @@ SwWrapTabPage::~SwWrapTabPage() { } -SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwWrapTabPage(pParent, *rSet); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e5c0eeb507a1..860c8983fce0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -173,7 +173,7 @@ protected: std::vector<long> GetOptimalColWidths() const; public: - SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder); + SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder); void ReadEntries(SvStream& rInStr); void WriteEntries(SvStream& rOutStr); @@ -197,7 +197,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog DECL_LINK(OkHdl, void *); public: - SwAutoMarkDlg_Impl(Window* pParent, const OUString& rAutoMarkURL, + SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, const OUString& rAutoMarkType, bool bCreate); virtual ~SwAutoMarkDlg_Impl(); @@ -211,7 +211,7 @@ sal_uInt16 CurTOXType::GetFlatIndex() const #define EDIT_MINWIDTH 15 -SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet, +SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal) @@ -631,11 +631,11 @@ class SwAddStylesDlg_Impl : public SfxModalDialog DECL_LINK(HeaderDragHdl, void *); public: - SwAddStylesDlg_Impl(Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); + SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); virtual ~SwAddStylesDlg_Impl(); }; -SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, +SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]) : SfxModalDialog(pParent, "AssignStylesDialog", "modules/swriter/ui/assignstylesdialog.ui") @@ -766,7 +766,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) return 0; } -SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet) +SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocIndexPage", "modules/swriter/ui/tocindexpage.ui", &rAttrSet) , aFromNames(SW_RES(RES_SRCTYPES)) @@ -787,7 +787,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS get(m_pCreateFrame, "createframe"); get(m_pFromHeadingsCB, "fromheadings"); get(m_pAddStylesCB, "addstylescb"); - sAddStyleUser = get<Window>("stylescb")->GetText(); + sAddStyleUser = get<vcl::Window>("stylescb")->GetText(); get(m_pAddStylesPB, "styles"); get(m_pFromTablesCB, "fromtables"); get(m_pFromFramesCB, "fromframes"); @@ -1247,7 +1247,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTOXSelectTabPage(pParent, *rAttrSet); } @@ -1462,7 +1462,7 @@ class SwTOXEdit : public Edit bool bNextControl; SwTokenWindow* m_pParent; public: - SwTOXEdit( Window* pParent, SwTokenWindow* pTokenWin, + SwTOXEdit( vcl::Window* pParent, SwTokenWindow* pTokenWin, const SwFormToken& aToken) : Edit( pParent, WB_BORDER|WB_TABSTOP|WB_CENTER), aFormToken(aToken), @@ -1547,7 +1547,7 @@ class SwTOXButton : public PushButton bool bNextControl; SwTokenWindow* m_pParent; public: - SwTOXButton( Window* pParent, SwTokenWindow* pTokenWin, + SwTOXButton( vcl::Window* pParent, SwTokenWindow* pTokenWin, const SwFormToken& rToken) : PushButton(pParent, WB_BORDER|WB_TABSTOP), aFormToken(rToken), @@ -1669,13 +1669,13 @@ void SwTOXButton::RequestHelp( const HelpEvent& rHEvt ) Button::RequestHelp(rHEvt); } -SwIdxTreeListBox::SwIdxTreeListBox(Window* pPar, WinBits nStyle) +SwIdxTreeListBox::SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle) : SvTreeListBox(pPar, nStyle) , pParent(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwIdxTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwIdxTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1722,7 +1722,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) SvTreeListBox::RequestHelp(rHEvt); } -SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet) +SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocEntriesPage", "modules/swriter/ui/tocentriespage.ui", &rAttrSet) , sDelimStr(SW_RESSTR(STR_DELIM)) @@ -2077,7 +2077,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return LEAVE_PAGE; } -SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTOXEntryTabPage(pParent, *rAttrSet); } @@ -2088,7 +2088,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) { SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_CHAR); - Window* pDefDlgParent = Application::GetDefDialogParent(); + vcl::Window* pDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(). GetView().GetViewFrame()->GetDispatcher()->Execute( @@ -2564,7 +2564,7 @@ OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const return sRet; } -SwTokenWindow::SwTokenWindow(Window* pParent) +SwTokenWindow::SwTokenWindow(vcl::Window* pParent) : VclHBox(pParent) , pForm(0) , nLevel(0) @@ -2603,7 +2603,7 @@ SwTokenWindow::SwTokenWindow(Window* pParent) m_pRightScrollWin->SetClickHdl(aLink); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwTokenWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwTokenWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwTokenWindow(pParent); } @@ -3482,7 +3482,7 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const return nIndex; } -SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) +SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet ) : SfxTabPage(pParent, "TocStylesPage", "modules/swriter/ui/tocstylespage.ui", &rAttrSet) , m_pCurrentForm(0) @@ -3592,7 +3592,7 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, +SfxTabPage* SwTOXStylesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTOXStylesTabPage(pParent, *rAttrSet); @@ -3604,7 +3604,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) { SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA); - Window* pDefDlgParent = Application::GetDefDialogParent(); + vcl::Window* pDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(); rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( @@ -3697,7 +3697,7 @@ void SwTOXStylesTabPage::Modify() #define ITEM_CASE 6 #define ITEM_WORDONLY 7 -SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder) +SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder) : SwEntryBrowseBox_Base( pParent, EBBF_NONE, WB_TABSTOP | WB_BORDER, BROWSER_KEEPSELECTION | BROWSER_COLUMNSELECTION | @@ -3712,15 +3712,15 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilde , nCurrentRow(0) , bModified(false) { - sSearch = pBuilder->get<Window>("searchterm")->GetText(); - sAlternative = pBuilder->get<Window>("alternative")->GetText(); - sPrimKey = pBuilder->get<Window>("key1")->GetText(); - sSecKey = pBuilder->get<Window>("key2")->GetText(); - sComment = pBuilder->get<Window>("comment")->GetText(); - sCaseSensitive = pBuilder->get<Window>("casesensitive")->GetText(); - sWordOnly = pBuilder->get<Window>("wordonly")->GetText(); - sYes = pBuilder->get<Window>("yes")->GetText(); - sNo = pBuilder->get<Window>("no")->GetText(); + sSearch = pBuilder->get<vcl::Window>("searchterm")->GetText(); + sAlternative = pBuilder->get<vcl::Window>("alternative")->GetText(); + sPrimKey = pBuilder->get<vcl::Window>("key1")->GetText(); + sSecKey = pBuilder->get<vcl::Window>("key2")->GetText(); + sComment = pBuilder->get<vcl::Window>("comment")->GetText(); + sCaseSensitive = pBuilder->get<vcl::Window>("casesensitive")->GetText(); + sWordOnly = pBuilder->get<vcl::Window>("wordonly")->GetText(); + sYes = pBuilder->get<vcl::Window>("yes")->GetText(); + sNo = pBuilder->get<vcl::Window>("no")->GetText(); aCellCheckBox.GetBox().EnableTriState(false); xController = new ::svt::EditCellController(&aCellEdit); @@ -4012,7 +4012,7 @@ bool SwEntryBrowseBox::IsModified()const return pController->IsModified(); } -SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const OUString& rAutoMarkURL, +SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, const OUString& rAutoMarkType, bool bCreate) : ModalDialog(pParent, "CreateAutomarkDialog", "modules/swriter/ui/createautomarkdialog.ui") diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index e125eeeb25c8..7fe0e656888e 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -24,7 +24,7 @@ #include "index.hrc" -SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(Window* pParent, SwTOXMgr& rTOXMgr) +SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) : SvxStandardDialog(pParent, "SelectIndexDialog", "modules/swriter/ui/selectindexdialog.ui") , rMgr(rTOXMgr) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index eed951a970da..8cf9a0fef693 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -952,7 +952,7 @@ void SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark } SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings, - SfxChildWindow* pChild, Window *pParent, + SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew) : SfxModelessDialog(_pBindings, pChild, pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui") , m_aContent(*this, bNew, *::GetActiveWrtShell()) @@ -972,7 +972,7 @@ void SwIndexMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell) m_aContent.ReInitDlg( rWrtShell ); } -SwIndexMarkModalDlg::SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) +SwIndexMarkModalDlg::SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) : SvxStandardDialog(pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui") , m_aContent(*this, false, rSh) { @@ -1005,7 +1005,7 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog DECL_LINK(EnableHdl, ListBox* pBox); public: - SwCreateAuthEntryDlg_Impl(Window* pParent, + SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, const OUString pFields[], SwWrtShell& rSh, bool bNewEntry, @@ -1416,7 +1416,7 @@ void SwAuthorMarkPane::Activate() m_pActionBT->Enable(!pSh->HasReadonlySel()); } -SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, +SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, const OUString pFields[], SwWrtShell& rSh, bool bNewEntry, @@ -1604,7 +1604,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox*, pBox) SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew) : SfxModelessDialog(_pBindings, pChild, pParent, @@ -1628,7 +1628,7 @@ void SwAuthMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell) m_aContent.ReInitDlg( rWrtShell ); } -SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) +SwAuthMarkModalDlg::SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh) : SvxStandardDialog(pParent, "BibliographyEntryDialog", "modules/swriter/ui/bibliographyentry.ui") , m_aContent(*this, false) diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 9add4dc7ae31..b1b33a0cdcbf 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -113,7 +113,7 @@ void SwInsertBookmarkDlg::Apply() } -SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) : +SwInsertBookmarkDlg::SwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) : SvxStandardDialog(pParent, "InsertBookmarkDialog", "modules/swriter/ui/insertbookmark.ui"), rSh( rS ), rReq( rRequest ) @@ -149,7 +149,7 @@ SwInsertBookmarkDlg::~SwInsertBookmarkDlg() { } -BookmarkCombo::BookmarkCombo(Window* pWin, WinBits nStyle) +BookmarkCombo::BookmarkCombo(vcl::Window* pWin, WinBits nStyle) : SwComboBox(pWin, nStyle) { } @@ -229,7 +229,7 @@ bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarkCombo(Window* pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarkCombo(vcl::Window* pParent, VclBuilder::stringmap &) { return new BookmarkCombo(pParent, 0); } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index f1cc191491ff..74188d14fa7f 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -38,7 +38,7 @@ #include <SwStyleNameMapper.hxx> #include <boost/scoped_ptr.hpp> -SwFootNoteOptionDlg::SwFootNoteOptionDlg(Window *pParent, SwWrtShell &rS) +SwFootNoteOptionDlg::SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rS) : SfxTabDialog(pParent, "FootEndnoteDialog", "modules/swriter/ui/footendnotedialog.ui") , rSh( rS ) { @@ -69,7 +69,7 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) return 0; } -SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, +SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN, const SfxItemSet &rSet) : SfxTabPage(pParent, bEN ? OString("EndnotePage") : OString("FootnotePage"), @@ -223,7 +223,7 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage() { } -SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet *rSet ) +SfxTabPage *SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SwEndNoteOptionPage( pParent, true, *rSet ); } @@ -390,7 +390,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) return true; } -SwFootNoteOptionPage::SwFootNoteOptionPage( Window *pParent, const SfxItemSet &rSet ) : +SwFootNoteOptionPage::SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SwEndNoteOptionPage( pParent, false, rSet ) { } @@ -399,7 +399,7 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet *rSet ) +SfxTabPage *SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet ) { return new SwFootNoteOptionPage( pParent, *rSet ); } diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 0fcc14f81e31..d65abfe36a8a 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -41,7 +41,7 @@ #define RENAME_TOKEN_DELIM (sal_Unicode)1 -SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, +SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent, std::vector<OUString> const& rPathArr, SwGlossaryHdl *pHdl) : SvxStandardDialog(pParent, "EditCategoriesDialog", "modules/swriter/ui/editcategories.ui") @@ -395,7 +395,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent ) Edit::KeyInput( rKEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new FEdit(pParent); } @@ -429,7 +429,7 @@ void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwGlossaryGroupTLB(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwGlossaryGroupTLB(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwGlossaryGroupTLB(pParent); } diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 58659f1a623f..e20090f4080f 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -127,7 +127,7 @@ protected: DECL_LINK(Rename, void *); public: - SwNewGlosNameDlg( Window* pParent, + SwNewGlosNameDlg( vcl::Window* pParent, const OUString& rOldName, const OUString& rOldShort ); @@ -135,7 +135,7 @@ public: OUString GetNewShort() const { return m_pNewShort->GetText(); } }; -SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, +SwNewGlosNameDlg::SwNewGlosNameDlg(vcl::Window* pParent, const OUString& rOldName, const OUString& rOldShort ) : ModalDialog(pParent, "RenameAutoTextDialog", @@ -808,7 +808,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) } // TreeListBox for groups and blocks -SwGlTreeListBox::SwGlTreeListBox(Window* pParent, WinBits nBits) +SwGlTreeListBox::SwGlTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , sReadonly(SW_RESSTR(SW_STR_READONLY)), pDragEntry(0) @@ -821,7 +821,7 @@ Size SwGlTreeListBox::GetOptimalSize() const return LogicToPixel(Size(212, 84), MapMode(MAP_APPFONT)); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwGlTreeListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwGlTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwGlTreeListBox(pParent, WB_BORDER | WB_TABSTOP); } diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 63d227dc41be..f9808c4dc040 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -67,11 +67,11 @@ class SwEndNoteOptionPage : public SfxTabPage DECL_LINK(NumCountHdl, void *); public: - SwEndNoteOptionPage( Window *pParent, bool bEndNote, + SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, const SfxItemSet &rSet ); virtual ~SwEndNoteOptionPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; @@ -80,11 +80,11 @@ public: class SwFootNoteOptionPage : public SwEndNoteOptionPage { - SwFootNoteOptionPage( Window *pParent, const SfxItemSet &rSet ); + SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SwFootNoteOptionPage(); public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); }; #endif diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 9e9dd470d5b2..50d720f3cd9e 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -163,7 +163,7 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn ) return 0; } -SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, bool bEd) +SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, bool bEd) : SvxStandardDialog(pParent, "InsertFootnoteDialog", "modules/swriter/ui/insertfootnote.ui") , rSh(rShell) , eCharSet(RTL_TEXTENCODING_DONTKNOW) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 3fdff721ad21..48e6732fed88 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -60,8 +60,8 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) sIntervalName += ")"; m_pDivIntervalNF->SetAccessibleName(sIntervalName); - Window *pNumIntervalFT = get<Window>("interval"); - Window *pNumRowsFT = get<Window>("intervallines"); + vcl::Window *pNumIntervalFT = get<vcl::Window>("interval"); + vcl::Window *pNumRowsFT = get<vcl::Window>("intervallines"); sIntervalName = pNumIntervalFT->GetAccessibleName(); sIntervalName += "("; sIntervalName += pNumRowsFT->GetAccessibleName(); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 08362914a24e..cd2ed1473548 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -60,7 +60,7 @@ static bool bLastRelative = false; //dialog to this one, except with a different preview window impl. //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged -SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, +SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlinePositionPage", "modules/swriter/ui/outlinepositionpage.ui", &rSet) @@ -512,7 +512,7 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SwNumPositionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwNumPositionTabPage(pParent, *rAttrSet); @@ -913,7 +913,7 @@ void SwNumPositionTabPage::SetModified(bool bRepaint) } #endif -SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, +SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rSh) : SfxTabDialog(pParent, "BulletsAndNumberingDialog", "modules/swriter/ui/bulletsandnumbering.ui", diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 042e0c8ea1a0..c3eae29e8ff7 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -69,7 +69,7 @@ class SwNumNamesDlg : public ModalDialog DECL_LINK(DoubleClickHdl, void *); public: - SwNumNamesDlg(Window *pParent); + SwNumNamesDlg(vcl::Window *pParent); void SetUserNames(const OUString *pList[]); OUString GetName() const { return m_pFormEdit->GetText(); } sal_Int32 GetCurEntryPos() const { return m_pFormBox->GetSelectEntryPos(); } @@ -121,7 +121,7 @@ IMPL_LINK_NOARG_INLINE_START(SwNumNamesDlg, DoubleClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwNumNamesDlg, DoubleClickHdl) -SwNumNamesDlg::SwNumNamesDlg(Window *pParent) +SwNumNamesDlg::SwNumNamesDlg(vcl::Window *pParent) : ModalDialog(pParent, "NumberingNameDialog", "modules/swriter/ui/numberingnamedialog.ui") { @@ -145,7 +145,7 @@ static sal_uInt16 lcl_BitToLevel(sal_uInt16 nActLevel) } sal_uInt16 SwOutlineTabDialog::nNumLevel = 1; -SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, +SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &rSh) : SfxTabDialog(pParent, "OutlineNumberingDialog", "modules/swriter/ui/outlinenumbering.ui", pSwItemSet) @@ -401,7 +401,7 @@ short SwOutlineTabDialog::Ok() return RET_OK; } -SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, +SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlineNumberingPage", "modules/swriter/ui/outlinenumberingpage.ui", &rSet) @@ -826,7 +826,7 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) ActivatePage(*rSet); } -SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, +SfxTabPage* SwOutlineSettingsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwOutlineSettingsTabPage(pParent, *rAttrSet); @@ -882,7 +882,7 @@ static long lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, long nXS return nRet; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumberingPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new NumberingPreview(pParent); } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index ee077af26f8e..e81e2c34d6f4 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -106,7 +106,7 @@ IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl) return 0; } -SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) +SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FootnoteAreaPage", "modules/swriter/ui/footnoteareapage.ui", &rSet) , lMaxHeight(0) @@ -137,7 +137,7 @@ SwFootNotePage::~SwFootNotePage() { } -SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFootNotePage(pParent, *rSet); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index f3cc570b0c23..0076090ded22 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -40,7 +40,7 @@ #include "swmodule.hxx" #include "view.hxx" -SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : +SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", &rSet), m_nRubyUserValue(0), m_bRubyUserValue(false), @@ -153,7 +153,7 @@ SwTextGridPage::~SwTextGridPage() { } -SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage *SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwTextGridPage(pParent, *rSet); } diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 063ffb2e1512..9e511f3ea7ea 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -104,7 +104,7 @@ static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) } // init list -SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) +SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) : SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui") , aColTxt(SW_RES(STR_COL)) , aRowTxt(SW_RES(STR_ROW)) diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index f8c5f7f192be..11475e7af8cf 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -42,7 +42,7 @@ #include <unomid.h> -SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) +SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(vcl::Window *pParent) : SfxModalDialog(pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui") { diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 232c9e25672b..1ddc306861d2 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -150,7 +150,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const return nPage; } -SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) : +SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : SfxModalDialog( pParent, "DLG_TITLEPAGE", "modules/swriter/ui/titlepage.ui"), mpPageFmtDesc(0) { diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 434872fca3c0..751b5a4c029d 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -41,7 +41,7 @@ IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl) } IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl) -SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) +SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc ) : SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" ) , rFnc(rTableFnc) { diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 851244f3e85e..6c1dd9449336 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -20,7 +20,7 @@ #include <swtypes.hxx> #include <mergetbl.hxx> -SwMergeTblDlg::SwMergeTblDlg( Window *pParent, bool& rWithPrev ) +SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ) : SvxStandardDialog(pParent, "MergeTableDialog", "modules/swriter/ui/mergetabledialog.ui") , m_rMergePrev(rWithPrev) { diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 348c5e8045af..f745f3f9356d 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -49,7 +49,7 @@ void SwTableHeightDlg::Apply() rSh.SetRowHeight( aSz ); } -SwTableHeightDlg::SwTableHeightDlg(Window *pParent, SwWrtShell &rS) +SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS) : SvxStandardDialog(pParent, "RowHeightDialog", "modules/swriter/ui/rowheight.ui") , rSh( rS ) { diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index d85bb957b4f7..d6d7b62ca16b 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -22,7 +22,7 @@ #include <table.hrc> #include <tblenum.hxx> -SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) +SwSplitTblDlg::SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ) : SvxStandardDialog( pParent, "SplitTableDialog", "modules/swriter/ui/splittable.ui" ) , rShell(rSh) , m_nSplit(HEADLINE_CNTNTCOPY) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 2252272406e0..221211fd3446 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; -SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet) +SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet) , m_aTextFilter(" .<>") , pTblData(0) @@ -370,7 +370,7 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) bModified = true; } -SfxTabPage* SwFormatTablePage::Create( Window* pParent, +SfxTabPage* SwFormatTablePage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwFormatTablePage( pParent, *rAttrSet ); @@ -709,7 +709,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } //Description: Page column configuration -SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) +SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableColumnPage", "modules/swriter/ui/tablecolumnpage.ui", &rSet) , pTblData(0) @@ -754,7 +754,7 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) { } -SfxTabPage* SwTableColumnPage::Create( Window* pParent, +SfxTabPage* SwTableColumnPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTableColumnPage( pParent, *rAttrSet ); @@ -1201,7 +1201,7 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth) } -SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&, +SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, SfxItemPool&, const SfxItemSet* pItemSet, SwWrtShell* pSh) : SfxTabDialog(0, pParent, "TablePropertiesDialog", "modules/swriter/ui/tableproperties.ui", pItemSet) @@ -1243,7 +1243,7 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } } -SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) +SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableTextFlowPage", "modules/swriter/ui/tabletextflowpage.ui", &rSet) , pShell(0) @@ -1315,7 +1315,7 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) { } -SfxTabPage* SwTextFlowPage::Create( Window* pParent, +SfxTabPage* SwTextFlowPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTextFlowPage(pParent, *rAttrSet); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 981cc7ddbfdf..7cff47ead65c 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -44,10 +44,10 @@ using namespace com::sun::star; #define FRAME_OFFSET 4 -class AutoFmtPreview : public Window +class AutoFmtPreview : public vcl::Window { public: - AutoFmtPreview(Window* pParent); + AutoFmtPreview(vcl::Window* pParent); virtual ~AutoFmtPreview(); void NotifyChange( const SwTableAutoFmt& rNewData ); @@ -100,7 +100,7 @@ private: class SwStringInputDlg : public ModalDialog { public: - SwStringInputDlg( Window* pParent, + SwStringInputDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault ); @@ -112,7 +112,7 @@ private: Edit* m_pEdInput; // Edit obtains the focus. }; -SwStringInputDlg::SwStringInputDlg(Window* pParent, const OUString& rTitle, +SwStringInputDlg::SwStringInputDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault) : ModalDialog(pParent, "StringInputDialog", "modules/swriter/ui/stringinput.ui") { @@ -134,7 +134,7 @@ SwStringInputDlg::~SwStringInputDlg() // AutoFormat-Dialogue: -SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell, +SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, bool bSetAutoFormat, const SwTableAutoFmt* pSelFmt ) : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui") , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE)) @@ -486,7 +486,7 @@ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl) } IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) -AutoFmtPreview::AutoFmtPreview(Window* pParent) : +AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent) : Window ( pParent ), aCurData ( OUString() ), aVD ( *this ), @@ -508,7 +508,7 @@ AutoFmtPreview::AutoFmtPreview(Window* pParent) : Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoFmtPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new AutoFmtPreview(pParent); } diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index d32fd6eb3a65..15902b8a076a 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star; -SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, +SwRenameXNamedDlg::SwRenameXNamedDlg( vcl::Window* pWin, uno::Reference< container::XNamed > & xN, uno::Reference< container::XNameAccess > & xNA ) : ModalDialog(pWin, "RenameObjectDialog", |