1 files changed, 58 insertions, 43 deletions

diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8d75e4a882..802cbb59dd 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -823,6 +823,48 @@ void FmXFormView::AutoFocus( sal_Bool _bSync )
     else
         m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus));
 }
+
+// -----------------------------------------------------------------------------
+bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl )
+{
+    if ( !i_rControl.is() )
+        return false;
+
+    try
+    {
+        Reference< XPropertySet > xModelProps( i_rControl->getModel(), UNO_QUERY_THROW );
+
+        // only enabled controls are allowed to participate
+        sal_Bool bEnabled = sal_False;
+        OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_ENABLED ) >>= bEnabled );
+        if ( !bEnabled )
+            return false;
+
+        // check the class id of the control model
+        sal_Int16 nClassId = FormComponentType::CONTROL;
+        OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId );
+
+        // controls which are not focussable
+        if	(	( FormComponentType::CONTROL != nClassId )
+            &&	( FormComponentType::IMAGEBUTTON != nClassId )
+            &&	( FormComponentType::GROUPBOX != nClassId )
+            &&	( FormComponentType::FIXEDTEXT != nClassId )
+            &&	( FormComponentType::HIDDENCONTROL != nClassId )
+            &&	( FormComponentType::IMAGECONTROL != nClassId )
+            &&	( FormComponentType::SCROLLBAR != nClassId )
+            &&	( FormComponentType::SPINBUTTON!= nClassId )
+            )
+        {
+            return true;
+        }
+    }
+    catch( const Exception& e )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    return false;
+}
+
 // -----------------------------------------------------------------------------
 static Reference< XControl > lcl_firstFocussableControl( const Sequence< Reference< XControl > >& _rControls )
 {
@@ -833,47 +875,19 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen
     const Reference< XControl >* pControlsEnd = _rControls.getConstArray() + _rControls.getLength();
     for ( ; pControls != pControlsEnd; ++pControls )
     {
-        try
-        {
-            if ( !pControls->is() )
-                continue;
-
-            Reference< XPropertySet > xModelProps( (*pControls)->getModel(), UNO_QUERY_THROW );
-
-            // only enabled controls are allowed to participate
-            sal_Bool bEnabled = sal_False;
-            OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_ENABLED ) >>= bEnabled );
-            if ( !bEnabled )
-                continue;
-
-            // check the class id of the control model
-            sal_Int16 nClassId = FormComponentType::CONTROL;
-            OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId );
-
-            // controls which are not focussable
-            if	(	( FormComponentType::CONTROL != nClassId )
-                &&	( FormComponentType::IMAGEBUTTON != nClassId )
-                &&	( FormComponentType::GROUPBOX != nClassId )
-                &&	( FormComponentType::FIXEDTEXT != nClassId )
-                &&	( FormComponentType::HIDDENCONTROL != nClassId )
-                &&	( FormComponentType::IMAGECONTROL != nClassId )
-                &&	( FormComponentType::SCROLLBAR != nClassId )
-                &&	( FormComponentType::SPINBUTTON!= nClassId )
-                )
-            {
-                xReturn = *pControls;
-                break;
-            }
-        }
-        catch( const Exception& e )
+        if ( !pControls->is() )
+            continue;
+
+        if ( FmXFormView::isFocusable( *pControls ) )
         {
-            (void)e;	// make compiler happy
+            xReturn = *pControls;
+            break;
         }
-
-        if ( !xReturn.is() && _rControls.getLength() )
-            xReturn = _rControls[0];
     }
 
+    if ( !xReturn.is() && _rControls.getLength() )
+        xReturn = _rControls[0];
+
     return xReturn;
 }
 
@@ -1008,11 +1022,6 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
 }
 
 // -----------------------------------------------------------------------------
-namespace
-{
-}
-
-// -----------------------------------------------------------------------------
 void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onCreatedFormObject" );
@@ -1590,7 +1599,13 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
         xLabelModel.set( pLabel->GetUnoControlModel(), UNO_QUERY );
         if ( xLabelModel.is() )
         {
-            xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sFieldName + _rFieldPostfix ) );
+            ::rtl::OUString sLabel;
+            if ( _rxField.is() && _rxField->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
+                _rxField->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
+            if ( !sLabel.getLength() )
+                sLabel = sFieldName;
+
+            xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) );
             String sObjectLabel( SVX_RES( RID_STR_OBJECT_LABEL ) );
             sObjectLabel.SearchAndReplaceAllAscii( "#object#", sFieldName );
             xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( ::rtl::OUString( sObjectLabel ) ) );