diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /svx/source/form/tbxform.cxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
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 'svx/source/form/tbxform.cxx')
| -rw-r--r-- | svx/source/form/tbxform.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 6e202f7e9fc0..6c7714e4083d 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using ::com::sun::star::beans::XPropertySet; -SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ) +SvxFmAbsRecWin::SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ) :NumericField( _pParent, WB_BORDER ) ,m_pController(_pController) { @@ -275,7 +275,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons } -Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); @@ -295,7 +295,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText() } -Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_TEXT)); FixedText* pFixedText = new FixedText( pParent ); @@ -321,7 +321,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() } -Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); FixedText* pFixedText = new FixedText( pParent, WB_CENTER ); @@ -348,7 +348,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal() } -Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent ) { pFixedText = new FixedText( pParent ); OUString aSample("123456"); |