summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-21 16:17:45 +0200
committerNoel Grandin <noel@peralex.com>2015-08-25 08:39:03 +0200
commita9ea1295a668feca4bfb9b2a53a92890177b5371 (patch)
treef71c38420643436176bd17e9e78a38ebde1f4b99
parent51ea8aeca8c3dc081c3ffcca0dd75c4bad48d992 (diff)
make eChildAlignment private in SfxChildWindow
Change-Id: I68a4c3324736e111a2c88e3edb9df506c33042b7
-rw-r--r--avmedia/source/framework/mediaplayer.cxx1
-rw-r--r--include/sfx2/childwin.hxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx2
-rw-r--r--sd/source/ui/dlg/AnimationChildWindow.cxx2
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx2
-rw-r--r--sfx2/source/dialog/dockwin.cxx1
-rw-r--r--sfx2/source/dialog/infobar.cxx2
-rw-r--r--sfx2/source/dialog/navigat.cxx1
-rw-r--r--sfx2/source/dialog/partwnd.cxx2
-rw-r--r--sfx2/source/dialog/recfloat.cxx1
-rw-r--r--sfx2/source/dialog/taskpane.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx2
-rw-r--r--starmath/source/ElementsDockingWindow.cxx2
-rw-r--r--starmath/source/view.cxx2
-rw-r--r--svx/source/dialog/SpellDialogChildWindow.cxx1
-rw-r--r--svx/source/dialog/_bmpmask.cxx2
-rw-r--r--svx/source/dialog/_contdlg.cxx2
-rw-r--r--svx/source/dialog/fontwork.cxx2
-rw-r--r--svx/source/dialog/hyperdlg.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx2
-rw-r--r--svx/source/dialog/rubydialog.cxx2
-rw-r--r--svx/source/dialog/srchdlg.cxx1
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/form/datanavi.cxx2
-rw-r--r--svx/source/form/filtnav.cxx1
-rw-r--r--svx/source/form/fmPropBrw.cxx1
-rw-r--r--svx/source/form/fmexpl.cxx1
-rw-r--r--svx/source/form/tabwin.cxx1
-rw-r--r--svx/source/tbxctrls/SvxColorChildWindow.cxx2
-rw-r--r--sw/source/uibase/dialog/wordcountwrapper.cxx2
-rw-r--r--sw/source/uibase/fldui/fldwrap.cxx2
-rw-r--r--sw/source/uibase/index/idxmrk.cxx3
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx2
34 files changed, 13 insertions, 46 deletions
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index b9c2b672d387..1298e8cfc0d8 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -41,7 +41,6 @@ MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _p
SfxChildWindow( _pParent, nId )
{
pWindow.reset( VclPtr<MediaFloater>::Create( _pBindings, this, _pParent ) );
- eChildAlignment = SfxChildAlignment::NOALIGNMENT;
static_cast< MediaFloater* >( pWindow.get() )->Initialize( pInfo );
};
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index f55f2ea9cf73..3cc607ed1291 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -152,10 +152,10 @@ class SFX2_DLLPUBLIC SfxChildWindow
sal_uInt16 nType; // ChildWindow-Id
protected:
- SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment
VclPtr<vcl::Window> pWindow; // actual contents
private:
+ SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment
SfxChildWindow_Impl* pImp; // Implementation data
SfxChildWindowContext* pContext; // With context-sensitive ChildWindows:
// Annother window in pWindow
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 7054af63037e..10688993df5a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -130,7 +130,7 @@ ScInputWindowWrapper::ScInputWindowWrapper( vcl::Window* pParentP,
pWin->SetSizePixel( pWin->CalcWindowSizePixel() );
- eChildAlignment = SfxChildAlignment::LOWESTTOP;
+ SetAlignment(SfxChildAlignment::LOWESTTOP);
pBindings->Invalidate( FID_TOGGLEINPUTLINE );
}
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index f18979356561..0afbcd4a793f 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -67,7 +67,7 @@ ScFunctionChildWindow::ScFunctionChildWindow( vcl::Window* pParentP,
pParentP, ScResId( FID_FUNCTION_BOX ) );
pWindow = pWin;
- eChildAlignment = SfxChildAlignment::RIGHT;
+ SetAlignment(SfxChildAlignment::RIGHT);
pWin->Initialize( pInfo );
}
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx
index d59f0ac2a083..1fd341642b7e 100644
--- a/sd/source/ui/dlg/AnimationChildWindow.cxx
+++ b/sd/source/ui/dlg/AnimationChildWindow.cxx
@@ -42,8 +42,6 @@ AnimationChildWindow::AnimationChildWindow(
VclPtr<AnimationWindow> pAnimWin = VclPtr<AnimationWindow>::Create(pBindings, this, _pParent);
pWindow = pAnimWin;
- eChildAlignment = SfxChildAlignment::NOALIGNMENT;
-
pAnimWin->Initialize( pInfo );
SetHideNotDelete( true );
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index b004e766131a..a52d00df7c3a 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -62,7 +62,7 @@ PaneChildWindow::PaneChildWindow (
this,
pParentWindow,
SD_RESSTR(nTitleBarResId));
- eChildAlignment = eAlignment;
+ SetAlignment(eAlignment);
static_cast<SfxDockingWindow*>(pWindow.get())->Initialize(pInfo);
SetHideNotDelete(true);
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 57dba9bd5f59..9afb766085fe 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -132,7 +132,6 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd ,
VclPtr<SfxTitleDockingWindow> pTitleDockWindow = VclPtr<SfxTitleDockingWindow>::Create( pBindings, this, pParentWnd,
WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
pWindow = pTitleDockWindow;
- eChildAlignment = SfxChildAlignment::NOALIGNMENT;
// Use factory manager to retrieve XWindow factory. That can be used to instantiate
// the real window factory.
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index f65946b58d67..0dd8089b7683 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -336,7 +336,7 @@ SfxInfoBarContainerChild::SfxInfoBarContainerChild( vcl::Window* _pParent, sal_u
pWindow->SetPosSizePixel(Point(0, 0), Size(_pParent->GetSizePixel().getWidth(), 0));
pWindow->Show();
- eChildAlignment = SfxChildAlignment::LOWESTTOP;
+ SetAlignment(SfxChildAlignment::LOWESTTOP);
}
SfxInfoBarContainerChild::~SfxInfoBarContainerChild()
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 98870a6981f1..7f0c223e840c 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -36,7 +36,6 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd ,
{
pWindow = VclPtr<SfxNavigator>::Create( pBindings, this, pParentWnd,
WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
- eChildAlignment = SfxChildAlignment::NOALIGNMENT;
pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW );
pWindow->SetOutputSizePixel( Size( 270, 240 ) );
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index f16288d4a1c7..3e4a5288c1cc 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -60,7 +60,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
{
// Create Window
pWindow = VclPtr<SfxPartDockWnd_Impl>::Create( pBindings, this, pParentWnd, WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK );
- eChildAlignment = SfxChildAlignment::TOP;
+ SetAlignment(SfxChildAlignment::TOP);
assert(pInfo);
pInfo->nFlags |= SfxChildWindowFlags::FORCEDOCK;
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index ce3dabb234b1..c771d63f1feb 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -133,7 +133,6 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pPare
{
pWindow = VclPtr<SfxRecordingFloat_Impl>::Create( pBindings, this, pParentWnd );
SetWantsFocus( false );
- eChildAlignment = SfxChildAlignment::NOALIGNMENT;
static_cast<SfxFloatingWindow*>(pWindow.get())->Initialize( pInfo );
}
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 4bf3d16039bc..548a0e557c4b 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -251,7 +251,7 @@ namespace sfx2
{
pWindow = VclPtr<TaskPaneDockingWindow>::Create( i_pBindings, *this, i_pParent,
WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
- eChildAlignment = SfxChildAlignment::RIGHT;
+ SetAlignment(SfxChildAlignment::RIGHT);
pWindow->SetHelpId( HID_TASKPANE_WINDOW );
pWindow->SetOutputSizePixel( Size( 300, 450 ) );
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index a37d50033cf8..59384c589ebd 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -38,7 +38,7 @@ SidebarChildWindow::SidebarChildWindow (vcl::Window* pParentWindow, sal_uInt16 n
WB_STDDOCKWIN | WB_OWNERDRAWDECORATION |
WB_CLIPCHILDREN | WB_SIZEABLE |
WB_3DLOOK | WB_ROLLABLE));
- eChildAlignment = SfxChildAlignment::RIGHT;
+ SetAlignment(SfxChildAlignment::RIGHT);
pWindow->SetHelpId(HID_SIDEBAR_WINDOW);
pWindow->SetOutputSizePixel(Size(GetDefaultWidth(pWindow), 450));
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 62a90930dd3d..3ca87b2a5a4e 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -769,7 +769,7 @@ SmElementsDockingWindowWrapper::SmElementsDockingWindowWrapper(
pDialog->SetPosSizePixel(Point(0, 0), Size(300, 0));
pDialog->Show();
- eChildAlignment = SfxChildAlignment::LEFT;
+ SetAlignment(SfxChildAlignment::LEFT);
pDialog->Initialize( pInfo );
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 9aaf0ae1ea18..3c21930fd898 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -892,7 +892,7 @@ SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId,
pWindow.reset(VclPtr<SmCmdBoxWindow>::Create(pBindings, this, pParentWindow));
// make window docked to the bottom initially (after first start)
- eChildAlignment = SfxChildAlignment::BOTTOM;
+ SetAlignment(SfxChildAlignment::BOTTOM);
static_cast<SfxDockingWindow *>(pWindow.get())->Initialize(pInfo);
}
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 );
}
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()