loplugin:flatten in cui

Change-Id: I0ea0784ab8c4542747da1e15fa7c60c60bccb602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92423
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

21 files changed, 1757 insertions, 1762 deletions

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 4952e7b8203c..5b623de576ef 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -159,21 +159,21 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl, weld::ComboBox&, void)
 {
     LanguageType eNewLang = m_xLanguageLB->get_active_id();
     // save old settings and fill anew
-    if(eNewLang != eLastDialogLanguage)
+    if(eNewLang == eLastDialogLanguage)
+        return;
+
+    OString sPageId = GetCurPageId();
+    if (sPageId == "replace")
     {
-        OString sPageId = GetCurPageId();
-        if (sPageId == "replace")
-        {
-            OfaAutocorrReplacePage* pPage = static_cast<OfaAutocorrReplacePage*>(GetTabPage(sPageId));
-            assert(pPage);
-            pPage->SetLanguage(eNewLang);
-        }
-        else if (sPageId == "exceptions")
-        {
-            OfaAutocorrExceptPage* pPage = static_cast<OfaAutocorrExceptPage*>(GetTabPage(sPageId));
-            assert(pPage);
-            pPage->SetLanguage(eNewLang);
-        }
+        OfaAutocorrReplacePage* pPage = static_cast<OfaAutocorrReplacePage*>(GetTabPage(sPageId));
+        assert(pPage);
+        pPage->SetLanguage(eNewLang);
+    }
+    else if (sPageId == "exceptions")
+    {
+        OfaAutocorrExceptPage* pPage = static_cast<OfaAutocorrExceptPage*>(GetTabPage(sPageId));
+        assert(pPage);
+        pPage->SetLanguage(eNewLang);
     }
 }
 
@@ -1791,28 +1791,28 @@ IMPL_LINK(OfaQuoteTabPage, QuoteHdl, weld::Button&, rBtn, void)
     }
     aMap.SetChar(  cDlg );
     aMap.DisableFontSelection();
-    if (aMap.run() == RET_OK)
+    if (aMap.run() != RET_OK)
+        return;
+
+    sal_UCS4 cNewChar = aMap.GetChar();
+    switch( nMode )
     {
-        sal_UCS4 cNewChar = aMap.GetChar();
-        switch( nMode )
-        {
-            case SGL_START:
-                cSglStartQuote = cNewChar;
-                m_xSglStartExFT->set_label(ChangeStringExt_Impl(cNewChar));
-            break;
-            case SGL_END:
-                cSglEndQuote = cNewChar;
-                m_xSglEndExFT->set_label(ChangeStringExt_Impl(cNewChar));
-            break;
-            case DBL_START:
-                cStartQuote = cNewChar;
-                m_xDblStartExFT->set_label(ChangeStringExt_Impl(cNewChar));
-            break;
-            case DBL_END:
-                cEndQuote = cNewChar;
-                m_xDblEndExFT->set_label(ChangeStringExt_Impl(cNewChar));
-            break;
-        }
+        case SGL_START:
+            cSglStartQuote = cNewChar;
+            m_xSglStartExFT->set_label(ChangeStringExt_Impl(cNewChar));
+        break;
+        case SGL_END:
+            cSglEndQuote = cNewChar;
+            m_xSglEndExFT->set_label(ChangeStringExt_Impl(cNewChar));
+        break;
+        case DBL_START:
+            cStartQuote = cNewChar;
+            m_xDblStartExFT->set_label(ChangeStringExt_Impl(cNewChar));
+        break;
+        case DBL_END:
+            cEndQuote = cNewChar;
+            m_xDblEndExFT->set_label(ChangeStringExt_Impl(cNewChar));
+        break;
     }
 }
 
@@ -2065,26 +2065,26 @@ IMPL_LINK(OfaAutoCompleteTabPage, CheckHdl, weld::ToggleButton&, rBox, void)
 void OfaAutoCompleteTabPage::CopyToClipboard() const
 {
     auto rows = m_xLBEntries->get_selected_rows();
-    if (m_pAutoCompleteList && !rows.empty())
-    {
-        rtl::Reference<TransferDataContainer> pCntnr = new TransferDataContainer;
+    if (!(m_pAutoCompleteList && !rows.empty()))
+        return;
 
-        OStringBuffer sData;
+    rtl::Reference<TransferDataContainer> pCntnr = new TransferDataContainer;
 
-        rtl_TextEncoding nEncode = osl_getThreadTextEncoding();
+    OStringBuffer sData;
 
-        for (auto a : rows)
-        {
-            sData.append(OUStringToOString(m_xLBEntries->get_text(a), nEncode));
+    rtl_TextEncoding nEncode = osl_getThreadTextEncoding();
+
+    for (auto a : rows)
+    {
+        sData.append(OUStringToOString(m_xLBEntries->get_text(a), nEncode));
 #if defined(_WIN32)
-            sData.append("\015\012");
+        sData.append("\015\012");
 #else
-            sData.append("\012");
+        sData.append("\012");
 #endif
-        }
-        pCntnr->CopyByteString( SotClipboardFormatId::STRING, sData.makeStringAndClear() );
-        pCntnr->CopyToClipboard(GetSystemClipboard());
     }
+    pCntnr->CopyByteString( SotClipboardFormatId::STRING, sData.makeStringAndClear() );
+    pCntnr->CopyToClipboard(GetSystemClipboard());
 }
 
 IMPL_LINK(OfaAutoCompleteTabPage, KeyReleaseHdl, const KeyEvent&, rEvent, bool)
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index e72ddcb4854b..123481198e17 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -290,52 +290,52 @@ IMPL_LINK(SvxBkgTabPage, TblDestinationHdl_Impl, weld::ComboBox&, rBox, void)
     }
 
     sal_Int32 nSelPos = rBox.get_active();
-    if (m_nActPos != nSelPos)
+    if (m_nActPos == nSelPos)
+        return;
+
+    m_nActPos = nSelPos;
+
+    // fill local item set with XATTR_FILL created from SvxBushItem for table destination slot Which
+    sal_uInt16 nWhich = maSet.GetPool()->GetWhich(lcl_GetTableDestSlot(nSelPos));
+    if (SfxItemState::SET == maSet.GetItemState(nWhich))
+    {
+        SvxBrushItem aBrushItem(static_cast<const SvxBrushItem&>(maSet.Get(nWhich)));
+        setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, maSet);
+    }
+    else
     {
-        m_nActPos = nSelPos;
+        SelectFillType(*m_xBtnNone, &maSet);
+        return;
+    }
 
-        // fill local item set with XATTR_FILL created from SvxBushItem for table destination slot Which
-        sal_uInt16 nWhich = maSet.GetPool()->GetWhich(lcl_GetTableDestSlot(nSelPos));
-        if (SfxItemState::SET == maSet.GetItemState(nWhich))
-        {
-            SvxBrushItem aBrushItem(static_cast<const SvxBrushItem&>(maSet.Get(nWhich)));
-            setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, maSet);
-        }
-        else
+    // show tab page
+    drawing::FillStyle eXFS = drawing::FillStyle_NONE;
+    if (maSet.GetItemState(XATTR_FILLSTYLE) != SfxItemState::DONTCARE)
+    {
+        XFillStyleItem aFillStyleItem(static_cast<const XFillStyleItem&>(maSet.Get(GetWhich( XATTR_FILLSTYLE))));
+        eXFS = aFillStyleItem.GetValue();
+    }
+    switch(eXFS)
+    {
+        default:
+        case drawing::FillStyle_NONE:
         {
             SelectFillType(*m_xBtnNone, &maSet);
-            return;
+            break;
         }
-
-        // show tab page
-        drawing::FillStyle eXFS = drawing::FillStyle_NONE;
-        if (maSet.GetItemState(XATTR_FILLSTYLE) != SfxItemState::DONTCARE)
+        case drawing::FillStyle_SOLID:
         {
-            XFillStyleItem aFillStyleItem(static_cast<const XFillStyleItem&>(maSet.Get(GetWhich( XATTR_FILLSTYLE))));
-            eXFS = aFillStyleItem.GetValue();
+            SelectFillType(*m_xBtnColor, &maSet);
+            // color tab page Active and New preview controls are same after SelectFillType
+            // hack to restore color tab page Active preview
+            setSvxBrushItemAsFillAttributesToTargetSet(static_cast<const SvxBrushItem&>(m_pResetSet->Get(nWhich)), *m_pResetSet);
+            static_cast<SvxColorTabPage*>(GetFillTabPage())->SetCtlPreviewOld(*m_pResetSet);
+            break;
         }
-        switch(eXFS)
+        case drawing::FillStyle_BITMAP:
         {
-            default:
-            case drawing::FillStyle_NONE:
-            {
-                SelectFillType(*m_xBtnNone, &maSet);
-                break;
-            }
-            case drawing::FillStyle_SOLID:
-            {
-                SelectFillType(*m_xBtnColor, &maSet);
-                // color tab page Active and New preview controls are same after SelectFillType
-                // hack to restore color tab page Active preview
-                setSvxBrushItemAsFillAttributesToTargetSet(static_cast<const SvxBrushItem&>(m_pResetSet->Get(nWhich)), *m_pResetSet);
-                static_cast<SvxColorTabPage*>(GetFillTabPage())->SetCtlPreviewOld(*m_pResetSet);
-                break;
-            }
-            case drawing::FillStyle_BITMAP:
-            {
-                SelectFillType(*m_xBtnBitmap, &maSet);
-                break;
-            }
+            SelectFillType(*m_xBtnBitmap, &maSet);
+            break;
         }
     }
 }
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index d8ab1aa1e9d1..68eca4fb4d48 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -535,19 +535,19 @@ void SvxCharNamePage::FillStyleBox_Impl(const weld::Widget& rNameBox)
 
     pStyleBox->Fill(sFontName, pFontList);
 
-    if ( m_pImpl->m_bInSearchMode )
-    {
-        // additional entries for the search:
-        // "not bold" and "not italic"
-        OUString aEntry = m_pImpl->m_aNoStyleText;
-        const char sS[] = "%1";
-        aEntry = aEntry.replaceFirst( sS, pFontList->GetBoldStr() );
-        m_pImpl->m_nExtraEntryPos = pStyleBox->get_count();
-        pStyleBox->append_text( aEntry );
-        aEntry = m_pImpl->m_aNoStyleText;
-        aEntry = aEntry.replaceFirst( sS, pFontList->GetItalicStr() );
-        pStyleBox->append_text(aEntry);
-    }
+    if ( !m_pImpl->m_bInSearchMode )
+        return;
+
+    // additional entries for the search:
+    // "not bold" and "not italic"
+    OUString aEntry = m_pImpl->m_aNoStyleText;
+    const char sS[] = "%1";
+    aEntry = aEntry.replaceFirst( sS, pFontList->GetBoldStr() );
+    m_pImpl->m_nExtraEntryPos = pStyleBox->get_count();
+    pStyleBox->append_text( aEntry );
+    aEntry = m_pImpl->m_aNoStyleText;
+    aEntry = aEntry.replaceFirst( sS, pFontList->GetItalicStr() );
+    pStyleBox->append_text(aEntry);
 }
 
 void SvxCharNamePage::FillSizeBox_Impl(const weld::Widget& rNameBox)
@@ -2439,20 +2439,20 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet)
     if (pDisableCtlItem)
         DisableControls(pDisableCtlItem->GetValue());
 
-    if (pFlagItem)
-    {
-        sal_uInt32 nFlags=pFlagItem->GetValue();
-        if ( ( nFlags & SVX_ENABLE_FLASH ) == SVX_ENABLE_FLASH )
-            m_xBlinkingBtn->show();
-        if ( ( nFlags & SVX_PREVIEW_CHARACTER ) == SVX_PREVIEW_CHARACTER )
-            // the writer uses SID_ATTR_BRUSH as font background
-            m_bPreviewBackgroundToCharacter = true;
-        if ((nFlags & SVX_ENABLE_CHAR_TRANSPARENCY) != SVX_ENABLE_CHAR_TRANSPARENCY)
-        {
-            // Only show these in case client code explicitly wants this.
-            m_xFontTransparencyFT->hide();
-            m_xFontTransparencyMtr->hide();
-        }
+    if (!pFlagItem)
+        return;
+
+    sal_uInt32 nFlags=pFlagItem->GetValue();
+    if ( ( nFlags & SVX_ENABLE_FLASH ) == SVX_ENABLE_FLASH )
+        m_xBlinkingBtn->show();
+    if ( ( nFlags & SVX_PREVIEW_CHARACTER ) == SVX_PREVIEW_CHARACTER )
+        // the writer uses SID_ATTR_BRUSH as font background
+        m_bPreviewBackgroundToCharacter = true;
+    if ((nFlags & SVX_ENABLE_CHAR_TRANSPARENCY) != SVX_ENABLE_CHAR_TRANSPARENCY)
+    {
+        // Only show these in case client code explicitly wants this.
+        m_xFontTransparencyFT->hide();
+        m_xFontTransparencyMtr->hide();
     }
 }
 
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index cda75610365c..a1f916c70a8b 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -410,18 +410,18 @@ IMPL_LINK(SvxCaptionTabPage, PositionSelectHdl_Impl, weld::ComboBox&, rListBox,
 
 IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, weld::ToggleButton&, rButton, void )
 {
-    if (&rButton == m_xCB_OPTIMAL.get())
+    if (&rButton != m_xCB_OPTIMAL.get())
+        return;
+
+    if (m_xCB_OPTIMAL->get_active() || !m_xCB_OPTIMAL->get_sensitive())
     {
-        if (m_xCB_OPTIMAL->get_active() || !m_xCB_OPTIMAL->get_sensitive())
-        {
-            m_xFT_LENGTHFT->set_sensitive(false);
-            m_xMF_LENGTH->set_sensitive(false);
-        }
-        else
-        {
-            m_xFT_LENGTHFT->set_sensitive(true);
-            m_xMF_LENGTH->set_sensitive(true);
-        }
+        m_xFT_LENGTHFT->set_sensitive(false);
+        m_xMF_LENGTH->set_sensitive(false);
+    }
+    else
+    {
+        m_xFT_LENGTHFT->set_sensitive(true);
+        m_xMF_LENGTH->set_sensitive(true);
     }
 }
 
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 97ba2da968ea..deb9ee5a7d10 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1534,52 +1534,52 @@ IMPL_LINK(SvxNumberFormatTabPage, OptEditHdl_Impl, weld::SpinButton&, rEdit, voi
 
 void SvxNumberFormatTabPage::OptHdl_Impl(const weld::Widget* pOptCtrl)
 {
-    if (   pOptCtrl == m_xEdLeadZeroes.get()
+    if (   !(pOptCtrl == m_xEdLeadZeroes.get()
         || pOptCtrl == m_xEdDecimals.get()
         || pOptCtrl == m_xEdDenominator.get()
         || pOptCtrl == m_xBtnNegRed.get()
         || pOptCtrl == m_xBtnThousand.get()
-        || pOptCtrl == m_xBtnEngineering.get())
+        || pOptCtrl == m_xBtnEngineering.get()))
+        return;
+
+    OUString          aFormat;
+    bool          bThousand  = ( m_xBtnThousand->get_visible() && m_xBtnThousand->get_sensitive() && m_xBtnThousand->get_active() )
+                            || ( m_xBtnEngineering->get_visible() && m_xBtnEngineering->get_sensitive() && m_xBtnEngineering->get_active() );
+    bool          bNegRed    =   m_xBtnNegRed->get_sensitive() && m_xBtnNegRed->get_active();
+    sal_uInt16    nPrecision = (m_xEdDecimals->get_sensitive() && m_xEdDecimals->get_visible())
+                             ? static_cast<sal_uInt16>(m_xEdDecimals->get_value())
+                             : ( (m_xEdDenominator->get_sensitive() && m_xEdDenominator->get_visible())
+                               ? static_cast<sal_uInt16>(m_xEdDenominator->get_value())
+                               : sal_uInt16(0) );
+    sal_uInt16    nLeadZeroes = (m_xEdLeadZeroes->get_sensitive())
+                             ? static_cast<sal_uInt16>(m_xEdLeadZeroes->get_value())
+                             : sal_uInt16(0);
+    if ( pNumFmtShell->GetStandardName() == m_xEdFormat->get_text() )
     {
-        OUString          aFormat;
-        bool          bThousand  = ( m_xBtnThousand->get_visible() && m_xBtnThousand->get_sensitive() && m_xBtnThousand->get_active() )
-                                || ( m_xBtnEngineering->get_visible() && m_xBtnEngineering->get_sensitive() && m_xBtnEngineering->get_active() );
-        bool          bNegRed    =   m_xBtnNegRed->get_sensitive() && m_xBtnNegRed->get_active();
-        sal_uInt16    nPrecision = (m_xEdDecimals->get_sensitive() && m_xEdDecimals->get_visible())
-                                 ? static_cast<sal_uInt16>(m_xEdDecimals->get_value())
-                                 : ( (m_xEdDenominator->get_sensitive() && m_xEdDenominator->get_visible())
-                                   ? static_cast<sal_uInt16>(m_xEdDenominator->get_value())
-                                   : sal_uInt16(0) );
-        sal_uInt16    nLeadZeroes = (m_xEdLeadZeroes->get_sensitive())
-                                 ? static_cast<sal_uInt16>(m_xEdLeadZeroes->get_value())
-                                 : sal_uInt16(0);
-        if ( pNumFmtShell->GetStandardName() == m_xEdFormat->get_text() )
-        {
-            m_xEdDecimals->set_value(nPrecision);
-        }
+        m_xEdDecimals->set_value(nPrecision);
+    }
 
-        pNumFmtShell->MakeFormat( aFormat,
-                                  bThousand, bNegRed,
-                                  nPrecision, nLeadZeroes,
-                                  static_cast<sal_uInt16>(m_xLbFormat->get_selected_index()) );
+    pNumFmtShell->MakeFormat( aFormat,
+                              bThousand, bNegRed,
+                              nPrecision, nLeadZeroes,
+                              static_cast<sal_uInt16>(m_xLbFormat->get_selected_index()) );
 
-        m_xEdFormat->set_text( aFormat );
-        MakePreviewText( aFormat );
+    m_xEdFormat->set_text( aFormat );
+    MakePreviewText( aFormat );
 
-        if ( pNumFmtShell->FindEntry( aFormat ) )
-        {
-            m_xIbAdd->set_sensitive(false );
-            bool bUserDef=pNumFmtShell->IsUserDefined( aFormat );
-            m_xIbRemove->set_sensitive(bUserDef);
-            m_xIbInfo->set_sensitive(bUserDef);
-            EditHdl_Impl(m_xEdFormat.get());
+    if ( pNumFmtShell->FindEntry( aFormat ) )
+    {
+        m_xIbAdd->set_sensitive(false );
+        bool bUserDef=pNumFmtShell->IsUserDefined( aFormat );
+        m_xIbRemove->set_sensitive(bUserDef);
+        m_xIbInfo->set_sensitive(bUserDef);
+        EditHdl_Impl(m_xEdFormat.get());
 
-        }
-        else
-        {
-            EditHdl_Impl( nullptr );
-            m_xLbFormat->select(-1);
-        }
+    }
+    else
+    {
+        EditHdl_Impl( nullptr );
+        m_xLbFormat->select(-1);
     }
 }
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index f80ee6f1481a..c2f5eae08b20 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -172,31 +172,31 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(weld::Container* pPage, weld::D
     m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage, DoubleClickHdl_Impl));
 
     Reference<XDefaultNumberingProvider> xDefNum = SvxNumOptionsTabPageHelper::GetNumberingProvider();
-    if(xDefNum.is())
+    if(!xDefNum.is())
+        return;
+
+    Sequence< Sequence< PropertyValue > > aNumberings;
+    const Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale();
+    try
     {
-        Sequence< Sequence< PropertyValue > > aNumberings;
-        const Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale();
-        try
-        {
-            aNumberings =
-                xDefNum->getDefaultContinuousNumberingLevels( rLocale );
+        aNumberings =
+            xDefNum->getDefaultContinuousNumberingLevels( rLocale );
 
 
-            sal_Int32 nLength = std::min<sal_Int32>(aNumberings.getLength(), NUM_VALUSET_COUNT);
+        sal_Int32 nLength = std::min<sal_Int32>(aNumberings.getLength(), NUM_VALUSET_COUNT);
 
-            const Sequence<PropertyValue>* pValuesArr = aNumberings.getConstArray();
-            for(sal_Int32 i = 0; i < nLength; i++)
-            {
-                SvxNumSettings_Impl* pNew = lcl_CreateNumSettingsPtr(pValuesArr[i]);
-                aNumSettingsArr.push_back(std::unique_ptr<SvxNumSettings_Impl>(pNew));
-            }
-        }
-        catch(const Exception&)
+        const Sequence<PropertyValue>* pValuesArr = aNumberings.getConstArray();
+        for(sal_Int32 i = 0; i < nLength; i++)
         {
+            SvxNumSettings_Impl* pNew = lcl_CreateNumSettingsPtr(pValuesArr[i]);
+            aNumSettingsArr.push_back(std::unique_ptr<SvxNumSettings_Impl>(pNew));
         }
-        Reference<XNumberingFormatter> xFormat(xDefNum, UNO_QUERY);
-        m_xExamplesVS->SetNumberingSettings(aNumberings, xFormat, rLocale);
     }
+    catch(const Exception&)
+    {
+    }
+    Reference<XNumberingFormatter> xFormat(xDefNum, UNO_QUERY);
+    m_xExamplesVS->SetNumberingSettings(aNumberings, xFormat, rLocale);
 }
 
 SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
@@ -292,40 +292,40 @@ void  SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet )
 
 IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void)
 {
-    if(pActNum)
-    {
-        bPreset = false;
-        bModified = true;
-        sal_uInt16 nIdx = m_xExamplesVS->GetSelectedItemId() - 1;
-        DBG_ASSERT(aNumSettingsArr.size() > nIdx, "wrong index");
-        if(aNumSettingsArr.size() <= nIdx)
-            return;
-        SvxNumSettings_Impl* _pSet = aNumSettingsArr[nIdx].get();
-        SvxNumType eNewType = _pSet->nNumberType;
-        const sal_Unicode cLocalPrefix = !_pSet->sPrefix.isEmpty() ? _pSet->sPrefix[0] : 0;
-        const sal_Unicode cLocalSuffix = !_pSet->sSuffix.isEmpty() ? _pSet->sSuffix[0] : 0;
+    if(!pActNum)
+        return;
 
-        sal_uInt16 nMask = 1;
-        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    bPreset = false;
+    bModified = true;
+    sal_uInt16 nIdx = m_xExamplesVS->GetSelectedItemId() - 1;
+    DBG_ASSERT(aNumSettingsArr.size() > nIdx, "wrong index");
+    if(aNumSettingsArr.size() <= nIdx)
+        return;
+    SvxNumSettings_Impl* _pSet = aNumSettingsArr[nIdx].get();
+    SvxNumType eNewType = _pSet->nNumberType;
+    const sal_Unicode cLocalPrefix = !_pSet->sPrefix.isEmpty() ? _pSet->sPrefix[0] : 0;
+    const sal_Unicode cLocalSuffix = !_pSet->sSuffix.isEmpty() ? _pSet->sSuffix[0] : 0;
+
+    sal_uInt16 nMask = 1;
+    for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    {
+        if(nActNumLvl & nMask)
         {
-            if(nActNumLvl & nMask)
-            {
-                SvxNumberFormat aFmt(pActNum->GetLevel(i));
-                aFmt.SetNumberingType(eNewType);
-                if(cLocalPrefix == ' ')
-                    aFmt.SetPrefix( "" );
-                else
-                    aFmt.SetPrefix(_pSet->sPrefix);
-                if(cLocalSuffix == ' ')
-                    aFmt.SetSuffix( "" );
-                else
-                    aFmt.SetSuffix(_pSet->sSuffix);
-                aFmt.SetCharFormatName("");
-                aFmt.SetBulletRelSize(100);
-                pActNum->SetLevel(i, aFmt);
-            }
-            nMask <<= 1;
+            SvxNumberFormat aFmt(pActNum->GetLevel(i));
+            aFmt.SetNumberingType(eNewType);
+            if(cLocalPrefix == ' ')
+                aFmt.SetPrefix( "" );
+            else
+                aFmt.SetPrefix(_pSet->sPrefix);
+            if(cLocalSuffix == ' ')
+                aFmt.SetSuffix( "" );
+            else
+                aFmt.SetSuffix(_pSet->sSuffix);
+            aFmt.SetCharFormatName("");
+            aFmt.SetBulletRelSize(100);
+            pActNum->SetLevel(i, aFmt);
         }
+        nMask <<= 1;
     }
 }
 
@@ -442,31 +442,31 @@ void  SvxBulletPickTabPage::Reset( const SfxItemSet* rSet )
 
 IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void)
 {
-    if(pActNum)
-    {
-        bPreset = false;
-        bModified = true;
-        sal_Unicode cChar = aBulletTypes[m_xExamplesVS->GetSelectedItemId() - 1];
-        const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+    if(!pActNum)
+        return;
 
-        sal_uInt16 nMask = 1;
-        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    bPreset = false;
+    bModified = true;
+    sal_Unicode cChar = aBulletTypes[m_xExamplesVS->GetSelectedItemId() - 1];
+    const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+
+    sal_uInt16 nMask = 1;
+    for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    {
+        if(nActNumLvl & nMask)
         {
-            if(nActNumLvl & nMask)
-            {
-                SvxNumberFormat aFmt(pActNum->GetLevel(i));
-                aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
-                // #i93908# clear suffix for bullet lists
-                aFmt.SetPrefix( OUString() );
-                aFmt.SetSuffix( OUString() );
-                aFmt.SetBulletFont(&rActBulletFont);
-                aFmt.SetBulletChar(cChar );
-                aFmt.SetCharFormatName(sBulletCharFormatName);
-                aFmt.SetBulletRelSize(45);
-                pActNum->SetLevel(i, aFmt);
-            }
-            nMask <<= 1;
+            SvxNumberFormat aFmt(pActNum->GetLevel(i));
+            aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
+            // #i93908# clear suffix for bullet lists
+            aFmt.SetPrefix( OUString() );
+            aFmt.SetSuffix( OUString() );
+            aFmt.SetBulletFont(&rActBulletFont);
+            aFmt.SetBulletChar(cChar );
+            aFmt.SetCharFormatName(sBulletCharFormatName);
+            aFmt.SetBulletRelSize(45);
+            pActNum->SetLevel(i, aFmt);
         }
+        nMask <<= 1;
     }
 }
 
@@ -501,37 +501,37 @@ SvxNumPickTabPage::SvxNumPickTabPage(weld::Container* pPage, weld::DialogControl
     m_xExamplesVS->SetDoubleClickHdl(LINK(this, SvxNumPickTabPage, DoubleClickHdl_Impl));
 
     Reference<XDefaultNumberingProvider> xDefNum = SvxNumOptionsTabPageHelper::GetNumberingProvider();
-    if(xDefNum.is())
+    if(!xDefNum.is())
+        return;
+
+    Sequence<Reference<XIndexAccess> > aOutlineAccess;
+    const Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale();
+    try
     {
-        Sequence<Reference<XIndexAccess> > aOutlineAccess;
-        const Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale();
-        try
+        aOutlineAccess = xDefNum->getDefaultOutlineNumberings( rLocale );
+
+        for(sal_Int32 nItem = 0;
+            nItem < aOutlineAccess.getLength() && nItem < NUM_VALUSET_COUNT;
+            nItem++ )
         {
-            aOutlineAccess = xDefNum->getDefaultOutlineNumberings( rLocale );
+            SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[ nItem ];
 
-            for(sal_Int32 nItem = 0;
-                nItem < aOutlineAccess.getLength() && nItem < NUM_VALUSET_COUNT;
-                nItem++ )
+            Reference<XIndexAccess> xLevel = aOutlineAccess.getConstArray()[nItem];
+            for(sal_Int32 nLevel = 0; nLevel < xLevel->getCount() && nLevel < 5; nLevel++)
             {
-                SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[ nItem ];
-
-                Reference<XIndexAccess> xLevel = aOutlineAccess.getConstArray()[nItem];
-                for(sal_Int32 nLevel = 0; nLevel < xLevel->getCount() && nLevel < 5; nLevel++)
-                {
-                    Any aValueAny = xLevel->getByIndex(nLevel);
-                    Sequence<PropertyValue> aLevelProps;
-                    aValueAny >>= aLevelProps;
-                    SvxNumSettings_Impl* pNew = lcl_CreateNumSettingsPtr(aLevelProps);
-                    rItemArr.push_back( std::unique_ptr<SvxNumSettings_Impl>(pNew) );
-                }
+                Any aValueAny = xLevel->getByIndex(nLevel);
+                Sequence<PropertyValue> aLevelProps;
+                aValueAny >>= aLevelProps;
+                SvxNumSettings_Impl* pNew = lcl_CreateNumSettingsPtr(aLevelProps);
+                rItemArr.push_back( std::unique_ptr<SvxNumSettings_Impl>(pNew) );
             }
         }
-        catch(const Exception&)
-        {
-        }
-        Reference<XNumberingFormatter> xFormat(xDefNum, UNO_QUERY);
-        m_xExamplesVS->SetOutlineNumberingSettings(aOutlineAccess, xFormat, rLocale);
     }
+    catch(const Exception&)
+    {
+    }
+    Reference<XNumberingFormatter> xFormat(xDefNum, UNO_QUERY);
+    m_xExamplesVS->SetOutlineNumberingSettings(aOutlineAccess, xFormat, rLocale);
 }
 
 SvxNumPickTabPage::~SvxNumPickTabPage()
@@ -627,83 +627,83 @@ void  SvxNumPickTabPage::Reset( const SfxItemSet* rSet )
 // all levels are changed here
 IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void)
 {
-    if(pActNum)
-    {
-        bPreset = false;
-        bModified = true;
+    if(!pActNum)
+        return;
 
-        const FontList*  pList = nullptr;
+    bPreset = false;
+    bModified = true;
 
-        SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_xExamplesVS->GetSelectedItemId() - 1];
+    const FontList*  pList = nullptr;
 
-        const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
-        SvxNumSettings_Impl* pLevelSettings = nullptr;
-        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
-        {
-            if(rItemArr.size() > i)
-                pLevelSettings = rItemArr[i].get();
-            if(!pLevelSettings)
-                break;
-            SvxNumberFormat aFmt(pActNum->GetLevel(i));
-            aFmt.SetNumberingType( pLevelSettings->nNumberType );
-            sal_uInt16 nUpperLevelOrChar = static_cast<sal_uInt16>(pLevelSettings->nParentNumbering);
-            if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL)
+    SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_xExamplesVS->GetSelectedItemId() - 1];
+
+    const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
+    SvxNumSettings_Impl* pLevelSettings = nullptr;
+    for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    {
+        if(rItemArr.size() > i)
+            pLevelSettings = rItemArr[i].get();
+        if(!pLevelSettings)
+            break;
+        SvxNumberFormat aFmt(pActNum->GetLevel(i));
+        aFmt.SetNumberingType( pLevelSettings->nNumberType );
+        sal_uInt16 nUpperLevelOrChar = static_cast<sal_uInt16>(pLevelSettings->nParentNumbering);
+        if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL)
+        {
+            // #i93908# clear suffix for bullet lists
+            aFmt.SetPrefix(OUString());
+            aFmt.SetSuffix(OUString());
+            if( !pLevelSettings->sBulletFont.isEmpty() &&
+                pLevelSettings->sBulletFont != rActBulletFont.GetFamilyName())
             {
-                // #i93908# clear suffix for bullet lists
-                aFmt.SetPrefix(OUString());
-                aFmt.SetSuffix(OUString());
-                if( !pLevelSettings->sBulletFont.isEmpty() &&
-                    pLevelSettings->sBulletFont != rActBulletFont.GetFamilyName())
+                //search for the font
+                if(!pList)
                 {
-                    //search for the font
-                    if(!pList)
-                    {
-                        SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
-                        const SvxFontListItem* pFontListItem =
-                                static_cast<const SvxFontListItem*>( pCurDocShell
-                                                    ->GetItem( SID_ATTR_CHAR_FONTLIST ));
-                        pList = pFontListItem ? pFontListItem->GetFontList() : nullptr;
-                    }
-                    if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
-                    {
-                        FontMetric aFontMetric = pList->Get(
-                            pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
-                        vcl::Font aFont(aFontMetric);
-                        aFmt.SetBulletFont(&aFont);
-                    }
-                    else
-                    {
-                        //if it cannot be found then create a new one
-                        vcl::Font aCreateFont( pLevelSettings->sBulletFont,
-                                                OUString(), Size( 0, 14 ) );
-                        aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
-                        aCreateFont.SetFamily( FAMILY_DONTKNOW );
-                        aCreateFont.SetPitch( PITCH_DONTKNOW );
-                        aCreateFont.SetWeight( WEIGHT_DONTKNOW );
-                        aCreateFont.SetTransparent( true );
-                        aFmt.SetBulletFont( &aCreateFont );
-                    }
+                    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
+                    const SvxFontListItem* pFontListItem =
+                            static_cast<const SvxFontListItem*>( pCurDocShell
+                                                ->GetItem( SID_ATTR_CHAR_FONTLIST ));
+                    pList = pFontListItem ? pFontListItem->GetFontList() : nullptr;
+                }
+                if(pList && pList->IsAvailable( pLevelSettings->sBulletFont ) )
+                {
+                    FontMetric aFontMetric = pList->Get(
+                        pLevelSettings->sBulletFont,WEIGHT_NORMAL, ITALIC_NONE);
+                    vcl::Font aFont(aFontMetric);
+                    aFmt.SetBulletFont(&aFont);
                 }
                 else
-                    aFmt.SetBulletFont( &rActBulletFont );
-
-                aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
-                                        ? pLevelSettings->sBulletChar[0]
-                                        : 0 );
-                aFmt.SetCharFormatName( sBulletCharFormatName );
-                aFmt.SetBulletRelSize(45);
+                {
+                    //if it cannot be found then create a new one
+                    vcl::Font aCreateFont( pLevelSettings->sBulletFont,
+                                            OUString(), Size( 0, 14 ) );
+                    aCreateFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
+                    aCreateFont.SetFamily( FAMILY_DONTKNOW );
+                    aCreateFont.SetPitch( PITCH_DONTKNOW );
+                    aCreateFont.SetWeight( WEIGHT_DONTKNOW );
+                    aCreateFont.SetTransparent( true );
+                    aFmt.SetBulletFont( &aCreateFont );
+                }
             }
             else
-            {
-                aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
-                aFmt.SetCharFormatName(sNumCharFmtName);
-                aFmt.SetBulletRelSize(100);
-                // #i93908#
-                aFmt.SetPrefix(pLevelSettings->sPrefix);
-                aFmt.SetSuffix(pLevelSettings->sSuffix);
-            }
-            pActNum->SetLevel(i, aFmt);
+                aFmt.SetBulletFont( &rActBulletFont );
+
+            aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
+                                    ? pLevelSettings->sBulletChar[0]
+                                    : 0 );
+            aFmt.SetCharFormatName( sBulletCharFormatName );
+            aFmt.SetBulletRelSize(45);
+        }
+        else
+        {
+            aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
+            aFmt.SetCharFormatName(sNumCharFmtName);
+            aFmt.SetBulletRelSize(100);
+            // #i93908#
+            aFmt.SetPrefix(pLevelSettings->sPrefix);
+            aFmt.SetSuffix(pLevelSettings->sSuffix);
         }
+        pActNum->SetLevel(i, aFmt);
     }
 }
 
@@ -869,38 +869,38 @@ void  SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet )
 
 IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, SvtValueSet*, void)
 {
-    if(pActNum)
-    {
-        bPreset = false;
-        bModified = true;
-        sal_uInt16 nIdx = m_xExamplesVS->GetSelectedItemId() - 1;
+    if(!pActNum)
+        return;
 
-        sal_uInt16 nMask = 1;
-        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    bPreset = false;
+    bModified = true;
+    sal_uInt16 nIdx = m_xExamplesVS->GetSelectedItemId() - 1;
+
+    sal_uInt16 nMask = 1;
+    for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    {
+        if(nActNumLvl & nMask)
         {
-            if(nActNumLvl & nMask)
-            {
-                SvxNumberFormat aFmt(pActNum->GetLevel(i));
-                aFmt.SetNumberingType(SVX_NUM_BITMAP);
-                aFmt.SetPrefix( "" );
-                aFmt.SetSuffix( "" );
-                aFmt.SetCharFormatName( "" );
+            SvxNumberFormat aFmt(pActNum->GetLevel(i));
+            aFmt.SetNumberingType(SVX_NUM_BITMAP);
+            aFmt.SetPrefix( "" );
+            aFmt.SetSuffix( "" );
+            aFmt.SetCharFormatName( "" );
 
-                Graphic aGraphic;
-                if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
-                {
-                    Size aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic);
-                    sal_Int16 eOrient = text::VertOrientation::LINE_CENTER;
-                    aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(eCoreUnit));
-                    SvxBrushItem aBrush(aGraphic, GPOS_AREA, SID_ATTR_BRUSH );
-                    aFmt.SetGraphicBrush( &aBrush, &aSize, &eOrient );
-                }
-                else if(aGrfNames.size() > nIdx)
-                    aFmt.SetGraphic( aGrfNames[nIdx] );
-                pActNum->SetLevel(i, aFmt);
+            Graphic aGraphic;
+            if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
+            {
+                Size aSize = SvxNumberFormat::GetGraphicSizeMM100(&aGraphic);
+                sal_Int16 eOrient = text::VertOrientation::LINE_CENTER;
+                aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(eCoreUnit));
+                SvxBrushItem aBrush(aGraphic, GPOS_AREA, SID_ATTR_BRUSH );
+                aFmt.SetGraphicBrush( &aBrush, &aSize, &eOrient );
             }
-            nMask <<= 1;
+            else if(aGrfNames.size() > nIdx)
+                aFmt.SetGraphic( aGrfNames[nIdx] );
+            pActNum->SetLevel(i, aFmt);
         }
+        nMask <<= 1;
     }
 }
 
@@ -935,76 +935,74 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, weld::Button&, voi
     DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     GraphicDescriptor aDescriptor(aURL);
-    if (aDescriptor.Detect())
-    {
-        uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
-        uno::Reference<ucb::XSimpleFileAccess3> xSimpleFileAccess(
-                     ucb::SimpleFileAccess::create( ::comphelper::getComponentContext(xFactory) ) );
-        if ( xSimpleFileAccess->exists( aUserImageURL ))
-        {
-            xSimpleFileAccess->copy( aUserImageURL, aUserGalleryURL );
-            INetURLObject gURL( aUserGalleryURL );
-            std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
-                          gURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ));
-            if ( pIn )
-            {
-                Graphic aGraphic;
-                GraphicConverter::Import( *pIn, aGraphic );
-
-                BitmapEx aBitmap = aGraphic.GetBitmapEx();
-                long nPixelX = aBitmap.GetSizePixel().Width();
-                long nPixelY = aBitmap.GetSizePixel().Height();
-                double ratio = nPixelY/static_cast<double>(nPixelX);
-                if(nPixelX > 30)
-                {
-                    nPixelX = 30;
-                    nPixelY = static_cast<long>(nPixelX*ratio);
-                }
-                if(nPixelY > 30)
-                {
-                    nPixelY = 30;
-                    nPixelX = static_cast<long>(nPixelY/ratio);
-                }
+    if (!aDescriptor.Detect())
+        return;
 
-                aBitmap.Scale( Size( nPixelX, nPixelY ), BmpScaleFlag::Fast );
-                Graphic aScaledGraphic( aBitmap );
-                GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+    uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
+    uno::Reference<ucb::XSimpleFileAccess3> xSimpleFileAccess(
+                 ucb::SimpleFileAccess::create( ::comphelper::getComponentContext(xFactory) ) );
+    if ( !xSimpleFileAccess->exists( aUserImageURL ))
+        return;
 
-                Sequence< PropertyValue > aFilterData( 2 );
-                aFilterData[ 0 ].Name = "Compression";
-                aFilterData[ 0 ].Value <<= sal_Int32(-1) ;
-                aFilterData[ 1 ].Name = "Quality";
-                aFilterData[ 1 ].Value <<= sal_Int32(1);
+    xSimpleFileAccess->copy( aUserImageURL, aUserGalleryURL );
+    INetURLObject gURL( aUserGalleryURL );
+    std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream(
+                  gURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ));
+    if ( !pIn )
+        return;
 
-                sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( gURL.GetFileExtension() );
-                rFilter.ExportGraphic( aScaledGraphic, gURL , nFilterFormat, &aFilterData );
-                GalleryExplorer::InsertURL( GALLERY_THEME_BULLETS, aUserGalleryURL );
+    Graphic aGraphic;
+    GraphicConverter::Import( *pIn, aGraphic );
 
-                aGrfNames.push_back(aUserGalleryURL);
-                size_t i = 0;
-                for (auto & grfName : aGrfNames)
-                {
-                    m_xExamplesVS->InsertItem( i + 1, i);
-                    INetURLObject aObj(grfName);
-                    if(aObj.GetProtocol() == INetProtocol::File)
-                        grfName = aObj.PathToFileName();
-                    m_xExamplesVS->SetItemText( i + 1, grfName );
-                    ++i;
-                }
+    BitmapEx aBitmap = aGraphic.GetBitmapEx();
+    long nPixelX = aBitmap.GetSizePixel().Width();
+    long nPixelY = aBitmap.GetSizePixel().Height();
+    double ratio = nPixelY/static_cast<double>(nPixelX);
+    if(nPixelX > 30)
+    {
+        nPixelX = 30;
+        nPixelY = static_cast<long>(nPixelX*ratio);
+    }
+    if(nPixelY > 30)
+    {
+        nPixelY = 30;
+        nPixelX = static_cast<long>(nPixelY/ratio);
+    }
 
-                if(aGrfNames.empty())
-                {
-                    m_xErrorText->show();
-                }
-                else
-                {
-                    m_xExamplesVS->Show();
-                    m_xExamplesVS->SetFormat();
-                }
+    aBitmap.Scale( Size( nPixelX, nPixelY ), BmpScaleFlag::Fast );
+    Graphic aScaledGraphic( aBitmap );
+    GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
 
-            }
-        }
+    Sequence< PropertyValue > aFilterData( 2 );
+    aFilterData[ 0 ].Name = "Compression";
+    aFilterData[ 0 ].Value <<= sal_Int32(-1) ;
+    aFilterData[ 1 ].Name = "Quality";
+    aFilterData[ 1 ].Value <<= sal_Int32(1);
+
+    sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName( gURL.GetFileExtension() );
+    rFilter.ExportGraphic( aScaledGraphic, gURL , nFilterFormat, &aFilterData );
+    GalleryExplorer::InsertURL( GALLERY_THEME_BULLETS, aUserGalleryURL );
+
+    aGrfNames.push_back(aUserGalleryURL);
+    size_t i = 0;
+    for (auto & grfName : aGrfNames)
+    {
+        m_xExamplesVS->InsertItem( i + 1, i);
+        INetURLObject aObj(grfName);
+        if(aObj.GetProtocol() == INetProtocol::File)
+            grfName = aObj.PathToFileName();
+        m_xExamplesVS->SetItemText( i + 1, grfName );
+        ++i;
+    }
 
+    if(aGrfNames.empty())
+    {
+        m_xErrorText->show();
+    }
+    else
+    {
+        m_xExamplesVS->Show();
+        m_xExamplesVS->SetFormat();
     }
 }
 
@@ -1151,27 +1149,26 @@ void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
     }
 
     bModified = (!pActNum->Get( 0 ) || bPreset);
-    if(*pActNum != *pSaveNum ||
-        nActNumLvl != nTmpNumLvl)
+    if(*pActNum == *pSaveNum && nActNumLvl == nTmpNumLvl)
+        return;
+
+    nActNumLvl = nTmpNumLvl;
+    sal_uInt16 nMask = 1;
+    m_xLevelLB->unselect_all();
+    if (nActNumLvl == SAL_MAX_UINT16)
+        m_xLevelLB->select(pActNum->GetLevelCount());
+    if(nActNumLvl != SAL_MAX_UINT16)
     {
-        nActNumLvl = nTmpNumLvl;
-        sal_uInt16 nMask = 1;
-        m_xLevelLB->unselect_all();
-        if (nActNumLvl == SAL_MAX_UINT16)
-            m_xLevelLB->select(pActNum->GetLevelCount());
-        if(nActNumLvl != SAL_MAX_UINT16)
+        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
         {
-            for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
-            {
-                if(nActNumLvl & nMask)
-                    m_xLevelLB->select(i);
-                nMask <<= 1 ;
-            }
+            if(nActNumLvl & nMask)
+                m_xLevelLB->select(i);
+            nMask <<= 1 ;
         }
-        *pActNum = *pSaveNum;
-
-        InitControls();
     }
+    *pActNum = *pSaveNum;
+
+    InitControls();
 }
 
 DeactivateRC SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
@@ -1835,93 +1832,93 @@ IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OString&, rIdent, void)
             }
         }
     }
-    if(bSucc)
-    {
-        aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(eCoreUnit));
+    if(!bSucc)
+        return;
 
-        sal_uInt16 nMask = 1;
-        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(eCoreUnit));
+
+    sal_uInt16 nMask = 1;
+    for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    {
+        if(nActNumLvl & nMask)
         {
-            if(nActNumLvl & nMask)
-            {
-                SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
-                aNumFmt.SetCharFormatName(m_sNumCharFmtName);
-                aNumFmt.SetGraphic(aGrfName);
+            SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
+            aNumFmt.SetCharFormatName(m_sNumCharFmtName);
+            aNumFmt.SetGraphic(aGrfName);
 
-                // set size for a later comparison
-                const SvxBrushItem* pBrushItem = aNumFmt.GetBrush();
-                // initiate asynchronous loading
-                sal_Int16 eOrient = aNumFmt.GetVertOrient();
-                aNumFmt.SetGraphicBrush( pBrushItem, &aSize, &eOrient );
-                aInitSize[i] = aNumFmt.GetGraphicSize();
+            // set size for a later comparison
+            const SvxBrushItem* pBrushItem = aNumFmt.GetBrush();
+            // initiate asynchronous loading
+            sal_Int16 eOrient = aNumFmt.GetVertOrient();
+            aNumFmt.SetGraphicBrush( pBrushItem, &aSize, &eOrient );
+            aInitSize[i] = aNumFmt.GetGraphicSize();
 
-                pActNum->SetLevel(i, aNumFmt);
-            }
-            nMask <<= 1;
+            pActNum->SetLevel(i, aNumFmt);
         }
-        m_xRatioCB->set_sensitive(true);
-        m_xWidthFT->set_sensitive(true);
-        m_xHeightFT->set_sensitive(true);
-        m_xWidthMF->set_sensitive(true);
-        m_xHeightMF->set_sensitive(true);
-        SetMetricValue(*m_xWidthMF, aSize.Width(), eCoreUnit);
-        SetMetricValue(*m_xHeightMF, aSize.Height(), eCoreUnit);
-        m_xOrientFT->set_sensitive(true);
-        m_xOrientLB->set_sensitive(true);
-        SetModified();
-        //needed due to asynchronous loading of graphics in the SvxBrushItem
-        aInvalidateTimer.Start();
+        nMask <<= 1;
     }
+    m_xRatioCB->set_sensitive(true);
+    m_xWidthFT->set_sensitive(true);
+    m_xHeightFT->set_sensitive(true);
+    m_xWidthMF->set_sensitive(true);
+    m_xHeightMF->set_sensitive(true);
+    SetMetricValue(*m_xWidthMF, aSize.Width(), eCoreUnit);
+    SetMetricValue(*m_xHeightMF, aSize.Height(), eCoreUnit);
+    m_xOrientFT->set_sensitive(true);
+    m_xOrientLB->set_sensitive(true);
+    SetModified();
+    //needed due to asynchronous loading of graphics in the SvxBrushItem
+    aInvalidateTimer.Start();
 }
 
 IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, weld::ToggleButton&, void)
 {
-    if (!m_xGalleryMenu)
-    {
-        m_xGalleryMenu = m_xBuilder->weld_menu("gallerysubmenu");
-        weld::WaitObject aWait(GetFrameWeld());
+    if (m_xGalleryMenu)
+        return;
 
-        if (GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames))
-        {
-            GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
+    m_xGalleryMenu = m_xBuilder->weld_menu("gallerysubmenu");
+    weld::WaitObject aWait(GetFrameWeld());
 
-            Graphic aGraphic;
-            OUString sGrfName;
-            ScopedVclPtrInstance< VirtualDevice > pVD;
-            size_t i = 0;
-            for (const auto & grfName : aGrfNames)
+    if (!GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames))
+        return;
+
+    GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
+
+    Graphic aGraphic;
+    OUString sGrfName;
+    ScopedVclPtrInstance< VirtualDevice > pVD;
+    size_t i = 0;
+    for (const auto & grfName : aGrfNames)
+    {
+        sGrfName = grfName;
+        OUString sItemId = "gallery" + OUString::number(i);
+        INetURLObject aObj(sGrfName);
+        if(aObj.GetProtocol() == INetProtocol::File)
+            sGrfName = aObj.PathToFileName();
+        if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
+        {
+            BitmapEx aBitmap(aGraphic.GetBitmapEx());
+            Size aSize(aBitmap.GetSizePixel());
+            if(aSize.Width() > MAX_BMP_WIDTH ||
+                aSize.Height() > MAX_BMP_HEIGHT)
             {
-                sGrfName = grfName;
-                OUString sItemId = "gallery" + OUString::number(i);
-                INetURLObject aObj(sGrfName);
-                if(aObj.GetProtocol() == INetProtocol::File)
-                    sGrfName = aObj.PathToFileName();
-                if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
-                {
-                    BitmapEx aBitmap(aGraphic.GetBitmapEx());
-                    Size aSize(aBitmap.GetSizePixel());
-                    if(aSize.Width() > MAX_BMP_WIDTH ||
-                        aSize.Height() > MAX_BMP_HEIGHT)
-                    {
-                        bool bWidth = aSize.Width() > aSize.Height();
-                        double nScale = bWidth ?
-                                            double(MAX_BMP_WIDTH) / static_cast<double>(aSize.Width()):
-                                                double(MAX_BMP_HEIGHT) / static_cast<double>(aSize.Height());
-                        aBitmap.Scale(nScale, nScale);
-                    }
-                    pVD->SetOutputSizePixel(aBitmap.GetSizePixel(), false);
-                    pVD->DrawBitmapEx(Point(), aBitmap);
-                    m_xGalleryMenu->append(sItemId, sGrfName, *pVD);
-                }
-                else
-                {
-                    m_xGalleryMenu->append(sItemId, sGrfName);
-                }
-                ++i;
+                bool bWidth = aSize.Width() > aSize.Height();
+                double nScale = bWidth ?
+                                    double(MAX_BMP_WIDTH) / static_cast<double>(aSize.Width()):
+                                        double(MAX_BMP_HEIGHT) / static_cast<double>(aSize.Height());
+                aBitmap.Scale(nScale, nScale);
             }
-            GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
+            pVD->SetOutputSizePixel(aBitmap.GetSizePixel(), false);
+            pVD->DrawBitmapEx(Point(), aBitmap);
+            m_xGalleryMenu->append(sItemId, sGrfName, *pVD);
         }
+        else
+        {
+            m_xGalleryMenu->append(sItemId, sGrfName);
+        }
+        ++i;
     }
+    GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
 }
 
 IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, weld::Button&, void)
@@ -1961,26 +1958,26 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, weld::Button&, void)
         aMap.SetCharFont(aActBulletFont);
     if (bSameBullet)
         aMap.SetChar(cBullet);
-    if (aMap.run() == RET_OK)
-    {
-        // change Font Numrules
-        aActBulletFont = aMap.GetCharFont();
+    if (aMap.run() != RET_OK)
+        return;
 
-        sal_uInt16 _nMask = 1;
-        for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    // change Font Numrules
+    aActBulletFont = aMap.GetCharFont();
+
+    sal_uInt16 _nMask = 1;
+    for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
+    {
+        if(nActNumLvl & _nMask)
         {
-            if(nActNumLvl & _nMask)
-            {
-                SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
-                aNumFmt.SetBulletFont(&aActBulletFont);
-                aNumFmt.SetBulletChar( static_cast<sal_Unicode>(aMap.GetChar()) );
-                pActNum->SetLevel(i, aNumFmt);
-            }
-            _nMask <<= 1;
+            SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
+            aNumFmt.SetBulletFont(&aActBulletFont);
+            aNumFmt.SetBulletChar( static_cast<sal_Unicode>(aMap.GetChar()) );
+            pActNum->SetLevel(i, aNumFmt);
         }
-
-        SetModified();
+        _nMask <<= 1;
     }
+
+    SetModified();
 }
 
 IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, void)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 2fd72a79596f..1b5fc2851ce9 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -828,48 +828,48 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void)
 {
     Paper ePaper = m_xPaperSizeBox->get_active_id();
 
-    if ( ePaper != PAPER_USER )
-    {
-        Size aSize( SvxPaperInfo::GetPaperSize( ePaper, MapUnit::Map100thMM ) );
+    if ( ePaper == PAPER_USER )
+        return;
 
-        if (m_xLandscapeBtn->get_active())
-            Swap( aSize );
+    Size aSize( SvxPaperInfo::GetPaperSize( ePaper, MapUnit::Map100thMM ) );
 
-        if ( aSize.Height() < m_xPaperHeightEdit->get_min( FieldUnit::MM_100TH ) )
-            m_xPaperHeightEdit->set_min(
-                m_xPaperHeightEdit->normalize( aSize.Height() ), FieldUnit::MM_100TH );
-        if ( aSize.Width() < m_xPaperWidthEdit->get_min( FieldUnit::MM_100TH ) )
-            m_xPaperWidthEdit->set_min(
-                m_xPaperWidthEdit->normalize( aSize.Width() ), FieldUnit::MM_100TH );
-        SetMetricValue( *m_xPaperHeightEdit, aSize.Height(), MapUnit::Map100thMM );
-        SetMetricValue( *m_xPaperWidthEdit, aSize.Width(), MapUnit::Map100thMM );
+    if (m_xLandscapeBtn->get_active())
+        Swap( aSize );
 
-        CalcMargin_Impl();
+    if ( aSize.Height() < m_xPaperHeightEdit->get_min( FieldUnit::MM_100TH ) )
+        m_xPaperHeightEdit->set_min(
+            m_xPaperHeightEdit->normalize( aSize.Height() ), FieldUnit::MM_100TH );
+    if ( aSize.Width() < m_xPaperWidthEdit->get_min( FieldUnit::MM_100TH ) )
+        m_xPaperWidthEdit->set_min(
+            m_xPaperWidthEdit->normalize( aSize.Width() ), FieldUnit::MM_100TH );
+    SetMetricValue( *m_xPaperHeightEdit, aSize.Height(), MapUnit::Map100thMM );
+    SetMetricValue( *m_xPaperWidthEdit, aSize.Width(), MapUnit::Map100thMM );
 
-        RangeHdl_Impl();
-        UpdateExample_Impl( true );
+    CalcMargin_Impl();
 
-        if ( eMode == SVX_PAGE_MODE_PRESENTATION )
-        {
-            // Draw: if paper format the margin shall be 1 cm
-            long nTmp = 0;
-            bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper));
-
-            if ( !bScreen )
-                // no margin if screen
-                nTmp = 1; // accordingly 1 cm
-
-            if ( bScreen || m_xRightMarginEdit->get_value(FieldUnit::NONE) == 0 )
-                SetMetricValue( *m_xRightMarginEdit, nTmp, MapUnit::MapCM );
-            if ( bScreen || m_xLeftMarginEdit->get_value(FieldUnit::NONE) == 0 )
-                SetMetricValue( *m_xLeftMarginEdit, nTmp, MapUnit::MapCM );
-            if ( bScreen || m_xBottomMarginEdit->get_value(FieldUnit::NONE) == 0 )
-                SetMetricValue( *m_xBottomMarginEdit, nTmp, MapUnit::MapCM );
-            if ( bScreen || m_xTopMarginEdit->get_value(FieldUnit::NONE) == 0 )
-                SetMetricValue( *m_xTopMarginEdit, nTmp, MapUnit::MapCM );
-            UpdateExample_Impl( true );
-        }
-    }
+    RangeHdl_Impl();
+    UpdateExample_Impl( true );
+
+    if ( eMode != SVX_PAGE_MODE_PRESENTATION )
+        return;
+
+    // Draw: if paper format the margin shall be 1 cm
+    long nTmp = 0;
+    bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper));
+
+    if ( !bScreen )
+        // no margin if screen
+        nTmp = 1; // accordingly 1 cm
+
+    if ( bScreen || m_xRightMarginEdit->get_value(FieldUnit::NONE) == 0 )
+        SetMetricValue( *m_xRightMarginEdit, nTmp, MapUnit::MapCM );
+    if ( bScreen || m_xLeftMarginEdit->get_value(FieldUnit::NONE) == 0 )
+        SetMetricValue( *m_xLeftMarginEdit, nTmp, MapUnit::MapCM );
+    if ( bScreen || m_xBottomMarginEdit->get_value(FieldUnit::NONE) == 0 )
+        SetMetricValue( *m_xBottomMarginEdit, nTmp, MapUnit::MapCM );
+    if ( bScreen || m_xTopMarginEdit->get_value(FieldUnit::NONE) == 0 )
+        SetMetricValue( *m_xTopMarginEdit, nTmp, MapUnit::MapCM );
+    UpdateExample_Impl( true );
 }
 
 IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, weld::MetricSpinButton&, void)
@@ -900,27 +900,27 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, weld::MetricSpinButton&,
 IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::Button&, rBtn, void)
 {
     if (
-        (!bLandscape && &rBtn == m_xLandscapeBtn.get()) ||
-        (bLandscape  && &rBtn == m_xPortraitBtn.get())
+        !((!bLandscape && &rBtn == m_xLandscapeBtn.get()) ||
+        (bLandscape  && &rBtn == m_xPortraitBtn.get()))
        )
-    {
-        bLandscape = m_xLandscapeBtn->get_active();
+        return;
+
+    bLandscape = m_xLandscapeBtn->get_active();
 
-        const long lWidth = GetCoreValue( *m_xPaperWidthEdit, MapUnit::Map100thMM );
-        const long lHeight = GetCoreValue( *m_xPaperHeightEdit, MapUnit::Map100thMM );
+    const long lWidth = GetCoreValue( *m_xPaperWidthEdit, MapUnit::Map100thMM );
+    const long lHeight = GetCoreValue( *m_xPaperHeightEdit, MapUnit::Map100thMM );
 
-        // swap width and height
-        SetMetricValue(*m_xPaperWidthEdit, lHeight, MapUnit::Map100thMM);
-        SetMetricValue(*m_xPaperHeightEdit, lWidth, MapUnit::Map100thMM);
+    // swap width and height
+    SetMetricValue(*m_xPaperWidthEdit, lHeight, MapUnit::Map100thMM);
+    SetMetricValue(*m_xPaperHeightEdit, lWidth, MapUnit::Map100thMM);
 
-        // recalculate margins if necessary
-        CalcMargin_Impl();
+    // recalculate margins if necessary
+    CalcMargin_Impl();
 
-        PaperSizeSelect_Impl(m_xPaperSizeBox->get_widget());
-        RangeHdl_Impl();
-        SwapFirstValues_Impl(bBorderModified);
-        UpdateExample_Impl(true);
-    }
+    PaperSizeSelect_Impl(m_xPaperSizeBox->get_widget());
+    RangeHdl_Impl();
+    SwapFirstValues_Impl(bBorderModified);
+    UpdateExample_Impl(true);
 }
 
 void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
@@ -965,21 +965,21 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
     nFirstTopMargin = m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(nNewT), FieldUnit::TWIP);
     nFirstBottomMargin = m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(nNewB), FieldUnit::TWIP);
 
-    if ( bSet )
-    {
-        if ( nSetL < nNewL )
-            m_xLeftMarginEdit->set_value( m_xLeftMarginEdit->normalize( nNewL ),
-                                      FieldUnit::TWIP );
-        if ( nSetR < nNewR )
-            m_xRightMarginEdit->set_value( m_xRightMarginEdit->normalize( nNewR ),
-                                       FieldUnit::TWIP );
-        if ( nSetT < nNewT )
-            m_xTopMarginEdit->set_value( m_xTopMarginEdit->normalize( nNewT ),
-                                     FieldUnit::TWIP );
-        if ( nSetB < nNewB )
-            m_xBottomMarginEdit->set_value( m_xBottomMarginEdit->normalize( nNewB ),
-                                        FieldUnit::TWIP );
-    }
+    if ( !bSet )
+        return;
+
+    if ( nSetL < nNewL )
+        m_xLeftMarginEdit->set_value( m_xLeftMarginEdit->normalize( nNewL ),
+                                  FieldUnit::TWIP );
+    if ( nSetR < nNewR )
+        m_xRightMarginEdit->set_value( m_xRightMarginEdit->normalize( nNewR ),
+                                   FieldUnit::TWIP );
+    if ( nSetT < nNewT )
+        m_xTopMarginEdit->set_value( m_xTopMarginEdit->normalize( nNewT ),
+                                 FieldUnit::TWIP );
+    if ( nSetB < nNewB )
+        m_xBottomMarginEdit->set_value( m_xBottomMarginEdit->normalize( nNewB ),
+                                    FieldUnit::TWIP );
 }
 
 IMPL_LINK_NOARG(SvxPageDescPage, BorderModify_Impl, weld::MetricSpinButton&, void)
@@ -1179,57 +1179,57 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
 
     // evaluate footer attributes
 
-    if ( SfxItemState::SET ==
+    if ( SfxItemState::SET !=
          rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
                             false, reinterpret_cast<const SfxPoolItem**>(&pSetItem) ) )
+        return;
+
+    const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
+    const SfxBoolItem& rFooterOn =
+        static_cast<const SfxBoolItem&>(rFooterSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ));
+
+    if ( rFooterOn.GetValue() )
     {
-        const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
-        const SfxBoolItem& rFooterOn =
-            static_cast<const SfxBoolItem&>(rFooterSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ));
+        const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(
+            rFooterSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) ));
+        const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(
+            rFooterSet.Get( GetWhich( SID_ATTR_ULSPACE ) ));
+        long nDist = rUL.GetUpper();
+        m_aBspWin.SetFtHeight( rSize.GetSize().Height() - nDist );
+        m_aBspWin.SetFtDist( nDist );
+        const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(
+            rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) ));
+        m_aBspWin.SetFtLeft( rLR.GetLeft() );
+        m_aBspWin.SetFtRight( rLR.GetRight() );
+        m_aBspWin.SetFooter( true );
+    }
+    else
+        m_aBspWin.SetFooter( false );
 
-        if ( rFooterOn.GetValue() )
-        {
-            const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(
-                rFooterSet.Get( GetWhich( SID_ATTR_PAGE_SIZE ) ));
-            const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(
-                rFooterSet.Get( GetWhich( SID_ATTR_ULSPACE ) ));
-            long nDist = rUL.GetUpper();
-            m_aBspWin.SetFtHeight( rSize.GetSize().Height() - nDist );
-            m_aBspWin.SetFtDist( nDist );
-            const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(
-                rFooterSet.Get( GetWhich( SID_ATTR_LRSPACE ) ));
-            m_aBspWin.SetFtLeft( rLR.GetLeft() );
-            m_aBspWin.SetFtRight( rLR.GetRight() );
-            m_aBspWin.SetFooter( true );
-        }
-        else
-            m_aBspWin.SetFooter( false );
+    // show background and border in the example
+    drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFooterFillAttributes;
 
-        // show background and border in the example
-        drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFooterFillAttributes;
+    if(mbEnableDrawingLayerFillStyles)
+    {
+        // create FillAttributes directly from DrawingLayer FillStyle entries
+        aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(rFooterSet);
+    }
+    else
+    {
+        const sal_uInt16 nWhich(GetWhich(SID_ATTR_BRUSH));
 
-        if(mbEnableDrawingLayerFillStyles)
-        {
-            // create FillAttributes directly from DrawingLayer FillStyle entries
-            aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(rFooterSet);
-        }
-        else
+        if(rFooterSet.GetItemState(nWhich) >= SfxItemState::DEFAULT)
         {
-            const sal_uInt16 nWhich(GetWhich(SID_ATTR_BRUSH));
+            // aBspWin.SetFtColor(rItem.GetColor());
+            const SvxBrushItem& rItem = static_cast<const SvxBrushItem&>(rFooterSet.Get(nWhich));
+            SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
 
-            if(rFooterSet.GetItemState(nWhich) >= SfxItemState::DEFAULT)
-            {
-                // aBspWin.SetFtColor(rItem.GetColor());
-                const SvxBrushItem& rItem = static_cast<const SvxBrushItem&>(rFooterSet.Get(nWhich));
-                SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
-
-                setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
-                aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet);
-            }
+            setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
+            aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet);
         }
-
-        m_aBspWin.setFooterFillAttributes(aFooterFillAttributes);
     }
+
+    m_aBspWin.setFooterFillAttributes(aFooterFillAttributes);
 }
 
 void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
@@ -1376,29 +1376,29 @@ void SvxPageDescPage::CalcMargin_Impl()
     long nWidth = nBL + nBR + MINBODY;
     long nHeight = nBT + nBB + MINBODY;
 
-    if ( nWidth > nW || nHeight > nH )
+    if ( !(nWidth > nW || nHeight > nH) )
+        return;
+
+    if ( nWidth > nW )
     {
-        if ( nWidth > nW )
-        {
-            long nTmp = nBL <= nBR ? nBR : nBL;
-            nTmp -= nWidth - nW;
+        long nTmp = nBL <= nBR ? nBR : nBL;
+        nTmp -= nWidth - nW;
 
-            if ( nBL <= nBR )
-                SetMetricValue( *m_xRightMarginEdit, nTmp, MapUnit::MapTwip );
-            else
-                SetMetricValue( *m_xLeftMarginEdit, nTmp, MapUnit::MapTwip );
-        }
+        if ( nBL <= nBR )
+            SetMetricValue( *m_xRightMarginEdit, nTmp, MapUnit::MapTwip );
+        else
+            SetMetricValue( *m_xLeftMarginEdit, nTmp, MapUnit::MapTwip );
+    }
 
-        if ( nHeight > nH )
-        {
-            long nTmp = nBT <= nBB ? nBB : nBT;
-            nTmp -= nHeight - nH;
+    if ( nHeight > nH )
+    {
+        long nTmp = nBT <= nBB ? nBB : nBT;
+        nTmp -= nHeight - nH;
 
-            if ( nBT <= nBB )
-                SetMetricValue( *m_xBottomMarginEdit, nTmp, MapUnit::MapTwip );
-            else
-                SetMetricValue( *m_xTopMarginEdit, nTmp, MapUnit::MapTwip );
-        }
+        if ( nBT <= nBB )
+            SetMetricValue( *m_xBottomMarginEdit, nTmp, MapUnit::MapTwip );
+        else
+            SetMetricValue( *m_xTopMarginEdit, nTmp, MapUnit::MapTwip );
     }
 }
 
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 54889cbf0bb5..27a34a33279e 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -632,36 +632,36 @@ void SvxStdParagraphTabPage::ActivatePage( const SfxItemSet& rSet )
     sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST );
     SfxItemState eItemState = rSet.GetItemState( _nWhich );
 
-    if ( eItemState >= SfxItemState::DEFAULT )
+    if ( eItemState < SfxItemState::DEFAULT )
+        return;
+
+    const SvxAdjustItem& rAdj = static_cast<const SvxAdjustItem&>( rSet.Get( _nWhich ) );
+    SvxAdjust eAdjust = rAdj.GetAdjust();
+    if ( eAdjust == SvxAdjust::Center || eAdjust == SvxAdjust::Block )
     {
-        const SvxAdjustItem& rAdj = static_cast<const SvxAdjustItem&>( rSet.Get( _nWhich ) );
-        SvxAdjust eAdjust = rAdj.GetAdjust();
-        if ( eAdjust == SvxAdjust::Center || eAdjust == SvxAdjust::Block )
-        {
-            _nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION );
-            eItemState = rSet.GetItemState( _nWhich );
+        _nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION );
+        eItemState = rSet.GetItemState( _nWhich );
 
-            if ( eItemState >= SfxItemState::DEFAULT )
-            {
-                const SvxFrameDirectionItem& rFrameDirItem = static_cast<const SvxFrameDirectionItem&>( rSet.Get( _nWhich ) );
-                SvxFrameDirection eFrameDirection = rFrameDirItem.GetValue();
+        if ( eItemState >= SfxItemState::DEFAULT )
+        {
+            const SvxFrameDirectionItem& rFrameDirItem = static_cast<const SvxFrameDirectionItem&>( rSet.Get( _nWhich ) );
+            SvxFrameDirection eFrameDirection = rFrameDirItem.GetValue();
 
-                m_aExampleWin.EnableRTL( SvxFrameDirection::Horizontal_RL_TB == eFrameDirection );
+            m_aExampleWin.EnableRTL( SvxFrameDirection::Horizontal_RL_TB == eFrameDirection );
 
-                if ( eAdjust == SvxAdjust::Block )
-                    m_aExampleWin.SetLastLine( rAdj.GetLastBlock() );
-            }
+            if ( eAdjust == SvxAdjust::Block )
+                m_aExampleWin.SetLastLine( rAdj.GetLastBlock() );
         }
-        else
-        {
-            m_aExampleWin.EnableRTL( eAdjust == SvxAdjust::Right );
-            eAdjust = SvxAdjust::Left; //required for correct preview display
-            m_aExampleWin.SetLastLine( eAdjust );
-        }
-        m_aExampleWin.SetAdjust( eAdjust );
-
-        UpdateExample_Impl();
     }
+    else
+    {
+        m_aExampleWin.EnableRTL( eAdjust == SvxAdjust::Right );
+        eAdjust = SvxAdjust::Left; //required for correct preview display
+        m_aExampleWin.SetLastLine( eAdjust );
+    }
+    m_aExampleWin.SetAdjust( eAdjust );
+
+    UpdateExample_Impl();
 }
 
 DeactivateRC SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
@@ -1977,22 +1977,22 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage(weld::Container* pPage, weld::Dia
     }
 
     sal_uInt16 nHtmlMode = GetHtmlMode_Impl( rAttr );
-    if ( nHtmlMode & HTMLMODE_ON )
-    {
-        bHtmlMode = true;
-        m_xHyphenBox->set_sensitive(false);
-        m_xHyphenNoCapsBox->set_sensitive(false);
-        m_xBeforeText->set_sensitive(false);
-        m_xExtHyphenBeforeBox->set_sensitive(false);
-        m_xAfterText->set_sensitive(false);
-        m_xExtHyphenAfterBox->set_sensitive(false);
-        m_xMaxHyphenLabel->set_sensitive(false);
-        m_xMaxHyphenEdit->set_sensitive(false);
-        m_xPageNumBox->set_sensitive(false);
-        m_xPagenumEdit->set_sensitive(false);
-        // no column break in HTML
-        m_xBreakTypeLB->remove(1);
-    }
+    if ( !(nHtmlMode & HTMLMODE_ON) )
+        return;
+
+    bHtmlMode = true;
+    m_xHyphenBox->set_sensitive(false);
+    m_xHyphenNoCapsBox->set_sensitive(false);
+    m_xBeforeText->set_sensitive(false);
+    m_xExtHyphenBeforeBox->set_sensitive(false);
+    m_xAfterText->set_sensitive(false);
+    m_xExtHyphenAfterBox->set_sensitive(false);
+    m_xMaxHyphenLabel->set_sensitive(false);
+    m_xMaxHyphenEdit->set_sensitive(false);
+    m_xPageNumBox->set_sensitive(false);
+    m_xPagenumEdit->set_sensitive(false);
+    // no column break in HTML
+    m_xBreakTypeLB->remove(1);
 }
 
 SvxExtParagraphTabPage::~SvxExtParagraphTabPage()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 9b144bf47919..f8d6beeb9649 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1007,54 +1007,54 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet)
     m_xHeightMF->save_value();
     m_fWidthHeightRatio = double(nWidth) / double(nHeight);
 
-    if(!m_bPositioningDisabled)
+    if(m_bPositioningDisabled)
+        return;
+
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_ORIENT);
+    if(pItem)
     {
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_ORIENT);
-        if(pItem)
-        {
-            short nHoriOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue();
-            m_nOldH = nHoriOrientation;
-        }
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_ORIENT);
-        if(pItem)
-        {
-            short nVertOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue();
-            m_nOldV = nVertOrientation;
-        }
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_RELATION);
-        if(pItem)
-        {
-            m_nOldHRel = static_cast< const SfxInt16Item*>(pItem)->GetValue();
-        }
+        short nHoriOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue();
+        m_nOldH = nHoriOrientation;
+    }
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_ORIENT);
+    if(pItem)
+    {
+        short nVertOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue();
+        m_nOldV = nVertOrientation;
+    }
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_RELATION);
+    if(pItem)
+    {
+        m_nOldHRel = static_cast< const SfxInt16Item*>(pItem)->GetValue();
+    }
 
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_RELATION);
-        if(pItem)
-        {
-            m_nOldVRel = static_cast< const SfxInt16Item*>(pItem)->GetValue();
-        }
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_MIRROR);
-        if(pItem)
-            m_xHoriMirrorCB->set_active(static_cast<const SfxBoolItem*>(pItem)->GetValue());
-        m_xHoriMirrorCB->save_state();
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_RELATION);
+    if(pItem)
+    {
+        m_nOldVRel = static_cast< const SfxInt16Item*>(pItem)->GetValue();
+    }
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_MIRROR);
+    if(pItem)
+        m_xHoriMirrorCB->set_active(static_cast<const SfxBoolItem*>(pItem)->GetValue());
+    m_xHoriMirrorCB->save_state();
 
-        sal_Int32 nHoriPos = 0;
-        sal_Int32 nVertPos = 0;
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_POSITION);
-        if(pItem)
-            nHoriPos = static_cast<const SfxInt32Item*>(pItem)->GetValue();
-        pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_POSITION);
-        if(pItem)
-            nVertPos = static_cast<const SfxInt32Item*>(pItem)->GetValue();
+    sal_Int32 nHoriPos = 0;
+    sal_Int32 nVertPos = 0;
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_POSITION);
+    if(pItem)
+        nHoriPos = static_cast<const SfxInt32Item*>(pItem)->GetValue();
+    pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_POSITION);
+    if(pItem)
+        nVertPos = static_cast<const SfxInt32Item*>(pItem)->GetValue();
 
-        InitPos(nAnchorType, m_nOldH, m_nOldHRel, m_nOldV, m_nOldVRel, nHoriPos, nVertPos);
+    InitPos(nAnchorType, m_nOldH, m_nOldHRel, m_nOldV, m_nOldVRel, nHoriPos, nVertPos);
 
-        m_xVertByMF->save_value();
-        m_xHoriByMF->save_value();
-        // #i18732#
-        m_xFollowCB->save_state();
+    m_xVertByMF->save_value();
+    m_xHoriByMF->save_value();
+    // #i18732#
+    m_xFollowCB->save_state();
 
-        RangeModifyHdl(m_xWidthMF->get_widget());  // initially set maximum values
-    }
+    RangeModifyHdl(m_xWidthMF->get_widget());  // initially set maximum values
 }
 
 DeactivateRC SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
@@ -1290,59 +1290,58 @@ IMPL_LINK(SvxSwPosSizeTabPage, PosHdl, weld::ComboBox&, rLB, void)
     UpdateExample();
 
     // special treatment for HTML-Mode with horz-vert-dependencies
-    if (m_bHtmlMode && RndStdIds::FLY_AT_CHAR == GetAnchorType())
+    if (!(m_bHtmlMode && RndStdIds::FLY_AT_CHAR == GetAnchorType()))
+        return;
+
+    bool bSet = false;
+    if(bHori)
     {
-        bool bSet = false;
-        if(bHori)
+        // on the right only below is allowed - from the left only at the top
+        // from the left at the character -> below
+        if((HoriOrientation::LEFT == nAlign || HoriOrientation::RIGHT == nAlign) &&
+                0 == m_xVertLB->get_active())
         {
-            // on the right only below is allowed - from the left only at the top
-            // from the left at the character -> below
-            if((HoriOrientation::LEFT == nAlign || HoriOrientation::RIGHT == nAlign) &&
-                    0 == m_xVertLB->get_active())
-            {
-                if(RelOrientation::FRAME == nRel)
-                    m_xVertLB->set_active(1);
-                else
-                    m_xVertLB->set_active(0);
-                bSet = true;
-            }
-            else if(HoriOrientation::LEFT == nAlign && 1 == m_xVertLB->get_active())
-            {
+            if(RelOrientation::FRAME == nRel)
+                m_xVertLB->set_active(1);
+            else
                 m_xVertLB->set_active(0);
-                bSet = true;
-            }
-            else if(HoriOrientation::NONE == nAlign && 1 == m_xVertLB->get_active())
+            bSet = true;
+        }
+        else if(HoriOrientation::LEFT == nAlign && 1 == m_xVertLB->get_active())
+        {
+            m_xVertLB->set_active(0);
+            bSet = true;
+        }
+        else if(HoriOrientation::NONE == nAlign && 1 == m_xVertLB->get_active())
+        {
+            m_xVertLB->set_active(0);
+            bSet = true;
+        }
+        if(bSet)
+            PosHdl(*m_xVertLB);
+    }
+    else
+    {
+        if(VertOrientation::TOP == nAlign)
+        {
+            if(1 == m_xHoriLB->get_active())
             {
-                m_xVertLB->set_active(0);
+                m_xHoriLB->set_active(0);
                 bSet = true;
             }
-            if(bSet)
-                PosHdl(*m_xVertLB);
+            m_xHoriToLB->set_active(1);
         }
-        else
+        else if(VertOrientation::CHAR_BOTTOM == nAlign)
         {
-            if(VertOrientation::TOP == nAlign)
-            {
-                if(1 == m_xHoriLB->get_active())
-                {
-                    m_xHoriLB->set_active(0);
-                    bSet = true;
-                }
-                m_xHoriToLB->set_active(1);
-            }
-            else if(VertOrientation::CHAR_BOTTOM == nAlign)
+            if(2 == m_xHoriLB->get_active())
             {
-                if(2 == m_xHoriLB->get_active())
-                {
-                    m_xHoriLB->set_active(0);
-                    bSet = true;
-                }
-                m_xHoriToLB->set_active(0) ;
+                m_xHoriLB->set_active(0);
+                bSet = true;
             }
-            if(bSet)
-                PosHdl(*m_xHoriLB);
+            m_xHoriToLB->set_active(0) ;
         }
-
+        if(bSet)
+            PosHdl(*m_xHoriLB);
     }
 }
 
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 6c1742b70b5c..ab5dc095bfff 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -57,25 +57,25 @@ SvxTextTabDialog::SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAtt
 
 void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
 {
-    if (rId == "RID_SVXPAGE_TEXTATTR")
+    if (rId != "RID_SVXPAGE_TEXTATTR")
+        return;
+
+    SdrObjKind eKind = OBJ_NONE;
+    if (pView)
     {
-        SdrObjKind eKind = OBJ_NONE;
-        if (pView)
+        const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
+        bool bHasMarked = rMarkList.GetMarkCount() > 0;
+        if (bHasMarked)
         {
-            const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-            bool bHasMarked = rMarkList.GetMarkCount() > 0;
-            if (bHasMarked)
+            if (rMarkList.GetMarkCount() == 1)
             {
-                if (rMarkList.GetMarkCount() == 1)
-                {
-                    const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-                    eKind = static_cast<SdrObjKind>(pObj->GetObjIdentifier());
-                }
+                const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+                eKind = static_cast<SdrObjKind>(pObj->GetObjIdentifier());
             }
         }
-        static_cast<SvxTextAttrPage&>(rPage).SetObjKind(eKind);
-        static_cast<SvxTextAttrPage&>(rPage).Construct();
     }
+    static_cast<SvxTextAttrPage&>(rPage).SetObjKind(eKind);
+    static_cast<SvxTextAttrPage&>(rPage).Construct();
 }
 
 /*************************************************************************
@@ -385,75 +385,74 @@ std::unique_ptr<SfxTabPage> SvxTextAnimationPage::Create(weld::Container* pPage,
 IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBox&, void)
 {
     int nPos = m_xLbEffect->get_active();
-    if (nPos != -1)
+    if (nPos == -1)
+        return;
+
+    eAniKind = static_cast<SdrTextAniKind>(nPos);
+    switch( eAniKind )
     {
-        eAniKind = static_cast<SdrTextAniKind>(nPos);
-        switch( eAniKind )
+        case SdrTextAniKind::NONE:
+        {
+            m_xBoxDirection->set_sensitive(false);
+            m_xFlProperties->set_sensitive(false);
+        }
+        break;
+
+        case SdrTextAniKind::Blink:
+        case SdrTextAniKind::Scroll:
+        case SdrTextAniKind::Alternate:
+        case SdrTextAniKind::Slide:
         {
-            case SdrTextAniKind::NONE:
+            m_xFlProperties->set_sensitive(true);
+            if( eAniKind == SdrTextAniKind::Slide )
             {
-                m_xBoxDirection->set_sensitive(false);
-                m_xFlProperties->set_sensitive(false);
+                m_xTsbStartInside->set_sensitive(false);
+                m_xTsbStopInside->set_sensitive(false);
+                m_xTsbEndless->set_sensitive(false);
+                m_xNumFldCount->set_sensitive(true);
+                m_xNumFldCount->set_value(m_xNumFldCount->get_value());
             }
-            break;
+            else
+            {
+                m_xTsbStartInside->set_sensitive(true);
+                m_xTsbStopInside->set_sensitive(true);
+                m_xTsbEndless->set_sensitive(true);
+                ClickEndlessHdl_Impl(*m_xTsbEndless);
+            }
+
+            m_xTsbAuto->set_sensitive(true);
+            ClickAutoHdl_Impl(*m_xTsbAuto);
 
-            case SdrTextAniKind::Blink:
-            case SdrTextAniKind::Scroll:
-            case SdrTextAniKind::Alternate:
-            case SdrTextAniKind::Slide:
+            if( eAniKind == SdrTextAniKind::Blink )
+            {
+                m_xBoxDirection->set_sensitive(false);
+                m_xBoxCount->set_sensitive(false);
+            }
+            else
             {
-                m_xFlProperties->set_sensitive(true);
-                if( eAniKind == SdrTextAniKind::Slide )
-                {
-                    m_xTsbStartInside->set_sensitive(false);
-                    m_xTsbStopInside->set_sensitive(false);
-                    m_xTsbEndless->set_sensitive(false);
-                    m_xNumFldCount->set_sensitive(true);
-                    m_xNumFldCount->set_value(m_xNumFldCount->get_value());
-                }
-                else
-                {
-                    m_xTsbStartInside->set_sensitive(true);
-                    m_xTsbStopInside->set_sensitive(true);
-                    m_xTsbEndless->set_sensitive(true);
-                    ClickEndlessHdl_Impl(*m_xTsbEndless);
-                }
-
-                m_xTsbAuto->set_sensitive(true);
-                ClickAutoHdl_Impl(*m_xTsbAuto);
-
-                if( eAniKind == SdrTextAniKind::Blink )
-                {
-                    m_xBoxDirection->set_sensitive(false);
-                    m_xBoxCount->set_sensitive(false);
-                }
-                else
-                {
-                    m_xBoxDirection->set_sensitive(true);
-                    m_xBoxCount->set_sensitive(true);
-                }
+                m_xBoxDirection->set_sensitive(true);
+                m_xBoxCount->set_sensitive(true);
             }
-            break;
         }
-
+        break;
     }
 }
 
 IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::Button&, void)
 {
-    if( eAniKind != SdrTextAniKind::Slide )
+    if( eAniKind == SdrTextAniKind::Slide )
+        return;
+
+    TriState eState = m_xTsbEndless->get_state();
+    if( eState != TRISTATE_FALSE )
     {
-        TriState eState = m_xTsbEndless->get_state();
-        if( eState != TRISTATE_FALSE )
-        {
-            m_xNumFldCount->set_sensitive(false);
-            m_xNumFldCount->set_text("");
-        }
-        else
-        {
-            m_xNumFldCount->set_sensitive(true);
-            m_xNumFldCount->set_value(m_xNumFldCount->get_value());
-        }
+        m_xNumFldCount->set_sensitive(false);
+        m_xNumFldCount->set_text("");
+    }
+    else
+    {
+        m_xNumFldCount->set_sensitive(true);
+        m_xNumFldCount->set_value(m_xNumFldCount->get_value());
     }
 }
 
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index b82e57ba3233..c9eaf461c94d 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -483,37 +483,37 @@ std::unique_ptr<SfxTabPage> SvxTextAttrPage::Create(weld::Container* pPage, weld
 */
 void SvxTextAttrPage::PointChanged(weld::DrawingArea*,  RectPoint eRP)
 {
-    if (m_xTsbFullWidth->get_state() == TRISTATE_TRUE)
-    {
-        // Depending on write direction and currently checked anchor we have
-        // to uncheck the "full width" button.
-        if (IsTextDirectionLeftToRight())
-            switch( eRP )
-            {
-                case RectPoint::LT:
-                case RectPoint::LM:
-                case RectPoint::LB:
-                case RectPoint::RT:
-                case RectPoint::RM:
-                case RectPoint::RB:
-                    m_xTsbFullWidth->set_state( TRISTATE_FALSE );
-                break;
-                default: ;//prevent warning
-            }
-        else
-            switch (eRP)
-            {
-                case RectPoint::LT:
-                case RectPoint::MT:
-                case RectPoint::RT:
-                case RectPoint::LB:
-                case RectPoint::MB:
-                case RectPoint::RB:
-                    m_xTsbFullWidth->set_state( TRISTATE_FALSE );
-                break;
-                default: ;//prevent warning
-            }
-    }
+    if (m_xTsbFullWidth->get_state() != TRISTATE_TRUE)
+        return;
+
+    // Depending on write direction and currently checked anchor we have
+    // to uncheck the "full width" button.
+    if (IsTextDirectionLeftToRight())
+        switch( eRP )
+        {
+            case RectPoint::LT:
+            case RectPoint::LM:
+            case RectPoint::LB:
+            case RectPoint::RT:
+            case RectPoint::RM:
+            case RectPoint::RB:
+                m_xTsbFullWidth->set_state( TRISTATE_FALSE );
+            break;
+            default: ;//prevent warning
+        }
+    else
+        switch (eRP)
+        {
+            case RectPoint::LT:
+            case RectPoint::MT:
+            case RectPoint::RT:
+            case RectPoint::LB:
+            case RectPoint::MB:
+            case RectPoint::RB:
+                m_xTsbFullWidth->set_state( TRISTATE_FALSE );
+            break;
+            default: ;//prevent warning
+        }
 }
 
 
@@ -529,51 +529,51 @@ void SvxTextAttrPage::PointChanged(weld::DrawingArea*,  RectPoint eRP)
 */
 IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::Button&, void)
 {
-    if( m_xTsbFullWidth->get_state() == TRISTATE_TRUE )
+    if( m_xTsbFullWidth->get_state() != TRISTATE_TRUE )
+        return;
+
+    if (IsTextDirectionLeftToRight())
     {
-        if (IsTextDirectionLeftToRight())
+        // Move text anchor to horizontal middle axis.
+        switch( m_aCtlPosition.GetActualRP() )
         {
-            // Move text anchor to horizontal middle axis.
-            switch( m_aCtlPosition.GetActualRP() )
-            {
-                case RectPoint::LT:
-                case RectPoint::RT:
-                    m_aCtlPosition.SetActualRP( RectPoint::MT );
-                    break;
-
-                case RectPoint::LM:
-                case RectPoint::RM:
-                    m_aCtlPosition.SetActualRP( RectPoint::MM );
-                    break;
-
-                case RectPoint::LB:
-                case RectPoint::RB:
-                    m_aCtlPosition.SetActualRP( RectPoint::MB );
-                    break;
-                default: ;//prevent warning
-            }
+            case RectPoint::LT:
+            case RectPoint::RT:
+                m_aCtlPosition.SetActualRP( RectPoint::MT );
+                break;
+
+            case RectPoint::LM:
+            case RectPoint::RM:
+                m_aCtlPosition.SetActualRP( RectPoint::MM );
+                break;
+
+            case RectPoint::LB:
+            case RectPoint::RB:
+                m_aCtlPosition.SetActualRP( RectPoint::MB );
+                break;
+            default: ;//prevent warning
         }
-        else
+    }
+    else
+    {
+        // Move text anchor to vertical middle axis.
+        switch( m_aCtlPosition.GetActualRP() )
         {
-            // Move text anchor to vertical middle axis.
-            switch( m_aCtlPosition.GetActualRP() )
-            {
-                case RectPoint::LT:
-                case RectPoint::LB:
-                    m_aCtlPosition.SetActualRP( RectPoint::LM );
-                    break;
-
-                case RectPoint::MT:
-                case RectPoint::MB:
-                    m_aCtlPosition.SetActualRP( RectPoint::MM );
-                    break;
-
-                case RectPoint::RT:
-                case RectPoint::RB:
-                    m_aCtlPosition.SetActualRP( RectPoint::RM );
+            case RectPoint::LT:
+            case RectPoint::LB:
+                m_aCtlPosition.SetActualRP( RectPoint::LM );
                 break;
-                default: ;//prevent warning
-            }
+
+            case RectPoint::MT:
+            case RectPoint::MB:
+                m_aCtlPosition.SetActualRP( RectPoint::MM );
+                break;
+
+            case RectPoint::RT:
+            case RectPoint::RB:
+                m_aCtlPosition.SetActualRP( RectPoint::RM );
+            break;
+            default: ;//prevent warning
         }
     }
 }
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 1e25750eefc6..70073f7e4fd3 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -436,25 +436,25 @@ void SvxBitmapTabPage::ClickBitmapHdl_Impl()
 
 void SvxBitmapTabPage::CalculateBitmapPresetSize()
 {
-    if(!rBitmapSize.IsEmpty())
-    {
-        long nObjectWidth = static_cast<long>(m_fObjectWidth);
-        long nObjectHeight = static_cast<long>(m_fObjectHeight);
+    if(rBitmapSize.IsEmpty())
+        return;
 
-        if(std::abs(rBitmapSize.Width() - nObjectWidth) < std::abs(rBitmapSize.Height() - nObjectHeight))
-        {
-            rFilledSize.setWidth( nObjectWidth );
-            rFilledSize.setHeight( rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width() );
-            rZoomedSize.setWidth( rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height() );
-            rZoomedSize.setHeight( nObjectHeight );
-        }
-        else
-        {
-            rFilledSize.setWidth( rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height() );
-            rFilledSize.setHeight( nObjectHeight );
-            rZoomedSize.setWidth( nObjectWidth );
-            rZoomedSize.setHeight( rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width() );
-        }
+    long nObjectWidth = static_cast<long>(m_fObjectWidth);
+    long nObjectHeight = static_cast<long>(m_fObjectHeight);
+
+    if(std::abs(rBitmapSize.Width() - nObjectWidth) < std::abs(rBitmapSize.Height() - nObjectHeight))
+    {
+        rFilledSize.setWidth( nObjectWidth );
+        rFilledSize.setHeight( rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width() );
+        rZoomedSize.setWidth( rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height() );
+        rZoomedSize.setHeight( nObjectHeight );
+    }
+    else
+    {
+        rFilledSize.setWidth( rBitmapSize.Width()*nObjectHeight/rBitmapSize.Height() );
+        rFilledSize.setHeight( nObjectHeight );
+        rZoomedSize.setWidth( nObjectWidth );
+        rZoomedSize.setHeight( rBitmapSize.Height()*nObjectWidth/rBitmapSize.Width() );
     }
 }
 
@@ -524,37 +524,37 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void)
     sal_uInt16 nId = m_xBitmapLB->GetSelectedItemId();
     size_t nPos = m_xBitmapLB->GetSelectItemPos();
 
-    if( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_BITMAP ) );
-        OUString aName( m_pBitmapList->GetBitmap( nPos )->GetName() );
+    if( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
+    OUString aDesc( CuiResId( RID_SVXSTR_DESC_NEW_BITMAP ) );
+    OUString aName( m_pBitmapList->GetBitmap( nPos )->GetName() );
 
-        bool bLoop = true;
-        while( bLoop && pDlg->Execute() == RET_OK )
-        {
-            pDlg->GetName( aName );
-            sal_Int32 nBitmapPos = SearchBitmapList( aName );
-            bool bValidBitmapName = (nBitmapPos == static_cast<sal_Int32>(nPos) ) || (nBitmapPos == -1);
+    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
 
-            if(bValidBitmapName)
-            {
-                bLoop = false;
-                m_pBitmapList->GetBitmap(nPos)->SetName(aName);
+    bool bLoop = true;
+    while( bLoop && pDlg->Execute() == RET_OK )
+    {
+        pDlg->GetName( aName );
+        sal_Int32 nBitmapPos = SearchBitmapList( aName );
+        bool bValidBitmapName = (nBitmapPos == static_cast<sal_Int32>(nPos) ) || (nBitmapPos == -1);
 
-                m_xBitmapLB->SetItemText(nId, aName);
-                m_xBitmapLB->SelectItem( nId );
+        if(bValidBitmapName)
+        {
+            bLoop = false;
+            m_pBitmapList->GetBitmap(nPos)->SetName(aName);
 
-                *m_pnBitmapListState |= ChangeType::MODIFIED;
-            }
-            else
-            {
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-                xBox->run();
-            }
+            m_xBitmapLB->SetItemText(nId, aName);
+            m_xBitmapLB->SelectItem( nId );
+
+            *m_pnBitmapListState |= ChangeType::MODIFIED;
+        }
+        else
+        {
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+            xBox->run();
         }
     }
 }
@@ -564,22 +564,22 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void)
     sal_uInt16 nId = m_xBitmapLB->GetSelectedItemId();
     size_t nPos = m_xBitmapLB->GetSelectItemPos();
 
-    if( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletebitmapdialog.ui"));
-        std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelBitmapDialog"));
+    if( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        if (xQueryBox->run() == RET_YES)
-        {
-            m_pBitmapList->Remove( static_cast<sal_uInt16>(nPos) );
-            m_xBitmapLB->RemoveItem( nId );
-            nId = m_xBitmapLB->GetItemId(0);
-            m_xBitmapLB->SelectItem( nId );
+    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletebitmapdialog.ui"));
+    std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelBitmapDialog"));
 
-            m_aCtlBitmapPreview.Invalidate();
-            ModifyBitmapHdl(m_xBitmapLB.get());
-            *m_pnBitmapListState |= ChangeType::MODIFIED;
-        }
+    if (xQueryBox->run() == RET_YES)
+    {
+        m_pBitmapList->Remove( static_cast<sal_uInt16>(nPos) );
+        m_xBitmapLB->RemoveItem( nId );
+        nId = m_xBitmapLB->GetItemId(0);
+        m_xBitmapLB->SelectItem( nId );
+
+        m_aCtlBitmapPreview.Invalidate();
+        ModifyBitmapHdl(m_xBitmapLB.get());
+        *m_pnBitmapListState |= ChangeType::MODIFIED;
     }
 }
 
@@ -722,71 +722,71 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void)
     aDlg.EnableLink(false);
     long nCount = m_pBitmapList->Count();
 
-    if( !aDlg.Execute() )
-    {
-        Graphic         aGraphic;
+    if( aDlg.Execute() )
+        return;
 
-        std::unique_ptr<weld::WaitObject> xWait(new weld::WaitObject(pDialogFrameWeld));
-        ErrCode nError = aDlg.GetGraphic( aGraphic );
-        xWait.reset();
+    Graphic         aGraphic;
 
-        if( !nError )
-        {
-            OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP));
+    std::unique_ptr<weld::WaitObject> xWait(new weld::WaitObject(pDialogFrameWeld));
+    ErrCode nError = aDlg.GetGraphic( aGraphic );
+    xWait.reset();
 
-            // convert file URL to UI name
-            OUString        aName;
-            INetURLObject   aURL( aDlg.GetPath() );
-            SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
-                pDialogFrameWeld, aURL.GetLastName().getToken(0, '.'), aDesc));
-            nError = ErrCode(1);
+    if( !nError )
+    {
+        OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP));
 
-            while( pDlg->Execute() == RET_OK )
-            {
-                pDlg->GetName( aName );
+        // convert file URL to UI name
+        OUString        aName;
+        INetURLObject   aURL( aDlg.GetPath() );
+        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(
+            pDialogFrameWeld, aURL.GetLastName().getToken(0, '.'), aDesc));
+        nError = ErrCode(1);
 
-                bool bDifferent = true;
+        while( pDlg->Execute() == RET_OK )
+        {
+            pDlg->GetName( aName );
 
-                for( long i = 0; i < nCount && bDifferent; i++ )
-                    if( aName == m_pBitmapList->GetBitmap( i )->GetName() )
-                        bDifferent = false;
+            bool bDifferent = true;
 
-                if( bDifferent ) {
-                    nError = ERRCODE_NONE;
-                    break;
-                }
+            for( long i = 0; i < nCount && bDifferent; i++ )
+                if( aName == m_pBitmapList->GetBitmap( i )->GetName() )
+                    bDifferent = false;
 
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pDialogFrameWeld, "cui/ui/queryduplicatedialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-                if (xBox->run() != RET_OK)
-                    break;
+            if( bDifferent ) {
+                nError = ERRCODE_NONE;
+                break;
             }
 
-            pDlg.disposeAndClear();
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pDialogFrameWeld, "cui/ui/queryduplicatedialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+            if (xBox->run() != RET_OK)
+                break;
+        }
 
-            if( !nError )
-            {
-                m_pBitmapList->Insert(std::make_unique<XBitmapEntry>(aGraphic, aName), nCount);
+        pDlg.disposeAndClear();
 
-                sal_Int32 nId = m_xBitmapLB->GetItemId( nCount - 1 );
-                BitmapEx aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_xBitmapLB->GetIconSize() );
+        if( !nError )
+        {
+            m_pBitmapList->Insert(std::make_unique<XBitmapEntry>(aGraphic, aName), nCount);
 
-                m_xBitmapLB->InsertItem( nId + 1, Image(aBitmap), aName );
-                m_xBitmapLB->SelectItem( nId + 1 );
-                *m_pnBitmapListState |= ChangeType::MODIFIED;
+            sal_Int32 nId = m_xBitmapLB->GetItemId( nCount - 1 );
+            BitmapEx aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_xBitmapLB->GetIconSize() );
 
-                ModifyBitmapHdl(m_xBitmapLB.get());
-            }
-        }
-        else
-        {
-            // graphic couldn't be loaded
-            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pDialogFrameWeld, "cui/ui/querynoloadedfiledialog.ui"));
-            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog"));
-            xBox->run();
+            m_xBitmapLB->InsertItem( nId + 1, Image(aBitmap), aName );
+            m_xBitmapLB->SelectItem( nId + 1 );
+            *m_pnBitmapListState |= ChangeType::MODIFIED;
+
+            ModifyBitmapHdl(m_xBitmapLB.get());
         }
     }
+    else
+    {
+        // graphic couldn't be loaded
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pDialogFrameWeld, "cui/ui/querynoloadedfiledialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog"));
+        xBox->run();
+    }
 }
 
 sal_Int32 SvxBitmapTabPage::SearchBitmapList(const GraphicObject& rGraphicObject)
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 24a8199e12f4..456897ee28d6 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -185,29 +185,29 @@ void SvxColorTabPage::Construct()
 
 void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 {
-    if( pColorList.is() )
+    if( !pColorList.is() )
+        return;
+
+    const SfxPoolItem* pPoolItem = nullptr;
+    if( SfxItemState::SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
     {
-        const SfxPoolItem* pPoolItem = nullptr;
-        if( SfxItemState::SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true, &pPoolItem ) )
-        {
-            SetColorModel( ColorModel::RGB );
-            ChangeColorModel();
+        SetColorModel( ColorModel::RGB );
+        ChangeColorModel();
 
-            const Color aColor = static_cast<const XFillColorItem*>(pPoolItem)->GetColorValue();
-            ChangeColor( aColor );
-            sal_Int32 nPos = FindInPalette( aColor );
+        const Color aColor = static_cast<const XFillColorItem*>(pPoolItem)->GetColorValue();
+        ChangeColor( aColor );
+        sal_Int32 nPos = FindInPalette( aColor );
 
-            if ( nPos != -1 )
-                m_xValSetColorList->SelectItem(m_xValSetColorList->GetItemId(nPos));
-            // else search in other palettes?
+        if ( nPos != -1 )
+            m_xValSetColorList->SelectItem(m_xValSetColorList->GetItemId(nPos));
+        // else search in other palettes?
 
-        }
+    }
 
-        m_aCtlPreviewOld.SetAttributes(aXFillAttr.GetItemSet());
-        m_aCtlPreviewOld.Invalidate();
+    m_aCtlPreviewOld.SetAttributes(aXFillAttr.GetItemSet());
+    m_aCtlPreviewOld.Invalidate();
 
-        SelectValSetHdl_Impl(m_xValSetColorList.get());
-    }
+    SelectValSetHdl_Impl(m_xValSetColorList.get());
 }
 
 DeactivateRC SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
@@ -396,32 +396,32 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, weld::Button&, void)
 {
     sal_uInt16 nId = m_xValSetColorList->GetSelectedItemId();
     size_t nPos = m_xValSetColorList->GetSelectItemPos();
-    if (m_xSelectPalette->get_active() == 0 && nPos != VALUESET_ITEM_NOTFOUND )
+    if (!(m_xSelectPalette->get_active() == 0 && nPos != VALUESET_ITEM_NOTFOUND) )
+        return;
+
+    std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create(m_context));
+    css::uno::Sequence< sal_Int32 > aCustomColorList(officecfg::Office::Common::UserColors::CustomColor::get());
+    css::uno::Sequence< OUString > aCustomColorNameList(officecfg::Office::Common::UserColors::CustomColorName::get());
+    sal_Int32 nSize = aCustomColorList.getLength() - 1;
+    for(sal_Int32 nIndex = static_cast<sal_Int32>(nPos);nIndex < nSize;nIndex++)
     {
-        std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create(m_context));
-        css::uno::Sequence< sal_Int32 > aCustomColorList(officecfg::Office::Common::UserColors::CustomColor::get());
-        css::uno::Sequence< OUString > aCustomColorNameList(officecfg::Office::Common::UserColors::CustomColorName::get());
-        sal_Int32 nSize = aCustomColorList.getLength() - 1;
-        for(sal_Int32 nIndex = static_cast<sal_Int32>(nPos);nIndex < nSize;nIndex++)
-        {
-            aCustomColorList[nIndex] = aCustomColorList[nIndex+1];
-            aCustomColorNameList[nIndex] = aCustomColorNameList[nIndex+1];
-        }
-        aCustomColorList.realloc(nSize);
-        aCustomColorNameList.realloc(nSize);
-        officecfg::Office::Common::UserColors::CustomColor::set(aCustomColorList, batch);
-        officecfg::Office::Common::UserColors::CustomColorName::set(aCustomColorNameList, batch);
-        batch->commit();
-        m_xValSetColorList->RemoveItem(nId);
-        if (m_xValSetColorList->GetItemCount() != 0)
-        {
-            nId = m_xValSetColorList->GetItemId(0);
-            m_xValSetColorList->SelectItem(nId);
-            SelectValSetHdl_Impl(m_xValSetColorList.get());
-        }
-        else
-            m_xBtnDelete->set_sensitive(false);
+        aCustomColorList[nIndex] = aCustomColorList[nIndex+1];
+        aCustomColorNameList[nIndex] = aCustomColorNameList[nIndex+1];
     }
+    aCustomColorList.realloc(nSize);
+    aCustomColorNameList.realloc(nSize);
+    officecfg::Office::Common::UserColors::CustomColor::set(aCustomColorList, batch);
+    officecfg::Office::Common::UserColors::CustomColorName::set(aCustomColorNameList, batch);
+    batch->commit();
+    m_xValSetColorList->RemoveItem(nId);
+    if (m_xValSetColorList->GetItemCount() != 0)
+    {
+        nId = m_xValSetColorList->GetItemId(0);
+        m_xValSetColorList->SelectItem(nId);
+        SelectValSetHdl_Impl(m_xValSetColorList.get());
+    }
+    else
+        m_xBtnDelete->set_sensitive(false);
 }
 
 IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void)
@@ -462,28 +462,28 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void)
 IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, SvtValueSet*, pValSet, void)
 {
     sal_Int32 nPos = pValSet->GetSelectedItemId();
-    if( nPos != 0 )
-    {
-        Color aColor = pValSet->GetItemColor( nPos );
+    if( nPos == 0 )
+        return;
 
-        rXFSet.Put( XFillColorItem( OUString(), aColor ) );
-        m_aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
-        m_aCtlPreviewNew.Invalidate();
-        ChangeColor(aColor, false);
+    Color aColor = pValSet->GetItemColor( nPos );
 
-        if (pValSet == m_xValSetColorList.get())
-        {
-            m_xValSetRecentList->SetNoSelection();
-            if (m_xSelectPalette->get_active() == 0 && m_xValSetColorList->GetSelectedItemId() != 0)
-                m_xBtnDelete->set_sensitive(true);
-            else
-                m_xBtnDelete->set_sensitive(false);
-        }
-        if (pValSet == m_xValSetRecentList.get())
-        {
-            m_xValSetColorList->SetNoSelection();
+    rXFSet.Put( XFillColorItem( OUString(), aColor ) );
+    m_aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+    m_aCtlPreviewNew.Invalidate();
+    ChangeColor(aColor, false);
+
+    if (pValSet == m_xValSetColorList.get())
+    {
+        m_xValSetRecentList->SetNoSelection();
+        if (m_xSelectPalette->get_active() == 0 && m_xValSetColorList->GetSelectedItemId() != 0)
+            m_xBtnDelete->set_sensitive(true);
+        else
             m_xBtnDelete->set_sensitive(false);
-        }
+    }
+    if (pValSet == m_xValSetRecentList.get())
+    {
+        m_xValSetColorList->SetNoSelection();
+        m_xBtnDelete->set_sensitive(false);
     }
 }
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 38bee1a8b1d7..777bc5d70bd9 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -128,44 +128,44 @@ void SvxGradientTabPage::Construct()
 
 void SvxGradientTabPage::ActivatePage( const SfxItemSet& rSet )
 {
-    if( m_pColorList.is() )
+    if( !m_pColorList.is() )
+        return;
+
+    // ColorList
+    if( *m_pnColorListState & ChangeType::CHANGED ||
+        *m_pnColorListState & ChangeType::MODIFIED )
     {
-        // ColorList
-        if( *m_pnColorListState & ChangeType::CHANGED ||
-            *m_pnColorListState & ChangeType::MODIFIED )
-        {
-            SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ?
-                dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr;
-            if (pArea)
-                m_pColorList = pArea->GetNewColorList();
+        SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ?
+            dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr;
+        if (pArea)
+            m_pColorList = pArea->GetNewColorList();
 
-            ModifiedHdl_Impl( this );
-        }
+        ModifiedHdl_Impl( this );
+    }
 
-        // determining (and possibly cutting) the name and
-        // displaying it in the GroupBox
-        OUString        aString = CuiResId( RID_SVXSTR_TABLE ) + ": ";
-        INetURLObject   aURL( m_pGradientList->GetPath() );
+    // determining (and possibly cutting) the name and
+    // displaying it in the GroupBox
+    OUString        aString = CuiResId( RID_SVXSTR_TABLE ) + ": ";
+    INetURLObject   aURL( m_pGradientList->GetPath() );
 
-        aURL.Append( m_pGradientList->GetName() );
-        SAL_WARN_IF( aURL.GetProtocol() == INetProtocol::NotValid, "cui.tabpages", "invalid URL" );
+    aURL.Append( m_pGradientList->GetName() );
+    SAL_WARN_IF( aURL.GetProtocol() == INetProtocol::NotValid, "cui.tabpages", "invalid URL" );
 
-        if ( aURL.getBase().getLength() > 18 )
-        {
-            aString += aURL.getBase().copy( 0, 15 ) + "...";
-        }
-        else
-            aString += aURL.getBase();
+    if ( aURL.getBase().getLength() > 18 )
+    {
+        aString += aURL.getBase().copy( 0, 15 ) + "...";
+    }
+    else
+        aString += aURL.getBase();
 
-        sal_Int32 nPos = SearchGradientList( rSet.Get(XATTR_FILLGRADIENT).GetName() );
-        if ( nPos != -1)
-        {
-            sal_uInt16 nId = m_xGradientLB->GetItemId( static_cast<size_t>( nPos ) );
-            m_xGradientLB->SelectItem( nId );
-        }
-        // colors could have been deleted
-        ChangeGradientHdl_Impl();
+    sal_Int32 nPos = SearchGradientList( rSet.Get(XATTR_FILLGRADIENT).GetName() );
+    if ( nPos != -1)
+    {
+        sal_uInt16 nId = m_xGradientLB->GetItemId( static_cast<size_t>( nPos ) );
+        m_xGradientLB->SelectItem( nId );
     }
+    // colors could have been deleted
+    ChangeGradientHdl_Impl();
 }
 
 
@@ -391,30 +391,30 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, weld::Button&, void)
     sal_uInt16 nId = m_xGradientLB->GetSelectedItemId();
     size_t nPos = m_xGradientLB->GetSelectItemPos();
 
-    if ( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aName( m_pGradientList->GetGradient( static_cast<sal_uInt16>(nPos) )->GetName() );
+    if ( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        XGradient aXGradient( m_xLbColorFrom->GetSelectEntryColor(),
-                              m_xLbColorTo->GetSelectEntryColor(),
-                              static_cast<css::awt::GradientStyle>(m_xLbGradientType->get_active()),
-                              static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10), // should be changed in resource
-                              static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FieldUnit::NONE)),
-                              static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FieldUnit::NONE)),
-                              static_cast<sal_uInt16>(m_xMtrBorder->get_value(FieldUnit::NONE)),
-                              static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)),
-                              static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)),
-                              static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) );
+    OUString aName( m_pGradientList->GetGradient( static_cast<sal_uInt16>(nPos) )->GetName() );
 
-        m_pGradientList->Replace(std::make_unique<XGradientEntry>(aXGradient, aName), nPos);
+    XGradient aXGradient( m_xLbColorFrom->GetSelectEntryColor(),
+                          m_xLbColorTo->GetSelectEntryColor(),
+                          static_cast<css::awt::GradientStyle>(m_xLbGradientType->get_active()),
+                          static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10), // should be changed in resource
+                          static_cast<sal_uInt16>(m_xMtrCenterX->get_value(FieldUnit::NONE)),
+                          static_cast<sal_uInt16>(m_xMtrCenterY->get_value(FieldUnit::NONE)),
+                          static_cast<sal_uInt16>(m_xMtrBorder->get_value(FieldUnit::NONE)),
+                          static_cast<sal_uInt16>(m_xMtrColorFrom->get_value(FieldUnit::NONE)),
+                          static_cast<sal_uInt16>(m_xMtrColorTo->get_value(FieldUnit::NONE)),
+                          static_cast<sal_uInt16>(m_xMtrIncrement->get_value()) );
 
-        BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_xGradientLB->GetIconSize() );
-        m_xGradientLB->RemoveItem( nId );
-        m_xGradientLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) );
-        m_xGradientLB->SelectItem( nId );
+    m_pGradientList->Replace(std::make_unique<XGradientEntry>(aXGradient, aName), nPos);
 
-        *m_pnGradientListState |= ChangeType::MODIFIED;
-    }
+    BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_xGradientLB->GetIconSize() );
+    m_xGradientLB->RemoveItem( nId );
+    m_xGradientLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) );
+    m_xGradientLB->SelectItem( nId );
+
+    *m_pnGradientListState |= ChangeType::MODIFIED;
 }
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
@@ -451,37 +451,37 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void
     sal_uInt16 nId = m_xGradientLB->GetSelectedItemId();
     size_t nPos = m_xGradientLB->GetSelectItemPos();
 
-    if ( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) );
-        OUString aName( m_pGradientList->GetGradient( nPos )->GetName() );
+    if ( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
+    OUString aDesc( CuiResId( RID_SVXSTR_DESC_GRADIENT ) );
+    OUString aName( m_pGradientList->GetGradient( nPos )->GetName() );
 
-        bool bLoop = true;
-        while( bLoop && pDlg->Execute() == RET_OK )
-        {
-            pDlg->GetName( aName );
-            sal_Int32 nGradientPos = SearchGradientList(aName);
-            bool bValidGradientName = (nGradientPos == static_cast<sal_Int32>(nPos) ) || (nGradientPos == -1);
+    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
 
-            if( bValidGradientName )
-            {
-                bLoop = false;
-                m_pGradientList->GetGradient(nPos)->SetName(aName);
+    bool bLoop = true;
+    while( bLoop && pDlg->Execute() == RET_OK )
+    {
+        pDlg->GetName( aName );
+        sal_Int32 nGradientPos = SearchGradientList(aName);
+        bool bValidGradientName = (nGradientPos == static_cast<sal_Int32>(nPos) ) || (nGradientPos == -1);
 
-                m_xGradientLB->SetItemText( nId, aName );
-                m_xGradientLB->SelectItem( nId );
+        if( bValidGradientName )
+        {
+            bLoop = false;
+            m_pGradientList->GetGradient(nPos)->SetName(aName);
 
-                *m_pnGradientListState |= ChangeType::MODIFIED;
-            }
-            else
-            {
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-                xBox->run();
-            }
+            m_xGradientLB->SetItemText( nId, aName );
+            m_xGradientLB->SelectItem( nId );
+
+            *m_pnGradientListState |= ChangeType::MODIFIED;
+        }
+        else
+        {
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+            xBox->run();
         }
     }
 }
@@ -518,50 +518,50 @@ void SvxGradientTabPage::ChangeGradientHdl_Impl()
         }
     }
 
-    if( pGradient )
-    {
-        css::awt::GradientStyle eXGS = pGradient->GetGradientStyle();
-        sal_uInt16 nValue = pGradient->GetSteps();
-        if( nValue == 0 )
-        {
-            m_xCbIncrement->set_state(TRISTATE_TRUE);
-            m_xMtrIncrement->set_sensitive(false);
-        }
-        else
-        {
-            m_xCbIncrement->set_state(TRISTATE_FALSE);
-            m_xMtrIncrement->set_sensitive(true);
-            m_xMtrIncrement->set_value( nValue );
-        }
-        m_xLbGradientType->set_active(
-            sal::static_int_cast< sal_Int32 >( eXGS ) );
-        // if the entry is not in the listbox,
-        // colors are added temporarily
-        m_xLbColorFrom->SetNoSelection();
-        m_xLbColorFrom->SelectEntry( pGradient->GetStartColor() );
-
-        m_xLbColorTo->SetNoSelection();
-        m_xLbColorTo->SelectEntry( pGradient->GetEndColor() );
-
-        m_xMtrAngle->set_value(pGradient->GetAngle() / 10, FieldUnit::NONE); // should be changed in resource
-        m_xSliderAngle->set_value(pGradient->GetAngle() / 10);
-        m_xMtrBorder->set_value(pGradient->GetBorder(), FieldUnit::NONE);
-        m_xSliderBorder->set_value(pGradient->GetBorder());
-        m_xMtrCenterX->set_value(pGradient->GetXOffset(), FieldUnit::NONE);
-        m_xMtrCenterY->set_value(pGradient->GetYOffset(), FieldUnit::NONE);
-        m_xMtrColorFrom->set_value(pGradient->GetStartIntens(), FieldUnit::NONE);
-        m_xMtrColorTo->set_value(pGradient->GetEndIntens(), FieldUnit::NONE);
-
-        // disable/enable controls
-        SetControlState_Impl( eXGS );
-
-        // fill ItemSet and pass it on to aCtlPreview
-        m_rXFSet.Put( XFillGradientItem( OUString(), *pGradient ) );
-        m_rXFSet.Put( XGradientStepCountItem( nValue ) );
-        m_aCtlPreview.SetAttributes(m_aXFillAttr.GetItemSet());
+    if( !pGradient )
+        return;
 
-        m_aCtlPreview.Invalidate();
+    css::awt::GradientStyle eXGS = pGradient->GetGradientStyle();
+    sal_uInt16 nValue = pGradient->GetSteps();
+    if( nValue == 0 )
+    {
+        m_xCbIncrement->set_state(TRISTATE_TRUE);
+        m_xMtrIncrement->set_sensitive(false);
+    }
+    else
+    {
+        m_xCbIncrement->set_state(TRISTATE_FALSE);
+        m_xMtrIncrement->set_sensitive(true);
+        m_xMtrIncrement->set_value( nValue );
     }
+    m_xLbGradientType->set_active(
+        sal::static_int_cast< sal_Int32 >( eXGS ) );
+    // if the entry is not in the listbox,
+    // colors are added temporarily
+    m_xLbColorFrom->SetNoSelection();
+    m_xLbColorFrom->SelectEntry( pGradient->GetStartColor() );
+
+    m_xLbColorTo->SetNoSelection();
+    m_xLbColorTo->SelectEntry( pGradient->GetEndColor() );
+
+    m_xMtrAngle->set_value(pGradient->GetAngle() / 10, FieldUnit::NONE); // should be changed in resource
+    m_xSliderAngle->set_value(pGradient->GetAngle() / 10);
+    m_xMtrBorder->set_value(pGradient->GetBorder(), FieldUnit::NONE);
+    m_xSliderBorder->set_value(pGradient->GetBorder());
+    m_xMtrCenterX->set_value(pGradient->GetXOffset(), FieldUnit::NONE);
+    m_xMtrCenterY->set_value(pGradient->GetYOffset(), FieldUnit::NONE);
+    m_xMtrColorFrom->set_value(pGradient->GetStartIntens(), FieldUnit::NONE);
+    m_xMtrColorTo->set_value(pGradient->GetEndIntens(), FieldUnit::NONE);
+
+    // disable/enable controls
+    SetControlState_Impl( eXGS );
+
+    // fill ItemSet and pass it on to aCtlPreview
+    m_rXFSet.Put( XFillGradientItem( OUString(), *pGradient ) );
+    m_rXFSet.Put( XGradientStepCountItem( nValue ) );
+    m_aCtlPreview.SetAttributes(m_aXFillAttr.GetItemSet());
+
+    m_aCtlPreview.Invalidate();
 }
 
 void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 888f33e8d96a..d65c501f9d57 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -434,26 +434,26 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void)
     }
     pDlg.disposeAndClear();
 
-    if( !nError )
-    {
-        XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(),
-                        static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()),
-                        GetCoreValue( *m_xMtrDistance, m_ePoolUnit ),
-                        static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) );
+    if( nError )
+        return;
 
-        m_pHatchingList->Insert(std::make_unique<XHatchEntry>(aXHatch, aName), nCount);
+    XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(),
+                    static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()),
+                    GetCoreValue( *m_xMtrDistance, m_ePoolUnit ),
+                    static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) );
 
-        sal_Int32 nId = m_xHatchLB->GetItemId(nCount - 1); // calculate the last ID
-        BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_xHatchLB->GetIconSize() );
-        // Insert the new entry at the next ID
-        m_xHatchLB->InsertItem( nId + 1, Image(aBitmap), aName );
-        m_xHatchLB->SelectItem( nId + 1 );
-        m_xHatchLB->Resize();
+    m_pHatchingList->Insert(std::make_unique<XHatchEntry>(aXHatch, aName), nCount);
 
-        *m_pnHatchingListState |= ChangeType::MODIFIED;
+    sal_Int32 nId = m_xHatchLB->GetItemId(nCount - 1); // calculate the last ID
+    BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_xHatchLB->GetIconSize() );
+    // Insert the new entry at the next ID
+    m_xHatchLB->InsertItem( nId + 1, Image(aBitmap), aName );
+    m_xHatchLB->SelectItem( nId + 1 );
+    m_xHatchLB->Resize();
 
-        ChangeHatchHdl_Impl();
-    }
+    *m_pnHatchingListState |= ChangeType::MODIFIED;
+
+    ChangeHatchHdl_Impl();
 }
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, weld::Button&, void)
@@ -461,31 +461,31 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, weld::Button&, void)
     sal_uInt16 nId = m_xHatchLB->GetSelectedItemId();
     size_t nPos = m_xHatchLB->GetSelectItemPos();
 
-    if( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aName( m_pHatchingList->GetHatch( static_cast<sal_uInt16>(nPos) )->GetName() );
+    if( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
+
+    OUString aName( m_pHatchingList->GetHatch( static_cast<sal_uInt16>(nPos) )->GetName() );
 
-        XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(),
-                        static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()),
-                         GetCoreValue( *m_xMtrDistance, m_ePoolUnit ),
-                        static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) );
+    XHatch aXHatch( m_xLbLineColor->GetSelectEntryColor(),
+                    static_cast<css::drawing::HatchStyle>(m_xLbLineType->get_active()),
+                     GetCoreValue( *m_xMtrDistance, m_ePoolUnit ),
+                    static_cast<long>(m_xMtrAngle->get_value(FieldUnit::NONE) * 10) );
 
-        m_pHatchingList->Replace(std::make_unique<XHatchEntry>(aXHatch, aName), nPos);
+    m_pHatchingList->Replace(std::make_unique<XHatchEntry>(aXHatch, aName), nPos);
 
-        BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_xHatchLB->GetIconSize() );
-        m_xHatchLB->RemoveItem( nId );
-        m_xHatchLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) );
-        m_xHatchLB->SelectItem( nId );
+    BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_xHatchLB->GetIconSize() );
+    m_xHatchLB->RemoveItem( nId );
+    m_xHatchLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) );
+    m_xHatchLB->SelectItem( nId );
 
-        // save values for changes recognition (-> method)
-        m_xMtrDistance->save_value();
-        m_xMtrAngle->save_value();
-        m_xLbLineType->save_value();
-        m_xLbLineColor->SaveValue();
-        m_xLbBackgroundColor->SaveValue();
+    // save values for changes recognition (-> method)
+    m_xMtrDistance->save_value();
+    m_xMtrAngle->save_value();
+    m_xLbLineType->save_value();
+    m_xLbLineColor->SaveValue();
+    m_xLbBackgroundColor->SaveValue();
 
-        *m_pnHatchingListState |= ChangeType::MODIFIED;
-    }
+    *m_pnHatchingListState |= ChangeType::MODIFIED;
 }
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
@@ -493,25 +493,25 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
     sal_uInt16 nId = m_xHatchLB->GetSelectedItemId();
     size_t nPos = m_xHatchLB->GetSelectItemPos();
 
-    if( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletehatchdialog.ui"));
-        std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelHatchDialog"));
-        if (xQueryBox->run() == RET_YES)
-        {
-            m_pHatchingList->Remove(nPos);
-            m_xHatchLB->RemoveItem( nId );
-            nId = m_xHatchLB->GetItemId(0);
-            m_xHatchLB->SelectItem( nId );
-            m_xHatchLB->Resize();
+    if( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-            m_aCtlPreview.Invalidate();
+    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletehatchdialog.ui"));
+    std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelHatchDialog"));
+    if (xQueryBox->run() != RET_YES)
+        return;
 
-            ChangeHatchHdl_Impl();
+    m_pHatchingList->Remove(nPos);
+    m_xHatchLB->RemoveItem( nId );
+    nId = m_xHatchLB->GetItemId(0);
+    m_xHatchLB->SelectItem( nId );
+    m_xHatchLB->Resize();
 
-            *m_pnHatchingListState |= ChangeType::MODIFIED;
-        }
-    }
+    m_aCtlPreview.Invalidate();
+
+    ChangeHatchHdl_Impl();
+
+    *m_pnHatchingListState |= ChangeType::MODIFIED;
 }
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
@@ -519,37 +519,37 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
     sal_uInt16 nId = m_xHatchLB->GetSelectedItemId();
     size_t nPos = m_xHatchLB->GetSelectItemPos();
 
-    if( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) );
-        OUString aName( m_pHatchingList->GetHatch( nPos )->GetName() );
+    if( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
+    OUString aDesc( CuiResId( RID_SVXSTR_DESC_HATCH ) );
+    OUString aName( m_pHatchingList->GetHatch( nPos )->GetName() );
 
-        bool bLoop = true;
-        while( bLoop && pDlg->Execute() == RET_OK )
-        {
-            pDlg->GetName( aName );
-            sal_Int32 nHatchPos = SearchHatchList( aName );
-            bool bValidHatchName = (nHatchPos == static_cast<sal_Int32>(nPos) ) || (nHatchPos == -1);
+    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
 
-            if(bValidHatchName)
-            {
-                bLoop = false;
-                m_pHatchingList->GetHatch(nPos)->SetName(aName);
+    bool bLoop = true;
+    while( bLoop && pDlg->Execute() == RET_OK )
+    {
+        pDlg->GetName( aName );
+        sal_Int32 nHatchPos = SearchHatchList( aName );
+        bool bValidHatchName = (nHatchPos == static_cast<sal_Int32>(nPos) ) || (nHatchPos == -1);
 
-                m_xHatchLB->SetItemText(nId, aName);
-                m_xHatchLB->SelectItem( nId );
+        if(bValidHatchName)
+        {
+            bLoop = false;
+            m_pHatchingList->GetHatch(nPos)->SetName(aName);
 
-                *m_pnHatchingListState |= ChangeType::MODIFIED;
-            }
-            else
-            {
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-                xBox->run();
-            }
+            m_xHatchLB->SetItemText(nId, aName);
+            m_xHatchLB->SelectItem( nId );
+
+            *m_pnHatchingListState |= ChangeType::MODIFIED;
+        }
+        else
+        {
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+            xBox->run();
         }
     }
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 881d5108a1c1..6079adcd5790 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1428,84 +1428,84 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::ToggleButton&, void)
             m_xSymbolMB->set_item_sensitive("gallery", false);
     }
 
-    if (!m_xSymbolsMenu && m_pSymbolList)
-    {
-        m_xSymbolsMenu = m_xBuilder->weld_menu("symbolssubmenu");
-        ScopedVclPtrInstance< VirtualDevice > pVDev;
-        pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
-        std::unique_ptr<SdrModel> pModel(
-            new SdrModel(nullptr, nullptr, true));
-        pModel->GetItemPool().FreezeIdRanges();
-        // Page
-        SdrPage* pPage = new SdrPage( *pModel, false );
-        pPage->SetSize(Size(1000,1000));
-        pModel->InsertPage( pPage, 0 );
-        {
-            // 3D View
-            std::unique_ptr<SdrView> pView(new SdrView( *pModel, pVDev ));
-            pView->hideMarkHandles();
-            pView->ShowSdrPage(pPage);
+    if (!(!m_xSymbolsMenu && m_pSymbolList))
+        return;
+
+    m_xSymbolsMenu = m_xBuilder->weld_menu("symbolssubmenu");
+    ScopedVclPtrInstance< VirtualDevice > pVDev;
+    pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
+    std::unique_ptr<SdrModel> pModel(
+        new SdrModel(nullptr, nullptr, true));
+    pModel->GetItemPool().FreezeIdRanges();
+    // Page
+    SdrPage* pPage = new SdrPage( *pModel, false );
+    pPage->SetSize(Size(1000,1000));
+    pModel->InsertPage( pPage, 0 );
+    {
+        // 3D View
+        std::unique_ptr<SdrView> pView(new SdrView( *pModel, pVDev ));
+        pView->hideMarkHandles();
+        pView->ShowSdrPage(pPage);
 
-            // Generate invisible square to give all symbols a
-            // bitmap size, which is independent from specific glyph
-            SdrObject *pInvisibleSquare=m_pSymbolList->GetObj(0);
+        // Generate invisible square to give all symbols a
+        // bitmap size, which is independent from specific glyph
+        SdrObject *pInvisibleSquare=m_pSymbolList->GetObj(0);
 
-            // directly clone to target SdrModel
-            pInvisibleSquare = pInvisibleSquare->CloneSdrObject(*pModel);
+        // directly clone to target SdrModel
+        pInvisibleSquare = pInvisibleSquare->CloneSdrObject(*pModel);
 
-            pPage->NbcInsertObject(pInvisibleSquare);
-            pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100));
-            pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100));
+        pPage->NbcInsertObject(pInvisibleSquare);
+        pInvisibleSquare->SetMergedItem(XFillTransparenceItem(100));
+        pInvisibleSquare->SetMergedItem(XLineTransparenceItem(100));
 
-            for(size_t i=0; i < m_pSymbolList->GetObjCount(); ++i)
-            {
-                SdrObject *pObj=m_pSymbolList->GetObj(i);
-                assert(pObj);
+        for(size_t i=0; i < m_pSymbolList->GetObjCount(); ++i)
+        {
+            SdrObject *pObj=m_pSymbolList->GetObj(i);
+            assert(pObj);
 
-                // directly clone to target SdrModel
-                pObj = pObj->CloneSdrObject(*pModel);
+            // directly clone to target SdrModel
+            pObj = pObj->CloneSdrObject(*pModel);
 
-                m_aGrfNames.emplace_back("");
-                pPage->NbcInsertObject(pObj);
-                if(m_pSymbolAttr)
-                {
-                    pObj->SetMergedItemSet(*m_pSymbolAttr);
-                }
-                else
-                {
-                    pObj->SetMergedItemSet(m_rOutAttrs);
-                }
-                pView->MarkAll();
-                BitmapEx aBitmapEx(pView->GetMarkedObjBitmapEx());
-                GDIMetaFile aMeta(pView->GetMarkedObjMetaFile());
-                pView->UnmarkAll();
-                pObj=pPage->RemoveObject(1);
-                SdrObject::Free(pObj);
-
-                SvxBmpItemInfo* pInfo = new SvxBmpItemInfo;
-                pInfo->pBrushItem.reset(new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH));
-                pInfo->sItemId = "symbol" + OUString::number(i);
-                m_aSymbolBrushItems.emplace_back(pInfo);
-
-                Size aSize(aBitmapEx.GetSizePixel());
-                if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT)
-                {
-                    bool bWidth = aSize.Width() > aSize.Height();
-                    double nScale = bWidth ?
-                                        double(MAX_BMP_WIDTH) / static_cast<double>(aSize.Width()):
-                                        double(MAX_BMP_HEIGHT) / static_cast<double>(aSize.Height());
-                    aBitmapEx.Scale(nScale, nScale);
-                }
-                pVD->SetOutputSizePixel(aBitmapEx.GetSizePixel());
-                pVD->DrawBitmapEx(Point(), aBitmapEx);
-                m_xSymbolsMenu->append(pInfo->sItemId, "", *pVD);
+            m_aGrfNames.emplace_back("");
+            pPage->NbcInsertObject(pObj);
+            if(m_pSymbolAttr)
+            {
+                pObj->SetMergedItemSet(*m_pSymbolAttr);
             }
-            pInvisibleSquare=pPage->RemoveObject(0);
-            SdrObject::Free(pInvisibleSquare);
+            else
+            {
+                pObj->SetMergedItemSet(m_rOutAttrs);
+            }
+            pView->MarkAll();
+            BitmapEx aBitmapEx(pView->GetMarkedObjBitmapEx());
+            GDIMetaFile aMeta(pView->GetMarkedObjMetaFile());
+            pView->UnmarkAll();
+            pObj=pPage->RemoveObject(1);
+            SdrObject::Free(pObj);
+
+            SvxBmpItemInfo* pInfo = new SvxBmpItemInfo;
+            pInfo->pBrushItem.reset(new SvxBrushItem(Graphic(aMeta), GPOS_AREA, SID_ATTR_BRUSH));
+            pInfo->sItemId = "symbol" + OUString::number(i);
+            m_aSymbolBrushItems.emplace_back(pInfo);
 
-            if (m_aGrfNames.empty())
-                m_xSymbolMB->set_item_sensitive("symbols", false);
+            Size aSize(aBitmapEx.GetSizePixel());
+            if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT)
+            {
+                bool bWidth = aSize.Width() > aSize.Height();
+                double nScale = bWidth ?
+                                    double(MAX_BMP_WIDTH) / static_cast<double>(aSize.Width()):
+                                    double(MAX_BMP_HEIGHT) / static_cast<double>(aSize.Height());
+                aBitmapEx.Scale(nScale, nScale);
+            }
+            pVD->SetOutputSizePixel(aBitmapEx.GetSizePixel());
+            pVD->DrawBitmapEx(Point(), aBitmapEx);
+            m_xSymbolsMenu->append(pInfo->sItemId, "", *pVD);
         }
+        pInvisibleSquare=pPage->RemoveObject(0);
+        SdrObject::Free(pInvisibleSquare);
+
+        if (m_aGrfNames.empty())
+            m_xSymbolMB->set_item_sensitive("symbols", false);
     }
 }
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index ba1ab3588fd0..2cef64e0e22e 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -148,32 +148,32 @@ void SvxLineDefTabPage::Construct()
 
 void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
 {
-    if( nDlgType == 0 ) // area dialog
+    if( nDlgType != 0 ) // area dialog
+        return;
+
+    // ActivatePage() is called before the dialog receives PageCreated() !!!
+    if( !pDashList.is() )
+        return;
+
+    if (*pPageType == PageType::Gradient &&
+        *pPosDashLb != -1)
     {
-        // ActivatePage() is called before the dialog receives PageCreated() !!!
-        if( pDashList.is() )
-        {
-            if (*pPageType == PageType::Gradient &&
-                *pPosDashLb != -1)
-            {
-                m_xLbLineStyles->set_active(*pPosDashLb);
-            }
-            // so that a possibly existing line style is discarded
-            SelectLinestyleHdl_Impl( nullptr );
+        m_xLbLineStyles->set_active(*pPosDashLb);
+    }
+    // so that a possibly existing line style is discarded
+    SelectLinestyleHdl_Impl( nullptr );
 
-            // determining (and possibly cutting) the name
-            // and displaying it in the GroupBox
+    // determining (and possibly cutting) the name
+    // and displaying it in the GroupBox
 //             OUString        aString( CuiResId( RID_SVXSTR_TABLE ) );
 //             aString         += ": ";
-            INetURLObject   aURL( pDashList->GetPath() );
+    INetURLObject   aURL( pDashList->GetPath() );
 
-            aURL.Append( pDashList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
+    aURL.Append( pDashList->GetName() );
+    DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
-            *pPageType = PageType::Area; // 2
-            *pPosDashLb = -1;
-        }
-    }
+    *pPageType = PageType::Area; // 2
+    *pPosDashLb = -1;
 }
 
 
@@ -307,31 +307,31 @@ IMPL_LINK(SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, weld::ComboBox&, rL
 
 void SvxLineDefTabPage::SelectLinestyleHdl_Impl(const weld::ComboBox* p)
 {
-    if(pDashList->Count())
+    if(!pDashList->Count())
+        return;
+
+    int nTmp = m_xLbLineStyles->get_active();
+    if (nTmp == -1)
     {
-        int nTmp = m_xLbLineStyles->get_active();
-        if (nTmp == -1)
-        {
-            OSL_ENSURE(false, "OOps, non-existent LineDash selected (!)");
-            nTmp = 1;
-        }
+        OSL_ENSURE(false, "OOps, non-existent LineDash selected (!)");
+        nTmp = 1;
+    }
 
-        aDash = pDashList->GetDash( nTmp )->GetDash();
+    aDash = pDashList->GetDash( nTmp )->GetDash();
 
-        FillDialog_Impl();
+    FillDialog_Impl();
 
-        rXLSet.Put( XLineDashItem( OUString(), aDash ) );
+    rXLSet.Put( XLineDashItem( OUString(), aDash ) );
 
-        // #i34740#
-        m_aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
-        m_aCtlPreview.Invalidate();
+    // #i34740#
+    m_aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
+    m_aCtlPreview.Invalidate();
 
-        // Is not set before, in order to take the new style
-        // only if there was an entry selected in the ListBox.
-        // If it was called via Reset(), then p is == NULL
-        if( p )
-            *pPageType = PageType::Hatch;
-    }
+    // Is not set before, in order to take the new style
+    // only if there was an entry selected in the ListBox.
+    // If it was called via Reset(), then p is == NULL
+    if( p )
+        *pPageType = PageType::Hatch;
 }
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ChangePreviewHdl_Impl, weld::MetricSpinButton&, void)
@@ -565,59 +565,59 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, weld::Button&, void)
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, weld::Button&, void)
 {
     int nPos = m_xLbLineStyles->get_active();
-    if (nPos != -1)
-    {
-        OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
-        OUString aName( pDashList->GetDash( nPos )->GetName() );
-        OUString aOldName = aName;
+    if (nPos == -1)
+        return;
 
-        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
+    OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
+    OUString aName( pDashList->GetDash( nPos )->GetName() );
+    OUString aOldName = aName;
 
-        long nCount = pDashList->Count();
-        bool bLoop = true;
+    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
 
-        while ( bLoop && pDlg->Execute() == RET_OK )
-        {
-            pDlg->GetName( aName );
-            bool bDifferent = true;
+    long nCount = pDashList->Count();
+    bool bLoop = true;
 
-            for( long i = 0; i < nCount && bDifferent; i++ )
-            {
-                if( aName == pDashList->GetDash( i )->GetName() &&
-                    aName != aOldName )
-                    bDifferent = false;
-            }
+    while ( bLoop && pDlg->Execute() == RET_OK )
+    {
+        pDlg->GetName( aName );
+        bool bDifferent = true;
 
-            if ( bDifferent )
-            {
-                bLoop = false;
-                FillDash_Impl();
+        for( long i = 0; i < nCount && bDifferent; i++ )
+        {
+            if( aName == pDashList->GetDash( i )->GetName() &&
+                aName != aOldName )
+                bDifferent = false;
+        }
 
-                pDashList->Replace(std::make_unique<XDashEntry>(aDash, aName), nPos);
-                m_xLbLineStyles->Modify(*pDashList->GetDash(nPos), nPos, pDashList->GetUiBitmap(nPos));
+        if ( bDifferent )
+        {
+            bLoop = false;
+            FillDash_Impl();
 
-                m_xLbLineStyles->set_active(nPos);
+            pDashList->Replace(std::make_unique<XDashEntry>(aDash, aName), nPos);
+            m_xLbLineStyles->Modify(*pDashList->GetDash(nPos), nPos, pDashList->GetUiBitmap(nPos));
 
-                *pnDashListState |= ChangeType::MODIFIED;
+            m_xLbLineStyles->set_active(nPos);
 
-                *pPageType = PageType::Hatch;
+            *pnDashListState |= ChangeType::MODIFIED;
 
-                // save values for changes recognition (-> method)
-                m_xNumFldNumber1->save_value();
-                m_xMtrLength1->save_value();
-                m_xLbType1->save_value();
-                m_xNumFldNumber2->save_value();
-                m_xMtrLength2->save_value();
-                m_xLbType2->save_value();
-                m_xMtrDistance->save_value();
-            }
-            else
-            {
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-                xBox->run();
-            }
+            *pPageType = PageType::Hatch;
+
+            // save values for changes recognition (-> method)
+            m_xNumFldNumber1->save_value();
+            m_xMtrLength1->save_value();
+            m_xLbType1->save_value();
+            m_xNumFldNumber2->save_value();
+            m_xMtrLength2->save_value();
+            m_xLbType2->save_value();
+            m_xMtrDistance->save_value();
+        }
+        else
+        {
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+            xBox->run();
         }
     }
 }
@@ -762,27 +762,27 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, weld::Button&, void)
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
-    if ( aDlg.Execute() == ERRCODE_NONE )
-    {
-        INetURLObject aURL( aDlg.GetPath() );
-        INetURLObject aPathURL( aURL );
+    if ( aDlg.Execute() != ERRCODE_NONE )
+        return;
 
-        aPathURL.removeSegment();
-        aPathURL.removeFinalSlash();
+    INetURLObject aURL( aDlg.GetPath() );
+    INetURLObject aPathURL( aURL );
 
-        pDashList->SetName( aURL.getName() );
-        pDashList->SetPath( aPathURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+    aPathURL.removeSegment();
+    aPathURL.removeFinalSlash();
 
-        if( pDashList->Save() )
-        {
-            *pnDashListState &= ~ChangeType::MODIFIED;
-        }
-        else
-        {
-            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui"));
-            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoSaveFileDialog"));
-            xBox->run();
-        }
+    pDashList->SetName( aURL.getName() );
+    pDashList->SetPath( aPathURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+
+    if( pDashList->Save() )
+    {
+        *pnDashListState &= ~ChangeType::MODIFIED;
+    }
+    else
+    {
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoSaveFileDialog"));
+        xBox->run();
     }
 }
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index d537b7ea1ac9..a9db979bcda5 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -121,24 +121,24 @@ void SvxLineEndDefTabPage::Construct()
 
 void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
 {
-    if( nDlgType == 0 ) // area dialog
-    {
-        // ActivatePage() is called before the dialog receives PageCreated() !!!
-        if( pLineEndList.is() )
-        {
-            if( *pPosLineEndLb != -1)
-            {
-                m_xLbLineEnds->set_active(*pPosLineEndLb);
-                SelectLineEndHdl_Impl();
-            }
-            INetURLObject   aURL( pLineEndList->GetPath() );
+    if( nDlgType != 0 ) // area dialog
+        return;
 
-            aURL.Append( pLineEndList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
-            *pPageType = PageType::Area; // 3
-            *pPosLineEndLb = -1;
-        }
+    // ActivatePage() is called before the dialog receives PageCreated() !!!
+    if( !pLineEndList.is() )
+        return;
+
+    if( *pPosLineEndLb != -1)
+    {
+        m_xLbLineEnds->set_active(*pPosLineEndLb);
+        SelectLineEndHdl_Impl();
     }
+    INetURLObject   aURL( pLineEndList->GetPath() );
+
+    aURL.Append( pLineEndList->GetName() );
+    DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
+    *pPageType = PageType::Area; // 3
+    *pPosLineEndLb = -1;
 }
 
 
@@ -237,25 +237,25 @@ std::unique_ptr<SfxTabPage> SvxLineEndDefTabPage::Create(weld::Container* pPage,
 
 void SvxLineEndDefTabPage::SelectLineEndHdl_Impl()
 {
-    if( pLineEndList->Count() > 0 )
-    {
-        int nPos = m_xLbLineEnds->get_active();
+    if( pLineEndList->Count() <= 0 )
+        return;
 
-        const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
+    int nPos = m_xLbLineEnds->get_active();
 
-        m_xEdtName->set_text(m_xLbLineEnds->get_active_text());
+    const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
 
-        rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) );
-        rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) );
+    m_xEdtName->set_text(m_xLbLineEnds->get_active_text());
 
-        // #i34740#
-        m_aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
-        m_aCtlPreview.Invalidate();
+    rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) );
+    rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) );
 
-        // Is not set before, in order to only take the new style,
-        // if there is an entry selected in the ListBox
-        *pPageType = PageType::Bitmap;
-    }
+    // #i34740#
+    m_aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
+    m_aCtlPreview.Invalidate();
+
+    // Is not set before, in order to only take the new style,
+    // if there is an entry selected in the ListBox
+    *pPageType = PageType::Bitmap;
 }
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, weld::ComboBox&, void)
@@ -266,72 +266,72 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, weld::ComboBox&, vo
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, weld::Button&, void)
 {
     int nPos = m_xLbLineEnds->get_active();
-    if (nPos != -1)
+    if (nPos == -1)
+        return;
+
+    OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
+    OUString aName(m_xEdtName->get_text());
+    long nCount = pLineEndList->Count();
+    bool bDifferent = true;
+
+    // check whether the name is existing already
+    for ( long i = 0; i < nCount && bDifferent; i++ )
+        if ( aName == pLineEndList->GetLineEnd( i )->GetName() )
+            bDifferent = false;
+
+    // if yes, repeat and demand a new name
+    if ( !bDifferent )
     {
-        OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
-        OUString aName(m_xEdtName->get_text());
-        long nCount = pLineEndList->Count();
-        bool bDifferent = true;
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xWarningBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+        xWarningBox->run();
 
-        // check whether the name is existing already
-        for ( long i = 0; i < nCount && bDifferent; i++ )
-            if ( aName == pLineEndList->GetLineEnd( i )->GetName() )
-                bDifferent = false;
+        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
+        bool bLoop = true;
 
-        // if yes, repeat and demand a new name
-        if ( !bDifferent )
+        while( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
         {
-            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
-            std::unique_ptr<weld::MessageDialog> xWarningBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-            xWarningBox->run();
-
-            SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-            ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
-            bool bLoop = true;
+            pDlg->GetName( aName );
+            bDifferent = true;
 
-            while( !bDifferent && bLoop && pDlg->Execute() == RET_OK )
+            for( long i = 0; i < nCount && bDifferent; i++ )
             {
-                pDlg->GetName( aName );
-                bDifferent = true;
-
-                for( long i = 0; i < nCount && bDifferent; i++ )
-                {
-                    if( aName == pLineEndList->GetLineEnd( i )->GetName() )
-                        bDifferent = false;
-                }
-
-                if( bDifferent )
-                    bLoop = false;
-                else
-                    xWarningBox->run();
+                if( aName == pLineEndList->GetLineEnd( i )->GetName() )
+                    bDifferent = false;
             }
+
+            if( bDifferent )
+                bLoop = false;
+            else
+                xWarningBox->run();
         }
+    }
 
-        // if not existing, enter the entry
-        if( bDifferent )
-        {
-            const XLineEndEntry* pOldEntry = pLineEndList->GetLineEnd(nPos);
+    // if not existing, enter the entry
+    if( !bDifferent )
+        return;
 
-            if(pOldEntry)
-            {
-                // #123497# Need to replace the existing entry with a new one
-                pLineEndList->Replace(std::make_unique<XLineEndEntry>(pOldEntry->GetLineEnd(), aName), nPos);
+    const XLineEndEntry* pOldEntry = pLineEndList->GetLineEnd(nPos);
 
-                m_xEdtName->set_text(aName);
+    if(pOldEntry)
+    {
+        // #123497# Need to replace the existing entry with a new one
+        pLineEndList->Replace(std::make_unique<XLineEndEntry>(pOldEntry->GetLineEnd(), aName), nPos);
 
-                m_xLbLineEnds->Modify(*pLineEndList->GetLineEnd(nPos), nPos, pLineEndList->GetUiBitmap(nPos));
-                m_xLbLineEnds->set_active(nPos);
+        m_xEdtName->set_text(aName);
 
-                // set flag for modified
-                *pnLineEndListState |= ChangeType::MODIFIED;
+        m_xLbLineEnds->Modify(*pLineEndList->GetLineEnd(nPos), nPos, pLineEndList->GetUiBitmap(nPos));
+        m_xLbLineEnds->set_active(nPos);
 
-                *pPageType = PageType::Bitmap;
-            }
-            else
-            {
-                OSL_ENSURE(false, "LineEnd to be modified not existing (!)");
-            }
-        }
+        // set flag for modified
+        *pnLineEndListState |= ChangeType::MODIFIED;
+
+        *pPageType = PageType::Bitmap;
+    }
+    else
+    {
+        OSL_ENSURE(false, "LineEnd to be modified not existing (!)");
     }
 }
 
@@ -582,27 +582,27 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, weld::Button&, void)
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
-    if ( aDlg.Execute() == ERRCODE_NONE )
-    {
-        INetURLObject   aURL( aDlg.GetPath() );
-        INetURLObject   aPathURL( aURL );
+    if ( aDlg.Execute() != ERRCODE_NONE )
+        return;
 
-        aPathURL.removeSegment();
-        aPathURL.removeFinalSlash();
+    INetURLObject   aURL( aDlg.GetPath() );
+    INetURLObject   aPathURL( aURL );
 
-        pLineEndList->SetName( aURL.getName() );
-        pLineEndList->SetPath( aPathURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+    aPathURL.removeSegment();
+    aPathURL.removeFinalSlash();
 
-        if( pLineEndList->Save() )
-        {
-            *pnLineEndListState &= ~ChangeType::MODIFIED;
-        }
-        else
-        {
-            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui"));
-            std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoSaveFileDialog"));
-            xBox->run();
-        }
+    pLineEndList->SetName( aURL.getName() );
+    pLineEndList->SetPath( aPathURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+
+    if( pLineEndList->Save() )
+    {
+        *pnLineEndListState &= ~ChangeType::MODIFIED;
+    }
+    else
+    {
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoSaveFileDialog"));
+        xBox->run();
     }
 }
 
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index cd223ed9284c..613508b64a79 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -128,47 +128,47 @@ void SvxPatternTabPage::Construct()
 
 void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet )
 {
-    if( m_pColorList.is() )
+    if( !m_pColorList.is() )
+        return;
+
+    // ColorList
+    if( *m_pnColorListState & ChangeType::CHANGED ||
+        *m_pnColorListState & ChangeType::MODIFIED )
     {
-        // ColorList
-        if( *m_pnColorListState & ChangeType::CHANGED ||
-            *m_pnColorListState & ChangeType::MODIFIED )
-        {
-            SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ?
-                dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr;
-            if (pArea)
-                m_pColorList = pArea->GetNewColorList();
-        }
+        SvxAreaTabDialog* pArea = (*m_pnColorListState & ChangeType::CHANGED) ?
+            dynamic_cast<SvxAreaTabDialog*>(GetDialogController()) : nullptr;
+        if (pArea)
+            m_pColorList = pArea->GetNewColorList();
+    }
 
-        // determining (possibly cutting) the name and
-        // displaying it in the GroupBox
-        OUString        aString = CuiResId( RID_SVXSTR_TABLE ) + ": ";
-        INetURLObject   aURL( m_pPatternList->GetPath() );
+    // determining (possibly cutting) the name and
+    // displaying it in the GroupBox
+    OUString        aString = CuiResId( RID_SVXSTR_TABLE ) + ": ";
+    INetURLObject   aURL( m_pPatternList->GetPath() );
 
-        aURL.Append( m_pPatternList->GetName() );
-        SAL_WARN_IF( aURL.GetProtocol() == INetProtocol::NotValid, "cui.tabpages", "invalid URL" );
+    aURL.Append( m_pPatternList->GetName() );
+    SAL_WARN_IF( aURL.GetProtocol() == INetProtocol::NotValid, "cui.tabpages", "invalid URL" );
 
-        if( aURL.getBase().getLength() > 18 )
-        {
-            aString += aURL.getBase().copy( 0, 15 ) + "...";
-        }
-        else
-            aString += aURL.getBase();
+    if( aURL.getBase().getLength() > 18 )
+    {
+        aString += aURL.getBase().copy( 0, 15 ) + "...";
+    }
+    else
+        aString += aURL.getBase();
 
-        XFillBitmapItem aItem( rSet.Get( XATTR_FILLBITMAP ) );
+    XFillBitmapItem aItem( rSet.Get( XATTR_FILLBITMAP ) );
 
-        if ( aItem.isPattern() )
+    if ( aItem.isPattern() )
+    {
+        sal_Int32 nPos = SearchPatternList( aItem.GetName() );
+        if ( nPos != -1)
         {
-            sal_Int32 nPos = SearchPatternList( aItem.GetName() );
-            if ( nPos != -1)
-            {
-                sal_uInt16 nId = m_xPatternLB->GetItemId( static_cast<size_t>( nPos ) );
-                m_xPatternLB->SelectItem( nId );
-            }
+            sal_uInt16 nId = m_xPatternLB->GetItemId( static_cast<size_t>( nPos ) );
+            m_xPatternLB->SelectItem( nId );
         }
-        else
-            m_xPatternLB->SelectItem( m_xPatternLB->GetItemId( static_cast<size_t>( 0 ) ) );
     }
+    else
+        m_xPatternLB->SelectItem( m_xPatternLB->GetItemId( static_cast<size_t>( 0 ) ) );
 }
 
 
@@ -272,47 +272,47 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, SvtValueSet*, void)
         }
     }
 
-    if(pGraphicObject)
-    {
-        Color aBackColor;
-        Color aPixelColor;
-        bool bIs8x8(vcl::bitmap::isHistorical8x8(pGraphicObject->GetGraphic().GetBitmapEx(), aBackColor, aPixelColor));
+    if(!pGraphicObject)
+        return;
 
-        m_xLbColor->SetNoSelection();
-        m_xLbBackgroundColor->SetNoSelection();
+    Color aBackColor;
+    Color aPixelColor;
+    bool bIs8x8(vcl::bitmap::isHistorical8x8(pGraphicObject->GetGraphic().GetBitmapEx(), aBackColor, aPixelColor));
 
-        if(bIs8x8)
-        {
-            m_xCtlPixel->SetPaintable( true );
-            m_xBtnModify->set_sensitive(true);
-            m_xBtnAdd->set_sensitive(true);
+    m_xLbColor->SetNoSelection();
+    m_xLbBackgroundColor->SetNoSelection();
 
-            // setting the pixel control
+    if(bIs8x8)
+    {
+        m_xCtlPixel->SetPaintable( true );
+        m_xBtnModify->set_sensitive(true);
+        m_xBtnAdd->set_sensitive(true);
 
-            m_xCtlPixel->SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx());
+        // setting the pixel control
 
-            m_xLbColor->SelectEntry( aPixelColor );
-            m_xLbBackgroundColor->SelectEntry( aBackColor );
+        m_xCtlPixel->SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx());
 
-            // update m_xBitmapCtl, rXFSet and m_aCtlPreview
-            m_xBitmapCtl->SetPixelColor( aPixelColor );
-            m_xBitmapCtl->SetBackgroundColor( aBackColor );
-            m_rXFSet.ClearItem();
-            m_rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
-            m_rXFSet.Put(XFillBitmapItem(OUString(), Graphic(m_xBitmapCtl->GetBitmapEx())));
-            m_aCtlPreview.SetAttributes( m_aXFillAttr.GetItemSet() );
-            m_aCtlPreview.Invalidate();
-        }
-        else
-        {
-            m_xCtlPixel->Reset();
-            m_xCtlPixel->SetPaintable( false );
-            m_xBtnModify->set_sensitive(false);
-            m_xBtnAdd->set_sensitive(false);
-        }
+        m_xLbColor->SelectEntry( aPixelColor );
+        m_xLbBackgroundColor->SelectEntry( aBackColor );
 
-        m_xCtlPixel->Invalidate();
+        // update m_xBitmapCtl, rXFSet and m_aCtlPreview
+        m_xBitmapCtl->SetPixelColor( aPixelColor );
+        m_xBitmapCtl->SetBackgroundColor( aBackColor );
+        m_rXFSet.ClearItem();
+        m_rXFSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
+        m_rXFSet.Put(XFillBitmapItem(OUString(), Graphic(m_xBitmapCtl->GetBitmapEx())));
+        m_aCtlPreview.SetAttributes( m_aXFillAttr.GetItemSet() );
+        m_aCtlPreview.Invalidate();
     }
+    else
+    {
+        m_xCtlPixel->Reset();
+        m_xCtlPixel->SetPaintable( false );
+        m_xBtnModify->set_sensitive(false);
+        m_xBtnAdd->set_sensitive(false);
+    }
+
+    m_xCtlPixel->Invalidate();
 }
 
 IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, weld::Button&, void)
@@ -405,22 +405,22 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, weld::Button&, void)
     sal_uInt16 nId = m_xPatternLB->GetSelectedItemId();
     size_t nPos = m_xPatternLB->GetSelectItemPos();
 
-    if ( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aName( m_pPatternList->GetBitmap( static_cast<sal_uInt16>(nPos) )->GetName() );
+    if ( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        const BitmapEx aBitmapEx(m_xBitmapCtl->GetBitmapEx());
+    OUString aName( m_pPatternList->GetBitmap( static_cast<sal_uInt16>(nPos) )->GetName() );
 
-        // #i123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
-        m_pPatternList->Replace(std::make_unique<XBitmapEntry>(Graphic(aBitmapEx), aName), nPos);
+    const BitmapEx aBitmapEx(m_xBitmapCtl->GetBitmapEx());
 
-        BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( static_cast<sal_uInt16>( nPos ), m_xPatternLB->GetIconSize() );
-        m_xPatternLB->RemoveItem(nId);
-        m_xPatternLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) );
-        m_xPatternLB->SelectItem( nId );
+    // #i123497# Need to replace the existing entry with a new one (old returned needs to be deleted)
+    m_pPatternList->Replace(std::make_unique<XBitmapEntry>(Graphic(aBitmapEx), aName), nPos);
 
-        *m_pnPatternListState |= ChangeType::MODIFIED;
-    }
+    BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( static_cast<sal_uInt16>( nPos ), m_xPatternLB->GetIconSize() );
+    m_xPatternLB->RemoveItem(nId);
+    m_xPatternLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) );
+    m_xPatternLB->SelectItem( nId );
+
+    *m_pnPatternListState |= ChangeType::MODIFIED;
 }
 
 
@@ -429,39 +429,39 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
     size_t nPos = m_xPatternLB->GetSelectItemPos();
     sal_Int32 nId = m_xPatternLB->GetSelectedItemId();
 
-    if ( nPos != VALUESET_ITEM_NOTFOUND )
-    {
-        OUString aDesc(CuiResId(RID_SVXSTR_DESC_NEW_PATTERN));
-        OUString aName(m_pPatternList->GetBitmap(nPos)->GetName());
+    if ( nPos == VALUESET_ITEM_NOTFOUND )
+        return;
 
-        SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-        ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
+    OUString aDesc(CuiResId(RID_SVXSTR_DESC_NEW_PATTERN));
+    OUString aName(m_pPatternList->GetBitmap(nPos)->GetName());
 
-        bool bLoop = true;
+    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+    ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc));
 
-        while( bLoop && pDlg->Execute() == RET_OK )
-        {
-            pDlg->GetName( aName );
-            sal_Int32 nPatternPos = SearchPatternList(aName);
-            bool bValidPatternName = (nPatternPos == static_cast<sal_Int32>(nPos) ) || (nPatternPos == -1);
+    bool bLoop = true;
 
-            if( bValidPatternName )
-            {
-                bLoop = false;
+    while( bLoop && pDlg->Execute() == RET_OK )
+    {
+        pDlg->GetName( aName );
+        sal_Int32 nPatternPos = SearchPatternList(aName);
+        bool bValidPatternName = (nPatternPos == static_cast<sal_Int32>(nPos) ) || (nPatternPos == -1);
 
-                m_pPatternList->GetBitmap(nPos)->SetName(aName);
+        if( bValidPatternName )
+        {
+            bLoop = false;
 
-                m_xPatternLB->SetItemText( nId, aName );
-                m_xPatternLB->SelectItem( nId );
+            m_pPatternList->GetBitmap(nPos)->SetName(aName);
 
-                *m_pnPatternListState |= ChangeType::MODIFIED;
-            }
-            else
-            {
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
-                std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
-                xWarnBox->run();
-            }
+            m_xPatternLB->SetItemText( nId, aName );
+            m_xPatternLB->SelectItem( nId );
+
+            *m_pnPatternListState |= ChangeType::MODIFIED;
+        }
+        else
+        {
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog"));
+            xWarnBox->run();
         }
     }
 }
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 1c8c5051d0b9..de448b197fd4 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -168,42 +168,42 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
     if (pPageTypeItem)
         SetPageType(static_cast<PageType>(pPageTypeItem->GetValue()));
 
-    if( m_nDlgType == 0 )
+    if( m_nDlgType != 0 )
+        return;
+
+    if( !m_pColorList.is() )
+        return;
+
+    // ColorList
+    if( *m_pnColorListState & ChangeType::CHANGED ||
+        *m_pnColorListState & ChangeType::MODIFIED )
     {
-        if( m_pColorList.is() )
+        if( *m_pnColorListState & ChangeType::CHANGED )
         {
-            // ColorList
-            if( *m_pnColorListState & ChangeType::CHANGED ||
-                *m_pnColorListState & ChangeType::MODIFIED )
+            SvxAreaTabDialog* pArea = dynamic_cast<SvxAreaTabDialog*>(GetDialogController());
+            if( pArea )
             {
-                if( *m_pnColorListState & ChangeType::CHANGED )
-                {
-                    SvxAreaTabDialog* pArea = dynamic_cast<SvxAreaTabDialog*>(GetDialogController());
-                    if( pArea )
-                    {
-                        m_pColorList = pArea->GetNewColorList();
-                    }
-                    else
-                    {
-                        SvxLineTabDialog* pLine = dynamic_cast<SvxLineTabDialog*>(GetDialogController());
-                        if( pLine )
-                            m_pColorList = pLine->GetNewColorList();
-                    }
-                }
-
-                SfxItemSet rAttribs( rSet );
-                // rSet contains shadow attributes too, but we want
-                // to use it for updating rectangle attributes only,
-                // so set the shadow to none here
-                SdrOnOffItem aItem( makeSdrShadowItem( false ));
-                rAttribs.Put( aItem );
-
-                m_aCtlXRectPreview.SetRectangleAttributes( rAttribs );
-                ModifyShadowHdl_Impl( *m_xMtrTransparent );
+                m_pColorList = pArea->GetNewColorList();
+            }
+            else
+            {
+                SvxLineTabDialog* pLine = dynamic_cast<SvxLineTabDialog*>(GetDialogController());
+                if( pLine )
+                    m_pColorList = pLine->GetNewColorList();
             }
-            m_nPageType = PageType::Shadow;
         }
+
+        SfxItemSet rAttribs( rSet );
+        // rSet contains shadow attributes too, but we want
+        // to use it for updating rectangle attributes only,
+        // so set the shadow to none here
+        SdrOnOffItem aItem( makeSdrShadowItem( false ));
+        rAttribs.Put( aItem );
+
+        m_aCtlXRectPreview.SetRectangleAttributes( rAttribs );
+        ModifyShadowHdl_Impl( *m_xMtrTransparent );
     }
+    m_nPageType = PageType::Shadow;
 }
 
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 612410ac94e6..77c3b7e7e8d2 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -328,64 +328,64 @@ DeactivateRC SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eRP)
 {
-    if (pDrawingArea == m_aCtlRect.GetDrawingArea())
+    if (pDrawingArea != m_aCtlRect.GetDrawingArea())
+        return;
+
+    switch(eRP)
     {
-        switch(eRP)
+        case RectPoint::LT:
         {
-            case RectPoint::LT:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::MT:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::RT:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::LM:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::MM:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::RM:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::LB:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::MB:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE );
-                break;
-            }
-            case RectPoint::RB:
-            {
-                m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE );
-                m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE );
-                break;
-            }
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::MT:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::RT:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getMinY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::LM:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::MM:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::RM:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getCenter().getY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::LB:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getMinX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::MB:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getCenter().getX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE );
+            break;
+        }
+        case RectPoint::RB:
+        {
+            m_xMtrPosX->set_value( basegfx::fround64(maRange.getMaxX()), FieldUnit::NONE );
+            m_xMtrPosY->set_value( basegfx::fround64(maRange.getMaxY()), FieldUnit::NONE );
+            break;
         }
     }
 }
@@ -1516,47 +1516,47 @@ void SvxPositionSizeTabPage::DisableProtect()
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl, weld::MetricSpinButton&, void)
 {
-    if( m_xCbxScale->get_active() && m_xCbxScale->get_sensitive() )
-    {
-        sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(m_xMtrWidth->get_value(FieldUnit::NONE))) / mfOldWidth));
-        int nMin, nMax;
-        m_xMtrHeight->get_range(nMin, nMax, FieldUnit::NONE);
+    if( !(m_xCbxScale->get_active() && m_xCbxScale->get_sensitive()) )
+        return;
 
-        if (nHeight <= nMax)
-        {
-            m_xMtrHeight->set_value(nHeight, FieldUnit::NONE);
-        }
-        else
-        {
-            nHeight = nMax;
-            m_xMtrHeight->set_value(nHeight, FieldUnit::NONE);
+    sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(m_xMtrWidth->get_value(FieldUnit::NONE))) / mfOldWidth));
+    int nMin, nMax;
+    m_xMtrHeight->get_range(nMin, nMax, FieldUnit::NONE);
 
-            const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(nHeight)) / mfOldHeight));
-            m_xMtrWidth->set_value(nWidth, FieldUnit::NONE);
-        }
+    if (nHeight <= nMax)
+    {
+        m_xMtrHeight->set_value(nHeight, FieldUnit::NONE);
+    }
+    else
+    {
+        nHeight = nMax;
+        m_xMtrHeight->set_value(nHeight, FieldUnit::NONE);
+
+        const sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(nHeight)) / mfOldHeight));
+        m_xMtrWidth->set_value(nWidth, FieldUnit::NONE);
     }
 }
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl, weld::MetricSpinButton&, void)
 {
-    if( m_xCbxScale->get_active() && m_xCbxScale->get_sensitive() )
-    {
-        sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(m_xMtrHeight->get_value(FieldUnit::NONE))) / mfOldHeight));
-        int nMin, nMax;
-        m_xMtrWidth->get_range(nMin, nMax, FieldUnit::NONE);
+    if( !(m_xCbxScale->get_active() && m_xCbxScale->get_sensitive()) )
+        return;
 
-        if (nWidth <= nMax)
-        {
-            m_xMtrWidth->set_value(nWidth, FieldUnit::NONE);
-        }
-        else
-        {
-            nWidth = nMax;
-            m_xMtrWidth->set_value(nWidth, FieldUnit::NONE);
+    sal_Int64 nWidth(basegfx::fround64((mfOldWidth * static_cast<double>(m_xMtrHeight->get_value(FieldUnit::NONE))) / mfOldHeight));
+    int nMin, nMax;
+    m_xMtrWidth->get_range(nMin, nMax, FieldUnit::NONE);
 
-            const sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(nWidth)) / mfOldWidth));
-            m_xMtrHeight->set_value(nHeight, FieldUnit::NONE);
-        }
+    if (nWidth <= nMax)
+    {
+        m_xMtrWidth->set_value(nWidth, FieldUnit::NONE);
+    }
+    else
+    {
+        nWidth = nMax;
+        m_xMtrWidth->set_value(nWidth, FieldUnit::NONE);
+
+        const sal_Int64 nHeight(basegfx::fround64((mfOldHeight * static_cast<double>(nWidth)) / mfOldWidth));
+        m_xMtrHeight->set_value(nHeight, FieldUnit::NONE);
     }
 }