[ooo-build-commit] patches/dev300
Noel Power
noelp at kemper.freedesktop.org
Wed Jun 3 11:09:27 PDT 2009
patches/dev300/apply | 2
patches/dev300/form-control-visibility.diff | 349 +++++++++++++++++++--
patches/dev300/forms-radio-button-group-names.diff | 6
patches/dev300/xl-import-formradiobutton.diff | 4
4 files changed, 325 insertions(+), 36 deletions(-)
New commits:
commit 1b602030e4b7501c87cc2412ef975c29bf9ceab7
Author: Noel Power <noel.power at novell.com>
Date: Wed Jun 3 19:07:47 2009 +0100
revert visibility patches, align form-control-visibility.diff with upstream
* patches/dev300/apply:
* patches/dev300/form-control-visibility.diff: sync with latest upstreamed
version ( also fixes problem with the wizards )
* patches/dev300/forms-radio-button-group-names.diff:
* patches/dev300/xl-import-formradiobutton.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 447de37..0934aa9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -485,7 +485,6 @@ localize-pl-cygwin-paths.diff, tml
# import/export form control's visibility
form-control-visibility.diff, i#88878, noelpwer
-control-visibility-in-designmode.diff, i#88878, noelpwer
# import tooltip for userforms
import-controls-tooltip.diff, i#90124, noelpwer
@@ -1775,7 +1774,6 @@ vba-fix-Range-Insert-CopyOrigin.diff, n#498325
calc-vba-volatile-user-func.diff
vba-documentcontext.diff
fix-read-disabled-toolbarimport.diff
-userform-filter-dialog-vba.diff
# more api related changes + dummy model support for multi-page
# would be nice to be able to move it nearer the other word patch
# but it won't apply there
diff --git a/patches/dev300/form-control-visibility.diff b/patches/dev300/form-control-visibility.diff
index 16e3490..cffdf47 100644
--- a/patches/dev300/form-control-visibility.diff
+++ b/patches/dev300/form-control-visibility.diff
@@ -53,10 +53,37 @@ Index: xmloff/source/forms/formattributes.cxx
case CCA_CURRENT_SELECTED: return "current-selected";
case CCA_CURRENT_VALUE: return "current-value";
case CCA_DISABLED: return "disabled";
-+ case CCA_ENABLEVISIBLE: return "enablevisible";
++ case CCA_ENABLEVISIBLE: return "visible";
case CCA_DROPDOWN: return "dropdown";
case CCA_FOR: return "for";
case CCA_IMAGE_DATA: return "image-data";
+Index: sc/source/filter/excel/xeescher.cxx
+===================================================================
+--- sc/source/filter/excel/xeescher.cxx (revision 271402)
++++ sc/source/filter/excel/xeescher.cxx (working copy)
+@@ -391,6 +391,9 @@
+ rEscherEx.OpenContainer( ESCHER_SpContainer );
+ rEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT );
+ EscherPropertyContainer aPropOpt;
++ bool bVisible = aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "EnableVisible" ) );
++ aPropOpt.AddOpt( ESCHER_Prop_fPrint, bVisible ? 0x00080000 : 0x00080002 ); // visible flag
++
+ aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01000100 ); // bool field
+ aPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // Text ID
+ aPropOpt.AddOpt( ESCHER_Prop_WrapText, 0x00000001 );
+Index: sc/source/filter/excel/xiescher.cxx
+===================================================================
+--- sc/source/filter/excel/xiescher.cxx (revision 271402)
++++ sc/source/filter/excel/xiescher.cxx (working copy)
+@@ -1702,7 +1702,7 @@
+ aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
+
+ // control visible and printable?
+-// aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() ); // waiting for #i88878#
++ aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
+ aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
+
+ // sheet links
Index: toolkit/source/helper/property.cxx
===================================================================
--- toolkit/source/helper/property.cxx (revision 271402)
@@ -147,24 +174,21 @@ Index: toolkit/source/controls/unocontrol.cxx
===================================================================
--- toolkit/source/controls/unocontrol.cxx (revision 271402)
+++ toolkit/source/controls/unocontrol.cxx (working copy)
-@@ -1292,6 +1292,16 @@
- }
- //issue79712 ends
-
-+ // Visible
-+ aPropName = GetPropertyName( BASEPROPERTY_ENABLEVISIBLE );
-+ if ( xInfo->hasPropertyByName( aPropName ) )
-+ {
-+ aVal = xPSet->getPropertyValue( aPropName );
-+ sal_Bool b = sal_Bool();
-+ if ( ( aVal >>=b ) )
-+ maComponentInfos.bVisible = b;
-+ }
-+
- // Align
- aPropName = GetPropertyName( BASEPROPERTY_ALIGN );
- if ( xInfo->hasPropertyByName( aPropName ) )
-@@ -1413,7 +1423,6 @@
+@@ -1054,7 +1054,13 @@
+ }
+
+ if ( xDrawPeerView.is() )
++ {
++ Reference< XVclWindowPeer > xWindowPeer;
++ xWindowPeer.set( xDrawPeer, UNO_QUERY );
++ if ( xWindowPeer.is() )
++ xWindowPeer->setDesignMode( mbDesignMode );
+ xDrawPeerView->draw( x, y );
++ }
+
+ if ( bDisposeDrawPeer )
+ xDrawPeer->dispose();
+@@ -1413,7 +1429,6 @@
// remember this
mbDesignMode = bOn;
xWindow = xWindow.query( getPeer() );
@@ -280,7 +304,7 @@ Index: toolkit/source/awt/vclxwindow.cxx
break;
+ case BASEPROPERTY_ENABLEVISIBLE:
-+ aProp <<= (sal_Bool) GetWindow()->IsVisible();
++ aProp <<= (sal_Bool) mpImpl->isEnableVisible();
+ break;
+
case BASEPROPERTY_TEXT:
@@ -293,7 +317,7 @@ Index: toolkit/source/awt/vclxwindow.cxx
-
- if ( pWindow )
+
-+ if ( mpImpl->isEnableVisible() )
++ if ( isDesignMode() || mpImpl->isEnableVisible() )
{
TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
if ( pTabPage )
@@ -441,6 +465,249 @@ Index: toolkit/inc/toolkit/helper/property.hxx
// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
+Index: extensions/source/propctrlr/formres.src
+===================================================================
+--- extensions/source/propctrlr/formres.src (revision 271402)
++++ extensions/source/propctrlr/formres.src (working copy)
+@@ -51,6 +51,10 @@
+ {
+ Text [ en-US ] = "Enabled" ;
+ };
++String RID_STR_ENABLE_VISIBLE
++{
++ Text [ en-US ] = "Visible" ;
++};
+ String RID_STR_AUTOCOMPLETE
+ {
+ Text [ en-US ] = "AutoFill" ;
+Index: extensions/source/propctrlr/formmetadata.cxx
+===================================================================
+--- extensions/source/propctrlr/formmetadata.cxx (revision 271402)
++++ extensions/source/propctrlr/formmetadata.cxx (working copy)
+@@ -149,6 +149,7 @@
+ 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 ),
+Index: extensions/source/propctrlr/formresid.hrc
+===================================================================
+--- extensions/source/propctrlr/formresid.hrc (revision 271402)
++++ extensions/source/propctrlr/formresid.hrc (working copy)
+@@ -150,6 +150,7 @@
+ #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 )
++#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 )
+ // FREE
+ // FREE
+ // FREE
+@@ -158,7 +159,6 @@
+ // FREE
+ // FREE
+ // FREE
+- // FREE
+ #define RID_STR_ENUM_NAVIGATION ( RID_FORMBROWSER_START + 131 )
+ #define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 )
+ #define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 )
+Index: extensions/source/propctrlr/formstrings.hxx
+===================================================================
+--- extensions/source/propctrlr/formstrings.hxx (revision 271402)
++++ extensions/source/propctrlr/formstrings.hxx (working copy)
+@@ -57,6 +57,7 @@
+ 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");
+Index: extensions/source/propctrlr/formmetadata.hxx
+===================================================================
+--- extensions/source/propctrlr/formmetadata.hxx (revision 271402)
++++ extensions/source/propctrlr/formmetadata.hxx (working copy)
+@@ -340,6 +340,7 @@
+ #define PROPERTY_ID_SCALE_MODE 196
+ #define PROPERTY_ID_INPUT_REQUIRED 197
+ #define PROPERTY_ID_WRITING_MODE 198
++ #define PROPERTY_ID_ENABLE_VISIBLE 199
+
+ //............................................................................
+ } // namespace pcr
+Index: extensions/inc/extensio.hrc
+===================================================================
+--- extensions/inc/extensio.hrc (revision 271402)
++++ extensions/inc/extensio.hrc (working copy)
+@@ -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)
+Index: extensions/util/hidother.src
+===================================================================
+--- extensions/util/hidother.src (revision 271402)
++++ extensions/util/hidother.src (working copy)
+@@ -308,3 +308,4 @@
+ 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; }
+Index: xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx (revision 271402)
++++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx (working copy)
+@@ -33,6 +33,7 @@
+ #include "imp_share.hxx"
+
+ #include <osl/diagnose.h>
++#include <tools/diagnose_ex.h>
+ #include <osl/mutex.hxx>
+
+ #include <rtl/ustrbuf.hxx>
+@@ -1612,6 +1613,23 @@
+ OUString( RTL_CONSTASCII_USTRINGPARAM("Enabled") ), makeAny( sal_False ) );
+ }
+
++ sal_Bool bVisible = sal_True;
++ if (getBoolAttr(
++ &bVisible, OUString( RTL_CONSTASCII_USTRINGPARAM("visible") ),
++ xAttributes, _pImport->XMLNS_DIALOGS_UID ) && !bVisible)
++ {
++ try
++ {
++
++ _xControlModel->setPropertyValue(
++ OUString( RTL_CONSTASCII_USTRINGPARAM("EnableVisible") ), makeAny( sal_False ) );
++ }
++ catch( Exception& )
++ {
++ DBG_UNHANDLED_EXCEPTION();
++ }
++ }
++
+ if (!importLongProperty( nBaseX,
+ OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM("left") ),
+Index: xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+===================================================================
+--- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (revision 271402)
++++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (working copy)
+@@ -33,6 +33,7 @@
+ #include "exp_share.hxx"
+
+ #include <rtl/ustrbuf.hxx>
++#include <tools/diagnose_ex.h>
+
+ #include <com/sun/star/awt/CharSet.hpp>
+ #include <com/sun/star/awt/FontFamily.hpp>
+@@ -996,6 +997,24 @@
+ OSL_ENSURE( 0, "unexpected property type for \"Enabled\": not bool!" );
+ }
+
++ sal_Bool bVisible = sal_True;
++ try
++ {
++ if (_xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("EnableVisible") ) ) >>= bVisible)
++ {
++
++ // only write out the non default case
++ if (! bVisible)
++ {
++ addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":visible") ),
++ OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
++ }
++ }
++ }
++ catch( Exception& )
++ {
++ DBG_UNHANDLED_EXCEPTION();
++ }
+ // force writing of pos/size
+ a = _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ) );
+ if (a.getValueTypeClass() == TypeClass_LONG)
+Index: svx/source/msfilter/msocximex.cxx
+===================================================================
+--- svx/source/msfilter/msocximex.cxx (revision 271402)
++++ svx/source/msfilter/msocximex.cxx (working copy)
+@@ -623,7 +623,11 @@
+ pS->SeekRel( 4 );
+ // option flags
+ if( nContentFlags & 0x00000010 )
+- pS->SeekRel( 4 );
++ {
++ sal_uInt32 nBitFlags = 0;
++ *pS >> nBitFlags;
++ rec.bVisible = ( ( nBitFlags & 0x02 ) == 0x02 );
++ }
+ // substream size
+ if( nContentFlags & 0x00000020 )
+ *pS >> rec.nSubStreamLen;
+@@ -1207,6 +1211,13 @@
+ xPropSet->setPropertyValue(WW8_ASCII2STR("Step"), aTmp);
+ }
+
++ try
++ {
++ xPropSet->setPropertyValue(WW8_ASCII2STR("EnableVisible"), uno::makeAny( mbVisible ) );
++ }
++ catch( uno::Exception& )
++ {
++ }
+ return sal_True;
+ }
+
+@@ -3606,6 +3617,7 @@
+ // reflect the ms tabbing from orig MS UserForm, see below
+ pControl->mnTabPos = rec.nTabPos;
+ pControl->SetInDialog(true);
++ pControl->mbVisible = rec.bVisible;
+ if ( mnStep )
+ {
+ // If the container has a step then it should be
+Index: svx/inc/svx/msocximex.hxx
+===================================================================
+--- svx/inc/svx/msocximex.hxx (revision 271402)
++++ svx/inc/svx/msocximex.hxx (working copy)
+@@ -230,7 +230,7 @@
+ {
+ public:
+ OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0),
+- mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), sName(sN), pDocSh(0),
++ mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), mbVisible(true), sName(sN), pDocSh(0),
+ bSetInDialog(FALSE), mpParent( parent ) {}
+ sal_Bool FullRead(SotStorageStream *pS)
+ {
+@@ -287,6 +287,7 @@
+ sal_Int32 mnBackColor;
+ sal_Int32 mnForeColor;
+ sal_uInt16 mnTabPos;
++ bool mbVisible;
+ UniString sName;
+ OCX_FontData aFontData;
+ SfxObjectShell *pDocSh;
+@@ -482,7 +483,7 @@
+ };
+ struct ContainerRecord
+ {
+- ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0) {}
++ ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0), bVisible( true ) {}
+
+ ::rtl::OUString cName;
+ ::rtl::OUString controlTip;
+@@ -493,6 +494,7 @@
+ sal_uInt32 nSubStreamLen;
+ sal_uInt16 nTabPos;
+ sal_uInt16 nTypeIdent;
++ bool bVisible;
+ };
+
+ typedef std::vector<OCX_Control*>::iterator CtrlIterator;
Index: forms/source/component/navigationbar.hxx
===================================================================
--- forms/source/component/navigationbar.hxx (revision 271402)
@@ -477,7 +744,15 @@ Index: forms/source/component/navigationbar.cxx
getPropertyDefaultByHandle( PROPERTY_ID_SHOW_POSITION ) >>= m_bShowPosition;
getPropertyDefaultByHandle( PROPERTY_ID_SHOW_NAVIGATION ) >>= m_bShowNavigation;
getPropertyDefaultByHandle( PROPERTY_ID_SHOW_RECORDACTIONS ) >>= m_bShowActions;
-@@ -125,6 +126,7 @@
+@@ -107,6 +108,7 @@
+ 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 @@
REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
@@ -485,7 +760,7 @@ Index: forms/source/component/navigationbar.cxx
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 +446,7 @@
+@@ -444,6 +447,7 @@
break;
case PROPERTY_ID_ENABLED:
@@ -497,7 +772,23 @@ Index: forms/source/component/Grid.cxx
===================================================================
--- forms/source/component/Grid.cxx (revision 271402)
+++ forms/source/component/Grid.cxx (working copy)
-@@ -415,7 +415,7 @@
+@@ -103,6 +103,7 @@
+ ,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)
+@@ -128,6 +129,7 @@
+
+ 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;
+@@ -415,7 +417,7 @@
//------------------------------------------------------------------------------
void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
@@ -506,7 +797,7 @@ Index: forms/source/component/Grid.cxx
DECL_PROP1(NAME, ::rtl::OUString, BOUND);
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
DECL_PROP1(TAG, ::rtl::OUString, BOUND);
-@@ -423,6 +423,7 @@
+@@ -423,6 +425,7 @@
DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID);
DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT);
DECL_PROP1(ENABLED, sal_Bool, BOUND);
@@ -514,7 +805,7 @@ Index: forms/source/component/Grid.cxx
DECL_PROP1(BORDER, sal_Int16, BOUND);
DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID);
DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND);
-@@ -496,6 +497,9 @@
+@@ -496,6 +499,9 @@
case PROPERTY_ID_ENABLED:
setBOOL(rValue, m_bEnable);
break;
@@ -524,7 +815,7 @@ Index: forms/source/component/Grid.cxx
case PROPERTY_ID_BORDER:
rValue <<= (sal_Int16)m_nBorder;
break;
-@@ -574,6 +578,9 @@
+@@ -574,6 +580,9 @@
case PROPERTY_ID_ENABLED:
bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnable);
break;
@@ -534,7 +825,7 @@ Index: forms/source/component/Grid.cxx
case PROPERTY_ID_BORDER:
bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_nBorder);
break;
-@@ -645,6 +652,9 @@
+@@ -645,6 +654,9 @@
case PROPERTY_ID_ENABLED:
m_bEnable = getBOOL(rValue);
break;
@@ -544,7 +835,7 @@ Index: forms/source/component/Grid.cxx
case PROPERTY_ID_RECORDMARKER:
m_bRecordMarker = getBOOL(rValue);
break;
-@@ -702,6 +712,7 @@
+@@ -702,6 +714,7 @@
case PROPERTY_ID_RECORDMARKER:
case PROPERTY_ID_DISPLAYSYNCHRON:
case PROPERTY_ID_ENABLED:
diff --git a/patches/dev300/forms-radio-button-group-names.diff b/patches/dev300/forms-radio-button-group-names.diff
index 942df7a..f6c15b8 100644
--- a/patches/dev300/forms-radio-button-group-names.diff
+++ b/patches/dev300/forms-radio-button-group-names.diff
@@ -57,12 +57,12 @@ diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr
index a889086..aed2207 100644
--- extensions/source/propctrlr/formresid.hrc
+++ extensions/source/propctrlr/formresid.hrc
-@@ -150,7 +150,7 @@
+@@ -150,7 +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
-+#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 122 )
+ #define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 )
++#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 123 )
// FREE
// FREE
// FREE
diff --git a/patches/dev300/xl-import-formradiobutton.diff b/patches/dev300/xl-import-formradiobutton.diff
index c59745e..0ce9132 100644
--- a/patches/dev300/xl-import-formradiobutton.diff
+++ b/patches/dev300/xl-import-formradiobutton.diff
@@ -20,7 +20,7 @@ index b19de94..1df3f38 100644
- aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
-
- // control visible and printable?
--// aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() ); // waiting for #i88878#
+- aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
- aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
-
- // sheet links
@@ -48,7 +48,7 @@ index b19de94..1df3f38 100644
+ aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
+
+ // control visible and printable?
-+// aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() ); // waiting for #i88878#
++ aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
+ aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
+
More information about the ooo-build-commit
mailing list