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 /cui | |
| 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 'cui')
202 files changed, 896 insertions, 896 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index cedfccc00331..bb7dd750e78d 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -661,7 +661,7 @@ void SfxAccCfgLBoxString_Impl::Paint( } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxAccCfgTabListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxAccCfgTabListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -729,7 +729,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey) } -SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet ) +SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxItemSet& aSet ) : SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet) , m_pMacroInfoItem() , m_pStringItem() diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 56d4bff2c6b0..30a7b8a26cf9 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -735,22 +735,22 @@ ConvertToolbarEntry( return aPropSeq; } -SfxTabPage *CreateSvxMenuConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SvxMenuConfigPage( pParent, *rSet ); } -SfxTabPage *CreateKeyboardConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SfxAcceleratorConfigPage( pParent, *rSet ); } -SfxTabPage *CreateSvxToolbarConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SvxToolbarConfigPage( pParent, *rSet ); } -SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SvxEventConfigPage( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); } @@ -780,7 +780,7 @@ bool showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFra * key bindings. * *****************************************************************************/ -SvxConfigDialog::SvxConfigDialog(Window * pParent, const SfxItemSet* pInSet) +SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet) : SfxTabDialog(pParent, "CustomizeDialog", "cui/ui/customizedialog.ui", pInSet) , m_nMenusPageId(0) @@ -1378,7 +1378,7 @@ public: * listbox * *****************************************************************************/ -SvxMenuEntriesListBox::SvxMenuEntriesListBox(Window* pParent, SvxConfigPage* pPg) +SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage* pPg) : SvTreeListBox(pParent, WB_TABSTOP|WB_CLIPCHILDREN|WB_HIDESELECTION|WB_BORDER) , pPage(pPg) , m_bIsInternalDrag( false ) @@ -1517,7 +1517,7 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent ) * both tabpages to add, delete, move and rename items etc. * *****************************************************************************/ -SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet) +SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "MenuAssignPage", "cui/ui/menuassignpage.ui", &rSet) , bInitialised(false) , pCurrentSaveInData(0) @@ -2172,7 +2172,7 @@ bool SvxConfigPage::MoveEntryData( return false; } -SvxMenuConfigPage::SvxMenuConfigPage(Window *pParent, const SfxItemSet& rSet) +SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) : SvxConfigPage(pParent, rSet) { m_pContentsListBox = new SvxMenuEntriesListBox(m_pEntries, this); @@ -2576,7 +2576,7 @@ SaveInData* SvxMenuConfigPage::CreateSaveInData( } SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( - Window* pParent, SvxEntries* entries, + vcl::Window* pParent, SvxEntries* entries, SvxConfigEntry* selection, bool bCreateMenu ) : ModalDialog(pParent, "MoveMenuDialog", "cui/ui/movemenu.ui") , bModified(false) @@ -2835,7 +2835,7 @@ bool SvxConfigEntry::IsRenamable() return true; } -SvxToolbarConfigPage::SvxToolbarConfigPage(Window *pParent, const SfxItemSet& rSet) +SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) : SvxConfigPage(pParent, rSet) { SetHelpId( HID_SVX_CONFIG_TOOLBAR ); @@ -3476,7 +3476,7 @@ void ToolbarSaveInData::SetSystemStyle( // this code is a temporary hack as the UI is not updating after // changing the toolbar style via the API uno::Reference< css::frame::XLayoutManager > xLayoutManager; - Window *window = NULL; + vcl::Window *window = NULL; uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY ); if ( xPropSet.is() ) @@ -4515,7 +4515,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction( return pNewLBEntry; } -SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg) +SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg) : SvxMenuEntriesListBox(pParent, pPg) , pPage(pPg) { @@ -4697,7 +4697,7 @@ TriState SvxToolbarEntriesListBox::NotifyCopying( return TRISTATE_FALSE; } -SvxNewToolbarDialog::SvxNewToolbarDialog(Window* pWindow, const OUString& rName) +SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName) : ModalDialog(pWindow, "NewToolbarDialog", "cui/ui/newtoolbardialog.ui") { get(m_pEdtName, "edit"); @@ -4724,7 +4724,7 @@ IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit) * The SvxIconSelectorDialog class * *******************************************************************************/ -SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, +SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, const uno::Reference< css::ui::XImageManager >& rXImageManager, const uno::Reference< css::ui::XImageManager >& rXParentImageManager ) : @@ -5302,7 +5302,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) * *******************************************************************************/ SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) + vcl::Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) : MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) @@ -5317,7 +5317,7 @@ MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_R } SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const OUString& aMessage ) + vcl::Window *pWindow, const OUString& aMessage ) : MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) { @@ -5350,7 +5350,7 @@ sal_uInt16 SvxIconReplacementDialog :: ShowDialog() * *******************************************************************************/ SvxIconChangeDialog::SvxIconChangeDialog( - Window *pWindow, const OUString& aMessage) + vcl::Window *pWindow, const OUString& aMessage) :ModalDialog(pWindow, "IconChange", "cui/ui/iconchangedialog.ui") { get(pFImageInfo, "infoImage"); diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 787534a27a60..641f3b46496f 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -249,7 +249,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) return lStyles; } -SfxConfigFunctionListBox::SfxConfigFunctionListBox(Window* pParent, WinBits nStyle) +SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox( pParent, nStyle ) , pCurEntry( 0 ) , pStylesInfo( 0 ) @@ -263,7 +263,7 @@ SfxConfigFunctionListBox::SfxConfigFunctionListBox(Window* pParent, WinBits nSty LINK( this, SfxConfigFunctionListBox, TimerHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -410,7 +410,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : FreeResource(); } -SfxConfigGroupListBox::SfxConfigGroupListBox(Window* pParent, WinBits nStyle) +SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), pStylesInfo(0) { @@ -418,7 +418,7 @@ SfxConfigGroupListBox::SfxConfigGroupListBox(Window* pParent, WinBits nStyle) SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 92238045faf3..bee41ccf336d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star; -SvxEventConfigPage::SvxEventConfigPage(Window *pParent, const SfxItemSet& rSet, +SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit) : _SvxMacroTabPage(pParent, "EventsConfigPage", "cui/ui/eventsconfigpage.ui", rSet) diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index b883ab200f06..b6b6c61fdcb2 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -47,7 +47,7 @@ public: /// this is only to let callers know that there is a LateInit which *must* be called struct EarlyInit { }; - SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, EarlyInit ); + SvxEventConfigPage( vcl::Window *pParent, const SfxItemSet& rSet, EarlyInit ); virtual ~SvxEventConfigPage(); void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index f8398a924a57..336277272d07 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -129,7 +129,7 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) return nRet; } -MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle ) +MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle ) : Control( pParent, nStyle ) , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ) @@ -140,7 +140,7 @@ MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle ) maListBox.EnableCellFocus(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMacroEventListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMacroEventListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -212,7 +212,7 @@ void _SvxMacroTabPage::EnableButtons() } } -_SvxMacroTabPage::_SvxMacroTabPage(Window* pParent, const OString& rID, +_SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet) : SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ), m_xAppEvents(0), @@ -801,7 +801,7 @@ Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eve return ::std::make_pair( type, url ); } -SvxMacroTabPage::SvxMacroTabPage(Window* pParent, +SvxMacroTabPage::SvxMacroTabPage(vcl::Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, @@ -835,7 +835,7 @@ SvxMacroTabPage::SvxMacroTabPage(Window* pParent, rListBox.Select(pE); } -SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, +SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex ) : SvxMacroAssignSingleTabDialog(pParent, rSet) { @@ -857,7 +857,7 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler) return 0; } -AssignComponentDialog::AssignComponentDialog( Window * pParent, const OUString& rURL ) +AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ) : ModalDialog( pParent, "AssignComponent", "cui/ui/assigncomponentdialog.ui" ) , maURL( rURL ) { @@ -890,7 +890,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) -SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent, +SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "MacroAssignDialog", "cui/ui/macroassigndialog.ui") { diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 4f8e824db0b3..7babc45611a5 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(ButtonHandler, void *); public: - AssignComponentDialog( Window * pParent, const OUString& rURL ); + AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); virtual ~AssignComponentDialog(); OUString getURL( void ) const diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 2b3b995f19ee..5541697f4380 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star::container; * The implementations of SvxConfigFunctionListBox and * SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx */ -SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nStyle) +SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP) , pCurEntry(0) , m_pDraggingEntry(0) @@ -86,7 +86,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nSty LINK( this, SvxConfigFunctionListBox, TimerHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -193,7 +193,7 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) return DND_ACTION_NONE; } -SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) +SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP) , m_bShowSlots(false) @@ -214,7 +214,7 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -858,7 +858,7 @@ void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) */ SvxScriptSelectorDialog::SvxScriptSelectorDialog( - Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) + vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) : ModelessDialog(pParent, "MacroSelectorDialog", "cui/ui/macroselectordialog.ui") , m_bShowSlots(bShowSlots) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index df7500531e31..a6440fce4afc 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -175,7 +175,7 @@ sal_uInt16 SpellUndoAction_Impl::GetId()const // class SvxSpellCheckDialog --------------------------------------------- SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, - Window * pParent, SfxBindings* _pBindings) + vcl::Window * pParent, SfxBindings* _pBindings) : SfxModelessDialog (_pBindings, pChildWindow, pParent, "SpellingDialog", "cui/ui/spellingdialog.ui") , aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl)) @@ -1009,7 +1009,7 @@ void SpellDialog::InvalidateDialog() if( bFocusLocked ) return; m_pIgnorePB->SetText(m_sResumeST); - Window* aDisableArr[] = + vcl::Window* aDisableArr[] = { m_pNotInDictFT, m_pSentenceED, @@ -1179,7 +1179,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe } -SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits) +SentenceEditWindow_Impl::SentenceEditWindow_Impl(vcl::Window * pParent, WinBits nBits) : VclMultiLineEdit(pParent, nBits) , m_nErrorStart(0) , m_nErrorEnd(0) @@ -1188,7 +1188,7 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits DisableSelectionOnFocus(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSentenceEditWindow(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSentenceEditWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 8236ebacc06a..0ac795a618b1 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -61,7 +61,7 @@ enum AboutDialogButton WEBSITE_BUTTON }; -AboutDialog::AboutDialog(Window* pParent) +AboutDialog::AboutDialog(vcl::Window* pParent) : SfxModalDialog(pParent, "AboutDialog", "cui/ui/aboutdialog.ui") { get(m_pLogoReplacement, "logoreplacement"); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index d972c2c02341..3b31d409499f 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -133,7 +133,7 @@ static void RGBtoCMYK( double dR, double dG, double dB, double& fCyan, double& f class HexColorControl : public Edit { public: - HexColorControl( Window* pParent, const WinBits& nStyle ); + HexColorControl( vcl::Window* pParent, const WinBits& nStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Paste() SAL_OVERRIDE; @@ -145,13 +145,13 @@ private: bool ImplProcessKeyInput( const KeyEvent& rKEv ); }; -HexColorControl::HexColorControl( Window* pParent, const WinBits& nStyle ) +HexColorControl::HexColorControl( vcl::Window* pParent, const WinBits& nStyle ) : Edit( pParent, nStyle ) { SetMaxTextLen( 6 ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHexColorControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHexColorControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new HexColorControl(pParent, WB_BORDER); } @@ -261,7 +261,7 @@ bool HexColorControl::ImplProcessKeyInput( const KeyEvent& rKEv ) class ColorPreviewControl : public Control { public: - ColorPreviewControl( Window* pParent, const WinBits& nStyle ); + ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -270,14 +270,14 @@ private: Color maColor; }; -ColorPreviewControl::ColorPreviewControl( Window* pParent, const WinBits& nStyle ) +ColorPreviewControl::ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ) : Control( pParent, nStyle ) { SetFillColor( maColor ); SetLineColor( maColor ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorPreviewControl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorPreviewControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; @@ -310,7 +310,7 @@ const ColorMode DefaultMode = HUE; class ColorFieldControl : public Control { public: - ColorFieldControl( Window* pParent, const WinBits& nStyle ); + ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle ); virtual ~ColorFieldControl(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -350,7 +350,7 @@ private: std::vector< sal_uInt16 > maPercent_Vert; }; -ColorFieldControl::ColorFieldControl( Window* pParent, const WinBits& nStyle ) +ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle ) : Control( pParent, nStyle ) , meMode( DefaultMode ) , mdX( -1.0 ) @@ -365,7 +365,7 @@ ColorFieldControl::~ColorFieldControl() delete mpBitmap; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorFieldControl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorFieldControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; @@ -702,7 +702,7 @@ void ColorFieldControl::UpdatePosition() class ColorSliderControl : public Control { public: - ColorSliderControl( Window* pParent, const WinBits& nStyle ); + ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle ); virtual ~ColorSliderControl(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -734,7 +734,7 @@ private: double mdValue; }; -ColorSliderControl::ColorSliderControl( Window* pParent, const WinBits& nStyle ) +ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle ) : Control( pParent, nStyle ) , meMode( DefaultMode ) , mpBitmap( 0 ) @@ -749,7 +749,7 @@ ColorSliderControl::~ColorSliderControl() delete mpBitmap; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorSliderControl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorSliderControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; @@ -958,7 +958,7 @@ const sal_uInt16 UPDATE_ALL = 0xff; class ColorPickerDialog : public ModalDialog { public: - ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); + ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); void update_color( sal_uInt16 n = UPDATE_ALL ); @@ -1010,7 +1010,7 @@ private: MetricField* mpMFKey; }; -ColorPickerDialog::ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int16 nMode ) +ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ) : ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" ) , maPreviousColor( nColor ) , mnDialogMode( nMode ) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 81ad04832245..ca9ca03a15c4 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -43,7 +43,7 @@ // class SvxCharacterMap ================================================= -SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet* pSet ) +SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxItemSet* pSet ) : SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui") , bOne( bOne_ ) , pSubsetMap( NULL ) @@ -166,13 +166,13 @@ short SvxCharacterMap::Execute() // class SvxShowText ===================================================== -SvxShowText::SvxShowText(Window* pParent, bool bCenter) +SvxShowText::SvxShowText(vcl::Window* pParent, bool bCenter) : Control(pParent) , mnY(0) , mbCenter(bCenter) {} -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowText(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowText(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxShowText(pParent); } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 393567a098e4..d1856f453deb 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -74,7 +74,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) m_pbClose->SetHelpText(OUString()); } -FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, +FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) :ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui") ,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) ) @@ -559,7 +559,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable) if ( !bEnable ) { // if one of my children has the focus, remember it - Window* pFocusWindow = Application::GetFocusWindow( ); + vcl::Window* pFocusWindow = Application::GetFocusWindow( ); if ( pFocusWindow && IsChild( pFocusWindow ) ) m_pPreSearchFocus = pFocusWindow; else diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 0dbe89c2fb2d..eb811fee61fe 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -204,7 +204,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, // - SearchProgress - -SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL ) +SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ) : ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui") , parent_(pParent) , startUrl_(rStartURL) @@ -335,7 +335,7 @@ void TakeThread::execute() } // - TakeProgress - -TakeProgress::TakeProgress(Window* pWindow) +TakeProgress::TakeProgress(vcl::Window* pWindow) : ModalDialog(pWindow, "GalleryApplyProgress", "cui/ui/galleryapplyprogress.ui") , window_(pWindow) @@ -433,7 +433,7 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) // - ActualizeProgress - -ActualizeProgress::ActualizeProgress(Window* pWindow, GalleryTheme* pThm) +ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm) : ModalDialog(pWindow, "GalleryUpdateProgress", "cui/ui/galleryupdateprogress.ui") , pTimer(NULL) @@ -508,7 +508,7 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL ) return 0; } -TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle) +TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle) : ModalDialog(pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui") { get(m_pEdit, "entry"); @@ -520,7 +520,7 @@ TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle) // - GalleryIdDialog - -GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) +GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm ) : ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui") , pThm(_pThm ) { @@ -575,7 +575,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) // - GalleryThemeProperties - -GalleryThemeProperties::GalleryThemeProperties(Window* pParent, +GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet) : SfxTabDialog( pParent, "GalleryThemeDialog", "cui/ui/gallerythemedialog.ui", pItemSet) @@ -608,7 +608,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } // - TPGalleryThemeGeneral - -TPGalleryThemeGeneral::TPGalleryThemeGeneral(Window* pParent, const SfxItemSet& rSet) +TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "GalleryGeneralPage", "cui/ui/gallerygeneralpage.ui", &rSet) , pData(NULL) @@ -687,13 +687,13 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ ) -SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new TPGalleryThemeGeneral( pParent, *rSet ); } // - TPGalleryThemeProperties - -TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) +TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ) : SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet) , pData(NULL) , nCurFilterPos(0) @@ -771,7 +771,7 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties() -SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new TPGalleryThemeProperties( pParent, *rSet ); } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index cb26be4b4251..57a853c7f74a 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -28,7 +28,7 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> -GraphicPreviewWindow::GraphicPreviewWindow(Window* pParent, +GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent, const WinBits nStyle) : Control(pParent, nStyle) , mpOrigGraphic(NULL) @@ -37,7 +37,7 @@ GraphicPreviewWindow::GraphicPreviewWindow(Window* pParent, { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGraphicPreviewWindow(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphicPreviewWindow(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -136,7 +136,7 @@ void GraphicPreviewWindow::Resize() ScaleImageToFit(); } -GraphicFilterDialog::GraphicFilterDialog(Window* pParent, +GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic) : ModalDialog(pParent, rID, rUIXMLDescription) @@ -181,7 +181,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) // - FilterMosaic - -GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, +GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges ) : GraphicFilterDialog(pParent, "MosaicDialog", "cui/ui/mosaicdialog.ui", rGraphic) @@ -246,7 +246,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, // - GraphicFilterSmooth - -GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius) +GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius) : GraphicFilterDialog(pParent, "SmoothDialog", "cui/ui/smoothdialog.ui", rGraphic) { @@ -290,7 +290,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double // - GraphicFilterSolarize - -GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, +GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 cGreyThreshold, bool bInvert ) : GraphicFilterDialog(pParent, "SolarizeDialog", "cui/ui/solarizedialog.ui", rGraphic) @@ -345,7 +345,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, // - GraphicFilterSepia - -GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, +GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ) : GraphicFilterDialog(pParent, "AgingDialog", "cui/ui/agingdialog.ui", rGraphic) @@ -386,7 +386,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, // - GraphicFilterPoster - -GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphic, +GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterCount) : GraphicFilterDialog(pParent, "PosterDialog", "cui/ui/posterdialog.ui", rGraphic) @@ -444,14 +444,14 @@ Size EmbossControl::GetOptimalSize() const return LogicToPixel(Size(77, 60), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEmbossControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEmbossControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new EmbossControl(pParent); } -GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent, +GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) : GraphicFilterDialog (pParent, "EmbossDialog", "cui/ui/embossdialog.ui", rGraphic) diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index ae8cf489d18d..7224ed36c8da 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -81,7 +81,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, |* |************************************************************************/ -SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) +SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) : IconChoiceDialog( pParent, "HyperlinkDialog", "cui/ui/hyperlinkdialog.ui" ), maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), mpBindings ( pBindings ), diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 2eeacbdaa459..118da3fc5c50 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -48,7 +48,7 @@ |* \************************************************************************/ -URLDlg::URLDlg( Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) +URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) : ModalDialog(pWindow, "IMapDialog", "cui/ui/cuiimapdlg.ui") { get(m_pEdtURL, "urlentry"); diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 134712df14a9..46ae5b5e78d6 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -30,7 +30,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent) +FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent) : ModalDialog( pParent, "RecordNumberDialog", "cui/ui/recordnumberdialog.ui") { get(m_pRecordNo, "entry-nospin"); diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index f032a59391b7..83ee94c07fce 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -31,7 +31,7 @@ |* \************************************************************************/ -SvxNameDialog::SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ) : +SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ) : ModalDialog ( pWindow, "NameDialog", "cui/ui/namedialog.ui" ) { get(pBtnOK, "ok"); @@ -58,7 +58,7 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) // plus uniqueness-callback-linkHandler SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, + vcl::Window* pWindow, const OUString& rName) : ModalDialog ( pWindow, "ObjectNameDialog", "cui/ui/objectnamedialog.ui" ) { @@ -88,7 +88,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) // Dialog for editing Object Title and Description SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( - Window* pWindow, + vcl::Window* pWindow, const OUString& rTitle, const OUString& rDescription) : ModalDialog ( pWindow, "ObjectTitleDescDialog", "cui/ui/objecttitledescdialog.ui" ) @@ -113,7 +113,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( |* \************************************************************************/ -SvxMessDialog::SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg ) +SvxMessDialog::SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg ) : ModalDialog(pWindow, "MessBox", "cui/ui/messbox.ui") , pImage(NULL) { diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 791bb7d340de..4ff53ba2457a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -212,7 +212,7 @@ namespace svx { public: - RubyRadioButton( Window* _pParent, WinBits nBits ); + RubyRadioButton( vcl::Window* _pParent, WinBits nBits ); void init( const OUString& rPrimaryText, const OUString& rSecondaryText, const PseudoRubyText::RubyPosition& rPosition ); virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -223,7 +223,7 @@ namespace svx PseudoRubyText m_aRubyText; }; - RubyRadioButton::RubyRadioButton( Window* _pParent, WinBits nBits ) + RubyRadioButton::RubyRadioButton( vcl::Window* _pParent, WinBits nBits ) :RadioButton( _pParent, nBits ) { } @@ -322,7 +322,7 @@ namespace svx return minimumSize; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyRadioButton( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyRadioButton( vcl::Window *pParent, VclBuilder::stringmap & ) { return new RubyRadioButton( pParent, WB_LEFT|WB_VCENTER ); } @@ -330,7 +330,7 @@ namespace svx //= SuggestionSet - SuggestionSet::SuggestionSet( Window* pParent ) + SuggestionSet::SuggestionSet( vcl::Window* pParent ) : ValueSet( pParent, pParent->GetStyle() | WB_BORDER ) { @@ -363,7 +363,7 @@ namespace svx //= SuggestionDisplay - SuggestionDisplay::SuggestionDisplay( Window* pParent, WinBits nBits ) + SuggestionDisplay::SuggestionDisplay( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ) , m_bDisplayListBox( true ) , m_aValueSet( this ) @@ -522,7 +522,7 @@ namespace svx m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSuggestionDisplay( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSuggestionDisplay( vcl::Window *pParent, VclBuilder::stringmap & ) { return new SuggestionDisplay( pParent, WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL ); } @@ -530,7 +530,7 @@ namespace svx //= HangulHanjaConversionDialog - HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) + HangulHanjaConversionDialog::HangulHanjaConversionDialog( vcl::Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) :ModalDialog( _pParent, "HangulHanjaConversionDialog", "cui/ui/hangulhanjaconversiondialog.ui" ) ,m_pIgnoreNonPrimary( NULL ) ,m_bDocumentMode( true ) @@ -744,7 +744,7 @@ namespace svx namespace { - void lcl_modifyWindowStyle( Window* _pWin, WinBits _nSet, WinBits _nReset ) + void lcl_modifyWindowStyle( vcl::Window* _pWin, WinBits _nSet, WinBits _nReset ) { DBG_ASSERT( 0 == ( _nSet & _nReset ), "lcl_modifyWindowStyle: set _and_ reset the same bit?" ); if ( _pWin ) @@ -767,8 +767,8 @@ namespace svx // switch the def button depending if we're working for document text if ( bOldDocumentMode != m_bDocumentMode ) { - Window* pOldDefButton = NULL; - Window* pNewDefButton = NULL; + vcl::Window* pOldDefButton = NULL; + vcl::Window* pNewDefButton = NULL; if ( m_bDocumentMode ) { pOldDefButton = m_pFind; @@ -1077,7 +1077,7 @@ namespace svx return 0L; } - HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(Window* _pParent) + HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent) : ModalDialog( _pParent, "HangulHanjaOptDialog", "cui/ui/hangulhanjaoptdialog.ui" ) , m_pCheckButtonData(NULL) @@ -1172,7 +1172,7 @@ namespace svx return 0; } - HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(Window* pParent) + HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(vcl::Window* pParent) : ModalDialog(pParent, "HangulHanjaAddDialog", "cui/ui/hangulhanjaadddialog.ui") , m_bEntered(false) { @@ -1350,7 +1350,7 @@ namespace svx ( static_cast< HangulHanjaEditDictDialog* >( GetParentDialog() ) )->UpdateScrollbar(); } - SuggestionEdit::SuggestionEdit( Window* pParent, WinBits nBits ) + SuggestionEdit::SuggestionEdit( vcl::Window* pParent, WinBits nBits ) : Edit(pParent, nBits) , m_pPrev(NULL) , m_pNext(NULL) @@ -1418,7 +1418,7 @@ namespace svx m_pNext = pNext; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSuggestionEdit( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSuggestionEdit( vcl::Window *pParent, VclBuilder::stringmap & ) { return new SuggestionEdit( pParent, WB_LEFT|WB_VCENTER|WB_BORDER ); } @@ -1703,7 +1703,7 @@ namespace svx UpdateButtonStates(); } - HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) + HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) :ModalDialog ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" ) ,m_aEditHintText ( CUI_RESSTR(RID_SVXSTR_EDITHINT) ) ,m_rDictList ( _rDictList ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index b9ed4cad71d4..97ea77ddd274 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -98,7 +98,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri |* |************************************************************************/ -SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) +SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkNewDocPage", "cui/ui/hyperlinknewdocpage.ui", rItemSet ) { get(m_pRbtEditNow, "editnow"); @@ -233,7 +233,7 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr |* |************************************************************************/ -IconChoicePage* SvxHyperlinkNewDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkNewDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 2a8308168d96..3764ddc52d0d 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -34,7 +34,7 @@ sal_Char const sFileScheme[] = INET_FILE_SCHEME; |* |************************************************************************/ -SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) +SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkDocPage", "cui/ui/hyperlinkdocpage.ui", rItemSet ), mbMarkWndOpen ( false ) { @@ -157,7 +157,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNam |* |************************************************************************/ -IconChoicePage* SvxHyperlinkDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 832f3c4dec9d..433d06f08978 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -34,7 +34,7 @@ sal_Char const sFTPScheme[] = INET_FTP_SCHEME; |* |************************************************************************/ -SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, +SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkInternetPage", "cui/ui/hyperlinkinternetpage.ui", @@ -187,7 +187,7 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const |* |************************************************************************/ -IconChoicePage* SvxHyperlinkInternetTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkInternetTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index daaec31ed649..00f8c97131d4 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; |* |************************************************************************/ -SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) +SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkMailPage", "cui/ui/hyperlinkmailpage.ui", rItemSet ) { @@ -169,7 +169,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const |* |************************************************************************/ -IconChoicePage* SvxHyperlinkMailTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkMailTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 0f45021c63fc..77ea1b8e17d7 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -66,14 +66,14 @@ struct TargetData //# # //# Tree-Window # //# # -SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle) +SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , mpParentWnd(NULL) { SetNodeDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHlmarkTreeLBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHlmarkTreeLBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 7719ffb1dbda..369f4ee7b8ba 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -35,13 +35,13 @@ using namespace ::ucbhelper; //# ComboBox-Control for URL's with History and Autocompletion # -SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart ) +SvxHyperURLBox::SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart ) : SvtURLBox ( pParent, eSmart ), DropTargetHelper ( this ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHyperURLBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxHyperURLBox(pParent, INET_PROT_HTTP); } @@ -85,7 +85,7 @@ bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) //# Hyperlink-Dialog: Tabpages-Baseclass # -SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, +SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent, IconChoiceDialog* pDlg, const OString& rID, const OUString& rUIXMLDescription, @@ -178,7 +178,7 @@ bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, bool bDisConnectDlg // Show Extra-Window void SvxHyperlinkTabPageBase::ShowMarkWnd () { - ( ( Window* ) mpMarkWnd )->Show(); + ( ( vcl::Window* ) mpMarkWnd )->Show(); // Size of dialog-window in screen pixels Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) ); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 383c45423fdd..4fd8aab64a4e 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -36,12 +36,12 @@ using namespace css; -HyphenEdit::HyphenEdit(Window* pParent) +HyphenEdit::HyphenEdit(vcl::Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK|WB_TABSTOP) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHyphenEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHyphenEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new HyphenEdit(pParent); } @@ -454,7 +454,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl) SvxHyphenWordDialog::SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, - Window* pParent, + vcl::Window* pParent, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper) : SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui") diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 4b1e48062e32..122a339c34ce 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -40,7 +40,7 @@ using ::std::vector; | \**********************************************************************/ -IconChoicePage::IconChoicePage( Window *pParent, const OString& rID, +IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ) : TabPage ( pParent, rID, rUIXMLDescription ), @@ -106,7 +106,7 @@ bool IconChoicePage::QueryClose() void IconChoicePage::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -166,14 +166,14 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) | \**********************************************************************/ -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtIconChoiceCtrl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtIconChoiceCtrl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvtIconChoiceCtrl(pParent, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP); } -IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID, +IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *pItemSet ) : ModalDialog ( pParent, rID, rUIXMLDescription ), diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 6a092a64bda1..cf22d8d858a7 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -91,7 +91,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( return uno::Reference< io::XInputStream >(); } -InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const OString& rID, +InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage) : ModalDialog(pParent, rID, rUIXMLDescription) @@ -167,7 +167,7 @@ void SvInsertOleDlg::SelectDefault() SvInsertOleDlg::SvInsertOleDlg ( - Window* pParent, + vcl::Window* pParent, const Reference < embed::XStorage >& xStorage, const SvObjectServerList* pServers ) @@ -383,7 +383,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) -SvInsertPlugInDialog::SvInsertPlugInDialog(Window* pParent, +SvInsertPlugInDialog::SvInsertPlugInDialog(vcl::Window* pParent, const uno::Reference < embed::XStorage >& xStorage) : InsertObjectDialog_Impl(pParent, "InsertPluginDialog", "cui/ui/insertplugin.ui", xStorage) , m_pURL(0) @@ -472,7 +472,7 @@ short SvInsertPlugInDialog::Execute() return nRet; } -SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, +SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ) : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui", xStorage ) @@ -480,7 +480,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, Init(); } -SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, +SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj ) : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui", uno::Reference < embed::XStorage >() ) @@ -718,7 +718,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) { - Window* pOldParent = Application::GetDefDialogParent(); + vcl::Window* pOldParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pThis ); // create the file dialog diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index cf6319cc1cfe..c3c167cca62d 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -32,7 +32,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( m_pCountEdit->GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const OString& sHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId ) : ModalDialog(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui") , aRow(CUI_RESSTR(RID_SVXSTR_ROW)) , aCol(CUI_RESSTR(RID_SVXSTR_COL)) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 45c5801fe6a6..ce2078554c29 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -85,7 +85,7 @@ static long nTabs[] = }; -SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml ) +SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml ) : ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"), aStrAutolink( CUI_RES( STR_AUTOLINK ) ), aStrManuallink( CUI_RES( STR_MANUALLINK ) ), diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index b353e2dfe747..1685afb527e7 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -176,7 +176,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl) return 0; } -SvxMultiPathDialog::SvxMultiPathDialog(Window* pParent) +SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent) : ModalDialog(pParent, "MultiPathDialog", "cui/ui/multipathdialog.ui") { get(m_pAddBtn, "add"); @@ -205,7 +205,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(Window* pParent) m_pRadioLB->ShowTable(); } -SvxPathSelectDialog::SvxPathSelectDialog(Window* pParent) +SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent) : ModalDialog(pParent, "SelectPathDialog", "cui/ui/selectpathdialog.ui") { get(m_pAddBtn, "add"); diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index d9a1844e1d8c..1fcf49d2ee04 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -21,7 +21,7 @@ #include "dialmgr.hxx" #include "newtabledlg.hxx" -SvxNewTableDialog::SvxNewTableDialog( Window* pParent ) +SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) : ModalDialog( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" ) { get(mpNumRows, "rows"); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index cf9faf80336f..bca8cd9c211e 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -142,7 +142,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG } PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( - Window * pParent, sal_uInt16 nMinPasswdLen, + vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) : SfxModalDialog( pParent, "PasswordDialog", "cui/ui/password.ui" ) { diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index e1e984d8105e..d8bff176376c 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -37,7 +37,7 @@ #include <dialmgr.hxx> #include <boost/scoped_ptr.hpp> -SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) +SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent ) : ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui") { get(m_pFtObjectSource, "source"); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index bf2d6a33f3bd..3bec42caa6ad 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -38,7 +38,7 @@ // class SvxPostItDialog ------------------------------------------------- -SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, +SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext) : SfxModalDialog(pParent, "CommentDialog", "cui/ui/comment.ui") , rSet(rCoreSet) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 358e5d540605..23d46bf10627 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -74,7 +74,7 @@ void ShowErrorDialog( const Any& aException ) pDlg->Execute(); } -SFTreeListBox::SFTreeListBox(Window* pParent) +SFTreeListBox::SFTreeListBox(vcl::Window* pParent) : SvTreeListBox(pParent) , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) , m_libImage(CUI_RES(RID_CUIIMG_LIB)) @@ -93,7 +93,7 @@ SFTreeListBox::SFTreeListBox(Window* pParent) nMode = 0xFF; // everything } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSFTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SFTreeListBox(pParent); } @@ -425,7 +425,7 @@ void SFTreeListBox::ExpandedHdl() // CuiInputDialog ------------------------------------------------------------ -CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) +CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode ) : ModalDialog(pParent, "NewLibDialog", "cui/ui/newlibdialog.ui") { @@ -453,7 +453,7 @@ CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) // ScriptOrgDialog ------------------------------------------------------------ -SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, const OUString& language ) +SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ) : SfxModalDialog(pParent, "ScriptOrganizerDialog", "cui/ui/scriptorganizer.ui") , m_sLanguage(language) @@ -525,7 +525,7 @@ short SvxScriptOrgDialog::Execute() } m_pScriptsBox->ExpandAllTrees(); - Window* pPrevDlgParent = Application::GetDefDialogParent(); + vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); Application::SetDefDialogParent( pPrevDlgParent ); @@ -890,7 +890,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } } - boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); + boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<vcl::Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); do @@ -906,7 +906,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) bValid = false; OUString aError( m_createErrStr ); aError += m_createDupStr; - MessageDialog aErrorBox(static_cast<Window*>(this), aError); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox.SetText( m_createErrTitleStr ); aErrorBox.Execute(); xNewDlg->SetObjectName( aNewName ); @@ -993,7 +993,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? OUString aError( m_createErrStr ); - MessageDialog aErrorBox(static_cast<Window*>(this), aError); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox.SetText( m_createErrTitleStr ); aErrorBox.Execute(); } @@ -1018,7 +1018,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) } sal_uInt16 nMode = INPUTMODE_RENAME; - boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); + boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<vcl::Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); bool bValid; @@ -1069,7 +1069,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? OUString aError( m_renameErrStr ); - MessageDialog aErrorBox(static_cast<Window*>(this), aError); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox.SetText( m_renameErrTitleStr ); aErrorBox.Execute(); } @@ -1080,7 +1080,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); // ISSUE L10N string & can we centre list? OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 ); - MessageDialog aQueryBox(static_cast<Window*>(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); + MessageDialog aQueryBox(static_cast<vcl::Window*>(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); aQueryBox.SetText( m_delQueryTitleStr ); if ( aQueryBox.Execute() == RET_NO ) { @@ -1115,7 +1115,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) else { //ISSUE L10N & message from exception? - MessageDialog aErrorBox(static_cast<Window*>(this), m_delErrStr); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), m_delErrStr); aErrorBox.SetText( m_delErrTitleStr ); aErrorBox.Execute(); } @@ -1450,7 +1450,7 @@ OUString GetErrorMessage( const com::sun::star::uno::Any& aException ) } SvxScriptErrorDialog::SvxScriptErrorDialog( - Window* , ::com::sun::star::uno::Any aException ) + vcl::Window* , ::com::sun::star::uno::Any aException ) : m_sMessage() { SolarMutexGuard aGuard; diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 400e9a834021..b8848e54f129 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -27,7 +27,7 @@ #include "border.hxx" #include <svx/dialogs.hrc> -SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) +SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) : SfxTabDialog(pParent, "FormatCellsDialog", "cui/ui/formatcellsdialog.ui", pAttr) , mrOutAttrs(*pAttr) , mpColorTab(pModel->GetColorList()) diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 45c5cf8fd6ee..1c87ff9609f5 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -28,7 +28,7 @@ #define CUIFM_PROP_HIDDEN "Hidden" #define CUIFM_PROP_LABEL "Label" -FmShowColsDialog::FmShowColsDialog(Window* pParent) +FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent) : ModalDialog(pParent, "ShowColDialog", "cui/ui/showcoldialog.ui") { get(m_pOK, "ok"); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 8c809e93d3bd..e3b6d18c58a3 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -24,7 +24,7 @@ #include "splitcelldlg.hxx" #include "cuires.hrc" -SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, +SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) : SvxStandardDialog(pParent, "SplitCellsDialog", "cui/ui/splitcellsdialog.ui") , mnMaxVertical(nMaxVertical) diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index cdaf0090595c..fe23c29bf210 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -36,7 +36,7 @@ #include <rtl/strbuf.hxx> #include "svtools/treelistentry.hxx" -SvxSearchFormatDialog::SvxSearchFormatDialog(Window* pParent, const SfxItemSet& rSet) +SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet) , m_pFontList(NULL) , m_nNamePageId(0) @@ -110,7 +110,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) } } -SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent, +SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges) : ModalDialog(pParent, "SearchAttrDialog", "cui/ui/searchattrdialog.ui") , rList(rLst) @@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) SvxSearchSimilarityDialog::SvxSearchSimilarityDialog ( - Window* pParent, + vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index abd225bb3f7b..a9d30d66b74a 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; // class LookUpComboBox -------------------------------------------------- -LookUpComboBox::LookUpComboBox(Window *pParent) +LookUpComboBox::LookUpComboBox(vcl::Window *pParent) : ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP) , m_pDialog(NULL) { @@ -67,7 +67,7 @@ LookUpComboBox::LookUpComboBox(Window *pParent) EnableAutocomplete( false ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLookUpComboBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLookUpComboBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new LookUpComboBox(pParent); } @@ -95,13 +95,13 @@ IMPL_LINK( LookUpComboBox, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) // class ReplaceEdit -------------------------------------------------- -ReplaceEdit::ReplaceEdit(Window *pParent) +ReplaceEdit::ReplaceEdit(vcl::Window *pParent) : Edit(pParent, WB_BORDER | WB_TABSTOP) , m_pBtn(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeReplaceEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReplaceEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ReplaceEdit(pParent); } @@ -159,7 +159,7 @@ void AlternativesString::Paint( rDev.SetFont( aOldFont ); } -ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent) +ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(vcl::Window* pParent) : SvxCheckListBox(pParent) , m_pDialog(NULL) { @@ -167,7 +167,7 @@ ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent) SetHighlightRange(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeThesaurusAlternativesCtrl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeThesaurusAlternativesCtrl(vcl::Window *pParent, VclBuilder::stringmap &) { return new ThesaurusAlternativesCtrl(pParent); } @@ -437,7 +437,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pB // class SvxThesaurusDialog ---------------------------------------------- SvxThesaurusDialog::SvxThesaurusDialog( - Window* pParent, + vcl::Window* pParent, uno::Reference< linguistic2::XThesaurus > xThes, const OUString &rWord, LanguageType nLanguage) diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index c25377390c7c..e4a5040084d8 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -126,7 +126,7 @@ void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) -SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) +SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog(pParent, "ZoomDialog", "cui/ui/zoomdialog.ui") , rSet(rCoreSet) , pOutSet(NULL) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 523c6414ddb4..5dc045dbabb0 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -356,7 +356,7 @@ sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const return pDlg->GetLanguage(); }; -Window* AbstractThesaurusDialog_Impl::GetWindow() +vcl::Window* AbstractThesaurusDialog_Impl::GetWindow() { return pDlg; } @@ -371,7 +371,7 @@ void AbstractHyphenWordDialog_Impl::SelRight() pDlg->SelRight(); } -Window* AbstractHyphenWordDialog_Impl::GetWindow() +vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow() { return pDlg; } @@ -443,7 +443,7 @@ void AbstractSpellDialog_Impl::Invalidate() pDlg->InvalidateDialog(); } -Window* AbstractSpellDialog_Impl::GetWindow() +vcl::Window* AbstractSpellDialog_Impl::GetWindow() { return pDlg; } @@ -544,7 +544,7 @@ OUString AbstractURLDlg_Impl::GetName() const void AbstractSvxHlinkDlgMarkWnd_Impl::Hide() { - ((Window*)pDlg)->Hide(); + ((vcl::Window*)pDlg)->Hide(); } void AbstractSvxHlinkDlgMarkWnd_Impl::SetSizePixel( const Size& rNewSize ) @@ -559,12 +559,12 @@ Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const { - return (( Window* )pDlg)->IsVisible(); + return (( vcl::Window* )pDlg)->IsVisible(); } void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( sal_uInt16 nFlags ) { - (( Window* )pDlg)->Invalidate(nFlags); + (( vcl::Window* )pDlg)->Invalidate(nFlags); } bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const @@ -817,9 +817,9 @@ void AbstractSvxPathSelectDialog_Impl::SetTitle( const OUString& rNewTitle ) pDlg->SetText( rNewTitle ); } -Window * AbstractSvxHpLinkDlg_Impl::GetWindow() +vcl::Window * AbstractSvxHpLinkDlg_Impl::GetWindow() { - return (Window *)pDlg; + return (vcl::Window *)pDlg; } bool AbstractSvxHpLinkDlg_Impl::QueryClose() @@ -949,9 +949,9 @@ IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl) aPrevHdl.Call(this); return 0; } -Window * AbstractSvxPostItDialog_Impl::GetWindow() +vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow() { - return (Window *)pDlg; + return (vcl::Window *)pDlg; } OUString AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const @@ -968,7 +968,7 @@ bool AbstractPasswordToOpenModifyDialog_Impl::IsRecommendToOpenReadonly() const } // Create dialogs with simplest interface -VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId ) +VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) { Dialog* pDlg=NULL; switch ( nResId ) @@ -1009,13 +1009,13 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, } // dialogs that use SfxBindings -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* /*pParent*/, const SfxBindings&, sal_uInt32 ) +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* /*pParent*/, const SfxBindings&, sal_uInt32 ) { return 0; } VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( - Window* pParent, const Reference< frame::XFrame >& rxFrame, + vcl::Window* pParent, const Reference< frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) { Dialog* pDlg = NULL; @@ -1039,7 +1039,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( // TabDialog outside the drawing layer SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* , bool /*bEditFmt*/, @@ -1064,7 +1064,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const Reference< frame::XFrame >& xViewFrame, bool /*bEditFmt*/, @@ -1093,7 +1093,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } // TabDialog that use functionality of the drawing layer -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* ) @@ -1103,7 +1103,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p } // TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog -AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent, +AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes ) { @@ -1111,7 +1111,7 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( return new AbstractSvxCaptionDialog_Impl( pDlg ); } -AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent, +AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor , SvxDistributeVertical eVer) @@ -1120,14 +1120,14 @@ AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeD return new AbstractSvxDistributeDialog_Impl( pDlg ); } -AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent, +AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(vcl::Window* pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) { HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection); return new AbstractHangulHanjaConversionDialog_Impl( pDlg ); } -AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, +AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( vcl::Window* pParent, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) { @@ -1135,7 +1135,7 @@ AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Wind return new AbstractThesaurusDialog_Impl( pDlg ); } -AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Window* pParent, +AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( vcl::Window* pParent, const OUString &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) @@ -1144,12 +1144,12 @@ AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Wi return new AbstractHyphenWordDialog_Impl( pDlg ); } -AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent ) +AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( vcl::Window* pParent ) { FmShowColsDialog* pDlg = new FmShowColsDialog( pParent); return new AbstractFmShowColsDialog_Impl( pDlg ); } -AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent, +AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet) { SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet); @@ -1157,7 +1157,7 @@ AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* } AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog( - Window* pParent, + vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow ) { @@ -1165,20 +1165,20 @@ AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog( return new AbstractSpellDialog_Impl(pDlg); } -VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ) +VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) { Dialog* pDlg = new ActualizeProgress( pParent, pThm); return new VclAbstractRefreshableDialog_Impl( pDlg ); } -AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent, +AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL ) { SearchProgress* pDlg = new SearchProgress( pParent, rStartURL); return new AbstractSearchProgress_Impl( pDlg ); } -AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent ) +AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( vcl::Window* pParent ) { TakeProgress* pDlg = new TakeProgress( pParent ); return new AbstractTakeProgress_Impl( pDlg ); @@ -1186,14 +1186,14 @@ AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Win VclAbstractDialog* AbstractDialogFactory_Impl::CreateScriptErrorDialog( - Window* pParent, ::com::sun::star::uno::Any aException ) + vcl::Window* pParent, ::com::sun::star::uno::Any aException ) { return new SvxScriptErrorDialog( pParent, aException ); } AbstractScriptSelectorDialog* AbstractDialogFactory_Impl::CreateScriptSelectorDialog( - Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) + vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) { SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog(pParent, bShowSlots, _rxFrame); return new AbstractScriptSelectorDialog_Impl(pDlg); @@ -1213,7 +1213,7 @@ void AbstractScriptSelectorDialog_Impl::SetRunLabel() return; } -VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window* pParent, +VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage) { Dialog* pDlg=NULL; @@ -1225,21 +1225,21 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window return 0; } -AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent, +AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText) { TitleDialog* pDlg = new TitleDialog( pParent, rOldText); return new AbstractTitleDialog_Impl( pDlg ); } -AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent, +AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ) { GalleryIdDialog* pDlg = new GalleryIdDialog( pParent, pThm); return new AbstractGalleryIdDialog_Impl( pDlg ); } -VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent, +VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) { @@ -1247,7 +1247,7 @@ VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDia return new VclAbstractDialog2_Impl( pDlg ); } -AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent, +AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) @@ -1274,7 +1274,7 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd } SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& , const SfxItemSet* pAttrSet ) { @@ -1282,14 +1282,14 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, return new CuiAbstractSfxDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) { SfxTabDialog* pDlg = new SvxSearchFormatDialog(pParent, rSet); return new CuiAbstractTabDialog_Impl(pDlg); } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ) { @@ -1297,7 +1297,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial return new CuiVclAbstractDialog_Impl( pDlg ); } -AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent, +AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, @@ -1311,7 +1311,7 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS //UUUU SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector, bool bEnableDrawingLayerFillStyles) @@ -1325,7 +1325,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( return new CuiAbstractTabDialog_Impl(pDlg); } -AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent, +AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes ) @@ -1334,7 +1334,7 @@ AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTab return new AbstractSvxTransformTabDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, @@ -1366,7 +1366,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W return 0; } -AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent, +AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) { @@ -1374,20 +1374,20 @@ AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOp return new AbstractSvxJSearchOptionsDialog_Impl( pDlg ); } -AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent ) +AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( vcl::Window* pParent ) { FmInputRecordNoDialog* pDlg = new FmInputRecordNoDialog( pParent ); return new AbstractFmInputRecordNoDialog_Impl( pDlg ); } -AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent, +AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) { SvxNewDictionaryDialog* pDlg = new SvxNewDictionaryDialog( pParent, xSpl ); return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId ) @@ -1407,43 +1407,43 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo return 0; } -AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent, +AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) { SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc ); return new AbstractSvxNameDialog_Impl( pDlg ); } -AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) +AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) { return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName)); } -AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) +AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) { return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription)); } -AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32, +AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32, const OUString& rText, const OUString& rDesc, Image* pImg ) { SvxMessDialog* pDlg = new SvxMessDialog( pParent, rText, rDesc, pImg ); return new AbstractSvxMessDialog_Impl( pDlg ); } -AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(Window* pParent) +AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(vcl::Window* pParent) { SvxMultiPathDialog* pDlg = new SvxMultiPathDialog(pParent); return new AbstractSvxMultiPathDialog_Impl( pDlg ); } -AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(Window* pParent) +AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(vcl::Window* pParent) { SvxPathSelectDialog* pDlg = new SvxPathSelectDialog(pParent); return new AbstractSvxPathSelectDialog_Impl( pDlg ); } -AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent, +AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId) { @@ -1462,7 +1462,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p return 0; } -AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, +AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, @@ -1474,7 +1474,7 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window return 0; } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) { @@ -1482,7 +1482,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) { @@ -1490,7 +1490,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) { @@ -1498,21 +1498,21 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSep return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(vcl::Window* pParent, const Graphic& rGraphic, double nRadius) { GraphicFilterDialog* pDlg = new GraphicFilterSmooth( pParent, rGraphic, nRadius ); return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert) { GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert ); return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) { @@ -1520,7 +1520,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent, +AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow) @@ -1529,7 +1529,7 @@ AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Wi return new AbstractSvxAreaTabDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj , bool bHasObj) @@ -1538,7 +1538,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window return new CuiAbstractTabDialog_Impl( pDlg ); } -SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, +SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const Reference< XFrame >& _rxDocumentFrame, sal_uInt32 nResId @@ -1562,7 +1562,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, return 0; } -SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, +SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId @@ -1591,7 +1591,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, return 0; } -AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent, +AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext ) { @@ -1602,7 +1602,7 @@ AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Wind class SvxMacroAssignDialog : public VclAbstractDialog { public: - SvxMacroAssignDialog( Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, + SvxMacroAssignDialog( vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) :m_aItems( SfxGetpApp()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM ) { @@ -1628,7 +1628,7 @@ SvxMacroAssignDialog::~SvxMacroAssignDialog() } VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg( - Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, + vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) { return new SvxMacroAssignDialog( _pParent, _rxDocumentFrame, _bUnoDialogMode, _rxEvents, _nInitiallySelectedEvent ); @@ -1777,7 +1777,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { @@ -1797,7 +1797,7 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const OUString& rCommand, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; @@ -1812,12 +1812,12 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p -SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent ) +SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( vcl::Window* pParent ) { return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); } -SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p) +SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p) { SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML ); if ( p ) @@ -1825,34 +1825,34 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* p return new AbstractLinksDialog_Impl( pLinkDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) { return new CuiAbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); } -SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) +SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) { return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal ); } -SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) +SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( vcl::Window* pParent ) { return new SvxNewTableDialog( pParent ); } VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ ) + vcl::Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ ) { return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) { return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( - Window * pParent, + vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) { PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index df9a0870ff6f..081a7373c3d0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -172,7 +172,7 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) virtual OUString GetWord() SAL_OVERRIDE; virtual sal_uInt16 GetLanguage() const SAL_OVERRIDE; - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; }; class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog @@ -180,7 +180,7 @@ class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) virtual void SelLeft() SAL_OVERRIDE; virtual void SelRight() SAL_OVERRIDE; - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; }; class FmShowColsDialog; @@ -208,7 +208,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual void SetLanguage( sal_uInt16 nLang ) SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; virtual void Invalidate() SAL_OVERRIDE; - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; virtual SfxBindings& GetBindings() SAL_OVERRIDE; }; @@ -413,7 +413,7 @@ class SvxHpLinkDlg; class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg { DECL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl,SvxHpLinkDlg) - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; virtual bool QueryClose() SAL_OVERRIDE; }; @@ -487,7 +487,7 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog virtual void HideAuthor() SAL_OVERRIDE ; virtual void SetReadonlyPostIt(bool bDisable) SAL_OVERRIDE ; virtual bool IsOkEnabled() const SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; + virtual vcl::Window * GetWindow() SAL_OVERRIDE; private: Link aNextHdl; Link aPrevHdl; @@ -509,167 +509,167 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, const SfxItemSet* pAttrSet=0 ); - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId ) SAL_OVERRIDE; - 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 VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, const OUString *pUserButtonText=0 ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const OUString *pUserButtonText=0 ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* pModel=0 ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent, + virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) SAL_OVERRIDE; - virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, + virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0 ) SAL_OVERRIDE; - virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, + virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone) SAL_OVERRIDE; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommmand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand, + virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE; - virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ) SAL_OVERRIDE; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; + virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; - virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, + virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) SAL_OVERRIDE; - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) SAL_OVERRIDE; - virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*, const OUString &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) SAL_OVERRIDE; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) SAL_OVERRIDE; - virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet) SAL_OVERRIDE; //UUUU add for SvxBorderBackgroundDlg virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false) SAL_OVERRIDE; - virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, + virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0) SAL_OVERRIDE ; - virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false ) SAL_OVERRIDE; virtual AbstractSpellDialog * CreateSvxSpellDialog( - Window* pParent, + vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow ) SAL_OVERRIDE; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE; - virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE; + virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL) SAL_OVERRIDE; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) SAL_OVERRIDE; - virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, + virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText) SAL_OVERRIDE; - virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, + virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm) SAL_OVERRIDE; - virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, + virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) SAL_OVERRIDE; - virtual AbstractURLDlg * CreateURLDialog( Window* pParent, + virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) SAL_OVERRIDE; virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, + virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges) SAL_OVERRIDE; - virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, + virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger) SAL_OVERRIDE; - virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, + virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) SAL_OVERRIDE; - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) SAL_OVERRIDE; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, + virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) SAL_OVERRIDE; - virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, + virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) SAL_OVERRIDE; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) SAL_OVERRIDE; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) SAL_OVERRIDE; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE; - virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, + virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ) SAL_OVERRIDE; - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) SAL_OVERRIDE; - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) SAL_OVERRIDE; - virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId) SAL_OVERRIDE; - virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, + virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, const Graphic& rGraphic, double nRadius) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) SAL_OVERRIDE; - virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent, + virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, + virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true ) SAL_OVERRIDE; - virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, + virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false ) SAL_OVERRIDE; @@ -679,38 +679,38 @@ public: virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; virtual DialogGetRanges GetDialogGetRangesFunc() SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE; + vcl::Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE; + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) SAL_OVERRIDE ; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) SAL_OVERRIDE ; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE; + vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE; - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE; + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index cff22986fc77..eb24820e3351 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -25,7 +25,7 @@ // caution: needs C-Linkage since dynamically loaded via symbol name extern "C" { -SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult) +SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult) { bool bRet = false; boost::scoped_ptr<SvxCharacterMap> aDlg(new SvxCharacterMap( i_pParent )); diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index ed1357658df2..b984838fa09c 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -29,7 +29,7 @@ private: Control* m_pFocusCtrl; public: - SvxControlFocusHelper( Window* pParent, const ResId& rId ) : + SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index cd0179b88b79..5bbe67ab91de 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -75,7 +75,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SentenceEditWindow_Impl(Window* pParent, WinBits nBits); + SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); virtual ~SentenceEditWindow_Impl(); void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;} @@ -217,7 +217,7 @@ protected: public: SpellDialog( svx::SpellDialogChildWindow* pChildWindow, - Window * pParent, + vcl::Window * pParent, SfxBindings* pBindings); virtual ~SpellDialog(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index dd275a06dc96..72c45c2bc728 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -64,7 +64,7 @@ protected: virtual void Resize() SAL_OVERRIDE; public: - AboutDialog(Window* pParent); + AboutDialog(vcl::Window* pParent); DECL_LINK( HandleClick, PushButton* ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 7ece823d5b88..88d096f8425f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -62,7 +62,7 @@ protected: const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: - SfxAccCfgTabListBox_Impl(Window *pParent, WinBits nStyle) + SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , m_pAccelConfigPage(NULL) { @@ -170,7 +170,7 @@ private: void CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 ); public: - SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3aa641cbe318..bb249b5822ce 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -59,7 +59,7 @@ class AlignmentTabPage : public SfxTabPage public: virtual ~AlignmentTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -68,7 +68,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - explicit AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + explicit AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); void InitVsRefEgde(); void UpdateEnableControls(); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5d70cc9d9fea..2ca4b4c440c7 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -52,7 +52,7 @@ class OfaAutoCorrDlg : public SfxTabDialog DECL_LINK(SelectLanguageHdl, ListBox*); public: - OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet); + OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); void EnableLanguage(bool bEnable); }; @@ -108,9 +108,9 @@ private: OUString m_sAccidentalCaps; public: - OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet); + OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -165,12 +165,12 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - OfaSwAutoFmtOptionsPage( Window* pParent, + OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSwAutoFmtOptionsPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -185,9 +185,9 @@ class AutoCorrEdit : public Edit bool bSpaces; public: - AutoCorrEdit(Window* pParent, const ResId& rResId) : + AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(false){} - AutoCorrEdit(Window* pParent) : + AutoCorrEdit(vcl::Window* pParent) : Edit(pParent), bSpaces(false){} void SetActionHdl( const Link& rLink ) @@ -260,10 +260,10 @@ private: void setTabs(); public: - OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ); + OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); - 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; @@ -318,10 +318,10 @@ private: LanguageType eOldLanguage, LanguageType eNewLanguage); public: - OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ); + OfaAutocorrExceptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrExceptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -383,11 +383,11 @@ private: SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaQuoteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaQuoteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -404,7 +404,7 @@ public: { OfaAutoCompleteTabPage* m_pPage; public: - AutoCompleteMultiListBox(Window *pParent, WinBits nBits) + AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits) : MultiListBox(pParent, nBits) , m_pPage(NULL) { @@ -432,12 +432,12 @@ private: DECL_LINK( CheckHdl, CheckBox* ); - OfaAutoCompleteTabPage( Window* pParent, + OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaAutoCompleteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -466,7 +466,7 @@ private: PushButton* m_pPropertiesPB; /// construction via Create() - OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); /** Inserts items into m_aSmartTagTypesLB @@ -504,7 +504,7 @@ public: virtual ~OfaSmartTagOptionsTabPage(); - 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/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 0402ecb85c0d..ab4145fcece1 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -46,13 +46,13 @@ class SvxBackgroundTabPage : public SvxTabPage { using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; /// Shift-ListBox activation void ShowSelector(); @@ -67,7 +67,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxBackgroundTabPage(); VclContainer* m_pAsGrid; diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index f5fc9d242f88..ca5d43550925 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -28,7 +28,7 @@ class SvxBorderBackgroundDlg: public SfxTabDialog { public: - SvxBorderBackgroundDlg(Window *pParent, + SvxBorderBackgroundDlg(vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index e3e352b72af9..0a5aea5504b6 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -43,7 +43,7 @@ class SvxBorderTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges(); @@ -58,7 +58,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); + SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); virtual ~SvxBorderTabPage(); // Controls diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 6d786a227c35..ebbff4af7b1f 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -64,7 +64,7 @@ private: sal_uInt16 m_nEventsPageId; public: - SvxConfigDialog( Window*, const SfxItemSet* ); + SvxConfigDialog( vcl::Window*, const SfxItemSet* ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); @@ -321,7 +321,7 @@ protected: bool m_bIsInternalDrag; public: - SvxMenuEntriesListBox(Window*, SvxConfigPage*); + SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); virtual ~SvxMenuEntriesListBox(); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; @@ -390,7 +390,7 @@ protected: ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; - SvxConfigPage( Window*, const SfxItemSet& ); + SvxConfigPage( vcl::Window*, const SfxItemSet& ); DECL_LINK( MoveHdl, Button * ); @@ -481,7 +481,7 @@ private: void DeleteSelectedTopLevel() SAL_OVERRIDE; public: - SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxMenuConfigPage(); SaveInData* CreateSaveInData( @@ -513,7 +513,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog public: SvxMainMenuOrganizerDialog ( - Window*, SvxEntries*, + vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); virtual ~SvxMainMenuOrganizerDialog (); @@ -542,7 +542,7 @@ protected: public: - SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg); + SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg); virtual ~SvxToolbarEntriesListBox(); void SetChangedListener( const Link& aChangedListener ) @@ -582,7 +582,7 @@ private: void DeleteSelectedTopLevel() SAL_OVERRIDE; public: - SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage(); SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, @@ -670,7 +670,7 @@ private: DECL_LINK(ModifyHdl, Edit*); public: - SvxNewToolbarDialog(Window* pWindow, const OUString& rName); + SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); ListBox* m_pSaveInListBox; @@ -733,7 +733,7 @@ private: public: SvxIconSelectorDialog( - Window *pWindow, + vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >& rXImageManager, const ::com::sun::star::uno::Reference< @@ -754,12 +754,12 @@ class SvxIconReplacementDialog : public MessBox { public: SvxIconReplacementDialog( - Window *pWindow, + vcl::Window *pWindow, const OUString& aMessage, bool aYestoAll); SvxIconReplacementDialog( - Window *pWindow, + vcl::Window *pWindow, const OUString& aMessage ); OUString ReplaceIconName( const OUString& ); @@ -772,7 +772,7 @@ private: FixedImage* pFImageInfo; VclMultiLineEdit* pLineEditDescription; public: - SvxIconChangeDialog(Window *pWindow, const OUString& aMessage); + SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index f14200363424..c2c124298101 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -111,7 +111,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SfxConfigFunctionListBox(Window*, WinBits nStyle); + SfxConfigFunctionListBox(vcl::Window*, WinBits nStyle); virtual ~SfxConfigFunctionListBox(); void ClearAll(); @@ -163,7 +163,7 @@ protected: virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; public: - SfxConfigGroupListBox(Window* pParent, WinBits nStyle); + SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SfxConfigGroupListBox(); void ClearAll(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index ab2841623eba..424a976b4df0 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -51,7 +51,7 @@ protected: bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); + SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); virtual ~SvxCharBasePage(); @@ -113,7 +113,7 @@ private: SvxCharNamePage_Impl* m_pImpl; - SvxCharNamePage( Window* pParent, const SfxItemSet& rSet ); + SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet ); void Initialize(); const FontList* GetFontList() const; @@ -152,7 +152,7 @@ public: public: virtual ~SvxCharNamePage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -210,7 +210,7 @@ private: OUString m_aTransparentColorName; - SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet ); + SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCharEffectsPage(); void Initialize(); @@ -231,7 +231,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -284,7 +284,7 @@ private: sal_uInt8 m_nSuperProp; sal_uInt8 m_nSubProp; - SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet ); + SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCharPositionPage(); void Initialize(); @@ -310,7 +310,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -334,7 +334,7 @@ private: sal_uInt16 m_nStartBracketPosition; sal_uInt16 m_nEndBracketPosition; - SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rSet); + SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxCharTwoLinesPage(); void UpdatePreview_Impl(); @@ -353,7 +353,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index b0e034ea16f3..e66fcd65f9f2 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -60,10 +60,10 @@ private: public: - SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxConnectionPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: class SvxConnectionDialog : public SfxSingleTabDialog { public: - SvxConnectionDialog( Window* pParent, const SfxItemSet& rAttr, + SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView ); virtual ~SvxConnectionDialog(); }; diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 0c982672ce74..a4d95279c2ac 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -39,7 +39,7 @@ namespace svx class SvxShowText : public Control { public: - SvxShowText( Window* pParent, + SvxShowText( vcl::Window* pParent, bool bCenter = false ); virtual ~SvxShowText(); @@ -97,7 +97,7 @@ private: void fillAllSubsets(ListBox &rListBox); public: - SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); + SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); virtual ~SvxCharacterMap(); void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 84fabd0d5eeb..d163b3d44b6f 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -76,7 +76,7 @@ class FmSearchDialog : public ModalDialog OUString m_sSearch; OUString m_sCancel; - Window* m_pPreSearchFocus; + vcl::Window* m_pPreSearchFocus; Link m_lnkFoundHandler; ///< Handler for "found" Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors @@ -107,7 +107,7 @@ public: (of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the arrFields of the context) */ - FmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, + FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); virtual ~FmSearchDialog(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 8106bc725973..83f234f9724c 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -83,7 +83,7 @@ private: FixedText* m_pFtSearchDir; FixedText* m_pFtSearchType; CancelButton* m_pBtnCancel; - Window * parent_; + vcl::Window * parent_; INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; @@ -91,7 +91,7 @@ private: void Terminate(); public: - SearchProgress( Window* pParent, const INetURLObject& rStartURL ); + SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); virtual ~SearchProgress() {}; DECL_LINK( CleanUpHdl, void* ); @@ -127,7 +127,7 @@ class TakeProgress : public ModalDialog private: FixedText* m_pFtTakeFile; CancelButton* m_pBtnCancel; - Window * window_; + vcl::Window * window_; rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; @@ -136,7 +136,7 @@ private: public: - TakeProgress( Window* pWindow ); + TakeProgress( vcl::Window* pWindow ); DECL_LINK( CleanUpHdl, void* ); @@ -159,7 +159,7 @@ private: DECL_LINK( ActualizeHdl, INetURLObject* pURL ); public: - ActualizeProgress( Window* pWindow, GalleryTheme* pThm ); + ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); virtual ~ActualizeProgress() {}; virtual short Execute() SAL_OVERRIDE; @@ -170,7 +170,7 @@ class TitleDialog : public ModalDialog private: Edit* m_pEdit; public: - TitleDialog(Window* pParent, const OUString& rOldText); + TitleDialog(vcl::Window* pParent, const OUString& rOldText); OUString GetTitle() const { return m_pEdit->GetText(); } }; @@ -184,7 +184,7 @@ private: DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); public: - GalleryIdDialog( Window* pParent, GalleryTheme* pThm ); + GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } }; @@ -198,7 +198,7 @@ class GalleryThemeProperties : public SfxTabDialog virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - GalleryThemeProperties(Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); + GalleryThemeProperties(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); }; class TPGalleryThemeGeneral : public SfxTabPage @@ -219,13 +219,13 @@ private: public: - TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ); + TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~TPGalleryThemeGeneral() {} void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; typedef ::std::vector< FilterEntry* > FilterEntryList_impl; @@ -284,7 +284,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); public: - TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ); + TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); virtual ~TPGalleryThemeProperties(); void SetXChgData( ExchangeData* pData ); @@ -292,7 +292,7 @@ public: void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index f501472c7560..f4faabb50960 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -50,7 +50,7 @@ private: public: - GraphicPreviewWindow(Window* pParent, WinBits nStyle); + GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle); void init(const Graphic* pOrigGraphic, const Link& rLink) { mpOrigGraphic = pOrigGraphic; @@ -84,7 +84,7 @@ protected: public: - GraphicFilterDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); + GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; @@ -101,7 +101,7 @@ private: public: - GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius); + GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } @@ -120,7 +120,7 @@ private: public: - GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic, + GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -141,7 +141,7 @@ private: public: - GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, + GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -158,7 +158,7 @@ class GraphicFilterSepia : public GraphicFilterDialog private: MetricField* mpMtrSepia; public: - GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, + GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetSepiaPercent() const @@ -176,7 +176,7 @@ class GraphicFilterPoster : public GraphicFilterDialog private: NumericField* mpNumPoster; public: - GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, + GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -194,7 +194,7 @@ private: virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - EmbossControl(Window* pParent) + EmbossControl(vcl::Window* pParent) : SvxRectCtl(pParent) {} void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } @@ -205,7 +205,7 @@ class GraphicFilterEmboss : public GraphicFilterDialog private: EmbossControl* mpCtlLight; public: - GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, + GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 244c195ce817..8ef2930ae952 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -78,7 +78,7 @@ protected: void Apply(); public: - SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); + SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SvxHpLinkDlg (); virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 2a22bc5b3312..3266a2a3449c 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -41,7 +41,7 @@ class URLDlg : public ModalDialog public: - URLDlg( Window* pWindow, + URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 49a3f0637016..86190a8c0ce3 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -64,10 +64,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: - SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxGeneralTabPage (); - 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/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 660e3c79eb9a..10b3b5bccd11 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -44,7 +44,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ); public: - SvxJSearchOptionsDialog(Window *pParent, + SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); // Window diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index adc998ad08cc..5bfbe3cc0044 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -75,7 +75,7 @@ protected: void SavePalettes(); public: - SvxAreaTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); + SvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); virtual ~SvxAreaTabDialog(); void SetNewColorList( XColorListRef pColTab ) @@ -159,17 +159,17 @@ class SvxTransparenceTabPage : public SvxTabPage void InvalidatePreview (bool bEnable = true ); public: - SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); void Construct(); - static SfxTabPage* Create(Window*, const SfxItemSet*); + static SfxTabPage* Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; - virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; + virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; } @@ -288,18 +288,18 @@ private: void ClickBitmapHdl_Impl(); public: - SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -354,17 +354,17 @@ private: DECL_LINK( ModifyShadowHdl_Impl, void * ); public: - SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } @@ -433,11 +433,11 @@ private: void SetControlState_Impl( XGradientStyle eXGS ); public: - SvxGradientTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -509,18 +509,18 @@ private: long CheckChanges_Impl(); public: - SvxHatchTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetHatchingList( XHatchListRef pHtchLst) @@ -594,19 +594,19 @@ private: long CheckChanges_Impl(); public: - SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxBitmapTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; } @@ -627,7 +627,7 @@ public: Return a label control that provides a name for the specified control. */ - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const SAL_OVERRIDE; }; /************************************************************************/ @@ -729,12 +729,12 @@ private: void UpdateModified(); public: - SvxColorTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxColorTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 83aac99004f3..bc4fffcd48bf 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -61,7 +61,7 @@ protected: void SavePalettes(); public: - SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true ); virtual ~SvxLineTabDialog(); @@ -202,12 +202,12 @@ public: void ShowSymbolControls(bool bOn); - SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -216,7 +216,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; @@ -301,11 +301,11 @@ private: void CheckChanges_Impl(); public: - SvxLineDefTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -370,12 +370,12 @@ private: void CheckChanges_Impl(); public: - SvxLineEndDefTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineEndDefTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 42e905ee73f3..1f2b34d616db 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -32,7 +32,7 @@ public: NumericField* m_pRecordNo; public: - FmInputRecordNoDialog(Window * pParent); + FmInputRecordNoDialog(vcl::Window * pParent); void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 37cf8b5e8c3b..f35f2adb57c8 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -89,10 +89,10 @@ namespace svx #endif public: - DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ); + DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -128,7 +128,7 @@ namespace svx ,public SfxSingleTabDialog { public: - DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr ); + DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rAttr ); virtual ~DatabaseRegistrationDialog(); virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index a4a306f564f1..e6d9ea26c9fd 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -39,7 +39,7 @@ private: DECL_LINK(ModifyHdl, void *); public: - SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ); + SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -87,7 +87,7 @@ private: public: // constructor - SvxObjectNameDialog(Window* pWindow, const OUString& rName); + SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -117,7 +117,7 @@ private: public: // constructor - SvxObjectTitleDescDialog(Window* pWindow, const OUString& rTitle, const OUString& rDesc); + SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } @@ -138,7 +138,7 @@ private: DECL_LINK(Button2Hdl, void *); public: - SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); + SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); virtual ~SvxMessDialog(); void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index ad54f935ff4d..e0be5f3dd87e 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -41,15 +41,15 @@ class SvxDistributePage : public SvxTabPage RadioButton* m_pBtnVerBottom; public: - SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs, + SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - static SfxTabPage* Create(Window*, const SfxItemSet&, + static SfxTabPage* Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; - virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; + virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; } @@ -60,7 +60,7 @@ class SvxDistributeDialog : public SfxSingleTabDialog SvxDistributePage* mpPage; public: - SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, + SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index e10d09bfedf0..8d7392ac26ac 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -26,14 +26,14 @@ #include <vcl/graph.hxx> #include <sfx2/tabdlg.hxx> -class SvxCropExample : public Window +class SvxCropExample : public vcl::Window { Size aFrameSize; Point aTopLeft, aBottomRight; Graphic aGrf; public: - SvxCropExample( Window* pPar, WinBits nStyle ); + SvxCropExample( vcl::Window* pPar, WinBits nStyle ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -93,7 +93,7 @@ class SvxGrfCropPage : public SfxTabPage bool bSetOrigSize; - SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); + SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxGrfCropPage(); DECL_LINK( ZoomHdl, MetricField * ); @@ -111,7 +111,7 @@ class SvxGrfCropPage : public SfxTabPage Size GetGrfOrigSize( const Graphic& ) const; public: - 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 *rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index cbee8ef6b0d7..4cea2af82cd2 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -41,7 +41,7 @@ namespace svx class SuggestionSet : public ValueSet { public: - SuggestionSet( Window* pParent ); + SuggestionSet( vcl::Window* pParent ); virtual ~SuggestionSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -51,7 +51,7 @@ namespace svx class SuggestionDisplay : public Control { public: - SuggestionDisplay( Window* pParent, WinBits nBits ); + SuggestionDisplay( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionDisplay(); void DisplayListBox( bool bDisplayListBox ); @@ -134,7 +134,7 @@ namespace svx public: HangulHanjaConversionDialog( - Window* _pParent, + vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); virtual ~HangulHanjaConversionDialog( ); @@ -220,7 +220,7 @@ namespace svx void Init( void ); ///< reads settings from core and init controls public: - HangulHanjaOptionsDialog( Window* _pParent ); + HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); void AddDict( const OUString& _rName, bool _bChecked ); @@ -238,7 +238,7 @@ namespace svx DECL_LINK( OKHdl, void* ); DECL_LINK( ModifyHdl, void* ); public: - HangulHanjaNewDictDialog( Window* _pParent ); + HangulHanjaNewDictDialog( vcl::Window* _pParent ); bool GetName( OUString& _rRetName ) const; }; @@ -256,7 +256,7 @@ namespace svx bool ShouldScroll( bool _bUp ) const; void DoJump( bool _bUp ); public: - SuggestionEdit( Window* pParent, WinBits nBits ); + SuggestionEdit( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionEdit(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); @@ -310,7 +310,7 @@ namespace svx bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: - HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); + HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); void UpdateScrollbar( void ); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 18b22a252c18..f536a1d77b57 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -33,7 +33,7 @@ protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - MacroEventListBox( Window* pParent, WinBits nStyle ); + MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 04159107b07b..98731d7e6172 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -50,10 +50,10 @@ protected: SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: - SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkNewDocTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual bool AskApply () SAL_OVERRIDE; virtual void DoApply () SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index ea69d978a6e7..1b7e3525840d 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -66,10 +66,10 @@ protected: OUString GetCurrentURL (); public: - SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkDocTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 11f1eb8d4c30..e11b74456b32 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -77,10 +77,10 @@ protected: virtual void SetMarkWndShouldOpen (bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} public: - SvxHyperlinkInternetTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkInternetTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9a366bc10684..44aacc78453d 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -55,10 +55,10 @@ protected: SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: - SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkMailTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index b858f51f54d9..2108beb587b4 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -42,7 +42,7 @@ private: SvxHlinkDlgMarkWnd* mpParentWnd; public: - SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle); + SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle); void SetParentWnd(SvxHlinkDlgMarkWnd* pParent) { diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index d63bd1c563ca..02e42c5e7e71 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -59,7 +59,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); + SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); }; @@ -79,7 +79,7 @@ private: mxDocumentFrame; protected: - Window* mpDialog; + vcl::Window* mpDialog; bool mbStdControlsInit; @@ -111,7 +111,7 @@ protected: public: SvxHyperlinkTabPageBase ( - Window *pParent, + vcl::Window *pParent, IconChoiceDialog* pDlg, const OString& rID, const OUString& rUIXMLDescription, @@ -134,7 +134,7 @@ public: virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } + bool IsMarkWndVisible () { return ((vcl::Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); @@ -147,8 +147,8 @@ protected: virtual void SetMarkWndShouldOpen(bool bOpen); void ShowMarkWnd (); - void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } - void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); } + void HideMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Hide(); } + void InvalidateMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Invalidate(); } SfxDispatcher* GetDispatcher() const; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index f4e4293ad958..4d0b7ba7c489 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -34,7 +34,7 @@ class SvxSpellWrapper; class HyphenEdit : public Edit { public: - HyphenEdit(Window* pParent); + HyphenEdit(vcl::Window* pParent); protected: virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; @@ -82,7 +82,7 @@ class SvxHyphenWordDialog : public SfxModalDialog public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, - Window* pParent, + vcl::Window* pParent, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); virtual ~SvxHyphenWordDialog(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 8248a720c5ff..269e61d3e006 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -41,7 +41,7 @@ class IconChoiceDialog; class IconChoicePage; // Create-Function -typedef IconChoicePage* (*CreatePage)(Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); +typedef IconChoicePage* (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value /// Data-structure for pages in dialog @@ -84,7 +84,7 @@ private : void ImplInitSettings(); protected : - IconChoicePage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); + IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } @@ -182,7 +182,7 @@ protected : public : // the IconChoiceCtrl's could also be set in the Ctor - IconChoiceDialog ( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * pItemSet = 0 ); virtual ~IconChoiceDialog (); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index bd793a7b0ece..f845ea80289a 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -44,7 +44,7 @@ protected: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage; comphelper::EmbeddedObjectContainer aCnt; - InsertObjectDialog_Impl(Window * pParent, const OString& rID, + InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); public: @@ -83,7 +83,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return m_pRbNewObject->IsChecked(); } public: - SvInsertOleDlg( Window* pParent, + SvInsertOleDlg( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); virtual short Execute() SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } public: - SvInsertPlugInDialog(Window* pParent, + SvInsertPlugInDialog(vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); virtual short Execute() SAL_OVERRIDE; @@ -139,9 +139,9 @@ private: void Init(); public: - SfxInsertFloatingFrameDialog(Window *pParent, + SfxInsertFloatingFrameDialog(vcl::Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); - SfxInsertFloatingFrameDialog( Window* pParent, + SfxInsertFloatingFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 65932047dc04..012916b89423 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -42,7 +42,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); + SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 1b73b594c2eb..743ba930f0eb 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -73,9 +73,9 @@ private: const SdrView* pView; public: - SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -104,7 +104,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SvxCaptionTabDialog(Window* pParent, const SdrView* pView, + SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); /// link for the Writer to validate positions diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index f42889593a31..d5440bda7a1b 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -91,7 +91,7 @@ class SvBaseLinksDlg : public ModalDialog void SetManager( sfx2::LinkManager* ); public: - SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, bool bHtml = false ); + SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false ); virtual ~SvBaseLinksDlg(); void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 988ff02abd9e..bdcd93c6f724 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -47,7 +47,7 @@ class _SfxMacroTabPage : public SfxTabPage protected: _SfxMacroTabPage_Impl* mpImpl; - _SfxMacroTabPage( Window* pParent, const SfxItemSet& rItemSet ); + _SfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rItemSet ); void InitAndSetHandler(); void FillEvents(); @@ -90,20 +90,20 @@ class SfxMacroTabPage : public _SfxMacroTabPage { public: SfxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); // --------- inherit from the base ------------- - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialog { public: SfxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 19ee9d2459f1..f151c36ba6e7 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -72,7 +72,7 @@ protected: bool bReadOnly, bDocModified, bAppEvents, bInitialized; EventDisplayNames aDisplayNames; - _SvxMacroTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); + _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); void EnableButtons(); ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); @@ -97,7 +97,7 @@ class SvxMacroTabPage : public _SvxMacroTabPage { public: SvxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xNameReplace, @@ -112,7 +112,7 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // gives international Which-va class SvxMacroAssignSingleTabDialog : public SfxSingleTabDialog { public: - SvxMacroAssignSingleTabDialog(Window* pParent, const SfxItemSet& rOptionsSet); + SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); @@ -123,7 +123,7 @@ class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog { public: SvxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 260937710207..a42ea5e7c4e4 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -64,16 +64,16 @@ private: public: - SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxMeasurePage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -86,7 +86,7 @@ public: class SvxMeasureDialog : public SfxSingleTabDialog { public: - SvxMeasureDialog(Window* pParent, const SfxItemSet& rAttr, + SvxMeasureDialog(vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView); }; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 095ce1ad3fe5..0508ff40aba1 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -49,7 +49,7 @@ private: DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*); public: - SvxMultiPathDialog(Window* pParent); + SvxMultiPathDialog(vcl::Window* pParent); virtual ~SvxMultiPathDialog(); OUString GetPath() const; @@ -68,7 +68,7 @@ private: DECL_LINK(SelectHdl_Impl, void *); public: - SvxPathSelectDialog(Window* pParent); + SvxPathSelectDialog(vcl::Window* pParent); virtual ~SvxPathSelectDialog(); OUString GetPath() const; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 37d1ce46bd28..63ed48b9943b 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -33,7 +33,7 @@ private: NumericField* mpNumRows; public: - SvxNewTableDialog( Window* pWindow ); + SvxNewTableDialog( vcl::Window* pWindow ); virtual short Execute(void) SAL_OVERRIDE; virtual void Apply(void); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 10c311c2c8d5..0bbec43c9fe4 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -41,7 +41,7 @@ class vector; -class SvxNumberPreview : public Window +class SvxNumberPreview : public vcl::Window { private: OUString aPrevStr; @@ -56,7 +56,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER); + SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER); void NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL ); }; @@ -70,7 +70,7 @@ class SvxNumberFormatTabPage : public SfxTabPage public: virtual ~SvxNumberFormatTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); @@ -87,7 +87,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; private: - SvxNumberFormatTabPage( Window* pParent, + SvxNumberFormatTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); FixedText* m_pFtCategory; ListBox* m_pLbCategory; @@ -128,7 +128,7 @@ private: OUString sAutomaticEntry; - Window* pLastActivWindow; + vcl::Window* pLastActivWindow; void Init_Impl(); void FillCurrencyBox(); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 5ead54c2c0bc..83987766ba73 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -38,7 +38,7 @@ class SvxBmpNumValueSet; class SvxNumValueSet; class SvxBrushItem; -class SvxNumberingPreview : public Window +class SvxNumberingPreview : public vcl::Window { const SvxNumRule* pActNum; vcl::Font aStdFont; @@ -51,7 +51,7 @@ class SvxNumberingPreview : public Window virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER); + SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER); void SetNumRule(const SvxNumRule* pNum) {pActNum = pNum; Invalidate();}; @@ -106,11 +106,11 @@ class SvxSingleNumPickTabPage : public SfxTabPage DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxSingleNumPickTabPage(Window* pParent, + SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxSingleNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -142,11 +142,11 @@ class SvxBulletPickTabPage : public SfxTabPage DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxBulletPickTabPage(Window* pParent, + SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -185,11 +185,11 @@ class SvxNumPickTabPage : public SfxTabPage DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxNumPickTabPage(Window* pParent, + SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -230,11 +230,11 @@ class SvxBitmapPickTabPage : public SfxTabPage DECL_LINK(LinkBmpHdl_Impl, void *); public: - SvxBitmapPickTabPage(Window* pParent, + SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBitmapPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -342,11 +342,11 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); public: - SvxNumOptionsTabPage(Window* pParent, + SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -445,7 +445,7 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( IndentAtHdl_Impl, MetricField* ); public: - SvxNumPositionTabPage(Window* pParent, + SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPositionTabPage(); @@ -454,7 +454,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index be965554cfcc..d2d182420783 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -52,12 +52,12 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK(ChangeStandardHdl, CheckBox*); DECL_LINK(ModifyHdl, Edit*); - SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ); + SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxAsianLayoutPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 4e0a5779b2da..e26a4b37f253 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -63,7 +63,7 @@ private: DECL_LINK(ModifyHdl_Impl, void *); public: - SvxNewDictionaryDialog( Window* pParent, + SvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); @@ -80,9 +80,9 @@ class SvxDictEdit : public Edit bool bSpaces; public: - SvxDictEdit(Window* pParent, const ResId& rResId) : + SvxDictEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(false){} - SvxDictEdit(Window* pParent, WinBits aWB) : + SvxDictEdit(vcl::Window* pParent, WinBits aWB) : Edit(pParent, aWB), bSpaces(false){} void SetActionHdl( const Link& rLink ) @@ -148,7 +148,7 @@ protected: // virtual void Paint( const Rectangle& rRect ); public: - SvxEditDictionaryDialog( Window* pParent, + SvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 8d31b7b3fb18..0a914642a354 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -84,7 +84,7 @@ class SvxEditModulesDlg : public ModalDialog DECL_LINK(OpenURLHdl_Impl, void *); public: - SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); + SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData); virtual ~SvxEditModulesDlg(); }; @@ -130,7 +130,7 @@ private: SvxLinguData_Impl* pLinguData; - SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); @@ -148,7 +148,7 @@ private: public: virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 0d4de78e4e61..8db65294ce6d 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -69,10 +69,10 @@ private: const OUString& _rUserPath, const OUString& _rWritablePath ); public: - SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxPathTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxPathTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index dcbdc212807f..d95220e13a15 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -178,7 +178,7 @@ private: void CheckMarginEdits( bool _bClear ); bool IsMarginOutOfRange(); - SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); + SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rSet ); //UUUU void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; } @@ -188,7 +188,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 08a370acd4ef..4209e04339a6 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -48,7 +48,7 @@ class SvxStdParagraphTabPage: public SfxTabPage using TabPage::DeactivatePage; private: - SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // indention SvxRelativeField* m_pLeftIndent; @@ -99,7 +99,7 @@ protected: public: DECL_LINK(ELRLoseFocusHdl, void *); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -153,14 +153,14 @@ class SvxParaAlignTabPage : public SfxTabPage void UpdateExample_Impl( bool bAll = false ); - SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxParaAlignTabPage(); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -191,7 +191,7 @@ class SvxExtParagraphTabPage: public SfxTabPage public: virtual ~SvxExtParagraphTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); @@ -204,7 +204,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // hyphenation TriStateBox* m_pHyphenBox; @@ -263,7 +263,7 @@ class SvxAsianTabPage : public SfxTabPage CheckBox* m_pHangingPunctCB; CheckBox* m_pScriptSpaceCB; - SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK( ClickHdl_Impl, CheckBox* ); @@ -271,7 +271,7 @@ public: virtual ~SvxAsianTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index c201c5f8f55a..1fe8c58551f8 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -37,7 +37,7 @@ class PasswordToOpenModifyDialog : public SfxModalDialog PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); public: - PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, + PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index a667ae5c914a..c7b815f764cb 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -54,7 +54,7 @@ class SvPasteObjectDialog : public ModalDialog DECL_LINK( DoubleClickHdl, ListBox * ); public: - SvPasteObjectDialog( Window* pParent ); + SvPasteObjectDialog( vcl::Window* pParent ); virtual ~SvPasteObjectDialog(); void Insert( SotFormatStringId nFormat, const OUString & rFormatName ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 1f0f200cdfe2..624649689e6a 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -43,7 +43,7 @@ class SvxPostItDialog : public SfxModalDialog { public: - SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, + SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false); virtual ~SvxPostItDialog(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index f51c2f6dd365..3b7240675e13 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -75,7 +75,7 @@ public: void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); - SFTreeListBox(Window* pParent); + SFTreeListBox(vcl::Window* pParent); virtual ~SFTreeListBox(); void ExpandAllTrees(); @@ -100,7 +100,7 @@ class CuiInputDialog : public ModalDialog private: Edit* m_pEdit; public: - CuiInputDialog(Window * pParent, sal_uInt16 nMode); + CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode); OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName(const OUString& rName) @@ -177,7 +177,7 @@ protected: public: // prob need another arg in the ctor // to specify the language or provider - SvxScriptOrgDialog( Window* pParent, const OUString& language ); + SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ); virtual ~SvxScriptOrgDialog(); virtual short Execute() SAL_OVERRIDE; @@ -195,7 +195,7 @@ private: public: SvxScriptErrorDialog( - Window* parent, ::com::sun::star::uno::Any aException ); + vcl::Window* parent, ::com::sun::star::uno::Any aException ); virtual ~SvxScriptErrorDialog(); diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index bcae0d840c38..66080975ca5d 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -42,7 +42,7 @@ protected: virtual void Apply(); public: - SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); + SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 3f4c1f211a2d..b22b85e30f30 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -100,7 +100,7 @@ friend class SvxConfigGroupListBox; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SvxConfigFunctionListBox(Window* pParent, WinBits nStyle); + SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigFunctionListBox(); void ClearAll(); OUString GetHelpText( SvTreeListEntry *pEntry ); @@ -160,7 +160,7 @@ protected: virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; public: - SvxConfigGroupListBox(Window* pParent, WinBits nStyle); + SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigGroupListBox(); void Init(bool bShowSlots, const ::com::sun::star::uno::Reference @@ -198,7 +198,7 @@ class SvxScriptSelectorDialog : public ModelessDialog public: SvxScriptSelectorDialog ( - Window* pParent = NULL, + vcl::Window* pParent = NULL, bool bShowSlots = false, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index d43868a4f5da..dceddb7e3a00 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -41,7 +41,7 @@ class FmShowColsDialog : public ModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: - FmShowColsDialog(Window* pParent); + FmShowColsDialog(vcl::Window* pParent); void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 94c3b983f985..212559f32968 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -39,7 +39,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SvxSplitTableDlg(Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); + SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg(); DECL_LINK( ClickHdl, Button * ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index c81a79d86003..0965484c9c45 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -29,7 +29,7 @@ class SvxSearchFormatDialog : public SfxTabDialog { public: - SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet ); + SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchFormatDialog(); protected: @@ -48,7 +48,7 @@ private: class SvxSearchAttributeDialog : public ModalDialog { public: - SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, + SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); private: @@ -71,7 +71,7 @@ private: CheckBox* m_pRelaxBox; public: - SvxSearchSimilarityDialog( Window* pParent, + SvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 315fb57654a4..94f34aa489ac 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -122,10 +122,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage void setOptimalRelWidth(); public: - SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxSwPosSizeTabPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index e5b64a687335..c5bf5475bdf8 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -50,7 +50,7 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -62,7 +62,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // tabulators and positions MetricBox* m_pTabBox; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index f043b8583c97..2981c4ae8005 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -73,10 +73,10 @@ private: sal_uInt16 GetSelectedDirection(); public: - SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAnimationPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ private: public: - SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView ); virtual ~SvxTextTabDialog() {}; }; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 1cac8d762b6a..4f67dbfb902f 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -74,16 +74,16 @@ private: public: - SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAttrPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 4ab94e7c2bd6..95e712c2af6e 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -42,7 +42,7 @@ class LookUpComboBox : public ComboBox LookUpComboBox& operator = ( const LookUpComboBox & ); public: - LookUpComboBox(Window *pParent); + LookUpComboBox(vcl::Window *pParent); virtual ~LookUpComboBox(); DECL_LINK( ModifyTimer_Hdl, Timer * ); @@ -83,7 +83,7 @@ class ThesaurusAlternativesCtrl ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ); public: - ThesaurusAlternativesCtrl(Window* pParent); + ThesaurusAlternativesCtrl(vcl::Window* pParent); void init(SvxThesaurusDialog *pDialog); virtual ~ThesaurusAlternativesCtrl(); @@ -108,7 +108,7 @@ class ReplaceEdit : public Edit ReplaceEdit & operator = ( const ReplaceEdit & ); public: - ReplaceEdit(Window *pParent); + ReplaceEdit(vcl::Window *pParent); virtual ~ReplaceEdit(); void init(Button *pBtn) { m_pBtn = pBtn; } @@ -159,7 +159,7 @@ public: virtual void Apply() SAL_OVERRIDE; public: - SvxThesaurusDialog( Window* pParent, + SvxThesaurusDialog( vcl::Window* pParent, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, LanguageType nLanguage ); virtual ~SvxThesaurusDialog(); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 6e388159673a..f4f692593fe1 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -59,7 +59,7 @@ private: public: - SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); virtual ~SvxTransformTabDialog(); @@ -145,9 +145,9 @@ private: void SetMaxSize( Rectangle aRect ); public: - SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -156,7 +156,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } @@ -200,9 +200,9 @@ private: FieldUnit eDlgUnit; public: - SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -211,7 +211,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -244,9 +244,9 @@ private: FieldUnit eDlgUnit; public: - SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -255,7 +255,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 447723d3ebb5..ac2d360734e6 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -196,10 +196,10 @@ protected: virtual short Execute() SAL_OVERRIDE; public: - OfaTreeOptionsDialog( Window* pParent, + OfaTreeOptionsDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame, bool bActivateLastSelection = true ); - OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ); + OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ); virtual ~OfaTreeOptionsDialog(); OptionsPageInfo* AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup ); @@ -272,7 +272,7 @@ private: public: ExtensionsTabPage( - Window* pParent, WinBits nStyle, + vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL, const OUString& rEvtHdl, const com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider >& rProvider ); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 64c46b53ac42..a8b3176ddb56 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -55,7 +55,7 @@ private: DECL_LINK( OKHdl, Button* ); public: - SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); + SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxZoomDialog(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 2d55e4ed9bc5..a31c25211a50 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; -CertPathDialog::CertPathDialog(Window* pParent) +CertPathDialog::CertPathDialog(vcl::Window* pParent) : ModalDialog(pParent, "CertDialog", "cui/ui/certdialog.ui") { get(m_pOKBtn, "ok"); diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index aa2128e29738..bdc083c987d8 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -33,7 +33,7 @@ private: void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const OUString &rProfile, const OUString &rPath); public: - CertPathDialog(Window* pParent); + CertPathDialog(vcl::Window* pParent); virtual ~CertPathDialog(); OUString getDirectory() const; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 9adf2b546413..dd73fb46be9f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -45,7 +45,7 @@ namespace offapp Link m_aRowChangeHandler; public: - DriverListControl(Window* _pParent); + DriverListControl(vcl::Window* _pParent); virtual void Init() SAL_OVERRIDE; void Update(const DriverPoolingSettings& _rSettings); @@ -87,7 +87,7 @@ namespace offapp }; - DriverListControl::DriverListControl(Window* _pParent) + DriverListControl::DriverListControl(vcl::Window* _pParent) :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER) ,m_aSeekRow(m_aSettings.end()) ,m_sYes(CUI_RES(RID_SVXSTR_YES)) @@ -98,7 +98,7 @@ namespace offapp SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDriverListControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDriverListControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new DriverListControl(pParent); } @@ -300,7 +300,7 @@ namespace offapp //= ConnectionPoolOptionsPage - ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) + ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet) : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet) { get(m_pEnablePooling, "connectionpooling"); @@ -326,7 +326,7 @@ namespace offapp } - SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet* _rAttrSet) + SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) { return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet); } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index f865438cf50b..868c42702a16 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -48,10 +48,10 @@ namespace offapp NumericField* m_pTimeout; protected: - ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet); + ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); public: - static SfxTabPage* Create(Window* _pParent, const SfxItemSet* _rAttrSet); + static SfxTabPage* Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); protected: virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index eb552d63ef9a..ef45114ddc09 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -47,7 +47,7 @@ // class SvxJSearchOptionsDialog ----------------------------------------- -SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent, +SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) : SfxSingleTabDialog(pParent, rOptionsSet) , nInitialTlFlags( nInitialFlags ) diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 303a7b570183..0258322d67fe 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -74,7 +74,7 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder() // class DatabaseRegistrationDialog ------------------------------------------------ -DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rInAttrs ) +DatabaseRegistrationDialog::DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : RegistrationItemSetHolder(rInAttrs) , SfxSingleTabDialog(pParent, getRegistrationItems()) { @@ -101,7 +101,7 @@ short DatabaseRegistrationDialog::Execute() // class DbRegistrationOptionsPage -------------------------------------------------- -DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) : +DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ), @@ -174,7 +174,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage() -SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, +SfxTabPage* DbRegistrationOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new DbRegistrationOptionsPage( pParent, *rAttrSet ) ); diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index ad1ba1fd97c3..068f361ce61d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -43,7 +43,7 @@ namespace svx //= ODocumentLinkDialog - ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ) + ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew ) : ModalDialog(_pParent, "DatabaseLinkDialog", "cui/ui/databaselinkdialog.ui") ,m_bCreatingNew(_bCreateNew) diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index d14566902e3c..0584734b761d 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -50,7 +50,7 @@ namespace svx Link m_aNameValidator; public: - ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ); + ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew ); // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 96014db525ea..4668b48f1508 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -36,7 +36,7 @@ /* */ /*********************************************************************/ -SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, +SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet) , pConfig(new SvtFontSubstConfig) @@ -143,7 +143,7 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage() delete m_pCheckLB; } -SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent, +SfxTabPage* SvxFontSubstTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxFontSubstTabPage(pParent, *rAttrSet); @@ -238,7 +238,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* ) m_pFontHeightLB->SaveValue(); } -IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) +IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) { if (pWin == m_pApply || pWin == m_pDelete) { diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 91f87d74e9cd..d73e2b0f9926 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -84,18 +84,18 @@ class SvxFontSubstTabPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK(SelectHdl, Window *pWin = 0); + DECL_LINK(SelectHdl, vcl::Window *pWin = 0); DECL_LINK(NonPropFontsHdl, CheckBox* pBox); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); void CheckEnable(); - SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxFontSubstTabPage(); public: - 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/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 2baf4f9e6a7d..d16723e130b8 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -56,7 +56,7 @@ struct Prop_Impl {} }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCuiCustomMultilineEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCuiCustomMultilineEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new CuiCustomMultilineEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } @@ -124,7 +124,7 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT); } -CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet& rItemSet*/ ) : +CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) : ModelessDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"), m_pPrefCtrl( get<SvSimpleTableContainer>("preferences") ), m_pResetBtn( get<PushButton>("reset") ), @@ -456,7 +456,7 @@ std::vector< OUString > CuiAboutConfigTabPage::commaStringToSequence( const OUSt return tempVector; } -CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( Window* pWindow, +CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue, int limit ) : ModalDialog( pWindow, "AboutConfigValueDialog", "cui/ui/aboutconfigvaluedialog.ui" ), diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index e848cc427bff..4714cb2e01e5 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -30,7 +30,7 @@ class CuiCustomMultilineEdit : public Edit { public: bool bNumericOnly; - CuiCustomMultilineEdit( Window* pParent, WinBits nStyle ) + CuiCustomMultilineEdit( vcl::Window* pParent, WinBits nStyle ) : Edit( pParent, nStyle ) , bNumericOnly(false) {} @@ -56,7 +56,7 @@ private: DECL_LINK( ResetBtnHdl_Impl, void * ); public: - CuiAboutConfigTabPage(Window* pParent); + CuiAboutConfigTabPage(vcl::Window* pParent); void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue); void Reset(); void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess); @@ -70,7 +70,7 @@ private: CuiCustomMultilineEdit* m_pEDValue; public: - CuiAboutConfigValueDialog( Window* pWindow, const OUString& rValue , int limit = 0); + CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0); OUString getValue() { diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index f63e7aee11b0..ea94d53b95d6 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -31,7 +31,7 @@ struct SvxAccessibilityOptionsTabPage_Impl : m_aConfig(){} }; -SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(Window* pParent, +SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptAccessibilityPage", "cui/ui/optaccessibilitypage.ui", &rSet) @@ -61,7 +61,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage() delete m_pImpl; } -SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxAccessibilityOptionsTabPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index c25316008654..c63c37dac682 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -40,12 +40,12 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage SvxAccessibilityOptionsTabPage_Impl* m_pImpl; - SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxAccessibilityOptionsTabPage(); - 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/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 9877760e70d0..2a2336afd9d1 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -121,7 +121,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; -SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : +SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet), pImpl(new SvxAsianLayoutPage_Impl) { @@ -154,7 +154,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage() delete pImpl; } -SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxAsianLayoutPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 826ac04c4706..db24702e6124 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -25,7 +25,7 @@ #include <boost/shared_ptr.hpp> #include <cuires.hrc> -SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet ) +SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) { SvtMiscOptions aMiscOpt; @@ -136,7 +136,7 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) pUseExtendedTypesChk->SaveValue(); } -SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxBasicIDEOptionsPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index a843a4eb4925..5b1959d9f5a6 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -37,10 +37,10 @@ private: void LoadConfig(); public: - SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxBasicIDEOptionsPage(); - 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* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index ac3d5a2df736..c8bbffd2f621 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -39,7 +39,7 @@ namespace } } -SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui", &rInAttrs) { get(m_pPBRemove, "delete"); @@ -103,7 +103,7 @@ void SvxDefaultColorOptPage::Construct() } -SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet* rAttrs ) +SfxTabPage* SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) { return new SvxDefaultColorOptPage( pParent, *rAttrs ); } diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 610e29743208..0f210e1ccd15 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -53,12 +53,12 @@ private: long GetColorIndex( const Color& rCol ); public: - SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxDefaultColorOptPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxDefaultColorOptPage(); void Construct(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 2bf8b38bd8fb..cf749f635df4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -173,7 +173,7 @@ class ColorConfigWindow_Impl , public VclBuilderContainer { public: - ColorConfigWindow_Impl(Window* pParent); + ColorConfigWindow_Impl(vcl::Window* pParent); virtual ~ColorConfigWindow_Impl(); public: @@ -196,7 +196,7 @@ private: FixedText *m_pText; public: Chapter(FixedText *pText, bool bShow); - Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName); + Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& sDisplayName); ~Chapter(); public: void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); } @@ -210,7 +210,7 @@ private: { public: Entry(ColorConfigWindow_Impl& rParent, unsigned iEntry, long nCheckBoxLabelOffset, bool bShow); - Entry(Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry, + Entry(vcl::Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry, long nCheckBoxLabelOffset); ~Entry(); public: @@ -238,7 +238,7 @@ private: // color list box ColorListBox* m_pColorList; // color preview box - Window* m_pPreview; + vcl::Window* m_pPreview; // default color Color m_aDefaultColor; private: @@ -290,7 +290,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow) } // ctor for extended groups -ColorConfigWindow_Impl::Chapter::Chapter(Window *pGrid, +ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& rDisplayName) : m_bOwnsWidget(true) { @@ -343,7 +343,7 @@ ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned i } // ctor for extended entries -ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos, +ColorConfigWindow_Impl::Entry::Entry( vcl::Window *pGrid, unsigned nYPos, ExtendedColorConfigValue const& rColorEntry, long nCheckBoxLabelOffset) : m_bOwnsWidgets(true) , m_aDefaultColor(rColorEntry.getDefaultColor()) @@ -360,7 +360,7 @@ ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos, m_pColorList->set_grid_left_attach(1); m_pColorList->set_grid_top_attach(nYPos); - m_pPreview = new Window(pGrid, WB_BORDER); + m_pPreview = new vcl::Window(pGrid, WB_BORDER); m_pPreview->set_grid_left_attach(2); m_pPreview->set_grid_top_attach(nYPos); m_pPreview->set_margin_right(6); @@ -500,7 +500,7 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor) // ColorConfigWindow_Impl -ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent) +ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent) : VclContainer(pParent) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "cui/ui/colorconfigwin.ui"); @@ -646,9 +646,9 @@ void ColorConfigWindow_Impl::AdjustHeaderBar() { // horizontal positions unsigned const nX0 = 0; - unsigned const nX1 = get<Window>("doccolor")->GetPosPixel().X(); - unsigned const nX2 = get<Window>("doccolor_lb")->GetPosPixel().X(); - unsigned const nX3 = get<Window>("doccolor_wn")->GetPosPixel().X(); + unsigned const nX1 = get<vcl::Window>("doccolor")->GetPosPixel().X(); + unsigned const nX2 = get<vcl::Window>("doccolor_lb")->GetPosPixel().X(); + unsigned const nX3 = get<vcl::Window>("doccolor_wn")->GetPosPixel().X(); unsigned const nX4 = m_pHeaderHB->GetSizePixel().Width(); m_pHeaderHB->SetItemSize(1, nX1 - nX0); m_pHeaderHB->SetItemSize(2, nX2 - nX1); @@ -840,7 +840,7 @@ class ColorConfigCtrl_Impl : public VclVBox virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; public: - ColorConfigCtrl_Impl(Window* pParent); + ColorConfigCtrl_Impl(vcl::Window* pParent); virtual ~ColorConfigCtrl_Impl(); void InitHeaderBar(const OUString &rOn, const OUString &rUIElems, @@ -859,7 +859,7 @@ public: } }; -ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(Window* pParent) +ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent) : VclVBox(pParent) , pColorConfig(0) , pExtColorConfig(0) @@ -916,7 +916,7 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() delete m_pHeaderHB; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorConfigCtrl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorConfigCtrl(vcl::Window *pParent, VclBuilder::stringmap &) { return new ColorConfigCtrl_Impl(pParent); } @@ -1030,7 +1030,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) SvxColorOptionsTabPage::SvxColorOptionsTabPage( - Window* pParent, const SfxItemSet& rCoreSet) + vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet) , bFillItemSetCalled(false) , pColorConfig(0) @@ -1043,10 +1043,10 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( get(m_pColorConfigCT, "colorconfig"); m_pColorConfigCT->InitHeaderBar( - get<Window>("on")->GetText(), - get<Window>("uielements")->GetText(), - get<Window>("colorsetting")->GetText(), - get<Window>("preview")->GetText()); + get<vcl::Window>("on")->GetText(), + get<vcl::Window>("uielements")->GetText(), + get<vcl::Window>("colorsetting")->GetText(), + get<vcl::Window>("preview")->GetText()); m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl)); Link aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl ); @@ -1075,7 +1075,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() delete pExtColorConfig; } -SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxColorOptionsTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index d19c6c628875..509d9f13ab7a 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -47,10 +47,10 @@ class SvxColorOptionsTabPage : public SfxTabPage void UpdateColorConfig(); public: - SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxColorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxColorOptionsTabPage( ); - 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/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 92ff2a7b81e6..45430195bc94 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -38,7 +38,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) return 0; } -SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) : +SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptCTLPage", "cui/ui/optctlpage.ui", &rSet ) @@ -61,7 +61,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage() { } -SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxCTLOptionsPage( pParent, *rAttrSet ); } diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index b61cf56bc3c9..3ab62ad2c09d 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -41,13 +41,13 @@ private: DECL_LINK( SequenceCheckingCB_Hdl, void* ); - SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxCTLOptionsPage(); - 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/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index f7ca6510f43f..a214b5952507 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -95,7 +95,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex // class SvxNewDictionaryDialog ------------------------------------------- -SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, +SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent, Reference< XSpellChecker1 > &xSpl ) : ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ), @@ -208,7 +208,7 @@ IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl) -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent, VclBuilder::stringmap&) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxDictEdit(vcl::Window *pParent, VclBuilder::stringmap&) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK; SvxDictEdit *pEdit = new SvxDictEdit(pParent, nWinStyle); @@ -216,7 +216,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent }; SvxEditDictionaryDialog::SvxEditDictionaryDialog( - Window* pParent, + vcl::Window* pParent, const OUString& rName, Reference< XSpellChecker1 > &xSpl ) : diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 1749c0ae84e0..7170a7cfd926 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -38,7 +38,7 @@ enum MSFltrPg2_CheckBoxEntries { -OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) +OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet ) { get( aWBasicCodeCB , "wo_basic" ); @@ -70,7 +70,7 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl) return 0; } -SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMSFilterTabPage( pParent, *rAttrSet ); @@ -128,7 +128,7 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* ) aPBasicStgCB->SaveValue(); } -OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) : +OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ), sHeader1(CUI_RES(RID_SVXSTR_HEADER1)), sHeader2(CUI_RES(RID_SVXSTR_HEADER2)), @@ -163,7 +163,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2() delete m_pCheckLB; } -SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage2::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMSFilterTabPage2( pParent, *rAttrSet ); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 0f4ed12634c1..d5e43d323ec0 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -36,14 +36,14 @@ class OfaMSFilterTabPage : public SfxTabPage CheckBox* aPBasicCodeCB; CheckBox* aPBasicStgCB; - OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); DECL_LINK(LoadWordBasicCheckHdl_Impl, void *); DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -83,7 +83,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage sChgToFromSmartArt; SvLBoxButtonData* pCheckButtonData; - OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ); + OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage2(); void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType ); @@ -93,7 +93,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage public: - 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/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e6d07105012a..f45b4a4dca44 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -183,7 +183,7 @@ namespace -OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) +OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet) { get(m_pToolTipsCB, "tooltips"); @@ -236,7 +236,7 @@ OfaMiscTabPage::~OfaMiscTabPage() -SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMiscTabPage( pParent, *rAttrSet ); } @@ -535,7 +535,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const // class OfaViewTabPage -------------------------------------------------- -OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) +OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet) , nSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) @@ -647,7 +647,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaViewTabPage(pParent, *rAttrSet); } @@ -839,7 +839,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if(bRepaintWindows) { - Window* pAppWindow = Application::GetFirstTopLevelWindow(); + vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow(); while(pAppWindow) { @@ -997,7 +997,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal return aBuf.makeStringAndClear(); } -OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : +OfaLanguagesTabPage::OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ), pLangConfig(new LanguageConfig_Impl) { @@ -1149,7 +1149,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage() delete pLangConfig; } -SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaLanguagesTabPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 9610eff0e89a..f559a0c00a03 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -65,10 +65,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMiscTabPage(); - 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; @@ -120,10 +120,10 @@ private: DECL_LINK( OnSelectionToggled, void* ); public: - OfaViewTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaViewTabPage(); - 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; @@ -164,10 +164,10 @@ class OfaLanguagesTabPage : public SfxTabPage DECL_LINK( DatePatternsHdl, Edit* ) ; public: - OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaLanguagesTabPage(); - 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/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 20303de88311..1408274a7643 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -209,7 +209,7 @@ public: -SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet) { @@ -296,7 +296,7 @@ void SvxGeneralTabPage::SetLinks () -SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxGeneralTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 0f3d5125dc03..b95873784cd0 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -42,7 +42,7 @@ const sal_uInt16 aExportToPosArr[] = }; -OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : +OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) { get(aSize1NF,"size1"); @@ -88,7 +88,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage() { } -SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, +SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaHtmlTabPage(pParent, *rAttrSet); diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 14052496703f..c79e2393e831 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -52,11 +52,11 @@ class OfaHtmlTabPage : public SfxTabPage DECL_LINK(ExportHdl_Impl, ListBox*); DECL_LINK(CheckBoxHdl_Impl, CheckBox*); - OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet); + OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~OfaHtmlTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 760d1ceb94a6..49e6ff064f51 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -96,7 +96,7 @@ using namespace ::sfx2; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNoSpaceEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNoSpaceEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } @@ -152,7 +152,7 @@ bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue) /* */ /********************************************************************/ -SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet) +SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", &rSet) , aProxyModePN("ooInetProxyType") , aHttpProxyPN("ooInetHTTPProxyName") @@ -214,7 +214,7 @@ SvxProxyTabPage::~SvxProxyTabPage() { } -SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxProxyTabPage(pParent, *rAttrSet); } @@ -574,7 +574,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) /* */ /********************************************************************/ -SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet) +SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet) , mpSecOptions(new SvtSecurityOptions) , mpSecOptDlg(NULL) @@ -853,7 +853,7 @@ void SvxSecurityTabPage::InitControls() } } -SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxSecurityTabPage(pParent, *rAttrSet); } @@ -1018,7 +1018,7 @@ struct SvxEMailTabPage_Impl MailerProgramCfg_Impl aMailConfig; }; -SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) +SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", &rSet) , pImpl(new SvxEMailTabPage_Impl) { @@ -1039,7 +1039,7 @@ SvxEMailTabPage::~SvxEMailTabPage() /* -------------------------------------------------------------------------*/ -SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxEMailTabPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 4182f76efd02..c7d81b756f12 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -43,7 +43,7 @@ class SvxNoSpaceEdit : public Edit private: bool bOnlyNumeric; public: - SvxNoSpaceEdit(Window* pParent, WinBits nStyle) + SvxNoSpaceEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) , bOnlyNumeric(false) {} @@ -98,11 +98,11 @@ private: DECL_LINK( ProxyHdl_Impl, ListBox * ); DECL_LINK( LoseFocusHdl_Impl, Edit * ); - SvxProxyTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxProxyTabPage(); public: - 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; }; @@ -111,9 +111,9 @@ public: class SvxScriptExecListBox : public ListBox { // for adding tooltips to ListBox public: - SvxScriptExecListBox( Window* pParent, WinBits nStyle = WB_BORDER ) + SvxScriptExecListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) :ListBox(pParent, nStyle) {} - SvxScriptExecListBox( Window* pParent, const ResId& rResId ) + SvxScriptExecListBox( vcl::Window* pParent, const ResId& rResId ) :ListBox(pParent, rResId) {} protected: @@ -164,7 +164,7 @@ private: void InitControls(); - SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxSecurityTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSecurityTabPage(); protected: @@ -172,7 +172,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - 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; }; @@ -192,10 +192,10 @@ class SvxEMailTabPage : public SfxTabPage DECL_LINK( FileDialogHdl_Impl, PushButton* ) ; public: - SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxEMailTabPage(); - 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/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 533bd97e1fca..4f9a7963a5db 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -131,7 +131,7 @@ public: // class SvxJavaOptionsPage ---------------------------------------------- -SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ) +SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", &rSet) , m_pParamDlg(NULL) , m_pPathDlg(NULL) @@ -195,7 +195,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet #if HAVE_FEATURE_JAVA jfw_lock(); #else - get<Window>("javaframe")->Disable(); + get<vcl::Window>("javaframe")->Disable(); #endif } @@ -635,7 +635,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) -SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxJavaOptionsPage( pParent, *rAttrSet ) ); } @@ -786,7 +786,7 @@ void SvxJavaOptionsPage::FillUserData() // class SvxJavaParameterDlg --------------------------------------------- -SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) : +SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) : ModalDialog( pParent, "JavaStartParameters", "cui/ui/javastartparametersdialog.ui" ) @@ -919,7 +919,7 @@ void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) // class SvxJavaClassPathDlg --------------------------------------------- -SvxJavaClassPathDlg::SvxJavaClassPathDlg(Window* pParent) +SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent) : ModalDialog(pParent, "JavaClassPath", "cui/ui/javaclasspathdialog.ui") { get( m_pPathList, "paths"); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ab9a9376ceec..353b749f32f5 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -104,10 +104,10 @@ private: void AddFolder( const OUString& _rFolder ); public: - SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxJavaOptionsPage(); - 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* rSet ) SAL_OVERRIDE; @@ -138,7 +138,7 @@ private: public: - SvxJavaParameterDlg( Window* pParent ); + SvxJavaParameterDlg( vcl::Window* pParent ); virtual ~SvxJavaParameterDlg(); virtual short Execute() SAL_OVERRIDE; @@ -170,7 +170,7 @@ private: m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } public: - SvxJavaClassPathDlg( Window* pParent ); + SvxJavaClassPathDlg( vcl::Window* pParent ); virtual ~SvxJavaClassPathDlg(); inline const OUString& GetOldPath() const { return m_sOldPath; } diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 43f32220590d..96bc0146811f 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::i18n; -SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) : +SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet ) { get( m_pMatchCase, "matchcase"); @@ -61,7 +61,7 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage() } -SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxJSearchOptionsPage( pParent, *rSet ); } diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 8a8bf0e96110..bb5ac7a4606e 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -24,7 +24,7 @@ #include <vcl/button.hxx> #include <sfx2/tabdlg.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; @@ -59,12 +59,12 @@ private: sal_Int32 GetTransliterationFlags_Impl(); protected: - SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxJSearchOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index bd6edfd16cc3..e59f541c7e46 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -343,7 +343,7 @@ class OptionsBreakSet : public ModalDialog NumericField* m_pBreakNF; public: - OptionsBreakSet(Window* pParent, sal_uInt16 nRID) + OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID) : ModalDialog(pParent, "BreakNumberOption", "cui/ui/breaknumberoption.ui") , m_pBreakNF(NULL) @@ -1031,7 +1031,7 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable // class SvxLinguTabPage ------------------------------------------------- -SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) : +SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet), sCapitalWords (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)), @@ -1147,7 +1147,7 @@ const sal_uInt16* SvxLinguTabPage::GetRanges() -SfxTabPage* SvxLinguTabPage::Create( Window* pParent, +SfxTabPage* SvxLinguTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxLinguTabPage( pParent, *rAttrSet ) ); @@ -1837,7 +1837,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) } } -SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) +SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData) : ModalDialog( pParent, "EditModulesDialog", "cui/ui/editmodulesdialog.ui") , sSpell(CUI_RES(RID_SVXSTR_SPELL)) diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index bae13c5c5fe6..787cf6f0a7f2 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -111,7 +111,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) -OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet) +OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet) { get(m_pUndoEdit, "undo"); @@ -148,7 +148,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage() -SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMemoryOptionsPage( pParent, *rAttrSet ); } diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b1bf5826a769..b3aaff18715d 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -56,10 +56,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet ); + OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMemoryOptionsPage(); - 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/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index eb212b30701e..d231aa10542b 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -195,7 +195,7 @@ bool IsMultiPath_Impl( const sal_uInt16 nIndex ) // class SvxPathTabPage -------------------------------------------------- -SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet) +SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) :SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet) , xDialogListener ( new ::svt::DialogClosedListener() ) { @@ -255,7 +255,7 @@ SvxPathTabPage::~SvxPathTabPage() -SfxTabPage* SvxPathTabPage::Create( Window* pParent, +SfxTabPage* SvxPathTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxPathTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index abdcbbd526cc..bb0188866e7a 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -80,7 +80,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl() // class SvxSaveTabPage -------------------------------------------------- -SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : +SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ), pImpl ( new SvxSaveTabPage_Impl ) { @@ -204,7 +204,7 @@ SfxSaveTabPage::~SfxSaveTabPage() -SfxTabPage* SfxSaveTabPage::Create( Window* pParent, +SfxTabPage* SfxSaveTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SfxSaveTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 97f49b72c310..b5fe40ad204e 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -71,10 +71,10 @@ private: void DetectHiddenControls(); public: - SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSaveTabPage(); - 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/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 6de31e2bb4da..702373b53009 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; // class SvxOnlineUpdateTabPage -------------------------------------------------- -SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet& rSet) +SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", &rSet) { m_aNeverChecked = get<FixedText>("neverchecked")->GetText(); @@ -149,7 +149,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() SfxTabPage* -SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxOnlineUpdateTabPage( pParent, *rAttrSet ); } diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index a9d397305c74..54bb2a3791f8 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -51,10 +51,10 @@ private: void UpdateLastCheckedText(); public: - SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxOnlineUpdateTabPage(); - 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* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 9500026f4354..5f02689b955c 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::beans; -SelectPersonaDialog::SelectPersonaDialog( Window *pParent ) +SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) : ModalDialog( pParent, "SelectPersonaDialog", "cui/ui/select_persona_dialog.ui" ) { get( m_pSearchButton, "search_personas" ); @@ -258,7 +258,7 @@ void SelectPersonaDialog::ClearSearchResults() } } -SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet ) +SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", &rSet ) { // persona @@ -295,7 +295,7 @@ SvxPersonalizationTabPage::~SvxPersonalizationTabPage() { } -SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet *rSet ) +SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SvxPersonalizationTabPage( pParent, *rSet ); } diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 4df2a68838b4..95da0717c932 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -40,10 +40,10 @@ private: public: ::rtl::Reference< SearchAndParseThread > m_rApplyThread; - SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet ); + SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxPersonalizationTabPage(); - static SfxTabPage* Create( Window *pParent, const SfxItemSet *rSet ); + static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet ); /// Apply the settings ([OK] button). virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; @@ -91,7 +91,7 @@ private: OUString m_aAppliedPersona; public: - SelectPersonaDialog( Window *pParent ); + SelectPersonaDialog( vcl::Window *pParent ); ::rtl::Reference< SearchAndParseThread > m_rSearchThread; OUString GetSelectedPersona() const; diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index e779aa17a966..b046f218bbb6 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -42,7 +42,7 @@ namespace svx { -SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions) +SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOptions* pOptions) : ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui") { DBG_ASSERT( pOptions, "SecurityOptionsDialog::SecurityOptionsDialog(): invalid SvtSecurityOptions" ); diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index 0838e2b39b69..614e3f72dfa3 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -48,7 +48,7 @@ namespace svx CheckBox* m_pBlockUntrustedRefererLinksCB; public: - SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ); + SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions ); virtual ~SecurityOptionsDialog(); bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index ab9356619845..88900347d401 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -286,8 +286,8 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& { } -//typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet ); -SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +//typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet ); +SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { CreateTabPage fnCreate = 0; switch(nId) @@ -510,7 +510,7 @@ void OfaTreeOptionsDialog::InitWidgets() // Ctor() with Frame ----------------------------------------------------- using namespace ::com::sun::star; OfaTreeOptionsDialog::OfaTreeOptionsDialog( - Window* pParent, + vcl::Window* pParent, const Reference< XFrame >& _xFrame, bool bActivateLastSelection ) : @@ -529,7 +529,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( } // Ctor() with ExtensionId ----------------------------------------------- -OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) : +OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ) : SfxModalDialog( pParent, "OptionsDialog", "cui/ui/optionsdialog.ui" ), INI_LIST() @@ -1131,7 +1131,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pNewPage = pPageInfo->m_pPage; // restore lost focus, if necessary - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); // if the focused window is not the options treebox and the old page has the focus if ( pFocusWin && pFocusWin != pBox && pOldPage && pOldPage->HasChildPathFocus() ) // then set the focus to the new page or if we are on a group set the focus to the options treebox @@ -1142,7 +1142,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() OString sHelpId(HID_OFADLG_TREELISTBOX); if (::isLayoutEnabled(pNewPage)) { - Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD); assert(pFirstChild); sHelpId = pFirstChild->GetHelpId(); } @@ -2151,7 +2151,7 @@ short OfaTreeOptionsDialog::Execute() // class ExtensionsTabPage ----------------------------------------------- ExtensionsTabPage::ExtensionsTabPage( - Window* pParent, WinBits nStyle, const OUString& rPageURL, + vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL, const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : TabPage( pParent, nStyle ), @@ -2214,7 +2214,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() Reference< awt::XWindowPeer > xWinPeer( xPageControl->getPeer() ); if ( xWinPeer.is() ) { - Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer ); if ( pWindow ) pWindow->SetStyle( pWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); } diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 427145a9e659..7d5a483cd647 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -102,7 +102,7 @@ void PasswordTable::setColWidths() // class WebConnectionInfoDialog ----------------------------------------- -WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent) +WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent) : ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui") , m_nPos( -1 ) { diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 0d8c278cabc4..366bcfc31283 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -62,7 +62,7 @@ namespace svx void FillPasswordList(); public: - WebConnectionInfoDialog( Window* pParent ); + WebConnectionInfoDialog( vcl::Window* pParent ); virtual ~WebConnectionInfoDialog(); }; diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c2f07521ab3f..7eac0ade3164 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -150,7 +150,7 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const -AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : +AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs ) @@ -253,7 +253,7 @@ AlignmentTabPage::~AlignmentTabPage() delete m_pOrientHlp; } -SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new AlignmentTabPage( pParent, *rAttrSet ); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 498a677b341a..7475cd1af6f9 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star; using namespace ::rtl; -OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) +OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, "AutoCorrectDialog", "cui/ui/autocorrectdialog.ui", _pSet) { get(m_pLanguageBox, "langbox"); @@ -179,7 +179,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) return 0; } -OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet) +OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet) , m_sInput(CUI_RESSTR(RID_SVXSTR_USE_REPLACE)) , m_sDoubleCaps(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD)) @@ -193,7 +193,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet get(m_pCheckLB, "checklist"); } -SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrOptionsPage(pParent, *rSet); @@ -285,7 +285,7 @@ class OfaAutoFmtPrcntSet : public ModalDialog { MetricField* m_pPrcntMF; public: - OfaAutoFmtPrcntSet(Window* pParent) + OfaAutoFmtPrcntSet(vcl::Window* pParent) : ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui") { get(m_pPrcntMF, "margin"); @@ -387,7 +387,7 @@ enum OfaAutoFmtOptions MERGE_SINGLE_LINE_PARA }; -OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, +OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet) , sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA)) @@ -431,9 +431,9 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, }; m_pCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUStringBuffer sHeader(get<Window>("m")->GetText()); + OUStringBuffer sHeader(get<vcl::Window>("m")->GetText()); sHeader.append('\t'); - sHeader.append(get<Window>("t")->GetText()); + sHeader.append(get<vcl::Window>("t")->GetText()); sHeader.append('\t'); m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); @@ -477,7 +477,7 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() delete m_pCheckLB; } -SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, +SfxTabPage* OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet); @@ -831,7 +831,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvSimpleTable::KeyInput(rKEvt); } -OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, +OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "AcorReplacePage", "cui/ui/acorreplacepage.ui", &rSet) , eLang(eLastDialogLanguage) @@ -905,7 +905,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage() delete pCharClass; } -SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrReplacePage(pParent, *rSet); } @@ -1361,7 +1361,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt return false; } -OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const SfxItemSet& rSet) +OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", &rSet) , eLang(eLastDialogLanguage) { @@ -1405,7 +1405,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage() delete pCompareClass; } -SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrExceptPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrExceptPage(pParent, *rSet); @@ -1685,7 +1685,7 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) return 0; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCorrEdit(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCorrEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new AutoCorrEdit(pParent); @@ -1740,7 +1740,7 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol) return pEntry; } -OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) +OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet) , sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE)) , sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL)) @@ -1795,9 +1795,9 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) m_pSwCheckLB->SetStyle(m_pSwCheckLB->GetStyle() | WB_HSCROLL| WB_VSCROLL); m_pSwCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUString sHeader(get<Window>("m")->GetText()); + OUString sHeader(get<vcl::Window>("m")->GetText()); sHeader += "\t"; - sHeader += get<Window>("t")->GetText(); + sHeader += get<vcl::Window>("t")->GetText(); sHeader += "\t"; m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); @@ -1822,7 +1822,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage() delete m_pSwCheckLB; } -SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, +SfxTabPage* OfaQuoteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new OfaQuoteTabPage(pParent, *rAttrSet); @@ -2085,7 +2085,7 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) return aOUStr; } -OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(Window* pParent, +OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "WordCompletionPage", "cui/ui/wordcompletionpage.ui", &rSet) @@ -2146,7 +2146,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() { } -SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, +SfxTabPage* OfaAutoCompleteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutoCompleteTabPage( pParent, *rSet ); @@ -2315,7 +2315,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const sData.append(aLineEnd); } pCntnr->CopyByteString( SOT_FORMAT_STRING, sData.makeStringAndClear() ); - pCntnr->CopyToClipboard( (Window*)this ); + pCntnr->CopyToClipboard( (vcl::Window*)this ); } } @@ -2346,7 +2346,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCompleteMultiListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -2359,7 +2359,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Wi // class OfaSmartTagOptionsTabPage --------------------------------------------- -OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent, +OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "SmartTagOptionsPage", "cui/ui/smarttagoptionspage.ui", &rSet) { @@ -2385,7 +2385,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaSmartTagOptionsTabPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 3f48db5ccea3..9929334ee452 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -176,10 +176,10 @@ sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) preview window for brush or bitmap */ -class BackgroundPreviewImpl : public Window +class BackgroundPreviewImpl : public vcl::Window { public: - BackgroundPreviewImpl(Window* pParent); + BackgroundPreviewImpl(vcl::Window* pParent); void setBmp(bool bBmp); virtual ~BackgroundPreviewImpl(); @@ -203,7 +203,7 @@ private: sal_uInt8 nTransparency; }; -BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent) +BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) : Window(pParent, WB_BORDER) , bIsBmp(false) , pBitmap(NULL) @@ -214,7 +214,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent) Paint(aDrawRect); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBackgroundPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBackgroundPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new BackgroundPreviewImpl(pParent); } @@ -350,7 +350,7 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) #define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl) -SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SvxTabPage(pParent, "BackgroundPage", "cui/ui/backgroundpage.ui", rCoreSet) , nHtmlMode(0) , bAllowShowSelector(true) @@ -456,7 +456,7 @@ const sal_uInt16* SvxBackgroundTabPage::GetRanges() -SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, +SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) /* [Description] @@ -1068,7 +1068,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) +void SvxBackgroundTabPage::PointChanged( vcl::Window* , RECT_POINT ) { // has to be implemented so that position control can work } @@ -1423,7 +1423,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) return 0; bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); - OUString aStrBrowse(get<Window>("findgraphicsft")->GetText()); + OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText()); pImportDlg = new SvxOpenGraphicDialog( aStrBrowse ); if ( bHtml || bLinkOnly ) pImportDlg->EnableLink(false); diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index d0d7752d4fff..2116a64364be 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -24,7 +24,7 @@ #include "svx/svxids.hrc" #include "cuitabarea.hxx" -SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent, +SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector, bool bEnableDrawingLayerFillStyles) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 6ccba2efba01..b514300acd1a 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -85,7 +85,7 @@ static void lcl_SetDecimalDigitsTo1(MetricField& rField) } -SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs) +SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", &rCoreAttrs) , @@ -349,7 +349,7 @@ const sal_uInt16* SvxBorderTabPage::GetRanges() -SfxTabPage* SvxBorderTabPage::Create( Window* pParent, +SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxBorderTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 05781ce7a99a..fc59a487e6b1 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() -SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( false ) @@ -262,7 +262,7 @@ struct SvxCharNamePage_Impl // class SvxCharNamePage ------------------------------------------------- -SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet) , m_pImpl(new SvxCharNamePage_Impl) { @@ -1180,7 +1180,7 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharNamePage( pParent, *rSet ); } @@ -1313,7 +1313,7 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet) } // class SvxCharEffectsPage ---------------------------------------------- -SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "EffectsPage", "cui/ui/effectspage.ui", rInSet) , m_aTransparentColorName(CUI_RES(RID_SVXSTR_CHARNAME_TRANSPARENT)) { @@ -1727,7 +1727,7 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharEffectsPage( pParent, *rSet ); } @@ -2564,7 +2564,7 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet) // class SvxCharPositionPage --------------------------------------------- -SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "PositionPage", "cui/ui/positionpage.ui", rInSet) , m_nSuperEsc((short)DFLT_ESC_SUPER) , m_nSubEsc((short)DFLT_ESC_SUB) @@ -2901,7 +2901,7 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharPositionPage( pParent, *rSet ); } @@ -3328,7 +3328,7 @@ void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet) } // class SvxCharTwoLinesPage ------------------------------------------------ -SvxCharTwoLinesPage::SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rInSet) +SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rInSet) : SvxCharBasePage(pParent, "TwoLinesPage", "cui/ui/twolinespage.ui", rInSet) , m_nStartBracketPosition( 0 ) , m_nEndBracketPosition( 0 ) @@ -3473,7 +3473,7 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharTwoLinesPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 61ac6853975d..b4269d3e8145 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -50,7 +50,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rInAttrs, +SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView ) : SfxSingleTabDialog(pParent, rInAttrs) { @@ -79,7 +79,7 @@ SvxConnectionDialog::~SvxConnectionDialog() |* \************************************************************************/ -SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) +SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage(pWindow ,"ConnectorTabPage" ,"cui/ui/connectortabpage.ui" ,&rInAttrs) , rOutAttrs(rInAttrs) @@ -388,7 +388,7 @@ void SvxConnectionPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxConnectionPage::Create( Window* pWindow, +SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxConnectionPage( pWindow, *rAttrs ) ); diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index edfbed3dcc9e..86d23299112b 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -SvxDistributeDialog::SvxDistributeDialog(Window* pParent, +SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) : SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog", @@ -47,7 +47,7 @@ SvxDistributeDialog::SvxDistributeDialog(Window* pParent, |* \************************************************************************/ -SvxDistributePage::SvxDistributePage(Window* pWindow, +SvxDistributePage::SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) : SvxTabPage(pWindow, "DistributionPage", "cui/ui/distributionpage.ui", @@ -74,13 +74,13 @@ SvxDistributePage::SvxDistributePage(Window* pWindow, |* \************************************************************************/ -SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs, +SfxTabPage* SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) { return new SvxDistributePage(pWindow, rAttrs, eHor, eVer); } -void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) +void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/) { } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index dad147e7d54b..0fcd835987ab 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -48,7 +48,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) description: crop graphic --------------------------------------------------------------------*/ -SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) +SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet) , pLastCropField(0) , nOldWidth(0) @@ -129,7 +129,7 @@ SvxGrfCropPage::~SvxGrfCropPage() aTimer.Stop(); } -SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SvxGrfCropPage( pParent, *rSet ); } @@ -749,7 +749,7 @@ Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const /*****************************************************************/ -SvxCropExample::SvxCropExample( Window* pPar, WinBits nStyle ) +SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle ) : Window( pPar, nStyle) , aFrameSize( OutputDevice::LogicToLogic( Size( CM_1_TO_TWIP / 2, CM_1_TO_TWIP / 2 ), @@ -765,7 +765,7 @@ Size SvxCropExample::GetOptimalSize() const return LogicToPixel(Size(78, 78), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCropExample(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCropExample(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 37bfe3e0ff8d..e1dcee776491 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -70,7 +70,7 @@ static const sal_uInt16 pCaptionRanges[] = 0 }; -SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", &rInAttrs) , nCaptionType(0) , nGap(0) @@ -336,7 +336,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, +SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) ); @@ -514,7 +514,7 @@ void SvxCaptionTabPage::FillValueSet() -SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, +SvxCaptionTabDialog::SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pSdrView, sal_uInt16 nAnchorTypes) : SfxTabDialog( pParent, "CalloutDialog", "cui/ui/calloutdialog.ui") , pView(pSdrView) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 52788fb317e2..3af840679e2b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -135,7 +135,7 @@ void _SfxMacroTabPage::EnableButtons() mpImpl->pAssignPB->Enable( false ); } -_SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet) +_SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet) { mpImpl = new _SfxMacroTabPage_Impl; @@ -433,7 +433,7 @@ void _SfxMacroTabPage::FillEvents() } } -SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) +SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) : _SfxMacroTabPage( pParent, rSet ) { mpImpl->sStrEvent = get<FixedText>("eventft")->GetText(); @@ -456,18 +456,18 @@ SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxD namespace { - SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet& rAttrSet ) + SfxMacroTabPage* CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { return new SfxMacroTabPage( pParent, NULL, rAttrSet ); } } -SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return CreateSfxMacroTabPage(pParent, *rAttrSet); } -SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent, +SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "EventAssignDialog", "cui/ui/eventassigndialog.ui") diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 6104a2a5fdf3..dfeb8fef7cc0 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -60,7 +60,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs, +SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView ) : SfxSingleTabDialog(pParent, rInAttrs) { @@ -79,7 +79,7 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs, |* \************************************************************************/ -SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : +SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SvxTabPage ( pWindow ,"DimensionLinesTabPage" ,"cui/ui/dimensionlinestabpage.ui" @@ -593,7 +593,7 @@ void SvxMeasurePage::Construct() |* \************************************************************************/ -SfxTabPage* SvxMeasurePage::Create( Window* pWindow, +SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxMeasurePage( pWindow, *rAttrs ) ); @@ -604,7 +604,7 @@ const sal_uInt16* SvxMeasurePage::GetRanges() return( pRanges ); } -void SvxMeasurePage::PointChanged( Window* pWindow, RECT_POINT /*eRP*/ ) +void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) { ChangeAttrHdl_Impl( pWindow ); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 6937e0c5cd16..19d42733f858 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -76,7 +76,7 @@ static const sal_uInt16 pRanges[] = #* #************************************************************************/ -SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) +SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , mnPos(-1) , mnChar(0x0) @@ -89,7 +89,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumberPreview(pParent); } @@ -235,7 +235,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl ) -SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent, +SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "NumberingFormatPage", "cui/ui/numberingformatpage.ui", &rCoreAttrs) @@ -375,7 +375,7 @@ const sal_uInt16* SvxNumberFormatTabPage::GetRanges() #* #************************************************************************/ -SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, +SfxTabPage* SvxNumberFormatTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxNumberFormatTabPage( pParent, *rAttrSet ) ); @@ -1664,7 +1664,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_LOSEFOCUS) { - if ( rNEvt.GetWindow() == dynamic_cast< Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) + if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) { pLastActivWindow = NULL; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 2e087739a05a..558536153a8d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -173,7 +173,7 @@ static vcl::Font& lcl_GetDefaultBulletFont() return aDefBulletFont; } -SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, +SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet) , pActNum(0) @@ -223,7 +223,7 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() delete pSaveNum; } -SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxSingleNumPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxSingleNumPickTabPage(pParent, *rAttrSet); @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) } -SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, +SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet) , pActNum(0) @@ -384,7 +384,7 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage() delete pSaveNum; } -SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBulletPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxBulletPickTabPage(pParent, *rAttrSet); @@ -524,7 +524,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) } -SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, +SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet) , pActNum(0) @@ -581,7 +581,7 @@ SvxNumPickTabPage::~SvxNumPickTabPage() delete pSaveNum; } -SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumPickTabPage(pParent, *rAttrSet); @@ -772,7 +772,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } -SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, +SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet) , pActNum(0) @@ -822,7 +822,7 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage() delete pSaveNum; } -SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBitmapPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxBitmapPickTabPage(pParent, *rAttrSet); @@ -1021,7 +1021,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR } // tabpage numbering options -SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, +SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet) , pActNum(0) @@ -1141,7 +1141,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) m_pHeightMF->SetUnit( eMetric ); } -SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, +SfxTabPage* SvxNumOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumOptionsTabPage(pParent, *rAttrSet); @@ -2265,7 +2265,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, return nRet; } -SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) +SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits) : Window(pParent, nWinBits) , pActNum(0) , nPageWidth(0) @@ -2276,7 +2276,7 @@ SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) SetBorderStyle(WINDOW_BORDER_MONO); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberingPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumberingPreview(pParent, WB_BORDER); } @@ -2580,7 +2580,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) //dialog to this one, except with a different preview window impl. //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged -SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, +SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet) , pActNum(0) @@ -3093,7 +3093,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPositionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumPositionTabPage(pParent, *rAttrSet); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 56877bf9dba8..97b662be8846 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -171,12 +171,12 @@ const sal_uInt16* SvxPageDescPage::GetRanges() -SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxPageDescPage( pParent, *rSet ); } -SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", &rAttr ), diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index a205605d183a..cf984bedbb22 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) return 0; } -SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SvxStdParagraphTabPage( pParent, *rSet ); } @@ -618,7 +618,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "ParaIndentSpacing","cui/ui/paraindentspacing.ui", &rAttr ), nAbst ( MAX_DURCH ), @@ -964,7 +964,7 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) #define LASTLINECOUNT_OLD 3 #define LASTLINECOUNT_NEW 4 -SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ) +SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",&rSet) { @@ -1046,7 +1046,7 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxParaAlignTabPage(pParent, *rSet); } @@ -1324,7 +1324,7 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, +SfxTabPage* SvxExtParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxExtParagraphTabPage( pParent, *rSet ); @@ -1829,7 +1829,7 @@ void SvxExtParagraphTabPage::DisablePageBreak() m_pPagenumEdit->Enable(false); } -SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", &rAttr ), bPageBreak ( true ), @@ -2119,7 +2119,7 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) DisablePageBreak(); } -SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : +SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "AsianTypography","cui/ui/asiantypography.ui", &rSet) { @@ -2138,7 +2138,7 @@ SvxAsianTabPage::~SvxAsianTabPage() { } -SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxAsianTabPage(pParent, *rSet); } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index ca0cff406751..ffd6bd3207c2 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -502,7 +502,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, return nLBRelations; } -SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs) , m_pVMap(0) , m_pHMap(0) @@ -693,7 +693,7 @@ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { } -SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SvxSwPosSizeTabPage(pParent, *rSet); } diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 3d3b3f82a17b..e5ab37b6f16f 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -37,7 +37,7 @@ SvxAreaTabDialog::SvxAreaTabDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 01ac68b57cc3..c473966340ad 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -35,7 +35,7 @@ SvxLineTabDialog::SvxLineTabDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pSdrObj, diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 0f528e4e8a17..de67049d9e11 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -36,7 +36,7 @@ // class TabWin_Impl ----------------------------------------------------- -class TabWin_Impl : public Window +class TabWin_Impl : public vcl::Window { SvxTabulatorTabPage* mpPage; private: @@ -44,7 +44,7 @@ private: public: - TabWin_Impl(Window* pParent, WinBits nBits) + TabWin_Impl(vcl::Window* pParent, WinBits nBits) : Window(pParent, nBits) , mpPage(0) , nTabStyle(0) @@ -57,7 +57,7 @@ public: void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabWin_Impl(vcl::Window *pParent, VclBuilder::stringmap &) { return new TabWin_Impl(pParent, 0); } @@ -96,7 +96,7 @@ void TabWin_Impl::Paint( const Rectangle& ) // class SvxTabulatorTabPage --------------------------------------------- -SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAttr ): +SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ): SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", &rAttr ), @@ -259,7 +259,7 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) -SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, +SfxTabPage* SvxTabulatorTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return ( new SvxTabulatorTabPage( pParent, *rSet ) ); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4ba2bb7c623f..4e1761d0a18d 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -41,7 +41,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxTextTabDialog::SvxTextTabDialog( Window* pParent, +SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent @@ -76,7 +76,7 @@ void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) |* \************************************************************************/ -SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) : +SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage ( pWindow ,"TextAnimation" ,"cui/ui/textanimtabpage.ui" @@ -450,7 +450,7 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges() |* \************************************************************************/ -SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, +SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxTextAnimationPage( pWindow, *rAttrs ) ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index d97cca54836a..3f74020f47c6 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -53,7 +53,7 @@ static const sal_uInt16 pRanges[] = |* dialog (page) for copying objects |* \************************************************************************/ -SvxTextAttrPage::SvxTextAttrPage(Window* pWindow, const SfxItemSet& rInAttrs) +SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SvxTabPage(pWindow,"TextAttributesPage","cui/ui/textattrtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) , pView(NULL) @@ -520,7 +520,7 @@ void SvxTextAttrPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxTextAttrPage::Create( Window* pWindow, +SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxTextAttrPage( pWindow, *rAttrs ) ); @@ -533,7 +533,7 @@ const sal_uInt16* SvxTextAttrPage::GetRanges() /** Check whether we have to uncheck the "Full width" check box. */ -void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP ) +void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP ) { if (m_pTsbFullWidth->GetState() == TRISTATE_TRUE) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 698d0a5de0ab..0dfd93040826 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -224,7 +224,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS) } } -SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage ( pParent, "TransparencyTabPage", "cui/ui/transparencytabpage.ui", @@ -289,7 +289,7 @@ void SvxTransparenceTabPage::Construct() { } -SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet* rAttrs) +SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) { return(new SvxTransparenceTabPage(pWindow, *rAttrs)); } @@ -486,7 +486,7 @@ int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) return(LEAVE_PAGE); } -void SvxTransparenceTabPage::PointChanged(Window* , RECT_POINT eRcPt) +void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt) { eRP = eRcPt; } @@ -579,7 +579,7 @@ void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet) |* \************************************************************************/ -SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage( pParent, "AreaTabPage", @@ -1756,7 +1756,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, +SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxAreaTabPage( pWindow, *rAttrs ) ); @@ -2365,7 +2365,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) -void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxAreaTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { eRP = eRcPt; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 42915cd6e848..b6b9280235dd 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; -SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs) : +SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage ( pParent, "BitmapTabPage", @@ -291,7 +291,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, +SfxTabPage* SvxBitmapTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return new SvxBitmapTabPage( pWindow, *rSet ); @@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) -void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) +void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) { if( pWindow == m_pCtlPixel ) { @@ -967,7 +967,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) -Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const +vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) return const_cast<FixedText*>(m_pLbBitmapsHidden); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 7d2def85d888..2fc15158a11a 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -300,7 +300,7 @@ struct SvxColorTabPageShadow -SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XCOLOR_LIST ) , mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() ) @@ -619,7 +619,7 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxColorTabPage::Create( Window* pWindow, +SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxColorTabPage( pWindow, *rOutAttrs ) ); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) { - Window *pWindow = this; + vcl::Window *pWindow = this; while( pWindow ) { pWindow = pWindow->GetParent(); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index bc1050e54a37..085ba9ce144f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; SvxGradientTabPage::SvxGradientTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", &rInAttrs ), @@ -366,7 +366,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxGradientTabPage::Create( Window* pWindow, +SfxTabPage* SvxGradientTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return new SvxGradientTabPage( pWindow, *rOutAttrs ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 85768a5cb066..ee0c8a2a666f 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; SvxHatchTabPage::SvxHatchTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -339,7 +339,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxHatchTabPage::Create( Window* pWindow, +SfxTabPage* SvxHatchTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return new SvxHatchTabPage( pWindow, *rSet ); @@ -799,7 +799,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) -void SvxHatchTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { if( pWindow == m_pCtlAngle ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 20efb0e3b754..5da506f3d745 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -76,7 +76,7 @@ static const sal_uInt16 pLineRanges[] = SvxLineTabPage::SvxLineTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent @@ -1483,7 +1483,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineTabPage::Create( Window* pWindow, +SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxLineTabPage( pWindow, *rAttrs ) ); @@ -1673,7 +1673,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) -void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt ) +void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { eRP = eRcPt; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 8d8583eabbce..cf945d689375 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -48,7 +48,7 @@ SvxLineDefTabPage::SvxLineDefTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -320,7 +320,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 94cf7635bc3f..a71ce58192b1 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -50,7 +50,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -264,7 +264,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet* rSet ) +SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return( new SvxLineEndDefTabPage( pWindow, *rSet ) ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 97ba83597c3d..7bd6076eb6c9 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -45,7 +45,7 @@ static const sal_uInt16 pShadowRanges[] = 0 }; -SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, "ShadowTabPage", @@ -456,7 +456,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, +SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxShadowTabPage( pWindow, *rAttrs ) ); @@ -533,7 +533,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) -void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxShadowTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { eRP = eRcPt; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 0245dcf1ba59..c6273945c7cb 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -102,7 +102,7 @@ static void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale) |* \************************************************************************/ -SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, +SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt16 nAnchorTypes ) : SfxTabDialog( pParent ,"PositionAndSizeDialog" @@ -197,7 +197,7 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink) |* angle and the rotation angle of the graphic objects |* \************************************************************************/ -SvxAngleTabPage::SvxAngleTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"Rotation","cui/ui/rotationtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) , pView(NULL) @@ -330,7 +330,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet* rSet) +SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { return(new SvxAngleTabPage(pWindow, *rSet)); } @@ -362,7 +362,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) +void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP) { if(pWindow == m_pCtlRect) { @@ -431,7 +431,7 @@ void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) |* dialog for changing slant and corner radius |* \************************************************************************/ -SvxSlantTabPage::SvxSlantTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) @@ -564,7 +564,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxSlantTabPage( pWindow, *rOutAttrs ) ); } @@ -603,7 +603,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) +void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT ) { } @@ -612,7 +612,7 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) |* Dialog for changing position and size of graphic objects |* \************************************************************************/ -SvxPositionSizeTabPage::SvxPositionSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui", rInAttrs) , mrOutAttrs(rInAttrs) , mpView(NULL) @@ -1003,7 +1003,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) ); } @@ -1349,7 +1349,7 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const -void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP ) +void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) { if( pWindow == m_pCtlPos ) { |