From fbb7a4cd4c90471ab9582b799e04a6c1023d507e Mon Sep 17 00:00:00 2001
From: "Ocke Janssen [oj]" <Ocke.Janssen@sun.com>
Date: Wed, 13 Jan 2010 08:44:34 +0100
Subject: dba33f: #i20615# new feature to allow server side column
 descrriptions to be visible and changeable in the table designer.

---
 svx/source/fmcomp/fmgridcl.cxx | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'svx/source/fmcomp')

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 35506d7d5ef4..89b18a05f650 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -213,10 +213,11 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt )
             Reference< ::com::sun::star::container::XIndexContainer >  xColumns(static_cast<FmGridControl*>(GetParent())->GetPeer()->getColumns());
             try
             {
-                Reference< ::com::sun::star::beans::XPropertySet >  xColumn;
-                ::cppu::extractInterface(xColumn, xColumns->getByIndex(nPos));
+                Reference< ::com::sun::star::beans::XPropertySet >  xColumn(xColumns->getByIndex(nPos),UNO_QUERY);
                 ::rtl::OUString aHelpText;
                 xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText;
+                if ( !aHelpText.getLength() )
+                    xColumn->getPropertyValue(FM_PROP_DESCRIPTION) >>= aHelpText;
                 if ( aHelpText.getLength() )
                 {
                     if ( rHEvt.GetMode() & HELPMODE_BALLOON )
@@ -2002,7 +2003,11 @@ namespace
             {
                 Reference<XPropertySet> xProp(GetPeer()->getColumns(),UNO_QUERY);
                 if ( xProp.is() )
+                {
                     xProp->getPropertyValue(FM_PROP_HELPTEXT) >>= sRetText;
+                    if ( !sRetText.getLength() )
+                        xProp->getPropertyValue(FM_PROP_DESCRIPTION) >>= sRetText;
+                }
             }
             break;
         case ::svt::BBTYPE_COLUMNHEADERCELL:
@@ -2011,6 +2016,13 @@ namespace
                 GetModelColumnPos(
                     sal::static_int_cast< sal_uInt16 >(_nPosition)),
                 FM_PROP_HELPTEXT);
+            if ( !sRetText.getLength() )
+                sRetText = getColumnPropertyFromPeer(
+                            GetPeer(),
+                            GetModelColumnPos(
+                                sal::static_int_cast< sal_uInt16 >(_nPosition)),
+                            FM_PROP_DESCRIPTION);
+
             break;
         default:
             sRetText = DbGridControl::GetAccessibleObjectDescription(_eObjType,_nPosition);
-- 
cgit