tdf#132274 follow-up fix to Writer zoom options

Applying the zoom value works now as expected. The prior
fix mixed up zoom value and 100% and didn't always apply
special zoom values.

Change-Id: I7cf1f34fca5724eea14339535e7614cfecffdd79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174688
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Tested-by: Jenkins

sw/source/ui/config/optpage.cxx

@@ -433,9 +433,11 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
             aElem.SetDefaultZoomValue(100);
         }
         else
+        {
             aElem.SetDefaultZoomType(SvxZoomType::PERCENT);
+            aElem.SetDefaultZoomValue(m_xZoomValue->get_value(FieldUnit::PERCENT));
+        }
     }
-    aElem.SetDefaultZoomValue(m_xZoomValue->get_value(FieldUnit::PERCENT));
 
     bool bRet = !pOldAttr || aElem != *pOldAttr;
     if(bRet)

sw/source/uibase/app/swmodul1.cxx

@@ -100,7 +100,7 @@ static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, SwViewShell
         pView->CreateTab();
     else
         pView->KillTab();
-
+    pView->SetZoom(rPref.GetZoomType(), rPref.GetZoom(), true);
     pView->GetPostItMgr()->PrepareView(true);
 }