diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-21 16:17:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-25 08:39:03 +0200 |
commit | a9ea1295a668feca4bfb9b2a53a92890177b5371 (patch) | |
tree | f71c38420643436176bd17e9e78a38ebde1f4b99 /svx | |
parent | 51ea8aeca8c3dc081c3ffcca0dd75c4bad48d992 (diff) |
make eChildAlignment private in SfxChildWindow
Change-Id: I68a4c3324736e111a2c88e3edb9df506c33042b7
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/SpellDialogChildWindow.cxx | 1 | ||||
-rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/fontwork.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/hyperdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 1 | ||||
-rw-r--r-- | svx/source/engine3d/float3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/datanavi.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 1 | ||||
-rw-r--r-- | svx/source/form/fmPropBrw.cxx | 1 | ||||
-rw-r--r-- | svx/source/form/fmexpl.cxx | 1 | ||||
-rw-r--r-- | svx/source/form/tabwin.cxx | 1 | ||||
-rw-r--r-- | svx/source/tbxctrls/SvxColorChildWindow.cxx | 2 |
15 files changed, 2 insertions, 22 deletions
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 181cede78c63..e8ed7dd52580 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -39,7 +39,6 @@ SpellDialogChildWindow::SpellDialogChildWindow ( pBindings, this )); pWindow = m_xAbstractSpellDialog->GetWindow(); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; SetHideNotDelete(true); } diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 0b5915922774..9bf464489e77 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -356,8 +356,6 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow(vcl::Window* pParent_, sal_uInt16 n pWindow = pDlg; - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 03537b1d4bd6..205980bce9eb 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -73,8 +73,6 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, sal_u if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN ) pDlg->RollUp(); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 80e04ddc3759..8b072d2ec3d5 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -166,8 +166,6 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow VclPtrInstance<SvxFontWorkDialog> pDlg(pBindings, this, _pParent); pWindow = pDlg.get(); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index c175121c1a57..fa0da20eb54d 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -64,8 +64,6 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, pWindow->SetPosPixel( pInfo->aPos ); } - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - SetHideNotDelete( true ); } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 4b0af966d5f1..69d395f5f13d 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -102,8 +102,6 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16 if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN ) pDlg->RollUp(); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index af49dcd5954b..19b5d2ab0f93 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -75,8 +75,6 @@ SvxRubyChildWindow::SvxRubyChildWindow(vcl::Window* _pParent, sal_uInt16 nId,Sfx if (pInfo->nFlags & SfxChildWindowFlags::ZOOMIN) pDlg->RollUp(); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - pDlg->Initialize(pInfo); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index de7672f1ee79..1b435645441d 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2274,7 +2274,6 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt1 pBindings->Update( SID_SEARCH_OPTIONS ); pBindings->Update( SID_SEARCH_SEARCHSET ); pBindings->Update( SID_SEARCH_REPLACESET ); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; dialog->bConstruct = false; } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 84d6b065657c..9a0982d95112 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2910,8 +2910,6 @@ Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent, VclPtr<Svx3DWin> pWin = VclPtr<Svx3DWin>::Create( pBindings, this, _pParent ); pWindow = pWin; - eChildAlignment = SfxChildAlignment::NOALIGNMENT; - pWin->Initialize( pInfo ); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index d0b2bf7e6dbf..f88668294b22 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2253,7 +2253,7 @@ namespace svxform { pWindow = VclPtr<DataNavigator>::Create( _pBindings, this, _pParent ); - eChildAlignment = SfxChildAlignment::RIGHT; + SetAlignment(SfxChildAlignment::RIGHT); pWindow->SetSizePixel( Size( 250, 400 ) ); static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( _pInfo ); } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index debf553e0539..17451ae11872 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1997,7 +1997,6 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uIn :SfxChildWindow( _pParent, _nId ) { pWindow = VclPtr<FmFilterNavigatorWin>::Create( _pBindings, this, _pParent ); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( _pInfo ); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index b7256df132aa..86d05a29b159 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -84,7 +84,6 @@ FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId, :SfxChildWindow(_pParent, _nId) { pWindow = VclPtr<FmPropBrw>::Create( ::comphelper::getProcessComponentContext(), _pBindings, this, _pParent, _pInfo ); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( _pInfo ); } diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 25a9da72c822..faabd491a0e2 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -615,7 +615,6 @@ namespace svxform :SfxChildWindow( _pParent, _nId ) { pWindow = VclPtr<NavigatorFrame>::Create( _pBindings, this, _pParent ); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxDockingWindow*>(pWindow.get())->Initialize( _pInfo ); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index a58f813d312d..83d28cdebd74 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -426,7 +426,6 @@ FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent, sal_uInt16 _nId, { pWindow = VclPtr<FmFieldWin>::Create(_pBindings, this, _pParent); SetHideNotDelete(true); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( _pInfo ); } diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index a4ad23f3fedc..eb34587863e1 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -38,7 +38,7 @@ SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent, pWindow = pWin; - eChildAlignment = SfxChildAlignment::BOTTOM; + SetAlignment(SfxChildAlignment::BOTTOM); pWin->Initialize( pInfo ); } |