diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index a51397d07906..01792284d479 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -908,7 +908,9 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) // check for valid alignment SfxChildAlignment eLocalAlignment = (SfxChildAlignment) (sal_uInt16) aStr.toInt32(); - if ( pImpl->bDockingPrevented ) + bool bIgnoreFloatConfig = (eLocalAlignment == SfxChildAlignment::NOALIGNMENT && + !StyleSettings::GetDockingFloatsSupported()); + if (pImpl->bDockingPrevented || bIgnoreFloatConfig) // docking prevented, ignore old configuration and take alignment from default aStr.clear(); else |