summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui/inc/UITools.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /dbaccess/source/ui/inc/UITools.hxx
parentDisable HTML export "hspace" and "vspace" check on OSX (diff)
downloadcore-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz
core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'dbaccess/source/ui/inc/UITools.hxx')
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx22
1 files changed, 11 insertions, 11 deletions
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,