diff options
Diffstat (limited to 'cui/source/dialogs')
35 files changed, 128 insertions, 128 deletions
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) |