1 files changed, 26 insertions, 46 deletions

diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 677613191130..b3d036d991f9 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -50,7 +50,7 @@ SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet
     xPage->Construct();
 
     SetTabPage(std::move(xPage));
-    m_xDialog->set_title(CuiResId(RID_SVXSTR_CONNECTOR));
+    m_xDialog->set_title(CuiResId(RID_CUISTR_CONNECTOR));
 }
 
 /*************************************************************************
@@ -118,6 +118,17 @@ SvxConnectionPage::~SvxConnectionPage()
     m_xCtlPreview.reset();
 }
 
+template<class T>
+void SvxConnectionPage::SetMetricValueAndSave(const SfxItemSet* rAttrs, weld::MetricSpinButton& rField, TypedWhichId<T> nWhich)
+{
+    const SfxPoolItem* pItem = GetItem( *rAttrs,  nWhich);
+    const SfxItemPool* pPool = rAttrs->GetPool();
+    if( !pItem )
+        pItem = &pPool->GetUserOrPoolDefaultItem( nWhich );
+    SetMetricValue(rField, pItem->StaticWhichCast(nWhich).GetValue(), eUnit);
+    rField.save_value();
+}
+
 /*************************************************************************
 |*
 |* reads passed Item-Set
@@ -126,66 +137,35 @@ SvxConnectionPage::~SvxConnectionPage()
 
 void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
 {
-    const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_EDGENODE1HORZDIST );
+    const SfxPoolItem* pItem;
     const SfxItemPool* pPool = rAttrs->GetPool();
 
     // SdrEdgeNode1HorzDistItem
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE1HORZDIST );
-    SetMetricValue(*m_xMtrFldHorz1, static_cast<const SdrEdgeNode1HorzDistItem*>(pItem)->GetValue(),
-                   eUnit);
-    m_xMtrFldHorz1->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldHorz1, SDRATTR_EDGENODE1HORZDIST);
 
     // SdrEdgeNode2HorzDistItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGENODE2HORZDIST );
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE2HORZDIST );
-    SetMetricValue(*m_xMtrFldHorz2, static_cast<const SdrEdgeNode2HorzDistItem*>(pItem)->GetValue(),
-                   eUnit);
-    m_xMtrFldHorz2->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldHorz2, SDRATTR_EDGENODE2HORZDIST);
 
     // SdrEdgeNode1VertDistItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGENODE1VERTDIST );
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE1VERTDIST );
-    SetMetricValue(*m_xMtrFldVert1, static_cast<const SdrEdgeNode1VertDistItem*>(pItem)->GetValue(),
-                   eUnit);
-    m_xMtrFldVert1->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldVert1, SDRATTR_EDGENODE1VERTDIST);
 
     // SdrEdgeNode2VertDistItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGENODE2VERTDIST );
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE2VERTDIST );
-    SetMetricValue(*m_xMtrFldVert2, static_cast<const SdrEdgeNode2VertDistItem*>(pItem)->GetValue(),
-                   eUnit);
-    m_xMtrFldVert2->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldVert2, SDRATTR_EDGENODE2VERTDIST);
 
     // SdrEdgeLine1DeltaItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGELINE1DELTA );
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE1DELTA );
-    SetMetricValue(*m_xMtrFldLine1, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit);
-    m_xMtrFldLine1->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldLine1, SDRATTR_EDGELINE1DELTA);
 
     // SdrEdgeLine2DeltaItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGELINE2DELTA );
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE2DELTA );
-    SetMetricValue(*m_xMtrFldLine2, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit);
-    m_xMtrFldLine2->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldLine2, SDRATTR_EDGELINE2DELTA);
 
     // SdrEdgeLine3DeltaItem
-    pItem = GetItem( *rAttrs, SDRATTR_EDGELINE3DELTA );
-    if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE3DELTA );
-    SetMetricValue(*m_xMtrFldLine3, static_cast<const SdrMetricItem*>(pItem)->GetValue(), eUnit);
-    m_xMtrFldLine3->save_value();
+    SetMetricValueAndSave(rAttrs, *m_xMtrFldLine3, SDRATTR_EDGELINE3DELTA);
 
     // SdrEdgeLineDeltaAnzItem
     pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTACOUNT );
     if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTACOUNT );
-    switch (static_cast<const SdrEdgeLineDeltaCountItem*>(pItem)->GetValue())
+        pItem = &pPool->GetUserOrPoolDefaultItem( SDRATTR_EDGELINEDELTACOUNT );
+    switch (pItem->StaticWhichCast(SDRATTR_EDGELINEDELTACOUNT).GetValue())
     {
         case 0:
             m_xFtLine1->set_sensitive(false);
@@ -207,9 +187,9 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
     // SdrEdgeKindItem
     pItem = GetItem( *rAttrs, SDRATTR_EDGEKIND );
     if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGEKIND );
+        pItem = &pPool->GetUserOrPoolDefaultItem( SDRATTR_EDGEKIND );
     m_xLbType->set_active(
-        sal::static_int_cast<sal_uInt16>(static_cast<const SdrEdgeKindItem*>(pItem)->GetValue()));
+        sal::static_int_cast<sal_uInt16>(pItem->StaticWhichCast(SDRATTR_EDGEKIND).GetValue()));
     m_xLbType->save_value();
 }
 
@@ -394,8 +374,8 @@ void SvxConnectionPage::FillTypeLB()
     const SfxItemPool* pPool = rOutAttrs.GetPool();
 
     if( !pItem )
-        pItem = &pPool->GetDefaultItem( SDRATTR_EDGEKIND );
-    const SdrEdgeKindItem* pEdgeKindItem = static_cast<const SdrEdgeKindItem*>(pItem);
+        pItem = &pPool->GetUserOrPoolDefaultItem( SDRATTR_EDGEKIND );
+    const SdrEdgeKindItem* pEdgeKindItem = &pItem->StaticWhichCast(SDRATTR_EDGEKIND);
     const sal_uInt16 nCount = pEdgeKindItem->GetValueCount();
     for (sal_uInt16 i = 0; i < nCount; i++)
     {