summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source/ui/app')
-rw-r--r--dbaccess/source/ui/app/AppController.cxx6
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx16
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx12
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx4
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx6
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx2
-rw-r--r--dbaccess/source/ui/app/AppIconControl.hxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx4
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx10
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx10
-rw-r--r--dbaccess/source/ui/app/AppView.cxx8
-rw-r--r--dbaccess/source/ui/app/AppView.hxx4
14 files changed, 44 insertions, 44 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 4996d491ce68..092ee4a909b1 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -312,7 +312,7 @@ OApplicationController::~OApplicationController()
dispose();
}
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< Window> aTemp( getView() );
+ ::std::auto_ptr< vcl::Window> aTemp( getView() );
SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
@@ -429,7 +429,7 @@ void SAL_CALL OApplicationController::disposing()
OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5
}
-bool OApplicationController::Construct(Window* _pParent)
+bool OApplicationController::Construct(vcl::Window* _pParent)
{
setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) );
getView()->SetUniqueId(UID_APP_VIEW);
@@ -452,7 +452,7 @@ bool OApplicationController::Construct(Window* _pParent)
if ( !bSuccess )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< Window> aTemp( getView() );
+ ::std::auto_ptr< vcl::Window> aTemp( getView() );
SAL_WNODEPRECATED_DECLARATIONS_POP
clearView();
return false;
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 18fdb41d14fc..2e262c67d22f 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -546,7 +546,7 @@ namespace dbaui
virtual void disconnect();
// late construction
- virtual bool Construct(Window* pParent) SAL_OVERRIDE;
+ virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
virtual void describeSupportedFeatures() SAL_OVERRIDE;
protected:
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 691775f20836..af80ee80ad34 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -125,17 +125,17 @@ namespace
return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL);
}
// class OPreviewWindow
- class OTablePreviewWindow : public Window
+ class OTablePreviewWindow : public vcl::Window
{
DECL_LINK(OnDisableInput, void*);
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 );
+ OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 );
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
};
- OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
+ OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle)
{
ImplInitSettings( true, true, true );
}
@@ -186,7 +186,7 @@ namespace
}
// class OAppDetailPageHelper
-OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
+OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL)
,m_rBorderWin(_rBorderWin)
,m_aFL(this,WB_VERT)
,m_aTBPreview(this,WB_TABSTOP )
@@ -675,10 +675,10 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
}
}
-void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
+void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow)
{
OSL_ENSURE(_pWindow,"OAppDetailPageHelper::setDetailPage: Window is NULL!");
- Window* pCurrent = getCurrentView();
+ vcl::Window* pCurrent = getCurrentView();
if ( pCurrent )
pCurrent->Hide();
@@ -965,7 +965,7 @@ void OAppDetailPageHelper::Resize()
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- Window* pWindow = getCurrentView();
+ vcl::Window* pWindow = getCurrentView();
if ( pWindow )
{
Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT );
@@ -1273,7 +1273,7 @@ void OAppDetailPageHelper::ImplInitSettings()
m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() );
}
-OPreviewWindow::OPreviewWindow(Window* _pParent)
+OPreviewWindow::OPreviewWindow(vcl::Window* _pParent)
: Window(_pParent)
{
ImplInitSettings( true, true, true );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index f102e5e37708..24affd63da1e 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -47,7 +47,7 @@ namespace dbaui
class OAppBorderWindow;
class DBTreeListBox;
- class OPreviewWindow : public Window
+ class OPreviewWindow : public vcl::Window
{
GraphicObject m_aGraphicObj;
Rectangle m_aPreviewRect;
@@ -66,7 +66,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OPreviewWindow(Window* _pParent);
+ OPreviewWindow(vcl::Window* _pParent);
// window overloads
virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
@@ -75,7 +75,7 @@ namespace dbaui
};
// A helper class for the controls in the detail page.
// Combines general functionality.
- class OAppDetailPageHelper : public Window
+ class OAppDetailPageHelper : public vcl::Window
{
DBTreeListBox* m_pLists[ELEMENT_COUNT];
OAppBorderWindow& m_rBorderWin;
@@ -85,7 +85,7 @@ namespace dbaui
OPreviewWindow m_aPreview;
::svtools::ODocumentInfoPreview
m_aDocumentInfo;
- Window* m_pTablePreview;
+ vcl::Window* m_pTablePreview;
::std::auto_ptr<PopupMenu> m_aMenu;
PreviewMode m_ePreviewMode;
::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
@@ -129,7 +129,7 @@ namespace dbaui
@param _pWindow
The control which should be visible.
*/
- void setDetailPage(Window* _pWindow);
+ void setDetailPage(vcl::Window* _pWindow);
/** sets all HandleCallbacks
@param _pTreeView
@@ -167,7 +167,7 @@ namespace dbaui
void ImplInitSettings();
public:
- OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
+ OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
virtual ~OAppDetailPageHelper();
// window overloads
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index e6e01c4e9809..4882593c2526 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -339,7 +339,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt )
}
}
-OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView)
+OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView)
: Window(_pParent,WB_DIALOGCONTROL )
,m_aCreation(*this)
,m_aDescription(this)
@@ -886,7 +886,7 @@ bool OApplicationDetailView::isSortUp() const
return m_pControlHelper->isSortUp();
}
-Window* OApplicationDetailView::getTreeWindow() const
+vcl::Window* OApplicationDetailView::getTreeWindow() const
{
return m_pControlHelper->getCurrentView();
}
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 4f83589343b7..ac12a0d0cfe8 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -109,7 +109,7 @@ namespace dbaui
sal_uInt16 nTitleId;
};
- class OTasksWindow : public Window
+ class OTasksWindow : public vcl::Window
{
OCreationList m_aCreation;
FixedText m_aDescription;
@@ -122,7 +122,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView);
+ OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView);
virtual ~OTasksWindow();
// window overloads
@@ -352,7 +352,7 @@ namespace dbaui
SvTreeListEntry* getEntry( const Point& _aPoint ) const;
- Window* getTreeWindow() const;
+ vcl::Window* getTreeWindow() const;
private:
void impl_createPage(
ElementType _eType,
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 62afddd51d2a..ff73ba0fdafc 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -29,7 +29,7 @@
using namespace ::dbaui;
// class OApplicationIconControl
-OApplicationIconControl::OApplicationIconControl(Window* _pParent)
+OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
,DropTargetHelper(this)
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index f8038ace0142..5fcecef90022 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -32,7 +32,7 @@ namespace dbaui
IControlActionListener* m_pActionListener;
public:
- OApplicationIconControl(Window* _pParent);
+ OApplicationIconControl(vcl::Window* _pParent);
virtual ~OApplicationIconControl();
void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 4f12cb9eb566..8c3d451bd0e3 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
// class OApplicationSwapWindow
-OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow )
+OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow )
:Window(_pParent,WB_DIALOGCONTROL )
,m_aIconControl(this)
,m_eLastType(E_NONE)
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 2282039f9995..5c10903cf9be 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -27,7 +27,7 @@
namespace dbaui
{
class OAppBorderWindow;
- class OApplicationSwapWindow : public Window,
+ class OApplicationSwapWindow : public vcl::Window,
public IClipboardTest
{
OApplicationIconControl m_aIconControl;
@@ -41,7 +41,7 @@ namespace dbaui
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow );
+ OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow );
virtual ~OApplicationSwapWindow();
// window overloads
virtual void Resize() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 72e37369f362..4276a553122b 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -27,7 +27,7 @@
namespace dbaui
{
-OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift)
+OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift)
: Window(_pParent,_nBits | WB_DIALOGCONTROL)
, m_aSpace1(this)
, m_aSpace2(this)
@@ -40,7 +40,7 @@ OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,
SetBorderStyle(WINDOW_BORDER_MONO);
ImplInitSettings( true, true, true );
- Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle };
+ vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle };
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
pWindows[i]->Show();
}
@@ -50,13 +50,13 @@ OTitleWindow::~OTitleWindow()
if ( m_pChild )
{
m_pChild->Hide();
- boost::scoped_ptr<Window> aTemp(m_pChild);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pChild);
m_pChild = NULL;
}
}
-void OTitleWindow::setChildWindow(Window* _pChild)
+void OTitleWindow::setChildWindow(vcl::Window* _pChild)
{
m_pChild = _pChild;
}
@@ -151,7 +151,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
- Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
+ vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle};
for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i)
{
vcl::Font aFont = pWindows[i]->GetFont();
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 0f1bedafd939..e33144a87395 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -23,18 +23,18 @@
namespace dbaui
{
- class OTitleWindow : public Window
+ class OTitleWindow : public vcl::Window
{
FixedText m_aSpace1;
FixedText m_aSpace2;
FixedText m_aTitle;
- Window* m_pChild;
+ vcl::Window* m_pChild;
bool m_bShift;
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
public:
- OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
+ OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
virtual ~OTitleWindow();
// window overloads
@@ -45,14 +45,14 @@ namespace dbaui
@param _pChild
The child window.
*/
- void setChildWindow(Window* _pChild);
+ void setChildWindow(vcl::Window* _pChild);
/** gets the child window.
@return
The child winodw.
*/
- inline Window* getChildWindow() const { return m_pChild; }
+ inline vcl::Window* getChildWindow() const { return m_pChild; }
/** sets the title text out of the resource
@param _nTitleId
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 3b22fd88badc..a3375b651fb0 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -90,13 +90,13 @@ OAppBorderWindow::~OAppBorderWindow()
if ( m_pPanel )
{
m_pPanel->Hide();
- boost::scoped_ptr<Window> aTemp(m_pPanel);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pPanel);
m_pPanel = NULL;
}
if ( m_pDetailView )
{
m_pDetailView->Hide();
- boost::scoped_ptr<Window> aTemp(m_pDetailView);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pDetailView);
m_pDetailView = NULL;
}
@@ -177,7 +177,7 @@ OApplicationSwapWindow* OAppBorderWindow::getPanel() const
// class OApplicationView
-OApplicationView::OApplicationView( Window* pParent
+OApplicationView::OApplicationView( vcl::Window* pParent
,const Reference< XComponentContext >& _rxOrb
,IApplicationController& _rAppController
,PreviewMode _ePreviewMode
@@ -208,7 +208,7 @@ OApplicationView::~OApplicationView()
{
stopComponentListening(m_xObject);
m_pWin->Hide();
- boost::scoped_ptr<Window> aTemp(m_pWin);
+ boost::scoped_ptr<vcl::Window> aTemp(m_pWin);
m_pWin = NULL;
}
}
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 109f63114ca1..a19118ac1917 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -42,7 +42,7 @@ namespace dbaui
class OApplicationDetailView;
class OApplicationSwapWindow;
class OTitleWindow;
- class OAppBorderWindow : public Window
+ class OAppBorderWindow : public vcl::Window
{
OTitleWindow* m_pPanel;
OApplicationDetailView* m_pDetailView;
@@ -97,7 +97,7 @@ namespace dbaui
// Window
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
public:
- OApplicationView( Window* pParent
+ OApplicationView( vcl::Window* pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
,IApplicationController& _rAppController
,PreviewMode _ePreviewMode
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:15:37 +0000