summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/inc/extensio.hrc4
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx5
-rw-r--r--extensions/source/propctrlr/formmetadata.hxx6
-rw-r--r--extensions/source/propctrlr/formres.src24
-rw-r--r--extensions/source/propctrlr/formresid.hrc9
-rw-r--r--extensions/source/propctrlr/formstrings.hxx2
-rw-r--r--extensions/util/hidother.src2
-rw-r--r--forms/source/component/Columns.cxx1
-rw-r--r--forms/source/component/ComboBox.cxx2
-rw-r--r--forms/source/component/FormComponent.cxx17
-rw-r--r--forms/source/component/Grid.cxx15
-rw-r--r--forms/source/component/Grid.hxx33
-rw-r--r--forms/source/component/navigationbar.cxx4
-rw-r--r--forms/source/component/navigationbar.hxx1
-rw-r--r--forms/source/inc/frm_strings.hxx1
-rw-r--r--forms/source/inc/property.hrc2
-rw-r--r--forms/source/misc/property.cxx1
-rw-r--r--forms/source/richtext/richtextmodel.cxx4
-rw-r--r--forms/source/richtext/richtextmodel.hxx1
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java10
20 files changed, 100 insertions, 44 deletions
diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc
index c2b627d25ecf..6af1dc5b04fb 100644
--- a/extensions/inc/extensio.hrc
+++ b/extensions/inc/extensio.hrc
@@ -181,7 +181,7 @@
#define HID_PROP_LOCKED (HID_FORMS_START + 22)
#define HID_PROP_FORMATKEY (HID_FORMS_START + 23)
#define HID_PROP_REQUIRED (HID_FORMS_START + 24)
- // FREE
+#define HID_PROP_WHEEL_BEHAVIOR (HID_FORMS_START + 25)
// FREE
#define HID_PROP_UNIQUE (HID_FORMS_START + 27)
#define HID_PROP_CLASSID (HID_FORMS_START + 28)
@@ -249,7 +249,7 @@
#define HID_PROP_ECHO_CHAR (HID_FORMS_START + 91)
#define HID_PROP_EMPTY_IS_NULL (HID_FORMS_START + 92)
#define HID_PROP_DECIMAL_ACCURACY (HID_FORMS_START + 93)
- // FREE
+#define HID_PROP_ENABLE_VISIBLE (HID_FORMS_START + 94)
#define HID_PROP_DEFAULT_BUTTON (HID_FORMS_START + 95)
#define HID_PROP_HIDDEN_VALUE (HID_FORMS_START + 96)
#define HID_PROP_TRISTATE (HID_FORMS_START + 97)
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index ccfc3f746ef7..cdfefa314c55 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -149,11 +149,13 @@ namespace pcr
DEF_INFO_3( LITERALMASK, LITERALMASK, LITERALMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( STRICTFORMAT, STRICTFORMAT, STRICTFORMAT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( ENABLED, ENABLED, ENABLED, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
+ DEF_INFO_3( ENABLE_VISIBLE, ENABLE_VISIBLE, ENABLE_VISIBLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( READONLY, READONLY, READONLY, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( PRINTABLE, PRINTABLE, PRINTABLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( STEP, STEP, STEP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_3( TABSTOP, TABSTOP, TABSTOP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
DEF_INFO_2( TABINDEX, TABINDEX, TABINDEX, FORM_VISIBLE, DIALOG_VISIBLE ),
+ DEF_INFO_3( WHEEL_BEHAVIOR, WHEEL_BEHAVIOR, WHEEL_BEHAVIOR, FORM_VISIBLE, ENUM, COMPOSEABLE ),
DEF_INFO_2( BOUND_CELL, BOUND_CELL, BOUND_CELL, FORM_VISIBLE, DATA_PROPERTY ),
DEF_INFO_3( CELL_EXCHANGE_TYPE,CELL_EXCHANGE_TYPE, CELL_EXCHANGE_TYPE,FORM_VISIBLE, DATA_PROPERTY, ENUM ),
@@ -513,6 +515,9 @@ namespace pcr
case PROPERTY_ID_WRITING_MODE:
nStringItemsResId = RID_RSC_ENUM_WRITING_MODE;
break;
+ case PROPERTY_ID_WHEEL_BEHAVIOR:
+ nStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR;
+ break;
case PROPERTY_ID_TEXT_ANCHOR_TYPE:
nStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE;
break;
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index b49fae5cf3d8..accfa5cc051f 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -340,8 +340,10 @@ namespace pcr
#define PROPERTY_ID_SCALE_MODE 196
#define PROPERTY_ID_INPUT_REQUIRED 197
#define PROPERTY_ID_WRITING_MODE 198
- #define PROPERTY_ID_TEXT_ANCHOR_TYPE 199
- #define PROPERTY_ID_SHEET_ANCHOR_TYPE 200
+ #define PROPERTY_ID_ENABLE_VISIBLE 199
+ #define PROPERTY_ID_WHEEL_BEHAVIOR 200
+ #define PROPERTY_ID_TEXT_ANCHOR_TYPE 201
+ #define PROPERTY_ID_SHEET_ANCHOR_TYPE 202
//............................................................................
} // namespace pcr
diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src
index 224587b11729..930b30697da9 100644
--- a/extensions/source/propctrlr/formres.src
+++ b/extensions/source/propctrlr/formres.src
@@ -51,6 +51,10 @@ String RID_STR_ENABLED
{
Text [ en-US ] = "Enabled" ;
};
+String RID_STR_ENABLE_VISIBLE
+{
+ Text [ en-US ] = "Visible" ;
+};
String RID_STR_AUTOCOMPLETE
{
Text [ en-US ] = "AutoFill" ;
@@ -234,6 +238,10 @@ String RID_STR_TABINDEX
{
Text [ en-US ] = "Tab order" ;
};
+String RID_STR_WHEEL_BEHAVIOR
+{
+ Text [ en-US ] = "Mouse wheel scroll" ;
+};
String RID_STR_FILTER
{
Text [ en-US ] = "Filter" ;
@@ -1431,6 +1439,22 @@ Resource RID_RSC_ENUM_WRITING_MODE
};
};
+Resource RID_RSC_ENUM_WHEEL_BEHAVIOR
+{
+ String 1
+ {
+ Text [ en-US ] = "Never";
+ };
+ String 2
+ {
+ Text [ en-US ] = "When focused";
+ };
+ String 3
+ {
+ Text [ en-US ] = "Always";
+ };
+};
+
String RID_STR_ANCHOR_TYPE
{
Text [ en-US ] = "Anchor";
diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc
index ad10cfd379e2..d8aab240bced 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -150,8 +150,8 @@
#define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 )
#define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
#define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
- // FREE
- // FREE
+#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 )
+#define RID_STR_WHEEL_BEHAVIOR ( RID_FORMBROWSER_START + 123 )
// FREE
// FREE
// FREE
@@ -345,8 +345,9 @@
#define RID_RSC_ENUM_YESNO ( RID_PROPCONTROLLER_START + 27 )
#define RID_RSC_ENUM_SHOWHIDE ( RID_PROPCONTROLLER_START + 28 )
#define RID_RSC_ENUM_WRITING_MODE ( RID_PROPCONTROLLER_START + 29 )
-#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 30 )
-#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 )
+#define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 )
+#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 )
+#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 )
// -----------------------------------------------------------------------
// - ImageList - local ids
diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx
index cc6bc9db824b..c07b386584b5 100644
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@ -48,6 +48,7 @@ namespace pcr
PCR_CONSTASCII_STRING( PROPERTY_CONTROLLABEL, "LabelControl");
PCR_CONSTASCII_STRING( PROPERTY_LABEL, "Label");
PCR_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex");
+ PCR_CONSTASCII_STRING( PROPERTY_WHEEL_BEHAVIOR, "MouseWheelBehavior");
PCR_CONSTASCII_STRING( PROPERTY_TAG, "Tag");
PCR_CONSTASCII_STRING( PROPERTY_NAME, "Name");
PCR_CONSTASCII_STRING( PROPERTY_VALUE, "Value");
@@ -57,6 +58,7 @@ namespace pcr
PCR_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField");
PCR_CONSTASCII_STRING( PROPERTY_INPUT_REQUIRED, "InputRequired");
PCR_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled");
+ PCR_CONSTASCII_STRING( PROPERTY_ENABLE_VISIBLE, "EnableVisible" );
PCR_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly");
PCR_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly");
PCR_CONSTASCII_STRING( PROPERTY_FILTER, "Filter");
diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
index 5c14a2e8d08e..49b67060f8a3 100644
--- a/extensions/util/hidother.src
+++ b/extensions/util/hidother.src
@@ -308,4 +308,6 @@ hidspecial HID_CHECK_FOR_UPD_CANCEL { HelpId = HID_CHECK_FOR_UPD_CAN
hidspecial HID_PROP_NOLABEL { HelpId = HID_PROP_NOLABEL; }
hidspecial HID_PROP_INPUT_REQUIRED { HelpId = HID_PROP_INPUT_REQUIRED; }
hidspecial HID_PROP_WRITING_MODE { HelpId = HID_PROP_WRITING_MODE; }
+hidspecial HID_PROP_ENABLE_VISIBLE { HelpId = HID_PROP_ENABLE_VISIBLE; }
+hidspecial HID_PROP_WHEEL_BEHAVIOR { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
hidspecial HID_PROP_ANCHOR_TYPE { HelpId = HID_PROP_ANCHOR_TYPE; }
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index b9b2b6cb5936..c307783f179b 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -345,6 +345,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B
aForbiddenProperties.insert( PROPERTY_VERTICALALIGN );
aForbiddenProperties.insert( PROPERTY_IMAGE_URL );
aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION );
+ aForbiddenProperties.insert( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) );
if ( !bAllowDropDown )
aForbiddenProperties.insert( PROPERTY_DROPDOWN );
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 3491c2142449..1d6d204ea977 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -733,6 +733,8 @@ void OComboBoxModel::onDisconnectedDbColumn()
// reset the string item list
if ( !hasExternalListSource() )
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( m_aDesignModeStringItems ) );
+
+ m_aListRowSet.dispose();
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 6e700c28f6d8..ed3e85a905ec 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -239,22 +239,9 @@ Sequence<Type> OControl::_getTypes()
}
//------------------------------------------------------------------------------
-void OControl::initFormControlPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxPeer )
+void OControl::initFormControlPeer( const Reference< XWindowPeer >& /*_rxPeer*/ )
{
- try
- {
- Reference< XVclWindowPeer > xVclWindowPeer( _rxPeer, UNO_QUERY_THROW );
-
- // #i63103# - form controls should only react on the mouse wheel when they're focused
- xVclWindowPeer->setProperty(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WheelWithoutFocus" ) ),
- makeAny( sal_Bool( sal_False ) )
- );
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
+ // nothing to do here
}
// OComponentHelper
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 9ca5a1b02ef3..ef0abf146632 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -104,6 +104,7 @@ OGridControlModel::OGridControlModel(const Reference<XMultiServiceFactory>& _rxF
,m_nBorder(1)
,m_nWritingMode( WritingMode2::CONTEXT )
,m_nContextWritingMode( WritingMode2::CONTEXT )
+ ,m_bEnableVisible(sal_True)
,m_bEnable(sal_True)
,m_bNavigation(sal_True)
,m_bRecordMarker(sal_True)
@@ -130,6 +131,7 @@ OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const
m_aDefaultControl = _pOriginal->m_aDefaultControl;
m_bEnable = _pOriginal->m_bEnable;
+ m_bEnableVisible = _pOriginal->m_bEnableVisible;
m_bNavigation = _pOriginal->m_bNavigation;
m_nBorder = _pOriginal->m_nBorder;
m_nWritingMode = _pOriginal->m_nWritingMode;
@@ -457,7 +459,7 @@ void OGridControlModel::_reset()
//------------------------------------------------------------------------------
void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
- BEGIN_DESCRIBE_BASE_PROPERTIES( 36 )
+ BEGIN_DESCRIBE_BASE_PROPERTIES( 37 )
DECL_PROP1(NAME, ::rtl::OUString, BOUND);
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
DECL_PROP1(TAG, ::rtl::OUString, BOUND);
@@ -465,6 +467,7 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps )
DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID);
DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT);
DECL_PROP1(ENABLED, sal_Bool, BOUND);
+ DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT);
DECL_PROP1(BORDER, sal_Int16, BOUND);
DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID);
DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND);
@@ -538,6 +541,9 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co
case PROPERTY_ID_ENABLED:
setBOOL(rValue, m_bEnable);
break;
+ case PROPERTY_ID_ENABLEVISIBLE:
+ setBOOL(rValue, m_bEnableVisible);
+ break;
case PROPERTY_ID_BORDER:
rValue <<= (sal_Int16)m_nBorder;
break;
@@ -616,6 +622,9 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any&
case PROPERTY_ID_ENABLED:
bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnable);
break;
+ case PROPERTY_ID_ENABLEVISIBLE:
+ bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnableVisible);
+ break;
case PROPERTY_ID_BORDER:
bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_nBorder);
break;
@@ -687,6 +696,9 @@ void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
case PROPERTY_ID_ENABLED:
m_bEnable = getBOOL(rValue);
break;
+ case PROPERTY_ID_ENABLEVISIBLE:
+ m_bEnableVisible = getBOOL(rValue);
+ break;
case PROPERTY_ID_RECORDMARKER:
m_bRecordMarker = getBOOL(rValue);
break;
@@ -744,6 +756,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
case PROPERTY_ID_RECORDMARKER:
case PROPERTY_ID_DISPLAYSYNCHRON:
case PROPERTY_ID_ENABLED:
+ case PROPERTY_ID_ENABLEVISIBLE:
aReturn = makeBoolAny(sal_True);
break;
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 56981f54349b..f5bb60489e45 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -28,22 +28,22 @@
*
************************************************************************/
-#include "errorbroadcaster.hxx"
-#include "FormComponent.hxx"
-#include "formcontrolfont.hxx"
-#include "InterfaceContainer.hxx"
-
-/** === begin UNO includes === **/
-#include <com/sun/star/form/XGridColumnFactory.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
-#include <com/sun/star/sdb/XRowSetSupplier.hpp>
-#include <com/sun/star/sdb/XRowSetChangeBroadcaster.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
-/** === end UNO includes === **/
-
-#include <comphelper/proparrhlp.hxx>
-#include <cppuhelper/implbase7.hxx>
-#include <tools/link.hxx>
+#include "errorbroadcaster.hxx"
+#include "FormComponent.hxx"
+#include "formcontrolfont.hxx"
+#include "InterfaceContainer.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/form/XGridColumnFactory.hpp>
+#include <com/sun/star/form/XLoadable.hpp>
+#include <com/sun/star/sdb/XRowSetSupplier.hpp>
+#include <com/sun/star/sdb/XRowSetChangeBroadcaster.hpp>
+#include <com/sun/star/view/XSelectionSupplier.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/proparrhlp.hxx>
+#include <cppuhelper/implbase7.hxx>
+#include <tools/link.hxx>
//.........................................................................
namespace frm
@@ -101,6 +101,7 @@ class OGridControlModel :public OControlModel
sal_Int16 m_nBorder;
sal_Int16 m_nWritingMode;
sal_Int16 m_nContextWritingMode;
+ sal_Bool m_bEnableVisible : 1;
sal_Bool m_bEnable : 1;
sal_Bool m_bNavigation : 1;
sal_Bool m_bRecordMarker : 1;
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 236f64f762a8..abe5b5c45488 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -84,6 +84,7 @@ namespace frm
getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder;
getPropertyDefaultByHandle( PROPERTY_ID_DELAY ) >>= m_nDelay;
getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled;
+ getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible;
getPropertyDefaultByHandle( PROPERTY_ID_SHOW_POSITION ) >>= m_bShowPosition;
getPropertyDefaultByHandle( PROPERTY_ID_SHOW_NAVIGATION ) >>= m_bShowNavigation;
getPropertyDefaultByHandle( PROPERTY_ID_SHOW_RECORDACTIONS ) >>= m_bShowActions;
@@ -107,6 +108,7 @@ namespace frm
m_sHelpText = _pOriginal->m_sHelpText;
m_sHelpURL = _pOriginal->m_sHelpURL;
m_bEnabled = _pOriginal->m_bEnabled;
+ m_bEnableVisible = _pOriginal->m_bEnableVisible;
m_nIconSize = _pOriginal->m_nIconSize;
m_nBorder = _pOriginal->m_nBorder;
m_nDelay = _pOriginal->m_nDelay;
@@ -125,6 +127,7 @@ namespace frm
REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
+ REGISTER_PROP_2( ENABLEVISIBLE, m_bEnableVisible, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( ICONSIZE, m_nIconSize, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( BORDER, m_nBorder, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( DELAY, m_nDelay, BOUND, MAYBEDEFAULT );
@@ -444,6 +447,7 @@ namespace frm
break;
case PROPERTY_ID_ENABLED:
+ case PROPERTY_ID_ENABLEVISIBLE:
case PROPERTY_ID_SHOW_POSITION:
case PROPERTY_ID_SHOW_NAVIGATION:
case PROPERTY_ID_SHOW_RECORDACTIONS:
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index a1f525e61980..1dd94eff2bbc 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -70,6 +70,7 @@ namespace frm
sal_Int16 m_nBorder;
sal_Int32 m_nDelay;
sal_Bool m_bEnabled;
+ sal_Bool m_bEnableVisible;
sal_Bool m_bShowPosition;
sal_Bool m_bShowNavigation;
sal_Bool m_bShowActions;
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 1eaee92f8421..bf2d5d4d7446 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -113,6 +113,7 @@ namespace frm
FORMS_CONSTASCII_STRING( PROPERTY_CYCLE, "Cycle" );
FORMS_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField" );
FORMS_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
+ FORMS_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
FORMS_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly" );
FORMS_CONSTASCII_STRING( PROPERTY_RELEVANT, "Relevant" );
FORMS_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly" );
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index 0a3e3739d31a..df94d1575a5a 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -206,7 +206,7 @@ namespace frm
#define PROPERTY_ID_FILTERPROPOSAL (PROPERTY_ID_START +162) // BOOL
#define PROPERTY_ID_FIELDSOURCE (PROPERTY_ID_START +163) // String
#define PROPERTY_ID_TABLENAME (PROPERTY_ID_START +164) // String
- // FREE
+#define PROPERTY_ID_ENABLEVISIBLE (PROPERTY_ID_START +165) // BOOL
// FREE
// FREE
// FREE
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 564cd822f145..12cc73e10264 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -106,6 +106,7 @@ void PropertyInfoService::initialize()
ADD_PROP_ASSIGNMENT(CYCLE);
ADD_PROP_ASSIGNMENT(CONTROLSOURCE);
ADD_PROP_ASSIGNMENT(ENABLED);
+ ADD_PROP_ASSIGNMENT(ENABLEVISIBLE);
ADD_PROP_ASSIGNMENT(SPIN);
ADD_PROP_ASSIGNMENT(READONLY);
ADD_PROP_ASSIGNMENT(FILTER);
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index ca2bf688a92d..d38b350ada32 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -88,6 +88,7 @@ namespace frm
getPropertyDefaultByHandle( PROPERTY_ID_DEFAULTCONTROL ) >>= m_sDefaultControl;
getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder;
getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled;
+ getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible;
getPropertyDefaultByHandle( PROPERTY_ID_HARDLINEBREAKS ) >>= m_bHardLineBreaks;
getPropertyDefaultByHandle( PROPERTY_ID_HSCROLL ) >>= m_bHScroll;
getPropertyDefaultByHandle( PROPERTY_ID_VSCROLL ) >>= m_bVScroll;
@@ -124,6 +125,7 @@ namespace frm
m_sHelpURL = _pOriginal->m_sHelpURL;
m_nBorder = _pOriginal->m_nBorder;
m_bEnabled = _pOriginal->m_bEnabled;
+ m_bEnableVisible = _pOriginal->m_bEnableVisible;
m_bHardLineBreaks = _pOriginal->m_bHardLineBreaks;
m_bHScroll = _pOriginal->m_bHScroll;
m_bVScroll = _pOriginal->m_bVScroll;
@@ -188,6 +190,7 @@ namespace frm
REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
+ REGISTER_PROP_2( ENABLEVISIBLE, m_bEnableVisible, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( BORDER, m_nBorder, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( HARDLINEBREAKS, m_bHardLineBreaks, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( HSCROLL, m_bHScroll, BOUND, MAYBEDEFAULT );
@@ -456,6 +459,7 @@ namespace frm
break;
case PROPERTY_ID_ENABLED:
+ case PROPERTY_ID_ENABLEVISIBLE:
case PROPERTY_ID_PRINTABLE:
case PROPERTY_ID_HIDEINACTIVESELECTION:
aDefault <<= (sal_Bool)sal_True;
diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx
index b124f76c4237..5e905e2873ad 100644
--- a/forms/source/richtext/richtextmodel.hxx
+++ b/forms/source/richtext/richtextmodel.hxx
@@ -83,6 +83,7 @@ namespace frm
sal_Int16 m_nContextWritingMode;
sal_Int16 m_nBorder;
sal_Bool m_bEnabled;
+ sal_Bool m_bEnableVisible;
sal_Bool m_bHardLineBreaks;
sal_Bool m_bHScroll;
sal_Bool m_bVScroll;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 6dbc246ca84c..3191c62d639f 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -341,7 +341,8 @@ public class FilterComponent
case DataType.BIGINT:
case DataType.INTEGER:
case DataType.SMALLINT:
- aValue = String.valueOf(((Double) aValue).intValue());
+ if ( AnyConverter.isDouble(aValue) )
+ aValue = String.valueOf(((Double) aValue).intValue());
break;
case DataType.BIT:
case DataType.BOOLEAN:
@@ -351,7 +352,8 @@ public class FilterComponent
//curValue = new Boolean(dblvalue == 1.0); // wrong! we need a string, not a boolean value
// converts the '1.0'/'0.0' (EffectiveValue) to a 'boolean' String like 'true'/'false'
- aValue = String.valueOf(((Double) aValue).intValue() == 1);
+ if ( AnyConverter.isDouble(aValue) )
+ aValue = String.valueOf(((Double) aValue).intValue() == 1);
break;
default:
aValue = String.valueOf(aValue);
@@ -413,7 +415,9 @@ public class FilterComponent
String sreturn = JavaTools.replaceSubString(_BaseString, FieldName, "<FIELDNAME>");
String soperator = sLogicOperators[_filtercondition.Handle - 1];
sreturn = JavaTools.replaceSubString(sreturn, soperator, "<LOGICOPERATOR>");
- String sDisplayValue = AnyConverter.toString(_filtercondition.Value);
+ String sDisplayValue = "";
+ if ( !AnyConverter.isVoid(_filtercondition.Value) )
+ sDisplayValue = AnyConverter.toString(_filtercondition.Value);
sreturn = JavaTools.replaceSubString(sreturn, sDisplayValue, "<VALUE>");
return sreturn;
}
generated by cgit (git 2.34.1) at 2024-08-16 05:26:16 +0000