diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
67 files changed, 128 insertions, 128 deletions
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 6c6fecb8bac0..80dc9bbaa45e 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -54,7 +54,7 @@ namespace dbaui /// sets the fixedtext to the right content void initCurrentPath(); public: - OCollectionView( Window * pParent + OCollectionView( vcl::Window * pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 19c55b9b69ce..b09d6ff6e030 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -53,7 +53,7 @@ namespace dbaui virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; public: - OColumnControlWindow(Window* pParent + OColumnControlWindow(vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); virtual ~OColumnControlWindow(); diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 3d7c3cd45890..ff1bfec69880 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -34,7 +34,7 @@ namespace dbaui short m_nPos; OUString m_strHelpText; public: - OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -52,7 +52,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -68,7 +68,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -85,7 +85,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); bool IsModified() const { return IsValueChangedFromSaved(); } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 01bb0591b54d..4205212e7bd8 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -66,8 +66,8 @@ namespace dbaui { private: OTableDesignHelpBar* pHelp; - Window* pLastFocusWindow; - Window* m_pActFocusWindow; + vcl::Window* pLastFocusWindow; + vcl::Window* m_pActFocusWindow; FixedText* pDefaultText; FixedText* pRequiredText; @@ -170,10 +170,10 @@ namespace dbaui const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } - void implFocusLost(Window* _pWhich); + void implFocusLost(vcl::Window* _pWhich); public: - OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar); + OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); void DisplayData(OFieldDescription* pFieldDescr ); diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index be666126f457..ff86d28f8eaf 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -38,7 +38,7 @@ namespace dbaui OJoinController& m_rController; public: - OJoinDesignView(Window* pParent, + OJoinDesignView(vcl::Window* pParent, OJoinController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OJoinDesignView(); diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 448a8c7820f3..18ab49a2c4fd 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -54,7 +54,7 @@ namespace dbaui // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index f3e39b917018..c9c500263402 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -48,18 +48,18 @@ namespace dbaui // this class conatins only the scrollbars to avoid that // the tablewindows clip the scrollbars class OJoinTableView; - class OScrollWindowHelper : public Window + class OScrollWindowHelper : public vcl::Window { ScrollBar m_aHScrollBar; ScrollBar m_aVScrollBar; - Window* m_pCornerWindow; + vcl::Window* m_pCornerWindow; OJoinTableView* m_pTableView; protected: virtual void Resize() SAL_OVERRIDE; public: - OScrollWindowHelper( Window* pParent); + OScrollWindowHelper( vcl::Window* pParent); virtual ~OScrollWindowHelper(); void setTableView(OJoinTableView* _pTableView); @@ -72,7 +72,7 @@ namespace dbaui }; - class OJoinTableView : public Window, + class OJoinTableView : public vcl::Window, public IDragTransferableListener, public DropTargetHelper { @@ -109,7 +109,7 @@ namespace dbaui OJoinDesignViewAccess* m_pAccessible; public: - OJoinTableView( Window* pParent, OJoinDesignView* pView ); + OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ); virtual ~OJoinTableView(); // window override diff --git a/dbaccess/source/ui/inc/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx index 5e5db54b797b..5f9187a38bba 100644 --- a/dbaccess/source/ui/inc/LimitBox.hxx +++ b/dbaccess/source/ui/inc/LimitBox.hxx @@ -23,7 +23,7 @@ namespace dbaui class LimitBox: public NumericBox { public: - LimitBox( Window* pParent, WinBits nStyle ); + LimitBox( vcl::Window* pParent, WinBits nStyle ); virtual ~LimitBox(); virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index 442668be6cc4..6b19daedb287 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -28,7 +28,7 @@ class QueryPropertiesDialog : public ModalDialog public: QueryPropertiesDialog( - Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); + vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); virtual ~QueryPropertiesDialog(); bool getDistinct() const; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index f42285e4fc01..ef4174c19878 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const SAL_OVERRIDE; public: - OQueryTableView(Window* pParent,OQueryDesignView* pView); + OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView); virtual ~OQueryTableView(); /// base class overwritten: create and delete windows diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index f1f7c0422733..9e9cdc4c6392 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -25,7 +25,7 @@ namespace dbaui { class OSqlEdit; - class OQueryTextView : public Window + class OQueryTextView : public vcl::Window { friend class OQueryViewSwitch; OSqlEdit* m_pEdit; diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 5953f3b310cf..00868b542329 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -55,7 +55,7 @@ namespace dbaui void mergeData(const TTableConnectionData& _aConnectionData); - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index b2c8936aac7b..f7a97a9687f5 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -32,7 +32,7 @@ namespace dbaui class ORelationDesignView : public OJoinDesignView { public: - ORelationDesignView(Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~ORelationDesignView(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index aec50985d581..9b38d8fb47b6 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -52,7 +52,7 @@ namespace dbaui virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - ORelationTableView( Window* pParent, ORelationDesignView* pView ); + ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 8430dc4d4f38..4368648429d9 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -56,12 +56,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) + OSQLNameEdit(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) + OSQLNameEdit(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { @@ -77,12 +77,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) + OSQLNameComboBox(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,nStyle) , OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) + OSQLNameComboBox(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,_rRes) , OSQLNameChecker(_rAllowedChars) { diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 95f60752ae65..76428fb60b24 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -36,7 +36,7 @@ namespace dbaui class OJoinTableView; class OConnectionLine; - class OTableConnection : public Window + class OTableConnection : public vcl::Window { ::std::vector<OConnectionLine*> m_vConnLine; TTableConnectionData::value_type diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index d0f6b4d8f543..999a7fe15aee 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -113,7 +113,7 @@ namespace dbaui inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index ca99ce7464ce..e1a9f1e84ae4 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -46,7 +46,7 @@ namespace dbaui bool m_bClipboardFilled; public: - OTableRowView(Window* pParent); + OTableRowView(vcl::Window* pParent); virtual ~OTableRowView(); virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index a025d341afe8..900c32374754 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -39,7 +39,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - OTableDesignHelpBar( Window* pParent ); + OTableDesignHelpBar( vcl::Window* pParent ); virtual ~OTableDesignHelpBar(); void SetHelpText( const OUString& rText ); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index c37bc7969450..1643aaccb037 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -30,7 +30,7 @@ namespace dbaui class OTableController; class OTableFieldDescWin; class OTableEditorCtrl; - class OTableBorderWindow : public Window + class OTableBorderWindow : public vcl::Window { Splitter m_aHorzSplitter; OTableFieldDescWin* m_pFieldDescWin; @@ -42,7 +42,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTableBorderWindow(Window* pParent); + OTableBorderWindow(vcl::Window* pParent); virtual ~OTableBorderWindow(); // window overloads virtual void Resize() SAL_OVERRIDE; @@ -73,7 +73,7 @@ namespace dbaui virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; public: - OTableDesignView( Window* pParent, + OTableDesignView( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OTableController& _rController); virtual ~OTableDesignView(); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 376d958e089f..9a6992bd732c 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -33,7 +33,7 @@ namespace comphelper class NamedValueCollection; } -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -49,7 +49,7 @@ namespace dbaui OUString m_aFieldAlias; ///< column alias OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) - Window* m_pTabWindow; + vcl::Window* m_pTabWindow; sal_Int32 m_eDataType; sal_Int32 m_eFunctionType; @@ -79,7 +79,7 @@ namespace dbaui void SetVisible( bool bVis=true ) { m_bVisible = bVis; } void SetGroupBy( bool bGb=false ) { m_bGroupBy = bGb; } - void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; } + void SetTabWindow( vcl::Window* pWin ){ m_pTabWindow = pWin; } void SetField( const OUString& rF ) { m_aFieldName = rF; } void SetFieldAlias( const OUString& rF ) { m_aFieldAlias = rF; } void SetTable( const OUString& rT ) { m_aTableName = rT; } @@ -105,7 +105,7 @@ namespace dbaui OUString GetCriteria( sal_uInt16 nIdx ) const; sal_Int32 GetColWidth() const { return m_nColWidth; } sal_Int32 GetFieldIndex() const { return m_nIndex; } - Window* GetTabWindow() const { return m_pTabWindow;} + vcl::Window* GetTabWindow() const { return m_pTabWindow;} sal_Int32 GetFunctionType() const { return m_eFunctionType; } sal_uInt16 GetColumnId() const { return m_nColumnId;} diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 32e0f519ad94..c16cba5d5568 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -59,7 +59,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox ImplSVEvent * m_nDeactivateEvent; public: - OTableGrantControl( Window* pParent, WinBits nBits); + OTableGrantControl( vcl::Window* pParent, WinBits nBits); virtual ~OTableGrantControl(); void UpdateTables(); void setUserName(const OUString& _sUserName); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 82028e1607be..7fc4bfdb70ae 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -48,7 +48,7 @@ namespace dbaui class OTableWindow : public ::cppu::BaseMutex ,public ::comphelper::OContainerListener - ,public Window + ,public vcl::Window { friend class OTableWindowTitle; friend class OTableWindowListBox; @@ -121,7 +121,7 @@ namespace dbaui */ void impl_updateImage(); - OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData ); + OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData ); public: virtual ~OTableWindow(); diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 3761026ec4c7..3ded3cef2e91 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -49,7 +49,7 @@ class ODbDataSourceAdministrationHelper; SfxItemSet* m_pOutSet; public: - OTableSubscriptionDialog(Window* pParent + OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index e005461d8465..6e0cc172a7b7 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -196,7 +196,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; - Window* m_pParent; + vcl::Window* m_pParent; bool m_bAlreadyAsked; bool insertNewRow(); @@ -205,7 +205,7 @@ namespace dbaui public: // export data - ORowSetImportExport(Window* _pParent, + ORowSetImportExport(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 7be8fd7b505c..ec384984cd0d 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -65,7 +65,7 @@ namespace svt class EditBrowseBox; } -class Window; +namespace vcl { class Window; } class ToolBox; namespace vcl { class Font; } class SvNumberFormatter; @@ -107,7 +107,7 @@ namespace dbaui @param _rxContext need to create the dialog */ void showError( const ::dbtools::SQLExceptionInfo& _rInfo, - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); /** fills a map and a vector with localized type names @@ -163,7 +163,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSourceByName( const OUString& _rDataSourceName, - Window* _pErrorMessageParent, + vcl::Window* _pErrorMessageParent, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -187,11 +187,11 @@ namespace dbaui void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField, SvNumberFormatter* _pFormatter, - Window* _pParent); + vcl::Window* _pParent); /** second variant of the function before */ - bool callColumnFormatDialog(Window* _pParent, + bool callColumnFormatDialog(vcl::Window* _pParent, SvNumberFormatter* _pFormatter, sal_Int32 _nDataType, sal_Int32& _nFormatKey, @@ -207,7 +207,7 @@ namespace dbaui bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pParent); + vcl::Window* _pParent); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. @param _pWindow @@ -220,9 +220,9 @@ namespace dbaui ::comphelper::mem_fun(&TaskPaneList::AddWindow) ::comphelper::mem_fun(&TaskPaneList::RemoveWindow) */ - void notifySystemWindow(Window* _pWindow, - Window* _pToRegister, - ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc); + void notifySystemWindow(vcl::Window* _pWindow, + vcl::Window* _pToRegister, + ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc); /** adjustToolBoxSize checks if the size of the ToolBox is still valid. If not it will be resized. @param _pToolBox @@ -327,7 +327,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); + sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); /** creates a new view from a query or table @param _sName @@ -389,7 +389,7 @@ namespace dbaui <TRUE/> if the insert opertions was successful, otherwise <FALSE/>. */ bool insertHierachyElement( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameContainer>& _xNames, const OUString& _sParentFolder, diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 9e136c1968e4..a342856b7aad 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -53,7 +53,7 @@ namespace dbaui protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: - OUserAdminDlg( Window* _pParent + OUserAdminDlg( vcl::Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index cdc635e187cf..f34af430a936 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -25,11 +25,11 @@ class Splitter; namespace dbaui { - class OSplitterView : public Window + class OSplitterView : public vcl::Window { Splitter* m_pSplitter; - Window* m_pLeft; - Window* m_pRight; + vcl::Window* m_pLeft; + vcl::Window* m_pRight; bool m_bVertical; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); @@ -37,13 +37,13 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OSplitterView(Window* _pParent,bool _bVertical = true); + OSplitterView(vcl::Window* _pParent,bool _bVertical = true); virtual ~OSplitterView(); // window overloads virtual void GetFocus() SAL_OVERRIDE; void setSplitter(Splitter* _pSplitter); - void set(Window* _pRight,Window* _pLeft = NULL); + void set(vcl::Window* _pRight,Window* _pLeft = NULL); virtual void Resize() SAL_OVERRIDE; }; } diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 0c0e1ff3ea41..e99fcf810529 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -64,7 +64,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OCopyTable( Window * pParent ); + OCopyTable( vcl::Window * pParent ); virtual ~OCopyTable(); bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); } diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 20288dfb1c40..98f029c6c665 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -78,7 +78,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OWizColumnSelect(Window* pParent); + OWizColumnSelect(vcl::Window* pParent); virtual ~OWizColumnSelect(); }; } diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 671bdc943e60..388ee1c27a1d 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -298,7 +298,7 @@ namespace dbaui public: // used for copy tables or queries OCopyTableWizard( - Window * pParent, + vcl::Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, @@ -310,7 +310,7 @@ namespace dbaui // used for importing rtf/html sources OCopyTableWizard( - Window* pParent, + vcl::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rDestColumns, diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index effb2399bc8e..e9d19621457f 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -30,12 +30,12 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizHTMLExtend(Window* pParent, SvStream& _rStream) + OWizHTMLExtend(vcl::Window* pParent, SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } - static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } + static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } virtual ~OWizHTMLExtend(){} }; @@ -45,12 +45,12 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizRTFExtend(Window* pParent,SvStream& _rStream) + OWizRTFExtend(vcl::Window* pParent,SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } - static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } + static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } virtual ~OWizRTFExtend(){} }; @@ -61,7 +61,7 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizNormalExtend(Window* pParent); + OWizNormalExtend(vcl::Window* pParent); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 0c713685c0d3..3feb7dc28e01 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -36,7 +36,7 @@ namespace dbaui virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: - OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER ); + OColumnTreeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER ); void FillListBox( const ODatabaseExport::TColumnVector& _rList); void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; } @@ -77,7 +77,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OWizNameMatching(Window* pParent); + OWizNameMatching(vcl::Window* pParent); virtual ~OWizNameMatching(); }; diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 83398f7e385f..9a30d7c311fb 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -32,7 +32,7 @@ namespace dbaui OCopyTableWizard* m_pParent; bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode - OWizardPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: virtual void Reset ( ) = 0; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 0967c5c06252..5f587481e867 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -37,7 +37,7 @@ namespace dbaui class OWizTypeSelectControl : public OFieldDescControl { protected: - Window* m_pParentTabPage; + vcl::Window* m_pParentTabPage; virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; @@ -51,7 +51,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; public: - OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); + OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); virtual ~OWizTypeSelectControl(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; @@ -69,15 +69,15 @@ namespace dbaui bool _bSet = false); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - Window* m_pParentTabPage; + vcl::Window* m_pParentTabPage; public: - OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) + OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) , m_bPKey(false) , m_pParentTabPage(NULL) {} void SetPKey(bool bPKey) { m_bPKey = bPKey; } - void SetParentTabPage(Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } + void SetParentTabPage(vcl::Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } }; // Wizard Page: OWizTypeSelect @@ -116,14 +116,14 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE; - OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL ); + OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } }; - typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& ); + typedef OWizTypeSelect* (*TypeSelectionPageFactory)( vcl::Window*, SvStream& ); } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index d33ea5f0570a..360ee70fa9eb 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -50,7 +50,7 @@ namespace dbaui virtual bool allowQueries() const = 0; virtual bool allowAddition() const = 0; virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) = 0; - virtual void onWindowClosing( const Window* _pWindow ) = 0; + virtual void onWindowClosing( const vcl::Window* _pWindow ) = 0; protected: ~IAddTableDialogContext() {} @@ -78,7 +78,7 @@ namespace dbaui public: OAddTableDlg( - Window* _pParent, + vcl::Window* _pParent, IAddTableDialogContext& _rContext ); virtual ~OAddTableDlg(); diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index ef0622bf0f62..3520485684be 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -45,7 +45,7 @@ namespace dbaui virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: - AdvancedSettingsDialog( Window* _pParent + AdvancedSettingsDialog( vcl::Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName); diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index bb2d19c087a6..f28f54185f1a 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -149,7 +149,7 @@ namespace dbaui UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); } // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // UNO virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 0f799f87075e..b0c9852de938 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -49,7 +49,7 @@ namespace dbaui DBTreeView* m_pTreeView; Splitter* m_pSplitter; mutable SbaGridControl* m_pVclControl; // our grid's VCL representation - Window* m_pStatus; + vcl::Window* m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access @@ -58,7 +58,7 @@ namespace dbaui SbaGridControl* getVclControl() const; public: - UnoDataBrowserView( Window* pParent, + UnoDataBrowserView( vcl::Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~UnoDataBrowserView(); diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 990c9df4f4e2..78f2da4f4a28 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -33,7 +33,7 @@ namespace dbaui class CharSetListBox : public ListBox { public: - CharSetListBox( Window* _pParent, WinBits _nBits ); + CharSetListBox( vcl::Window* _pParent, WinBits _nBits ); virtual ~CharSetListBox(); void SelectEntryByIanaName( const OUString& _rIanaName ); diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 4a1238dbb4ad..dc1a42986116 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -41,7 +41,7 @@ class OConnectionURLEdit : public Edit bool m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not public: - OConnectionURLEdit(Window* pParent, WinBits _nBits,bool _bShowPrefix = false); + OConnectionURLEdit(vcl::Window* pParent, WinBits _nBits,bool _bShowPrefix = false); virtual ~OConnectionURLEdit(); public: diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index f87f4681a9ab..f5d64a0f48cd 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -30,7 +30,7 @@ namespace dbtools class SQLExceptionInfo; } -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -38,7 +38,7 @@ namespace dbaui class ODatasourceConnector { protected: - Window* m_pErrorMessageParent; + vcl::Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; OUString m_sContextInformation; @@ -46,11 +46,11 @@ namespace dbaui public: ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pMessageParent + vcl::Window* _pMessageParent ); ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pMessageParent, + vcl::Window* _pMessageParent, const OUString& _rContextInformation ); diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index ddce2e2250ef..66989228b351 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -61,7 +61,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbAdminDialog(Window* pParent, + ODbAdminDialog(vcl::Window* pParent, SfxItemSet* _pItems, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index ce9ad84ea2d4..ab15137087bb 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -80,7 +80,7 @@ namespace dbaui DECL_LINK( ScrollDownHdl, SvTreeListBox* ); public: - DBTreeListBox( Window* pParent + DBTreeListBox( vcl::Window* pParent ,WinBits nWinStyle=0 ,bool _bHandleEnterKey = false); virtual ~DBTreeListBox(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 124b6a8b6eb6..0f84ea6404f4 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -70,7 +70,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbTypeWizDialog(Window* pParent + ODbTypeWizDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 067907ca335f..bdd22395f9c6 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -96,7 +96,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbTypeWizDialogSetup(Window* pParent + ODbTypeWizDialogSetup(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index ef4aff479b3d..d27de6c58125 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -66,7 +66,7 @@ namespace dbaui public: DirectSQLDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); virtual ~DirectSQLDialog(); diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index f6956361fbdc..b6614cf62701 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -33,7 +33,7 @@ namespace dbaui sal_uInt32 m_nNumberFormatId; public: - SbaSbAttrDlg(Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); + SbaSbAttrDlg(vcl::Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); virtual ~SbaSbAttrDlg(); virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 5d30bd92bff5..5217e1fcb0a0 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -52,14 +52,14 @@ namespace dbaui OSaveAsDlgImpl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; public: - OSaveAsDlg( Window * pParent,const sal_Int32& _rType, + OSaveAsDlg( vcl::Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window* _pParent, + OSaveAsDlg( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const OUString& _rDefault, const OUString& _sLabel, diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 25e35964efe6..e145cf7675ad 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -43,7 +43,7 @@ namespace dbaui CheckBox* m_pCB_STANDARD; public: - DlgSize( Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); + DlgSize( vcl::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); sal_Int32 GetValue(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 3aa05ffafe8e..f204c8c3cf89 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -48,7 +48,7 @@ namespace dbaui bool m_bSuspendSelectHdl; public: - DbaIndexList(Window* _pParent, WinBits nWinBits); + DbaIndexList(vcl::Window* _pParent, WinBits nWinBits); void SetSelectHdl(const Link& _rHdl) { m_aSelectHdl = _rHdl; } Link GetSelectHdl() const { return m_aSelectHdl; } @@ -103,7 +103,7 @@ namespace dbaui m_xContext; public: DbaIndexDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 7151d6dc9b38..fb1347d2b3eb 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -50,7 +50,7 @@ namespace dbaui bool m_bAddIndexAppendix; public: - IndexFieldsControl( Window* _pParent, WinBits nWinStyle); + IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle); virtual ~IndexFieldsControl(); void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index ebe50f47c8e7..7c597b24624e 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -49,13 +49,13 @@ namespace dbaui m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - Window* m_pDialogParent; + vcl::Window* m_pDialogParent; OUString m_sCurrentlyEditing; OUString m_sDataSourceName; public: OLinkedDocumentsAccess( - Window* _pDialogParent, + vcl::Window* _pDialogParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index cd86e1a8eba1..2e10a99b82c6 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -38,7 +38,7 @@ class OMarkableTreeListBox : public DBTreeListBox Link m_aCheckButtonHandler; public: - OMarkableTreeListBox( Window* pParent, WinBits nWinStyle=0 ); + OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); virtual ~OMarkableTreeListBox(); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 1dcd219a818a..24d475cb8c3d 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -40,7 +40,7 @@ namespace dbaui OUString m_sModule; public: - OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ); + OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ); protected: void impl_init( const sal_Char* _pAsciiModuleName ); @@ -57,7 +57,7 @@ namespace dbaui MapIndexToStringPair m_aURLs; public: - OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName ); + OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ); OUString GetSelectedDocumentURL() const; OUString GetSelectedDocumentFilter() const; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 71b1f4b347e9..edc37862a366 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -79,7 +79,7 @@ namespace dbaui m_aFinalValues; /// the final values as entered by the user public: - OParameterDialog(Window* _pParent, + OParameterDialog(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & _rParamContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index e895a0dae32d..64f828ecb721 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -35,7 +35,7 @@ namespace dbaui class OBeamer : public DockingWindow { public: - OBeamer(Window* _pParent) : DockingWindow(_pParent,0){} + OBeamer(vcl::Window* _pParent) : DockingWindow(_pParent,0){} }; // OQueryContainerWindow @@ -48,7 +48,7 @@ namespace dbaui DECL_LINK( SplitHdl, void* ); public: - OQueryContainerWindow(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~OQueryContainerWindow(); virtual void Construct() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 6d94e84fc02b..35d9165d0ae1 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -165,7 +165,7 @@ namespace dbaui ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 25694f44ff76..b9d76cccca97 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -106,7 +106,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; public: - DlgFilterCrit( Window * pParent, + DlgFilterCrit( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index a4a535ada1d0..007c42966a6a 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -79,7 +79,7 @@ namespace dbaui void EnableLines(); public: - DlgOrderCrit( Window * pParent, + DlgOrderCrit( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 467b09f040b0..0a05a3153b40 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -27,7 +27,7 @@ namespace dbaui class OQueryView : public OJoinDesignView { public: - OQueryView(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + OQueryView(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OQueryView(); virtual bool isCutAllowed() = 0; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index e9c7e3ba586e..3141c0cf96b3 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -88,7 +88,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent) SAL_OVERRIDE; + virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) SAL_OVERRIDE; }; // SbaXGridPeer @@ -127,7 +127,7 @@ namespace dbaui virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle) SAL_OVERRIDE; + virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; #ifdef _MSC_VER typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 6a6387445e2b..d91ec74cac56 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -70,7 +70,7 @@ public: detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). */ OSQLMessageBox( - Window* _pParent, + vcl::Window* _pParent, const dbtools::SQLExceptionInfo& _rException, WinBits _nStyle = WB_OK | WB_DEF_OK, const OUString& _rHelpURL = OUString() @@ -82,7 +82,7 @@ public: @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version */ - OSQLMessageBox(Window* pParent, + OSQLMessageBox(vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage, WinBits nStyle = WB_OK | WB_DEF_OK, @@ -107,7 +107,7 @@ private: class OSQLWarningBox : public OSQLMessageBox { public: - OSQLWarningBox( Window* _pParent, + OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); @@ -117,7 +117,7 @@ public: class OSQLErrorBox : public OSQLMessageBox { public: - OSQLErrorBox( Window* _pParent, + OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 3114ef511525..52afd2764b40 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -46,7 +46,7 @@ protected: bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed? public: - OTableTreeListBox(Window* pParent, WinBits nWinStyle); + OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle); void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; } diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 080025084dd6..40ab9616095b 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -37,7 +37,7 @@ namespace dbaui class TextConnectionSettingsDialog : public ModalDialog { public: - TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems ); + TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ); virtual ~TextConnectionSettingsDialog(); /** initializes a set of PropertyStorage instaces, which are bound to diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 1c004917d8d8..e28f3e2adff5 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -147,7 +147,7 @@ namespace dbaui DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 5bae185c4528..45cfaf2ec921 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -69,7 +69,7 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui |