diff options
Diffstat (limited to 'extensions/source/propctrlr')
45 files changed, 127 insertions, 127 deletions
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 788aabbc4ed2..1b94ac756bbb 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -103,7 +103,7 @@ namespace pcr } - Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent) + Dialog* MasterDetailLinkDialog::createDialog(vcl::Window* _pParent) { return new FormLinkDialog(_pParent,m_xDetail,m_xMaster, m_aContext ,m_sExplanation,m_sDetailLabel,m_sMasterLabel); diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 392310085e91..3ff5f64ec0cf 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -60,7 +60,7 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail; diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ab72d013db29..8cfbc3cabe21 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -53,7 +53,7 @@ namespace pcr //= OBrowserLine - OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent ) + OBrowserLine::OBrowserLine( const OUString& _rEntryName, vcl::Window* pParent ) :m_sEntryName( _rEntryName ) ,m_aFtTitle(pParent) ,m_pControlWindow( NULL ) @@ -121,13 +121,13 @@ namespace pcr } - Window* OBrowserLine::GetRefWindow() + vcl::Window* OBrowserLine::GetRefWindow() { - Window* pRefWindow=&m_aFtTitle; + vcl::Window* pRefWindow=&m_aFtTitle; if(m_pBrowseButton) { - pRefWindow=(Window*)m_pBrowseButton; + pRefWindow=(vcl::Window*)m_pBrowseButton; } else if ( m_pControlWindow ) { @@ -137,11 +137,11 @@ namespace pcr } - void OBrowserLine::SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ) + void OBrowserLine::SetTabOrder(vcl::Window* pRefWindow, sal_uInt16 nFlags ) { m_aFtTitle.SetZOrder(pRefWindow,nFlags); if ( m_pControlWindow ) - m_pControlWindow->SetZOrder( (Window*)&m_aFtTitle, WINDOW_ZORDER_BEHIND ); + m_pControlWindow->SetZOrder( (vcl::Window*)&m_aFtTitle, WINDOW_ZORDER_BEHIND ); if ( m_pBrowseButton && m_pControlWindow ) m_pBrowseButton->SetZOrder( m_pControlWindow, WINDOW_ZORDER_BEHIND ); @@ -325,13 +325,13 @@ namespace pcr } } - void implEnable( Window* _pWindow, sal_uInt16 _nEnabledBits, sal_uInt16 _nMatchBits ) + void implEnable( vcl::Window* _pWindow, sal_uInt16 _nEnabledBits, sal_uInt16 _nMatchBits ) { if ( _pWindow ) _pWindow->Enable( ( _nEnabledBits & _nMatchBits ) == _nMatchBits ); } - void implEnable( Window* _pWindow, bool _bEnable ) + void implEnable( vcl::Window* _pWindow, bool _bEnable ) { if ( _pWindow ) _pWindow->Enable( _bEnable ); diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 8f39ae82b3e7..cdc91c712fd0 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -56,18 +56,18 @@ namespace pcr Point m_aLinePos; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > m_xControl; - Window* m_pControlWindow; + vcl::Window* m_pControlWindow; PushButton* m_pBrowseButton; PushButton* m_pAdditionalBrowseButton; IButtonClickListener* m_pClickListener; - Window* m_pTheParent; + vcl::Window* m_pTheParent; sal_uInt16 m_nNameWidth; sal_uInt16 m_nEnableFlags; bool m_bIndentTitle; bool m_bReadOnly; public: - OBrowserLine( const OUString& _rEntryName, Window* pParent); + OBrowserLine( const OUString& _rEntryName, vcl::Window* pParent); ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); @@ -75,7 +75,7 @@ namespace pcr { return m_xControl; } - inline Window* getControlWindow() const + inline vcl::Window* getControlWindow() const { return m_pControlWindow; } @@ -95,8 +95,8 @@ namespace pcr void Hide(); bool IsVisible(); - Window* GetRefWindow(); - void SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ); + vcl::Window* GetRefWindow(); + void SetTabOrder(vcl::Window* pRefWindow, sal_uInt16 nFlags ); bool GrabFocus(); void ShowBrowseButton( const OUString& _rImageURL, bool _bPrimary ); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 05d672822053..66664193ad9b 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -343,7 +343,7 @@ namespace pcr //= OBrowserListBox - OBrowserListBox::OBrowserListBox( Window* pParent, WinBits nWinStyle) + OBrowserListBox::OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle| WB_CLIPCHILDREN) ,m_aLinesPlayground(this,WB_DIALOGCONTROL | WB_CLIPCHILDREN) ,m_aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG) @@ -1096,7 +1096,7 @@ namespace pcr if ( nPos < m_aLines.size() ) { - Window* pRefWindow = NULL; + vcl::Window* pRefWindow = NULL; if ( nPos > 0 ) pRefWindow = m_aLines[nPos-1].pLine->GetRefWindow(); @@ -1105,7 +1105,7 @@ namespace pcr // the old control and some data about it Reference< XPropertyControl > xControl = rLine.pLine->getControl(); - Window* pControlWindow = rLine.pLine->getControlWindow(); + vcl::Window* pControlWindow = rLine.pLine->getControlWindow(); Point aControlPos; if ( pControlWindow ) aControlPos = pControlWindow->GetPosPixel(); @@ -1189,7 +1189,7 @@ namespace pcr // So, we manually switch this to read-only. if ( xControl.is() && ( xControl->getControlType() == PropertyControlType::Unknown ) ) { - Window *pWindow = rLine.pLine->getControlWindow(); + vcl::Window *pWindow = rLine.pLine->getControlWindow(); Edit* pControlWindowAsEdit = dynamic_cast<Edit*>(pWindow); if (pControlWindowAsEdit) pControlWindowAsEdit->SetReadOnly(true); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index dca5005c7c7c..b61911c66fb9 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -122,7 +122,7 @@ namespace pcr void Resize() SAL_OVERRIDE; public: - OBrowserListBox( Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL ); + OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL ); virtual ~OBrowserListBox(); diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 00bce2cd7f00..8f03f67ea1ca 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -33,7 +33,7 @@ namespace pcr // class OBrowserPage - OBrowserPage::OBrowserPage(Window* pParent,WinBits nWinStyle) + OBrowserPage::OBrowserPage(vcl::Window* pParent,WinBits nWinStyle) :TabPage(pParent,nWinStyle) ,m_aListBox(this) { diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index bb368df0ed45..6ef6ef80bce9 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -41,7 +41,7 @@ namespace pcr virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; public: - OBrowserPage(Window* pParent, WinBits nWinStyle = 0); + OBrowserPage(vcl::Window* pParent, WinBits nWinStyle = 0); virtual ~OBrowserPage(); sal_Int32 getMinimumWidth(); diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 3ce6501c41c9..f56532cab6d0 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -30,7 +30,7 @@ namespace pcr //= class OPropertyBrowserView - OPropertyBrowserView::OPropertyBrowserView(Window* _pParent, WinBits nBits) + OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent, WinBits nBits) :Window(_pParent, nBits | WB_3DLOOK) ,m_nActivePage(0) { @@ -58,7 +58,7 @@ namespace pcr sal_uInt16 nTmpPage = m_pPropBox->GetCurPage(); if (nTmpPage) m_nActivePage = nTmpPage; - boost::scoped_ptr<Window> aTemp(m_pPropBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pPropBox); m_pPropBox = NULL; } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 58ffb6c3dad9..c87dd55b3c0a 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -35,7 +35,7 @@ namespace pcr //= - class OPropertyBrowserView : public Window + class OPropertyBrowserView : public vcl::Window { OPropertyEditor* m_pPropBox; sal_uInt16 m_nActivePage; @@ -47,7 +47,7 @@ namespace pcr virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; public: - OPropertyBrowserView( Window* pParent, WinBits nBits = 0); + OPropertyBrowserView( vcl::Window* pParent, WinBits nBits = 0); virtual ~OPropertyBrowserView(); diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index ae676b764c06..0e95203be50a 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -40,7 +40,7 @@ namespace pcr //= ControlHelper - ControlHelper::ControlHelper( Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) + ControlHelper::ControlHelper( vcl::Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) :m_pControlWindow( _pControlWindow ) ,m_nControlType( _nControlType ) ,m_rAntiImpl( _rAntiImpl ) @@ -144,7 +144,7 @@ namespace pcr } - IMPL_LINK( ControlHelper, ModifiedHdl, Window*, /*_pWin*/ ) + IMPL_LINK( ControlHelper, ModifiedHdl, vcl::Window*, /*_pWin*/ ) { if ( m_pModifyListener ) m_pModifyListener->modified(); @@ -152,7 +152,7 @@ namespace pcr } - IMPL_LINK( ControlHelper, GetFocusHdl, Window*, /*_pWin*/ ) + IMPL_LINK( ControlHelper, GetFocusHdl, vcl::Window*, /*_pWin*/ ) { try { @@ -167,7 +167,7 @@ namespace pcr } - IMPL_LINK( ControlHelper, LoseFocusHdl, Window*, /*_pWin*/ ) + IMPL_LINK( ControlHelper, LoseFocusHdl, vcl::Window*, /*_pWin*/ ) { // TODO/UNOize: should this be outside the default control's implementations? If somebody // has an own control implementation, which does *not* do this - would this be allowed? diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index ea838ea44cc2..629660eda8d7 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -47,7 +47,7 @@ namespace pcr ControlHelper* m_pHelper; public: - ControlWindow( Window* _pParent, WinBits _nStyle ) + ControlWindow( vcl::Window* _pParent, WinBits _nStyle ) :WindowType( _pParent, _nStyle ) ,m_pHelper( NULL ) { @@ -86,7 +86,7 @@ namespace pcr class ControlHelper { private: - Window* m_pControlWindow; + vcl::Window* m_pControlWindow; sal_Int16 m_nControlType; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > m_xContext; @@ -116,7 +116,7 @@ namespace pcr would just call our <member>setModified</member>. */ ControlHelper( - Window* _pControlWindow, + vcl::Window* _pControlWindow, sal_Int16 _nControlType, ::com::sun::star::inspection::XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ); @@ -126,8 +126,8 @@ namespace pcr /** sets our "modified" flag to <TRUE/> */ inline void setModified() { m_bModified = true; } - inline Window* getVclControlWindow() { return m_pControlWindow; } - inline const Window* getVclControlWindow() const { return m_pControlWindow; } + inline vcl::Window* getVclControlWindow() { return m_pControlWindow; } + inline const vcl::Window* getVclControlWindow() const { return m_pControlWindow; } public: // XPropertyControl @@ -153,9 +153,9 @@ namespace pcr void autoSizeWindow(); /// may be used by derived classes, they forward the event to the PropCtrListener - DECL_LINK( ModifiedHdl, Window* ); - DECL_LINK( GetFocusHdl, Window* ); - DECL_LINK( LoseFocusHdl, Window* ); + DECL_LINK( ModifiedHdl, vcl::Window* ); + DECL_LINK( GetFocusHdl, vcl::Window* ); + DECL_LINK( LoseFocusHdl, vcl::Window* ); private: /** fail-safe wrapper around calling our context's activateNextControl @@ -191,7 +191,7 @@ namespace pcr ControlHelper m_aImplControl; protected: - inline CommonBehaviourControl( sal_Int16 _nControlType, Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); + inline CommonBehaviourControl( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); // XPropertyControl - delegated to ->m_aImplControl virtual ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; @@ -244,7 +244,7 @@ namespace pcr template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::CommonBehaviourControl ( sal_Int16 _nControlType, Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers ) + inline CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::CommonBehaviourControl ( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers ) :ComponentBaseClass( m_aMutex ) ,m_aImplControl( new WindowType( _pParentWindow, _nWindowStyle ), _nControlType, *this, this ) { diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 54f1a3819cb6..5be7ba9215e0 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -141,7 +141,7 @@ namespace pcr } - Dialog* OControlFontDialog::createDialog(Window* _pParent) + Dialog* OControlFontDialog::createDialog(vcl::Window* _pParent) { ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults); diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index efe72404f4de..a5bd97d45b81 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -82,7 +82,7 @@ namespace pcr protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 3e09a79a9181..8016a2da0831 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -151,9 +151,9 @@ namespace pcr } - Window* DefaultHelpProvider::impl_getVclControlWindow_nothrow( const Reference< XPropertyControl >& _rxControl ) + vcl::Window* DefaultHelpProvider::impl_getVclControlWindow_nothrow( const Reference< XPropertyControl >& _rxControl ) { - Window* pControlWindow = NULL; + vcl::Window* pControlWindow = NULL; OSL_PRECOND( _rxControl.is(), "DefaultHelpProvider::impl_getVclControlWindow_nothrow: illegal control!" ); if ( !_rxControl.is() ) return pControlWindow; @@ -179,7 +179,7 @@ namespace pcr if ( !_rxControl.is() ) return sHelpText; - Window* pControlWindow( impl_getVclControlWindow_nothrow( _rxControl ) ); + vcl::Window* pControlWindow( impl_getVclControlWindow_nothrow( _rxControl ) ); OSL_ENSURE( pControlWindow, "DefaultHelpProvider::impl_getHelpText_nothrow: could not determine the VCL window!" ); if ( !pControlWindow ) return sHelpText; diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index d16f327fe72f..2fafe3d979a4 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/implbase2.hxx> -class Window; +namespace vcl { class Window; } namespace pcr @@ -71,7 +71,7 @@ namespace pcr void create( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxUI ); private: - Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + vcl::Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index f8698dbff07e..8030bf8c42a7 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -171,7 +171,7 @@ namespace pcr //= ControlCharacterDialog - ControlCharacterDialog::ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet) + ControlCharacterDialog::ControlCharacterDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet) : SfxTabDialog(_pParent, "ControlFontDialog", "modules/spropctrlr/ui/controlfontdialog.ui", &_rCoreSet) , m_nCharsId(0) diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index a96ddc4c0a29..cb157913e77a 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -35,7 +35,7 @@ namespace pcr class ControlCharacterDialog : public SfxTabDialog { public: - ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet); + ControlCharacterDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet); virtual ~ControlCharacterDialog(); /// creates an item set to be used with this dialog diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 6b4ff90b1127..5eed30a9d960 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -454,7 +454,7 @@ namespace pcr ::std::auto_ptr< WaitObject > m_aWaitObject; public: - WaitCursor( Window* _pWindow ) + WaitCursor( vcl::Window* _pWindow ) { if ( _pWindow ) m_aWaitObject.reset( new WaitObject( _pWindow ) ); diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 6a79a3de496e..e421a5b2c4ce 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -70,7 +70,7 @@ namespace pcr Link m_aLinkChangeHandler; public: - FieldLinkRow( Window* _pParent ); + FieldLinkRow( vcl::Window* _pParent ); inline void SetLinkChangeHandler( const Link& _rHdl ) { m_aLinkChangeHandler = _rHdl; } @@ -92,7 +92,7 @@ namespace pcr }; - FieldLinkRow::FieldLinkRow( Window* _pParent ) + FieldLinkRow::FieldLinkRow( vcl::Window* _pParent ) :TabPage( _pParent, "FieldLinkRow", "modules/spropctrlr/ui/fieldlinkrow.ui" ) { get(m_pDetailColumn, "detailCombobox"); @@ -140,7 +140,7 @@ namespace pcr return 0L; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFieldLinkRow(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFieldLinkRow(vcl::Window *pParent, VclBuilder::stringmap &) { return new FieldLinkRow(pParent); } @@ -149,7 +149,7 @@ namespace pcr //= FormLinkDialog - FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, + FormLinkDialog::FormLinkDialog( vcl::Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, const OUString& _sExplanation, const OUString& _sDetailLabel, diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index db85f6f0da81..e4fc3f01a766 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -73,7 +73,7 @@ namespace pcr public: FormLinkDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDetailForm, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxMasterForm, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 5859c1eff48b..54fa2ef2e0d8 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -275,9 +275,9 @@ namespace pcr } - Window* PropertyHandlerHelper::getDialogParentWindow( const Reference<XComponentContext>& _rContext ) + vcl::Window* PropertyHandlerHelper::getDialogParentWindow( const Reference<XComponentContext>& _rContext ) { - Window* pInspectorWindow = NULL; + vcl::Window* pInspectorWindow = NULL; try { Reference< XWindow > xInspectorWindow( _rContext->getValueByName( "DialogParentWindow" ), UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index f3482aafeb65..f60f5672ad57 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -30,7 +30,7 @@ #include <vector> -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace inspection { struct LineDescriptor; @@ -174,13 +174,13 @@ namespace pcr /** gets the window of the ObjectInspector in which an property handler lives The method looks up a value called "DialogParentWindow" in the given UNO copmonent context, - queries it for XWindow, and returns the respective Window*. If either of those steps fails, + queries it for XWindow, and returns the respective vcl::Window*. If either of those steps fails, this is asserted in a non-product version, and silently ignore otherwise. @param _rContext the component context which was used to create the component calling this method */ - static Window* getDialogParentWindow( const css::uno::Reference< css::uno::XComponentContext > & _rContext ); + static vcl::Window* getDialogParentWindow( const css::uno::Reference< css::uno::XComponentContext > & _rContext ); /** determines whether given PropertyAttributes require a to-be-created diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index 1ea7bbf26c87..b62010cf6cd9 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -27,7 +27,7 @@ namespace pcr //= InspectorHelpWindow - InspectorHelpWindow::InspectorHelpWindow( Window* _pParent ) + InspectorHelpWindow::InspectorHelpWindow( vcl::Window* _pParent ) :Window( _pParent, WB_DIALOGCONTROL ) ,m_aSeparator( this ) ,m_aHelpText( this, WB_LEFT | WB_READONLY | WB_AUTOVSCROLL ) diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index b24d461938e0..9419a72ec7a9 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -30,7 +30,7 @@ namespace pcr //= InspectorHelpWindow - class InspectorHelpWindow : public Window + class InspectorHelpWindow : public vcl::Window { private: FixedLine m_aSeparator; @@ -40,7 +40,7 @@ namespace pcr sal_Int32 m_nMaxLines; public: - InspectorHelpWindow( Window* _pParent ); + InspectorHelpWindow( vcl::Window* _pParent ); virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 7808c276c0d3..fdb6229dc370 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -29,7 +29,7 @@ namespace pcr using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - ListSelectionDialog::ListSelectionDialog(Window* _pParent, const Reference< XPropertySet >& _rxListBox, + ListSelectionDialog::ListSelectionDialog(vcl::Window* _pParent, const Reference< XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName) : ModalDialog( _pParent, "ListSelectDialog", "modules/spropctrlr/ui/listselectdialog.ui" ) ,m_xListBox ( _rxListBox ) diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index 7dd905e9dd96..aaccb0754ec2 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -39,7 +39,7 @@ namespace pcr public: ListSelectionDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 43638d7f103c..62cc6da9c247 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -29,7 +29,7 @@ namespace pcr //= NewDataTypeDialog - NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) + NewDataTypeDialog::NewDataTypeDialog( vcl::Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) : ModalDialog( _pParent, "DataTypeDialog", "modules/spropctrlr/ui/datatypedialog.ui" ) , m_aProhibitedNames( _rProhibitedNames.begin(), _rProhibitedNames.end() ) diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index f9d64045a5aa..135514aaa271 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -41,7 +41,7 @@ namespace pcr ::std::set< OUString > m_aProhibitedNames; public: - NewDataTypeDialog(Window* _pParent, const OUString& _rNameBase, + NewDataTypeDialog(vcl::Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ); OUString GetName() const { return m_pName->GetText(); } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index de4ebe669192..6b1c71c45e4a 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -130,7 +130,7 @@ namespace pcr } - Dialog* OTabOrderDialog::createDialog( Window* _pParent ) + Dialog* OTabOrderDialog::createDialog( vcl::Window* _pParent ) { return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext ); } diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 7ad83a94c4f4..61a76bf24f4c 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -78,7 +78,7 @@ namespace pcr protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index ff37ef1ba4d6..4e5dda00b2e4 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -373,7 +373,7 @@ namespace pcr // announcement is responsible for calling setComponent, too. Reference< XWindow > xContainerWindow = m_xFrame->getContainerWindow(); VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); - Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; + vcl::Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); @@ -696,7 +696,7 @@ namespace pcr } - bool OPropertyBrowserController::Construct(Window* _pParentWin) + bool OPropertyBrowserController::Construct(vcl::Window* _pParentWin) { DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!"); DBG_ASSERT(_pParentWin, "OPropertyBrowserController::Construct: invalid parent window!"); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index f5aa70673268..62c73a6fe3b6 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -60,7 +60,7 @@ #include <vector> #include <memory> -class Window; +namespace vcl { class Window; } namespace pcr @@ -310,7 +310,7 @@ namespace pcr */ bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); - bool Construct(Window* _pParentWin); + bool Construct(vcl::Window* _pParentWin); /** retrieves the property handler for a given property name @param _rPropertyName diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 364d07ff7ba9..24bbd498ec01 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -41,7 +41,7 @@ namespace pcr // class OPropertyEditor - OPropertyEditor::OPropertyEditor( Window* pParent, WinBits nWinStyle) + OPropertyEditor::OPropertyEditor( vcl::Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle) ,m_aTabControl( this ) ,m_pListener(NULL) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index e80dceeffdd2..53e48fd10fbf 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -71,7 +71,7 @@ namespace pcr void GetFocus() SAL_OVERRIDE; public: - OPropertyEditor (Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL); + OPropertyEditor (vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL); virtual ~OPropertyEditor(); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 8bc0651126a9..862ab4b84a57 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -307,7 +307,7 @@ namespace pcr ) ); } - Window* PropertyHandler::impl_getDefaultDialogParent_nothrow() const + vcl::Window* PropertyHandler::impl_getDefaultDialogParent_nothrow() const { return PropertyHandlerHelper::getDialogParentWindow( m_xContext ); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index c086b5d4f67a..ee669ca76d93 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { } } } } -class Window; +namespace vcl { class Window; } namespace pcr { @@ -138,7 +138,7 @@ namespace pcr /** retrieves a window which can be used as parent for dialogs */ - Window* impl_getDefaultDialogParent_nothrow() const; + vcl::Window* impl_getDefaultDialogParent_nothrow() const; /** retrieves the property id for a given property name @throw com::sun::star::beans::UnknownPropertyException diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index d786b27350aa..c1302009bd99 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -47,7 +47,7 @@ namespace pcr // OSelectLabelDialog - OSelectLabelDialog::OSelectLabelDialog( Window* pParent, Reference< XPropertySet > _xControlModel ) + OSelectLabelDialog::OSelectLabelDialog( vcl::Window* pParent, Reference< XPropertySet > _xControlModel ) :ModalDialog(pParent, "LabelSelectionDialog", "modules/spropctrlr/ui/labelselectiondialog.ui") ,m_aModelImages(PcrRes(RID_IL_FORMEXPLORER)) ,m_xControlModel(_xControlModel) diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 8c627155ab63..abb138248f97 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -56,7 +56,7 @@ namespace pcr bool m_bHaveAssignableControl; public: - OSelectLabelDialog(Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xControlModel); + OSelectLabelDialog(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xControlModel); virtual ~OSelectLabelDialog(); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetSelected() const { return m_pNoAssignment->IsChecked() ? ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > () : m_xSelectedControl; } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 413273410e66..cd9815167d8d 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -68,7 +68,7 @@ namespace pcr //= OTimeControl - OTimeControl::OTimeControl( Window* pParent, WinBits nWinStyle ) + OTimeControl::OTimeControl( vcl::Window* pParent, WinBits nWinStyle ) :OTimeControl_Base( PropertyControlType::TimeField, pParent, nWinStyle ) { getTypedControlWindow()->SetStrictFormat( true ); @@ -113,7 +113,7 @@ namespace pcr //= ODateControl - ODateControl::ODateControl( Window* pParent, WinBits nWinStyle ) + ODateControl::ODateControl( vcl::Window* pParent, WinBits nWinStyle ) :ODateControl_Base( PropertyControlType::DateField, pParent, nWinStyle | WB_DROPDOWN ) { WindowType* pControlWindow = getTypedControlWindow(); @@ -167,7 +167,7 @@ namespace pcr //= OEditControl - OEditControl::OEditControl(Window* _pParent, bool _bPW, WinBits _nWinStyle) + OEditControl::OEditControl(vcl::Window* _pParent, bool _bPW, WinBits _nWinStyle) :OEditControl_Base( _bPW ? PropertyControlType::CharacterField : PropertyControlType::TextField, _pParent, _nWinStyle ) { m_bIsPassword = _bPW; @@ -253,7 +253,7 @@ namespace pcr // class ODateTimeControl - ODateTimeControl::ODateTimeControl( Window* _pParent, WinBits _nWinStyle) + ODateTimeControl::ODateTimeControl( vcl::Window* _pParent, WinBits _nWinStyle) :ODateTimeControl_Base( PropertyControlType::DateTimeField, _pParent, _nWinStyle ) { getTypedControlWindow()->EnableEmptyField( true ); @@ -326,7 +326,7 @@ namespace pcr //= HyperlinkInput - HyperlinkInput::HyperlinkInput( Window* _pParent, WinBits _nWinStyle ) + HyperlinkInput::HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle ) :Edit( _pParent, _nWinStyle ) { ::svtools::ColorConfig aColorConfig; @@ -411,7 +411,7 @@ namespace pcr //= OHyperlinkControl - OHyperlinkControl::OHyperlinkControl( Window* _pParent, WinBits _nWinStyle ) + OHyperlinkControl::OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle ) :OHyperlinkControl_Base( PropertyControlType::HyperlinkField, _pParent, _nWinStyle ) ,m_aActionListeners( m_aMutex ) { @@ -477,7 +477,7 @@ namespace pcr //= ONumericControl - ONumericControl::ONumericControl( Window* _pParent, WinBits _nWinStyle ) + ONumericControl::ONumericControl( vcl::Window* _pParent, WinBits _nWinStyle ) :ONumericControl_Base( PropertyControlType::NumericField, _pParent, _nWinStyle ) ,m_eValueUnit( FUNIT_NONE ) ,m_nFieldToUNOValueFactor( 1 ) @@ -664,7 +664,7 @@ namespace pcr } - OColorControl::OColorControl(Window* pParent, WinBits nWinStyle) + OColorControl::OColorControl(vcl::Window* pParent, WinBits nWinStyle) :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle ) { // initialize the color listbox @@ -798,7 +798,7 @@ namespace pcr //= OListboxControl - OListboxControl::OListboxControl( Window* pParent, WinBits nWinStyle) + OListboxControl::OListboxControl( vcl::Window* pParent, WinBits nWinStyle) :OListboxControl_Base( PropertyControlType::ListBox, pParent, nWinStyle ) { getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT ); @@ -890,7 +890,7 @@ namespace pcr //= OComboboxControl - OComboboxControl::OComboboxControl( Window* pParent, WinBits nWinStyle) + OComboboxControl::OComboboxControl( vcl::Window* pParent, WinBits nWinStyle) :OComboboxControl_Base( PropertyControlType::ComboBox, pParent, nWinStyle ) { getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT ); @@ -967,7 +967,7 @@ namespace pcr virtual void Resize() SAL_OVERRIDE; public: - OMultilineFloatingEdit(Window* _pParen); + OMultilineFloatingEdit(vcl::Window* _pParen); MultiLineEdit& getEdit() { return m_aImplEdit; } protected: @@ -975,7 +975,7 @@ namespace pcr }; - OMultilineFloatingEdit::OMultilineFloatingEdit(Window* _pParent) + OMultilineFloatingEdit::OMultilineFloatingEdit(vcl::Window* _pParent) :FloatingWindow(_pParent, WB_BORDER) ,m_aImplEdit(this, WB_VSCROLL|WB_IGNORETAB|WB_NOBORDER) { @@ -1022,7 +1022,7 @@ namespace pcr //= DropDownEditControl_Base - DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle ) + DropDownEditControl::DropDownEditControl( vcl::Window* _pParent, WinBits _nStyle ) :DropDownEditControl_Base( _pParent, _nStyle ) ,m_pFloatingEdit( NULL ) ,m_pImplEdit( NULL ) @@ -1064,16 +1064,16 @@ namespace pcr DropDownEditControl::~DropDownEditControl() { { - boost::scoped_ptr<Window> aTemp(m_pFloatingEdit); + boost::scoped_ptr<vcl::Window> aTemp(m_pFloatingEdit); m_pFloatingEdit = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pImplEdit); + boost::scoped_ptr<vcl::Window> aTemp(m_pImplEdit); SetSubEdit( NULL ); m_pImplEdit = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pDropdownButton); + boost::scoped_ptr<vcl::Window> aTemp(m_pDropdownButton); m_pDropdownButton = NULL; } } @@ -1142,7 +1142,7 @@ namespace pcr ShowDropDown( true ); m_pFloatingEdit->getEdit().GrabFocus(); m_pFloatingEdit->getEdit().SetSelection( aSel ); - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); pFocusWin->KeyInput( *rNEvt.GetKeyEvent() ); } } @@ -1355,7 +1355,7 @@ namespace pcr //= OMultilineEditControl - OMultilineEditControl::OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ) + OMultilineEditControl::OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ) :OMultilineEditControl_Base( _eMode == eMultiLineText ? PropertyControlType::MultiLineTextField : PropertyControlType::StringListField , pParent , ( nWinStyle | WB_DIALOGCONTROL ) & ( ~WB_READONLY | ~WB_DROPDOWN ) diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 1cf13284a28f..fdfb1dc638d1 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -58,7 +58,7 @@ namespace pcr typedef ControlWindow< LISTBOX_WINDOW > ListBoxType; public: - ListLikeControlWithModifyHandler( Window* _pParent, WinBits _nStyle ) + ListLikeControlWithModifyHandler( vcl::Window* _pParent, WinBits _nStyle ) :ListBoxType( _pParent, _nStyle ) { } @@ -100,7 +100,7 @@ namespace pcr class OTimeControl : public OTimeControl_Base { public: - OTimeControl( Window* pParent, WinBits nWinStyle ); + OTimeControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -115,7 +115,7 @@ namespace pcr class ODateControl : public ODateControl_Base { public: - ODateControl( Window* pParent, WinBits nWinStyle ); + ODateControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -133,7 +133,7 @@ namespace pcr bool m_bIsPassword : 1; public: - OEditControl( Window* _pParent, bool _bPassWord, WinBits nWinStyle ); + OEditControl( vcl::Window* _pParent, bool _bPassWord, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -151,7 +151,7 @@ namespace pcr class ODateTimeControl : public ODateTimeControl_Base { public: - ODateTimeControl( Window* pParent,WinBits nWinStyle ); + ODateTimeControl( vcl::Window* pParent,WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -169,7 +169,7 @@ namespace pcr Link m_aClickHandler; public: - HyperlinkInput( Window* _pParent, WinBits _nWinStyle ); + HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle ); /** sets the handler which will (asynchronously, with locked SolarMutex) be called when the hyperlink has been clicked by the user @@ -198,7 +198,7 @@ namespace pcr ::cppu::OInterfaceContainerHelper m_aActionListeners; public: - OHyperlinkControl( Window* _pParent, WinBits _nWinStyle ); + OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -225,7 +225,7 @@ namespace pcr typedef ControlWindow< MetricField > BaseClass; public: - CustomConvertibleNumericField( Window* _pParent, WinBits _nStyle ) + CustomConvertibleNumericField( vcl::Window* _pParent, WinBits _nStyle ) :BaseClass( _pParent, _nStyle ) { } @@ -244,7 +244,7 @@ namespace pcr sal_Int16 m_nFieldToUNOValueFactor; public: - ONumericControl( Window* pParent, WinBits nWinStyle ); + ONumericControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -289,7 +289,7 @@ namespace pcr ::std::set< OUString > m_aNonColorEntries; public: - OColorControl( Window* pParent, WinBits nWinStyle ); + OColorControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -315,7 +315,7 @@ namespace pcr class OListboxControl : public OListboxControl_Base { public: - OListboxControl( Window* pParent, WinBits nWinStyle ); + OListboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -339,7 +339,7 @@ namespace pcr class OComboboxControl : public OComboboxControl_Base { public: - OComboboxControl( Window* pParent, WinBits nWinStyle ); + OComboboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -381,7 +381,7 @@ namespace pcr bool m_bDropdown : 1; public: - DropDownEditControl( Window* _pParent, WinBits _nStyle ); + DropDownEditControl( vcl::Window* _pParent, WinBits _nStyle ); virtual ~DropDownEditControl(); void setOperationMode( MultiLineOperationMode _eMode ) { m_nOperationMode = _eMode; } @@ -419,7 +419,7 @@ namespace pcr class OMultilineEditControl : public OMultilineEditControl_Base { public: - OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ); + OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 1f768cb148a3..554c069775e3 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -71,7 +71,7 @@ namespace pcr //= TabOrderDialog - TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, + TabOrderDialog::TabOrderDialog( vcl::Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB ) :ModalDialog( _pParent, "TabOrderDialog", "modules/spropctrlr/ui/taborder.ui") ,m_xModel( _rxTabModel ) @@ -289,7 +289,7 @@ namespace pcr //= TabOrderListBox - TabOrderListBox::TabOrderListBox( Window* pParent, WinBits nBits ) + TabOrderListBox::TabOrderListBox( vcl::Window* pParent, WinBits nBits ) :SvTreeListBox( pParent, nBits ) { SetDragDropMode(0xFFFF/*SV_DRAGDROP_CTRL_MOVE*/); @@ -298,7 +298,7 @@ namespace pcr SetSelectionMode( MULTIPLE_SELECTION ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabOrderListBox(Window *pParent, + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabOrderListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 688c5300a7c2..d70e60cce47f 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -46,7 +46,7 @@ namespace pcr class TabOrderListBox : public SvTreeListBox { public: - TabOrderListBox( Window* pParent, WinBits nBits ); + TabOrderListBox( vcl::Window* pParent, WinBits nBits ); virtual ~TabOrderListBox(); void MoveSelection( long nRelPos ); @@ -95,7 +95,7 @@ namespace pcr public: TabOrderDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& _rxTabModel, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxControlCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 043535b501bf..9007f570aef8 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -87,7 +87,7 @@ namespace pcr // OFormatSampleControl - OFormatSampleControl::OFormatSampleControl( Window* pParent, WinBits nWinStyle ) + OFormatSampleControl::OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle ) :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) { } @@ -169,7 +169,7 @@ namespace pcr // class OFormattedNumericControl - OFormattedNumericControl::OFormattedNumericControl( Window* pParent, WinBits nWinStyle ) + OFormattedNumericControl::OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle ) :OFormattedNumericControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) { getTypedControlWindow()->TreatAsNumber(true); @@ -261,7 +261,7 @@ namespace pcr //= OFileUrlControl - OFileUrlControl::OFileUrlControl( Window* pParent, WinBits nWinStyle ) + OFileUrlControl::OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle ) :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN ) { getTypedControlWindow()->SetDropDownLineCount( 10 ); @@ -307,7 +307,7 @@ namespace pcr //= OTimeDurationControl - OTimeDurationControl::OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ) + OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle ) :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index a5a9f23c9aba..3fe258a7d9bd 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -41,7 +41,7 @@ namespace pcr typedef ControlWindow< FormattedField > BaseClass; public: - NumberFormatSampleField( Window* _pParent, WinBits _nStyle ) + NumberFormatSampleField( vcl::Window* _pParent, WinBits _nStyle ) :BaseClass( _pParent, _nStyle ) { } @@ -59,7 +59,7 @@ namespace pcr class OFormatSampleControl : public OFormatSampleControl_Base { public: - OFormatSampleControl( Window* pParent, WinBits nWinStyle ); + OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -102,7 +102,7 @@ namespace pcr sal_Int32 m_nLastDecimalDigits; public: - OFormattedNumericControl( Window* pParent, WinBits nWinStyle = WB_TABSTOP); + OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -128,7 +128,7 @@ namespace pcr class OFileUrlControl : public OFileUrlControl_Base { public: - OFileUrlControl( Window* pParent, WinBits nWinStyle ); + OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -145,7 +145,7 @@ namespace pcr class OTimeDurationControl : public ONumericControl { public: - OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ); + OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle ); virtual ~OTimeDurationControl(); // XPropertyControl |