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 /sw/source/uibase | |
| parent | 51ea8aeca8c3dc081c3ffcca0dd75c4bad48d992 (diff) | |
make eChildAlignment private in SfxChildWindow
Change-Id: I68a4c3324736e111a2c88e3edb9df506c33042b7
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/dialog/wordcountwrapper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/fldui/fldwrap.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/index/idxmrk.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/inputwin.cxx | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/sw/source/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx index 16546675aa2b..3dfa2a7fca67 100644 --- a/sw/source/uibase/dialog/wordcountwrapper.cxx +++ b/sw/source/uibase/dialog/wordcountwrapper.cxx @@ -26,8 +26,6 @@ SwWordCountWrapper::SwWordCountWrapper( vcl::Window *pParentWindow, xAbstDlg.reset(pFact->CreateSwWordCountDialog(pBindings, this, pParentWindow, pInfo)); assert(xAbstDlg && "Dialog construction failed!"); pWindow = xAbstDlg->GetWindow(); - - eChildAlignment = SfxChildAlignment::NOALIGNMENT; } SfxChildWinInfo SwWordCountWrapper::GetInfo() const diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 3573174dfc01..a241e66fe571 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -86,7 +86,6 @@ SwFieldDlgWrapper::SwFieldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, pDlgInterface = pDlg; pWindow = pDlg->GetWindow(); pDlg->Start(); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; } // newly initialise dialog after Doc switch @@ -134,7 +133,6 @@ SwFieldDataOnlyDlgWrapper::SwFieldDataOnlyDlgWrapper( vcl::Window* _pParent, sal pDlg->ActivateDatabasePage(); pDlg->Start(); pDlg->Initialize( pInfo ); - eChildAlignment = SfxChildAlignment::NOALIGNMENT; } // re-init after doc activation diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx index 8ffb76094630..6fe389b6f8de 100644 --- a/sw/source/uibase/index/idxmrk.cxx +++ b/sw/source/uibase/index/idxmrk.cxx @@ -67,7 +67,6 @@ SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( vcl::Window *pParentWindow, pWindow = pAbstDlg->GetWindow(); pWindow->Show(); // at this point,because before pSh has to be initialized in ReInitDlg() // -> Show() will invoke StateChanged() and save pos - eChildAlignment = SfxChildAlignment::NOALIGNMENT; } SfxChildWinInfo SwInsertIdxMarkWrapper::GetInfo() const @@ -95,8 +94,6 @@ SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( vcl::Window *pParentWindow, pAbstDlg = pFact->CreateAuthMarkFloatDlg(pBindings, this, pParentWindow, pInfo); OSL_ENSURE(pAbstDlg, "Dialog creation failed!"); pWindow = pAbstDlg->GetWindow(); - - eChildAlignment = SfxChildAlignment::NOALIGNMENT; } SfxChildWinInfo SwInsertAuthMarkWrapper::GetInfo() const diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 702a7b828b01..8bd5a5c37870 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -624,7 +624,7 @@ SwInputChild::SwInputChild(vcl::Window* _pParent, pDispatch = pBindings->GetDispatcher(); pWindow = VclPtr<SwInputWindow>::Create( _pParent ); static_cast<SwInputWindow*>(pWindow.get())->ShowWin(); - eChildAlignment = SfxChildAlignment::LOWESTTOP; + SetAlignment(SfxChildAlignment::LOWESTTOP); } SwInputChild::~SwInputChild() |