#86096# added functionallity to allow to use this dialog as UNO service

2 files changed, 619 insertions, 9 deletions

diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 764db8b97385..8a3afb4617d2 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fontdialog.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2001-06-06 08:16:00 $
+ *  last change: $Author: fs $ $Date: 2001-06-11 11:29:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,10 +62,6 @@
 #ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
 #endif
-#define ITEMID_FONTLIST         SID_ATTR_CHAR_FONTLIST
-#ifndef _SVX_FLSTITEM_HXX
-#include <svx/flstitem.hxx>
-#endif
 
 #ifndef _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_
 #include "fontdialog.hxx"
@@ -82,12 +78,224 @@
 #ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_
 #include "formlocalid.hrc"
 #endif
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#include <toolkit/unohlp.hxx>
+#endif
+#ifndef _COMPHELPER_TYPES_HXX_
+#include <comphelper/types.hxx>
+#endif
+#ifndef _COMPHELPER_EXTRACT_HXX_
+#include <comphelper/extract.hxx>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_
+#include <com/sun/star/awt/FontDescriptor.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTWEIGHT_HPP_
+#include <com/sun/star/awt/FontWeight.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTSLANT_HPP_
+#include <com/sun/star/awt/FontSlant.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTUNDERLINE_HPP_
+#include <com/sun/star/awt/FontUnderline.hpp>
+#endif
+#ifndef _COM_SUN_STAR_AWT_FONTSTRIKEOUT_HPP_
+#include <com/sun/star/awt/FontStrikeout.hpp>
+#endif
+#ifndef _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_
+#include "formstrings.hxx"
+#endif
+
+#ifndef _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
+#include "fontitemids.hxx"
+#endif
+#define ITEMID_FONT             CFID_FONT
+#define ITEMID_FONTHEIGHT       CFID_HEIGHT
+#define ITEMID_WEIGHT           CFID_WEIGHT
+#define ITEMID_POSTURE          CFID_POSTURE
+#define ITEMID_LANGUAGE         CFID_LANGUAGE
+#define ITEMID_UNDERLINE        CFID_UNDERLINE
+#define ITEMID_CROSSEDOUT       CFID_STRIKEOUT
+#define ITEMID_WORDLINEMODE     CFID_WORDLINEMODE
+#define ITEMID_COLOR            CFID_CHARCOLOR
+#define ITEMID_CHARRELIEF       CFID_RELIEF
+#define ITEMID_EMPHASISMARK     CFID_EMPHASIS
+#define ITEMID_CASEMAP          CFID_CASEMAP
+#define ITEMID_CONTOUR          CFID_CONTOUR
+#define ITEMID_SHADOWED         CFID_SHADOWED
+#define ITEMID_FONTLIST         CFID_FONTLIST
+
+#ifndef _SVX_CHARRELIEFITEM_HXX
+#include <svx/charreliefitem.hxx>
+#endif
+#ifndef _SVX_EMPHITEM_HXX
+#include <svx/emphitem.hxx>
+#endif
+#ifndef _SVX_FONTITEM_HXX
+#include <svx/fontitem.hxx>
+#endif
+#ifndef _SVX_FHGTITEM_HXX
+#include <svx/fhgtitem.hxx>
+#endif
+#ifndef _SVX_POSTITEM_HXX
+#include <svx/postitem.hxx>
+#endif
+#ifndef _SVX_WGHTITEM_HXX
+#include <svx/wghtitem.hxx>
+#endif
+#ifndef _SVX_UDLNITEM_HXX
+#include <svx/udlnitem.hxx>
+#endif
+#ifndef _SVX_CRSDITEM_HXX
+#include <svx/crsditem.hxx>
+#endif
+#ifndef _SVX_COLRITEM_HXX
+#include <svx/colritem.hxx>
+#endif
+#ifndef _SVX_FLSTITEM_HXX
+#include <svx/flstitem.hxx>
+#endif
+#ifndef _SVX_LANGITEM_HXX
+#include <svx/langitem.hxx>
+#endif
+#ifndef _SVX_WRLMITEM_HXX
+#include <svx/wrlmitem.hxx>
+#endif
+#ifndef _SVX_CMAPITEM_HXX
+#include <svx/cmapitem.hxx>
+#endif
+#ifndef _SVX_ITEM_HXX
+#include <svx/cntritem.hxx>
+#endif
+#ifndef _SVX_SHDDITEM_HXX
+#include <svx/shdditem.hxx>
+#endif
+#ifndef _SVX_FLSTITEM_HXX
+#include <svx/flstitem.hxx>
+#endif
+#ifndef _SV_SYSTEM_HXX
+#include <vcl/system.hxx>
+#endif
+#ifndef _CTRLTOOL_HXX
+#include <svtools/ctrltool.hxx>
+#endif
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_
+#include <com/sun/star/beans/XPropertyState.hpp>
+#endif
 
 //............................................................................
 namespace pcr
 {
 //............................................................................
 
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::beans;
+
+    //========================================================================
+    //= OFontPropertyExtractor
+    //========================================================================
+    class OFontPropertyExtractor
+    {
+    protected:
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+                    m_xPropValueAccess;
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >
+                    m_xPropStateAccess;
+
+    public:
+        OFontPropertyExtractor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >&
+            _rxProps );
+
+    public:
+        sal_Bool        getCheckFontProperty(const ::rtl::OUString& _rPropName, ::com::sun::star::uno::Any& _rValue);
+        ::rtl::OUString getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault);
+        sal_Int16       getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault);
+        sal_Int32       getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault);
+        float           getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault);
+
+        void            invalidateItem(
+                            const ::rtl::OUString& _rPropName,
+                            sal_uInt16 _nItemId,
+                            SfxItemSet& _rSet,
+                            sal_Bool _bForceInvalidation = sal_False);
+    };
+
+    //------------------------------------------------------------------------
+    OFontPropertyExtractor::OFontPropertyExtractor(const Reference< XPropertySet >& _rxProps)
+        :m_xPropValueAccess(_rxProps)
+        ,m_xPropStateAccess(_rxProps, UNO_QUERY)
+    {
+        OSL_ENSURE(m_xPropValueAccess.is(), "OFontPropertyExtractor::OFontPropertyExtractor: invalid property set!");
+    }
+
+    //------------------------------------------------------------------------
+    sal_Bool OFontPropertyExtractor::getCheckFontProperty(const ::rtl::OUString& _rPropName, Any& _rValue)
+    {
+        _rValue = m_xPropValueAccess->getPropertyValue(_rPropName);
+        if (m_xPropStateAccess.is())
+            return PropertyState_DEFAULT_VALUE == m_xPropStateAccess->getPropertyState(_rPropName);
+
+        return sal_False;
+    }
+
+    //------------------------------------------------------------------------
+    ::rtl::OUString OFontPropertyExtractor::getStringFontProperty(const ::rtl::OUString& _rPropName, const ::rtl::OUString& _rDefault)
+    {
+        Any aValue;
+        if (getCheckFontProperty(_rPropName, aValue))
+            return _rDefault;
+
+        return ::comphelper::getString(aValue);
+    }
+
+    //------------------------------------------------------------------------
+    sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const ::rtl::OUString& _rPropName, const sal_Int16 _nDefault)
+    {
+        Any aValue;
+        if (getCheckFontProperty(_rPropName, aValue))
+            return _nDefault;
+
+        sal_Int32 nValue(_nDefault);
+        ::cppu::enum2int(nValue, aValue);
+        return (sal_Int16)nValue;
+    }
+
+    //------------------------------------------------------------------------
+    sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const ::rtl::OUString& _rPropName, const sal_Int32 _nDefault)
+    {
+        Any aValue;
+        if (getCheckFontProperty(_rPropName, aValue))
+            return _nDefault;
+
+        sal_Int32 nValue(_nDefault);
+        ::cppu::enum2int(nValue, aValue);
+        return nValue;
+    }
+
+    //------------------------------------------------------------------------
+    float OFontPropertyExtractor::getFloatFontProperty(const ::rtl::OUString& _rPropName, const float _nDefault)
+    {
+        Any aValue;
+        if (getCheckFontProperty(_rPropName, aValue))
+            return _nDefault;
+
+        return ::comphelper::getFloat(aValue);
+    }
+
+    //------------------------------------------------------------------------
+    void OFontPropertyExtractor::invalidateItem(const ::rtl::OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation)
+    {
+        if  (   _bForceInvalidation
+            ||  (   m_xPropStateAccess.is()
+                && (PropertyState_AMBIGUOUS_VALUE == m_xPropStateAccess->getPropertyState(_rPropName))
+                )
+            )
+            _rSet.InvalidateItem(_nItemId);
+    }
+
     //========================================================================
     //= ControlCharacterDialog
     //========================================================================
@@ -107,13 +315,384 @@ namespace pcr
     }
 
     //------------------------------------------------------------------------
+    void ControlCharacterDialog::translatePropertiesToItems(const Reference< XPropertySet >& _rxModel, SfxItemSet* _pSet)
+    {
+        OSL_ENSURE(_pSet && _rxModel.is(), "ControlCharacterDialog::translatePropertiesToItems: invalid arguments!");
+        if (!_pSet || !_rxModel.is())
+            return;
+
+        try
+        {
+            OFontPropertyExtractor aPropExtractor(_rxModel);
+
+            // some items, which may be in default state, have to be filled with non-void information
+            Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
+            ::com::sun::star::awt::FontDescriptor aDefaultFont = VCLUnoHelper::CreateFontDescriptor(aDefaultVCLFont);
+
+            // get the current properties
+            ::rtl::OUString aFontName       = aPropExtractor.getStringFontProperty(PROPERTY_FONT_NAME, aDefaultFont.Name);
+            ::rtl::OUString aFontStyleName  = aPropExtractor.getStringFontProperty(PROPERTY_FONT_STYLENAME, aDefaultFont.StyleName);
+            sal_Int16   nFontFamily         = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_FAMILY, aDefaultFont.Family);
+            sal_Int16   nFontCharset        = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_CHARSET, aDefaultFont.CharSet);
+            float   nFontHeight             = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_HEIGHT, (float)aDefaultFont.Height);
+            float   nFontWeight             = aPropExtractor.getFloatFontProperty(PROPERTY_FONT_WEIGHT, aDefaultFont.Weight);
+            sal_Int16 nFontSlant            = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_SLANT, aDefaultFont.Slant);
+            sal_Int16 nFontUnderline        = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_UNDERLINE, aDefaultFont.Underline);
+            sal_Int16 nFontStrikeout        = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_STRIKEOUT, aDefaultFont.Strikeout);
+
+            sal_Int32 nTextLineColor        = aPropExtractor.getInt32FontProperty(PROPERTY_TEXTLINECOLOR, COL_AUTO);
+            sal_Int16 nFontRelief           = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_RELIEF, aDefaultVCLFont.GetRelief());
+            sal_Int16 nFontEmphasisMark     = aPropExtractor.getInt16FontProperty(PROPERTY_FONT_EMPHASIS_MARK, aDefaultVCLFont.GetEmphasisMark());
+
+            Any aValue;
+            sal_Bool bWordLineMode          = aPropExtractor.getCheckFontProperty(PROPERTY_WORDLINEMODE, aValue) ? aDefaultFont.WordLineMode : ::cppu::any2bool(aValue);
+            sal_Int32 nColor32              = aPropExtractor.getInt32FontProperty(PROPERTY_TEXTCOLOR, 0);
+
+            // build SfxItems with the values
+            SvxFontItem aFontItem((FontFamily)nFontFamily, aFontName, aFontStyleName, PITCH_DONTKNOW, nFontCharset, CFID_FONT);
+
+            nFontHeight = (float)OutputDevice::LogicToLogic(Size(0, (sal_Int32)nFontHeight), MAP_POINT, MAP_TWIP).Height();
+            SvxFontHeightItem aSvxFontHeightItem((sal_uInt32)nFontHeight,100,CFID_HEIGHT);
+
+            FontWeight      eWeight=VCLUnoHelper::ConvertFontWeight(nFontWeight);
+            FontItalic      eItalic=(FontItalic)nFontSlant;
+            FontUnderline   eUnderline=(FontUnderline)nFontUnderline;
+            FontStrikeout   eStrikeout=(FontStrikeout)nFontStrikeout;
+
+            SvxWeightItem       aWeightItem(eWeight,CFID_WEIGHT);
+            SvxPostureItem      aPostureItem(eItalic,CFID_POSTURE);
+
+            SvxCrossedOutItem   aCrossedOutItem(eStrikeout,CFID_STRIKEOUT);
+            SvxWordLineModeItem aWordLineModeItem(bWordLineMode, CFID_WORDLINEMODE);
+
+            SvxUnderlineItem    aUnderlineItem(eUnderline,CFID_UNDERLINE);
+            aUnderlineItem.SetColor(Color(nTextLineColor));
+
+            SvxColorItem aSvxColorItem(nColor32,CFID_CHARCOLOR);
+            SvxLanguageItem aLanguageItem(Application::GetAppInternational().GetLanguage(), CFID_LANGUAGE);
+
+            // the 2 CJK props
+            SvxCharReliefItem aFontReliefItem((FontRelief)nFontRelief);
+            SvxEmphasisMarkItem aEmphasisMarkitem((FontEmphasisMark)nFontEmphasisMark);
+
+            _pSet->Put(aFontItem, CFID_FONT);
+            _pSet->Put(aSvxFontHeightItem,CFID_HEIGHT);
+            _pSet->Put(aWeightItem, CFID_WEIGHT);
+            _pSet->Put(aPostureItem, CFID_POSTURE);
+            _pSet->Put(aLanguageItem, CFID_LANGUAGE);
+            _pSet->Put(aUnderlineItem,CFID_UNDERLINE);
+            _pSet->Put(aCrossedOutItem,CFID_STRIKEOUT);
+            _pSet->Put(aWordLineModeItem, CFID_WORDLINEMODE);
+            _pSet->Put(aSvxColorItem, CFID_CHARCOLOR);
+            _pSet->Put(aFontReliefItem, CFID_RELIEF);
+            _pSet->Put(aEmphasisMarkitem, CFID_EMPHASIS);
+
+            aPropExtractor.invalidateItem(PROPERTY_FONT_NAME, CFID_FONT, *_pSet);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_HEIGHT, CFID_HEIGHT, *_pSet);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_WEIGHT, CFID_WEIGHT, *_pSet, ::com::sun::star::awt::FontWeight::DONTKNOW == nFontWeight);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_SLANT, CFID_POSTURE, *_pSet, ::com::sun::star::awt::FontSlant_DONTKNOW == nFontSlant);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_UNDERLINE, CFID_UNDERLINE, *_pSet, ::com::sun::star::awt::FontUnderline::DONTKNOW == nFontUnderline);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_STRIKEOUT, CFID_STRIKEOUT, *_pSet, ::com::sun::star::awt::FontStrikeout::DONTKNOW == nFontStrikeout);
+            aPropExtractor.invalidateItem(PROPERTY_WORDLINEMODE, CFID_WORDLINEMODE, *_pSet);
+            aPropExtractor.invalidateItem(PROPERTY_TEXTCOLOR, CFID_CHARCOLOR, *_pSet);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_RELIEF, CFID_RELIEF, *_pSet);
+            aPropExtractor.invalidateItem(PROPERTY_FONT_EMPHASIS_MARK, CFID_EMPHASIS, *_pSet);
+        }
+        catch (Exception&)
+        {
+            DBG_ERROR("ControlCharacterDialog::translatePropertiesToItems: caught an exception!")
+        }
+
+        _pSet->DisableItem(SID_ATTR_CHAR_CJK_FONT);
+        _pSet->DisableItem(SID_ATTR_CHAR_CJK_FONTHEIGHT);
+        _pSet->DisableItem(SID_ATTR_CHAR_CJK_LANGUAGE);
+        _pSet->DisableItem(SID_ATTR_CHAR_CJK_POSTURE);
+        _pSet->DisableItem(SID_ATTR_CHAR_CJK_WEIGHT);
+
+        _pSet->DisableItem(SID_ATTR_CHAR_CASEMAP);
+        _pSet->DisableItem(SID_ATTR_CHAR_CONTOUR);
+        _pSet->DisableItem(SID_ATTR_CHAR_SHADOWED);
+
+    }
+
+    //------------------------------------------------------------------------
+    String ControlCharacterDialog::translatePropertiesToItems(const SfxItemSet* _pSet, const Reference< XPropertySet >& _rxModel)
+    {
+        String sNewFontName;
+
+        OSL_ENSURE(_pSet && _rxModel.is(), "ControlCharacterDialog::translatePropertiesToItems: invalid arguments!");
+        if (!_pSet || !_rxModel.is())
+            return sNewFontName;
+
+        try
+        {
+            // --------------------------
+            // font name
+            SfxItemState eState = _pSet->GetItemState(CFID_FONT);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxFontItem& rFontItem =
+                    static_cast<const SvxFontItem&>(_pSet->Get(CFID_FONT));
+
+                sNewFontName = rFontItem.GetFamilyName();
+
+                _rxModel->setPropertyValue( PROPERTY_FONT_NAME     , makeAny(::rtl::OUString(rFontItem.GetFamilyName())));
+                _rxModel->setPropertyValue( PROPERTY_FONT_STYLENAME, makeAny(::rtl::OUString(rFontItem.GetStyleName())));
+                _rxModel->setPropertyValue( PROPERTY_FONT_FAMILY   , makeAny((sal_Int16)rFontItem.GetFamily()));
+                _rxModel->setPropertyValue( PROPERTY_FONT_CHARSET  , makeAny((sal_Int16)rFontItem.GetCharSet()));
+            }
+
+            // --------------------------
+            // font height
+            eState = _pSet->GetItemState(CFID_HEIGHT);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxFontHeightItem& rSvxFontHeightItem =
+                    static_cast<const SvxFontHeightItem&>(_pSet->Get(CFID_HEIGHT));
+
+                float nHeight = (float)OutputDevice::LogicToLogic(Size(0, rSvxFontHeightItem.GetHeight()), MAP_TWIP, MAP_POINT).Height();
+                _rxModel->setPropertyValue( PROPERTY_FONT_HEIGHT,makeAny(nHeight));
+
+            }
+
+            // --------------------------
+            // font weight
+            eState = _pSet->GetItemState(CFID_WEIGHT);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxWeightItem& rWeightItem =
+                    static_cast<const SvxWeightItem&>(_pSet->Get(CFID_WEIGHT));
+
+                float nWeight = VCLUnoHelper::ConvertFontWeight( rWeightItem.GetWeight());
+                _rxModel->setPropertyValue( PROPERTY_FONT_WEIGHT,makeAny(nWeight));
+            }
+
+            // --------------------------
+            // font slant
+            eState = _pSet->GetItemState(CFID_POSTURE);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxPostureItem& rPostureItem =
+                    static_cast<const SvxPostureItem&>(_pSet->Get(CFID_POSTURE));
+
+                ::com::sun::star::awt::FontSlant eSlant = (::com::sun::star::awt::FontSlant)rPostureItem.GetPosture();
+                _rxModel->setPropertyValue( PROPERTY_FONT_SLANT, makeAny((sal_Int16)eSlant));
+            }
+
+            // --------------------------
+            // font underline
+            eState = _pSet->GetItemState(CFID_UNDERLINE);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxUnderlineItem& rUnderlineItem =
+                    static_cast<const SvxUnderlineItem&>(_pSet->Get(CFID_UNDERLINE));
+
+                sal_Int16 nUnderline = rUnderlineItem.GetUnderline();
+                _rxModel->setPropertyValue( PROPERTY_FONT_UNDERLINE,makeAny(nUnderline));
+
+                // the text line color is transported in this item, too
+                sal_Int32 nColor = rUnderlineItem.GetColor().GetColor();
+
+                Any aUnoColor;
+                if (COL_AUTO != nColor)
+                    aUnoColor <<= (sal_Int32)nColor;
+
+                _rxModel->setPropertyValue(PROPERTY_TEXTLINECOLOR, aUnoColor);
+            }
+
+            // --------------------------
+            // font strikeout
+            eState = _pSet->GetItemState(CFID_STRIKEOUT);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxCrossedOutItem& rCrossedOutItem =
+                    static_cast<const SvxCrossedOutItem&>(_pSet->Get(CFID_STRIKEOUT));
+
+                sal_Int16 nStrikeout = rCrossedOutItem.GetStrikeout();
+                _rxModel->setPropertyValue( PROPERTY_FONT_STRIKEOUT,makeAny(nStrikeout));
+            }
+
+
+            // --------------------------
+            // font wordline mode
+            eState = _pSet->GetItemState(CFID_WORDLINEMODE);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxWordLineModeItem& rWordLineModeItem =
+                    static_cast<const SvxWordLineModeItem&>(_pSet->Get(CFID_WORDLINEMODE));
+
+                _rxModel->setPropertyValue( PROPERTY_WORDLINEMODE, ::cppu::bool2any(rWordLineModeItem.GetValue()));
+            }
+
+
+            // --------------------------
+            // text color
+            eState = _pSet->GetItemState(CFID_CHARCOLOR);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxColorItem& rColorItem =
+                    static_cast<const SvxColorItem&>(_pSet->Get(CFID_CHARCOLOR));
+
+                sal_Int32 nColor = rColorItem.GetValue().GetColor();
+
+                Any aUnoColor;
+                if (COL_AUTO != nColor)
+                    aUnoColor <<= (sal_Int32)nColor;
+
+                _rxModel->setPropertyValue( PROPERTY_TEXTCOLOR, aUnoColor );
+            }
+
+            // --------------------------
+            // font relief
+            eState = _pSet->GetItemState(CFID_RELIEF);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxCharReliefItem& rReliefItem =
+                    static_cast<const SvxCharReliefItem&>(_pSet->Get(CFID_RELIEF));
+
+                _rxModel->setPropertyValue(PROPERTY_FONT_RELIEF, makeAny((sal_Int16)rReliefItem.GetValue()));
+            }
+
+            // --------------------------
+            // font emphasis mark
+            eState = _pSet->GetItemState(CFID_EMPHASIS);
+
+            if ( eState == SFX_ITEM_SET )
+            {
+                const SvxEmphasisMarkItem& rEmphMarkItem =
+                    static_cast<const SvxEmphasisMarkItem&>(_pSet->Get(CFID_EMPHASIS));
+
+                _rxModel->setPropertyValue(PROPERTY_FONT_EMPHASIS_MARK, makeAny((sal_Int16)rEmphMarkItem.GetEmphasisMark()));
+            }
+        }
+        catch (Exception&)
+        {
+            DBG_ERROR("ControlCharacterDialog::translatePropertiesToItems: caught an exception!")
+        }
+
+        return sNewFontName;
+    }
+
+    //------------------------------------------------------------------------
+    SfxItemSet* ControlCharacterDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
+    {
+        // just to be sure ....
+        _rpSet = NULL;
+        _rpPool = NULL;
+        _rppDefaults = NULL;
+
+        // create and initialize the defaults
+        _rppDefaults = new SfxPoolItem*[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1];
+
+        Font aDefaultVCLFont = Application::GetDefaultDevice()->GetSettings().GetStyleSettings().GetAppFont();
+
+        SfxPoolItem** pCounter = _rppDefaults;  // want to modify this without affecting the out param _rppDefaults
+        *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_FONT);
+        *pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_HEIGHT);
+        *pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_WEIGHT);
+        *pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_POSTURE);
+        *pCounter++ = new SvxLanguageItem(Application::GetAppInternational().GetLanguage(), CFID_LANGUAGE);
+        *pCounter++ = new SvxUnderlineItem(aDefaultVCLFont.GetUnderline(), CFID_UNDERLINE);
+        *pCounter++ = new SvxCrossedOutItem(aDefaultVCLFont.GetStrikeout(), CFID_STRIKEOUT);
+        *pCounter++ = new SvxWordLineModeItem(aDefaultVCLFont.IsWordLineMode(), CFID_WORDLINEMODE);
+        *pCounter++ = new SvxColorItem(aDefaultVCLFont.GetColor(), CFID_CHARCOLOR);
+        *pCounter++ = new SvxCharReliefItem(aDefaultVCLFont.GetRelief(), CFID_RELIEF);
+        *pCounter++ = new SvxEmphasisMarkItem(aDefaultVCLFont.GetEmphasisMark(), CFID_EMPHASIS);
+
+        *pCounter++ = new SvxFontItem(aDefaultVCLFont.GetFamily(), aDefaultVCLFont.GetStyleName(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetPitch(), aDefaultVCLFont.GetCharSet(), CFID_CJK_FONT);
+        *pCounter++ = new SvxFontHeightItem(aDefaultVCLFont.GetHeight(), 100, CFID_CJK_HEIGHT);
+        *pCounter++ = new SvxWeightItem(aDefaultVCLFont.GetWeight(), CFID_CJK_WEIGHT);
+        *pCounter++ = new SvxPostureItem(aDefaultVCLFont.GetItalic(), CFID_CJK_POSTURE);
+        *pCounter++ = new SvxLanguageItem(Application::GetAppInternational().GetLanguage(), CFID_CJK_LANGUAGE);
+
+        *pCounter++ = new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, CFID_CASEMAP);
+        *pCounter++ = new SvxContourItem(sal_False, CFID_CONTOUR);
+        *pCounter++ = new SvxShadowedItem(sal_False, CFID_SHADOWED);
+
+        *pCounter++ = new SvxFontListItem (new FontList(Application::GetDefaultDevice()), CFID_FONTLIST);
+
+        // create the pool
+        static SfxItemInfo __READONLY_DATA aItemInfos[CFID_LAST_ITEM_ID - CFID_FIRST_ITEM_ID + 1] =
+        {
+            { SID_ATTR_CHAR_FONT,               0 },
+            { SID_ATTR_CHAR_FONTHEIGHT,         0 },
+            { SID_ATTR_CHAR_WEIGHT,             0 },
+            { SID_ATTR_CHAR_POSTURE,            0 },
+            { SID_ATTR_CHAR_LANGUAGE,           0 },
+            { SID_ATTR_CHAR_UNDERLINE,          0 },
+            { SID_ATTR_CHAR_STRIKEOUT,          0 },
+            { SID_ATTR_CHAR_WORDLINEMODE,       0 },
+            { SID_ATTR_CHAR_COLOR,              0 },
+            { SID_ATTR_CHAR_RELIEF,             0 },
+            { SID_ATTR_CHAR_EMPHASISMARK,       0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { 0,                                0 },
+            { SID_ATTR_CHAR_FONTLIST,           0 }
+        };
+
+        _rpPool = new SfxItemPool(String::CreateFromAscii("PCRControlFontItemPool"), CFID_FIRST_ITEM_ID, CFID_LAST_ITEM_ID,
+            aItemInfos, _rppDefaults);
+        _rpPool->FreezeIdRanges();
+
+        // and, finally, the set
+        _rpSet = new SfxItemSet(*_rpPool, sal_True);
+
+        return _rpSet;
+    }
+
+    //-------------------------------------------------------------------------
+    void ControlCharacterDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
+    {
+        // from the pool, get and remember the font list (needs to be deleted)
+        const SvxFontListItem& rFontListItem = static_cast<const SvxFontListItem&>(_rpPool->GetDefaultItem(CFID_FONTLIST));
+        const FontList* pFontList = rFontListItem.GetFontList();
+
+        // _first_ delete the set (refering the pool)
+        if (_rpSet)
+        {
+            delete _rpSet;
+            _rpSet = NULL;
+        }
+
+        // delete the pool
+        if (_rpPool)
+        {
+            _rpPool->ReleaseDefaults(sal_True);
+                // the "true" means delete the items, too
+            delete _rpPool;
+            _rpPool = NULL;
+        }
+
+        // reset the defaults ptr
+        _rppDefaults = NULL;
+            // no need to explicitly delete the defaults, this has been done by the ReleaseDefaults
+
+        delete pFontList;
+    }
+
+    //------------------------------------------------------------------------
     void ControlCharacterDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage )
     {
         switch ( _nId )
         {
             case TABPAGE_CHARACTERS:
                 static_cast<SvxCharNamePage&>(_rPage).SetFontList(
-                    static_cast<const SvxFontListItem&>(GetInputSetImpl()->Get(SID_ATTR_CHAR_FONTLIST))
+                    static_cast<const SvxFontListItem&>(GetInputSetImpl()->Get(CFID_FONTLIST))
                 );
                 break;
         }
@@ -126,6 +705,9 @@ namespace pcr
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.2  2001/06/06 08:16:00  fs
+ *  #86096# don't disable underline color anymore
+ *
  *  Revision 1.1  2001/03/21 15:41:36  fs
  *  initial checkin - font dialog for form controls
  *
diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx
index 77f92f6e8e89..cccc0f36f279 100644
--- a/extensions/source/propctrlr/fontdialog.hxx
+++ b/extensions/source/propctrlr/fontdialog.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fontdialog.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-03-21 15:41:58 $
+ *  last change: $Author: fs $ $Date: 2001-06-11 11:29:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,13 @@
 #ifndef _SFXTABDLG_HXX
 #include <sfx2/tabdlg.hxx>
 #endif
+#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
+#include <com/sun/star/beans/XPropertySet.hpp>
+#endif
 
 class SvxFontListItem;
+class FontList;
+
 //............................................................................
 namespace pcr
 {
@@ -81,6 +86,26 @@ namespace pcr
         ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet);
         ~ControlCharacterDialog();
 
+        /// creates an item set to be used with this dialog
+        static SfxItemSet*  createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults);
+
+        /// destroys an item previously created with <method>createItemSet</method>
+        static void         destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults);
+
+        /// fills the given item set with values obtained from the given property set
+        static void         translatePropertiesToItems(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,
+            SfxItemSet* _pSet);
+
+        /** fills the given property set with values obtained from the given item set
+            @return
+                the name of the selected font (if changed by the user)
+        */
+        static String       translatePropertiesToItems(
+            const SfxItemSet* _pSet,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel);
+
+    protected:
         virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
     };
 //............................................................................
@@ -92,6 +117,9 @@ namespace pcr
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.1  2001/03/21 15:41:58  fs
+ *  initial checkin - font dialog for form controls
+ *
  *
  *  Revision 1.0 21.03.01 10:13:24  fs
  ************************************************************************/