3 files changed, 18 insertions, 16 deletions
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index fa58294386..8970126111 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -936,7 +936,7 @@ void Array::SetAddMergedLeftSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nAdd
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddLeft = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
@@ -951,7 +951,7 @@ void Array::SetAddMergedRightSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nAd
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddRight = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
@@ -966,7 +966,7 @@ void Array::SetAddMergedTopSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nAddS
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddTop = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
@@ -981,7 +981,7 @@ void Array::SetAddMergedBottomSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nA
             return;
         Cell aTempCell(*pTempCell);
         aTempCell.mnAddBottom = nAddSize;
-        mxImpl->PutCell( nCol, nRow, aTempCell );
+        mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
     }
 }
 
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 2226eaa4e2..66ddc8c4e5 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -161,17 +161,19 @@ SvxGridTabPage::SvxGridTabPage(weld::Container* pPage, weld::DialogController* p
 
     if (m_Emode != HTML_MODE)
     {
-        SfxViewFrame* pCurrent = SfxViewFrame::Current();
-        OUString aModuleName = vcl::CommandInfoProvider::GetModuleIdentifier(pCurrent->GetFrame().GetFrameInterface());
-        std::u16string_view sModulename = aModuleName.subView(aModuleName.lastIndexOf('.') + 1);
-        if (sModulename.starts_with(u"Text"))
-            m_Emode = WRITER_MODE;
-        else if (sModulename.starts_with(u"Spreadsheet"))
-            m_Emode = CALC_MODE;
-        else if (sModulename.starts_with(u"Presentation"))
-            m_Emode = IMPRESS_MODE;
-        else if (sModulename.starts_with(u"Drawing"))
-            m_Emode = DRAW_MODE;
+        if (SfxViewFrame* pCurrent = SfxViewFrame::Current())
+        {
+            OUString aModuleName = vcl::CommandInfoProvider::GetModuleIdentifier(pCurrent->GetFrame().GetFrameInterface());
+            std::u16string_view sModulename = aModuleName.subView(aModuleName.lastIndexOf('.') + 1);
+            if (sModulename.starts_with(u"Text"))
+                m_Emode = WRITER_MODE;
+            else if (sModulename.starts_with(u"Spreadsheet"))
+                m_Emode = CALC_MODE;
+            else if (sModulename.starts_with(u"Presentation"))
+                m_Emode = IMPRESS_MODE;
+            else if (sModulename.starts_with(u"Drawing"))
+                m_Emode = DRAW_MODE;
+        }
     }
 
     m_xCbxRotate->connect_toggled(LINK(this, SvxGridTabPage, ClickRotateHdl_Impl));
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6323583fd2..17c4edaa93 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1033,7 +1033,7 @@ void SvxRuler::UpdateTabs()
             lCurrentDefTabDist = mxTabStopItem->GetDefaultDistance();
         tools::Long nDefTabDist = ConvertHPosPixel(lCurrentDefTabDist);
 
-        const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > lRightIndent
+        const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > lRightIndent || nDefTabDist == 0
                     ? 0
                     : static_cast<sal_uInt16>( (lRightIndent - lPosPixel) / nDefTabDist );