diff options
Diffstat (limited to 'forms/source/richtext/richtextmodel.cxx')
| -rw-r--r-- | forms/source/richtext/richtextmodel.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 1f5037b62d71..02e1585a1852 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -35,7 +35,7 @@ #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <editeng/editstat.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> @@ -46,7 +46,6 @@ namespace frm using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::io; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::form; using namespace ::com::sun::star::util; @@ -64,7 +63,9 @@ namespace frm m_nClassId = FormComponentType::TEXTFIELD; getPropertyDefaultByHandle( PROPERTY_ID_DEFAULTCONTROL ) >>= m_sDefaultControl; - getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder; + // Default to 'flat' instead of '3D Look' for form controls, but don't change + // getPropertyDefaultByHandle, see tdf#152974 + m_nBorder = 2; getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled; getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible; getPropertyDefaultByHandle( PROPERTY_ID_HARDLINEBREAKS ) >>= m_bHardLineBreaks; @@ -450,7 +451,9 @@ namespace frm } } - + // note tdf#152974, we can't simply change a default here because properties + // that match the default are not exported, so for compatibility these + // can't be changed without some sort of solution for that Any ORichTextModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const { Any aDefault; @@ -496,7 +499,7 @@ namespace frm break; case PROPERTY_ID_DEFAULTCONTROL: - aDefault <<= OUString(FRM_SUN_CONTROL_RICHTEXTCONTROL); + aDefault <<= FRM_SUN_CONTROL_RICHTEXTCONTROL; break; case PROPERTY_ID_HELPTEXT: @@ -559,7 +562,7 @@ namespace frm } - Sequence<sal_Int8> ORichTextModel::getUnoTunnelId() + const Sequence<sal_Int8> & ORichTextModel::getUnoTunnelId() { static const comphelper::UnoIdInit aId; return aId.getSeq(); |