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/misc | |
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/misc')
-rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/docfnote.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/glossary.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/misc/impfnote.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/misc/insfnote.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/outline.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/srtdlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/titlepage.cxx | 2 |
14 files changed, 38 insertions, 38 deletions
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) { |