diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2021-10-26 23:55:47 -0800 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2021-10-27 22:50:32 +0200 |
| commit | fc71991510df6ac6d9de278689f2def1a5af775e (patch) | |
| tree | 4bf4712dd6dac84d66867eff3ec5bb3ed7eca838 /sw/source | |
| parent | 0349c9df44896fea2c41588243a151bf594ea0e5 (diff) | |
tdf#131755 SwNavigator: Fix drag mode configuration restore
Seems extraction from the Any here needs to be to a long even though
an unsigned short is inserted.
Change-Id: I3439d4282c99d2b83d4e9e146e241db0dd41a452
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124258
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/utlui/navicfg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/utlui/navicfg.cxx b/sw/source/uibase/utlui/navicfg.cxx index 73597f01df74..d941f5fe3e4d 100644 --- a/sw/source/uibase/utlui/navicfg.cxx +++ b/sw/source/uibase/utlui/navicfg.cxx @@ -112,7 +112,7 @@ SwNavigationConfig::SwNavigationConfig() : case 2: pValues[nProp] >>= m_nOutlineLevel; break; case 3: { - sal_uInt16 nTmp; + sal_Int32 nTmp; if (pValues[nProp] >>= nTmp) m_nRegionMode = static_cast<RegionMode>(nTmp); break; diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index b414aaffa95f..1652aa2e81a7 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -569,6 +569,8 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent, bool bFloatingNavigator = ParentIsFloatingWindow(m_xNavigatorDlg); + SetRegionDropMode(m_pConfig->GetRegionMode()); + m_xContentTree->SetOutlineLevel(static_cast<sal_uInt8>(m_pConfig->GetOutlineLevel())); m_xContentTree->SetOutlineTracking(static_cast<sal_uInt8>(m_pConfig->GetOutlineTracking())); @@ -1145,8 +1147,6 @@ SwNavigatorWin::SwNavigatorWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, } } - m_xNavi->SetRegionDropMode( pNaviConfig->GetRegionMode() ); - SetMinOutputSizePixel(GetOptimalSize()); if (pNaviConfig->IsSmall()) m_xNavi->ZoomIn(); |