diff options
Diffstat (limited to 'filter/source')
26 files changed, 63 insertions, 63 deletions
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 3de33b2bacf5..fe6b7fe7c485 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::beans; // - ImpPDFDialog - -ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) : +ImpSWFDialog::ImpSWFDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) : ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ), maConfigItem( "Office.Common/Filter/Flash/Export/", &rFilterData ) diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 0726e2de3729..cb128448112e 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -36,7 +36,7 @@ class ResMgr; -class Window; +namespace vcl { class Window; } class ImpSWFDialog : public ModalDialog { @@ -55,7 +55,7 @@ private: DECL_LINK( OnToggleCheckbox, CheckBox* ); public: - ImpSWFDialog( Window* pParent, + ImpSWFDialog( vcl::Window* pParent, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); virtual ~ImpSWFDialog(); diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index e13fc4bd03b2..1b5f5fa287f4 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -146,7 +146,7 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames() -Dialog* SWFDialog::createDialog( Window* pParent ) +Dialog* SWFDialog::createDialog( vcl::Window* pParent ) { Dialog* pRet = NULL; diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 793d6eea0f83..931432e33c4c 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -29,7 +29,7 @@ // - SWFDialog - -class Window; +namespace vcl { class Window; } class ResMgr; class SWFDialog : public ::svt::OGenericUnoDialog, @@ -54,7 +54,7 @@ protected: virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 069e50642f13..13d5505febe6 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -61,7 +61,7 @@ void CustomToolBarImportHelper::applyIcons() uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; - Window* topwin = Application::GetActiveTopWindow(); + vcl::Window* topwin = Application::GetActiveTopWindow(); if ( topwin != NULL && topwin->GetDisplayBackground().GetColor().IsDark() ) nColor = css::ui::ImageType::COLOR_HIGHCONTRAST; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index ba74e6f93d00..108a781a98f8 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; // please note: the default used here are the same as per specification, // they should be the same in PDFFilter::implExport and in PDFExport::PDFExport -ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFilterData, +ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >& rFilterData, const Reference< XComponent >& rxDoc) : SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui"), maConfigItem( "Office.Common/Filter/PDF/Export/", &rFilterData ), @@ -510,7 +510,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() } -ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rCoreSet) +ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfGeneralPage","filter/ui/pdfgeneralpage.ui", &rCoreSet) , mbTaggedPDFUserSelection(false) , mbExportFormFieldsUserSelection(false) @@ -704,7 +704,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) } -SfxTabPage* ImpPDFTabGeneralPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabGeneralPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabGeneralPage( pParent, *rAttrSet ) ); @@ -822,7 +822,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) } // the option features tab page -ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& rCoreSet) +ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", &rCoreSet) , mbUseCTLFont(false) { @@ -855,7 +855,7 @@ ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage() } -SfxTabPage* ImpPDFTabOpnFtrPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabOpnFtrPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabOpnFtrPage( pParent, *rAttrSet ) ); @@ -984,7 +984,7 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, ) // The Viewer preferences tab page -ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, +ImpPDFTabViewerPage::ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage(pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", &rCoreSet) , mbIsPresentation(false) @@ -1015,7 +1015,7 @@ IMPL_LINK( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, void*, ) return 0; } -SfxTabPage* ImpPDFTabViewerPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabViewerPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabViewerPage( pParent, *rAttrSet ) ); @@ -1064,7 +1064,7 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent } // The Security preferences tab page -ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet& i_rCoreSet) +ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(vcl::Window* i_pParent, const SfxItemSet& i_rCoreSet) : SfxTabPage(i_pParent, "PdfSecurityPage","filter/ui/pdfsecuritypage.ui", &i_rCoreSet) , msUserPwdTitle( PDFFilterResId( STR_PDF_EXPORT_UDPWD ) ) , mbHaveOwnerPassword( false ) @@ -1072,7 +1072,7 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet , msOwnerPwdTitle( PDFFilterResId( STR_PDF_EXPORT_ODPWD ) ) { get(mpPbSetPwd, "setpassword"); - msStrSetPwd = get<Window>("setpasswordstitle")->GetText(); + msStrSetPwd = get<vcl::Window>("setpasswordstitle")->GetText(); get(mpUserPwdSet, "userpwdset"); get(mpUserPwdUnset, "userpwdunset"); @@ -1107,7 +1107,7 @@ ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage() } -SfxTabPage* ImpPDFTabSecurityPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabSecurityPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabSecurityPage( pParent, *rAttrSet ) ); @@ -1306,7 +1306,7 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity ) // The link preferences tab page (relative and other stuff) -ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, +ImpPDFTabLinksPage::ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",&rCoreSet ), @@ -1328,7 +1328,7 @@ ImpPDFTabLinksPage::~ImpPDFTabLinksPage() } -SfxTabPage* ImpPDFTabLinksPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabLinksPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabLinksPage( pParent, *rAttrSet ) ); @@ -1527,7 +1527,7 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) // The digital signatures tab page -ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rCoreSet) +ImpPDFTabSigningPage::ImpPDFTabSigningPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", &rCoreSet) , maSignCertificate() { @@ -1585,7 +1585,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) } -SfxTabPage* ImpPDFTabSigningPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabSigningPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabSigningPage( pParent, *rAttrSet ) ); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 9dbd624fb28f..244d4b904552 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -165,7 +165,7 @@ public: friend class ImpPDFTabLinksPage; friend class ImpPDFTabSigningPage; - ImpPDFTabDialog( Window* pParent, + ImpPDFTabDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData, const Reference< XComponent >& rDoc ); @@ -238,11 +238,11 @@ class ImpPDFTabGeneralPage : public SfxTabPage public: DECL_LINK( ToggleExportPDFAHdl, void* ); - ImpPDFTabGeneralPage( Window* pParent, + ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabGeneralPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void GetFilterConfigItem(ImpPDFTabDialog* paParent); @@ -277,11 +277,11 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage DECL_LINK( ToggleRbMagnHdl, void* ); public: - ImpPDFTabOpnFtrPage( Window* pParent, + ImpPDFTabOpnFtrPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabOpnFtrPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -310,11 +310,11 @@ class ImpPDFTabViewerPage : public SfxTabPage DECL_LINK( ToggleRbBookmarksHdl, void* ); public: - ImpPDFTabViewerPage( Window* pParent, + ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabViewerPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -365,11 +365,11 @@ class ImpPDFTabSecurityPage : public SfxTabPage void enablePermissionControls(); public: - ImpPDFTabSecurityPage( Window* pParent, + ImpPDFTabSecurityPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabSecurityPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -396,11 +396,11 @@ class ImpPDFTabLinksPage : public SfxTabPage DECL_LINK( ClickRbOpnLnksBrowserHdl, void* ); public: - ImpPDFTabLinksPage( Window* pParent, + ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabLinksPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -425,11 +425,11 @@ class ImpPDFTabSigningPage : public SfxTabPage DECL_LINK( ClickmaPbSignCertClear, void* ); public: - ImpPDFTabSigningPage( Window* pParent, + ImpPDFTabSigningPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabSigningPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index dbfcfea780cf..02d6a8e374e2 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -108,7 +108,7 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() -Dialog* PDFDialog::createDialog( Window* pParent ) +Dialog* PDFDialog::createDialog( vcl::Window* pParent ) { Dialog* pRet = NULL; diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 86ae9b19aa2e..85135fa24079 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -29,7 +29,7 @@ // - PDFDialog - -class Window; +namespace vcl { class Window; } typedef ::svt::OGenericUnoDialog PDFDialog_DialogBase; typedef ::cppu::ImplInheritanceHelper2 < @@ -51,7 +51,7 @@ protected: virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 31332b362ca4..cdaa4d521697 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -131,7 +131,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) class FocusWindowWaitCursor { - Window* m_pFocusWindow; + vcl::Window* m_pFocusWindow; public: FocusWindowWaitCursor() : m_pFocusWindow( Application::GetFocusWindow() ) diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 1f41db43d9ea..7a7a958b2447 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -25,7 +25,7 @@ using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal ) +inline sal_Int32 implMap( vcl::Window& /*rWnd*/, sal_Int32 nVal ) { //return( rWnd.LogicToLogic( Size( nVal, nVal ) ).Height(), MAP_APPFONT, MAP_APPFONT ); return( nVal << 1 ); @@ -35,7 +35,7 @@ inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal ) // - ImpSVGDialog - -ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) : +ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) : ModalDialog( pParent ), maFI( this ), maCBTinyProfile( this ), diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 7add6c83019f..657cd9a47bb9 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -42,7 +42,7 @@ class ResMgr; -class Window; +namespace vcl { class Window; } class ImpSVGDialog : public ModalDialog { @@ -64,7 +64,7 @@ private: public: - ImpSVGDialog( Window* pParent, /*ResMgr& rResMgr,*/ + ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); virtual ~ImpSVGDialog(); diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 9d9dd4b302a9..ee307a3c27ff 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -143,7 +143,7 @@ Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames() -Dialog* SVGDialog::createDialog( Window* pParent ) +Dialog* SVGDialog::createDialog( vcl::Window* pParent ) { return( ( /*KA: *mapResMgr.get() &&*/ mxSrcDoc.is() ) ? new ImpSVGDialog( pParent/*KA: , *mapResMgr*/, maFilterData ) : diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 5cc335bf77f2..5cc62a7cf3b0 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -55,7 +55,7 @@ protected: virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 2ca7de74249c..4da938250940 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -92,7 +92,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); bool bRet; if( pFocusWindow ) diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 80bfc9112543..6e55c266787d 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -331,7 +331,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException, if( NULL == mpDialog ) { - Window* pParent = DIALOG_NO_PARENT; + vcl::Window* pParent = DIALOG_NO_PARENT; if (mxParent.is()) pParent = VCLUnoHelper::GetWindow(mxParent); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 444559b6f368..4c715e589b33 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -54,7 +54,7 @@ using namespace com::sun::star::util; using ::rtl::Uri; -XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent, +XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext) : ModelessDialog(pParent, "XMLFilterSettingsDialog", "filter/ui/xmlfiltersettings.ui") , mxContext( rxContext ) @@ -1336,7 +1336,7 @@ OUString getApplicationUIName( const OUString& rServiceName ) } } -SvxPathControl::SvxPathControl(Window* pParent) +SvxPathControl::SvxPathControl(vcl::Window* pParent) : VclVBox(pParent) , bHasBeenShown(false) { @@ -1376,7 +1376,7 @@ SvxPathControl::~SvxPathControl() delete m_pHeaderBar; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPathControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPathControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxPathControl(pParent); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 1af868fdb975..6ed617fd40de 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -46,7 +46,7 @@ private: protected: virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: - SvxPathControl(Window* pParent); + SvxPathControl(vcl::Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } XMLFilterListBox* getListBox() { return m_pFocusCtrl; } virtual ~SvxPathControl(); @@ -85,7 +85,7 @@ public: class XMLFilterSettingsDialog : public ModelessDialog { public: - XMLFilterSettingsDialog(Window* pParent, + XMLFilterSettingsDialog(vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext); DECL_LINK(ClickHdl_Impl, PushButton * ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 72b52189e573..4494a74ba799 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::lang; -XMLFilterTabDialog::XMLFilterTabDialog(Window *pParent, ResMgr& rResMgr, +XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo) : TabDialog(pParent, "XSLTFilterDialog","filter/ui/xsltfilterdialog.ui") , mxContext(rxContext) @@ -89,7 +89,7 @@ bool XMLFilterTabDialog::onOk() sal_uInt16 nErrorPage = 0; sal_uInt16 nErrorId = 0; - Window* pFocusWindow = NULL; + vcl::Window* pFocusWindow = NULL; OUString aReplace1; OUString aReplace2; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index c44c8a5ee042..1ec8594ceac4 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -24,7 +24,7 @@ #include <vcl/tabdlg.hxx> #include <vcl/button.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class filter_info_impl; @@ -34,7 +34,7 @@ class XMLFilterTabPageXSLT; class XMLFilterTabDialog: public TabDialog { public: - XMLFilterTabDialog(Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); + XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); virtual ~XMLFilterTabDialog(); bool onOk(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index 88670c874a11..fb1d35ac2599 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -23,7 +23,7 @@ #include "xmlfiltertabpagebasic.hxx" #include "xmlfiltersettingsdialog.hxx" -XMLFilterTabPageBasic::XMLFilterTabPageBasic(Window* pParent) +XMLFilterTabPageBasic::XMLFilterTabPageBasic(vcl::Window* pParent) : TabPage(pParent, "XmlFilterTabPageGeneral", "filter/ui/xmlfiltertabpagegeneral.ui") { get(m_pEDFilterName, "filtername"); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index dfb918c087b2..13d38d11e046 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -25,14 +25,14 @@ #include <vcl/combobox.hxx> #include <svtools/svmedit.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class filter_info_impl; class XMLFilterTabPageBasic : public TabPage { public: - XMLFilterTabPageBasic(Window* pParent); + XMLFilterTabPageBasic(vcl::Window* pParent); virtual ~XMLFilterTabPageBasic(); bool FillInfo( filter_info_impl* pInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index edb9ffe896eb..1edc50fb25a7 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent) : +XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) : TabPage( pParent, "XmlFilterTabPageTransformation", "filter/ui/xmlfiltertabpagetransformation.ui" ), sHTTPSchema( "http://" ), diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index efc7bfad38ab..5f09a33c067f 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -26,14 +26,14 @@ #include <vcl/combobox.hxx> #include <svtools/inettbc.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class filter_info_impl; class XMLFilterTabPageXSLT : public TabPage { public: - XMLFilterTabPageXSLT( Window* pParent); + XMLFilterTabPageXSLT( vcl::Window* pParent); virtual ~XMLFilterTabPageXSLT(); bool FillInfo( filter_info_impl* pInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index de7761009e52..03672fd7f7f8 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -133,7 +133,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString return false; } -XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent, +XMLFilterTestDialog::XMLFilterTestDialog(vcl::Window* pParent, const Reference<XComponentContext>& rxContext) : ModalDialog(pParent, "TestXMLFilterDialog", "filter/ui/testxmlfilter.ui") , mxContext(rxContext) diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 6bdb429c81ca..45953483b43a 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -34,7 +34,7 @@ class filter_info_impl; class XMLFilterTestDialog : public ModalDialog { public: - XMLFilterTestDialog(Window* pParent, + XMLFilterTestDialog(vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext); virtual ~XMLFilterTestDialog(); |