| blob | cffdf47c2715fe8a11aab1bafb65b426910f8c16 |
1 Index: xmloff/source/forms/formattributes.hxx
2 ===================================================================
3 --- xmloff/source/forms/formattributes.hxx (revision 271402)
4 +++ xmloff/source/forms/formattributes.hxx (working copy)
5 @@ -69,6 +69,7 @@
6 #define CCA_VALUE 0x00200000
7 #define CCA_ORIENTATION 0x00400000
8 #define CCA_VISUAL_EFFECT 0x00800000
9 + #define CCA_ENABLEVISIBLE 0x01000000
11 // flags for database control atttributes
12 #define DA_BOUND_COLUMN 0x00000001
13 Index: xmloff/source/forms/elementexport.cxx
14 ===================================================================
15 --- xmloff/source/forms/elementexport.cxx (revision 271402)
16 +++ xmloff/source/forms/elementexport.cxx (working copy)
17 @@ -529,15 +529,15 @@
18 {
19 static sal_Int32 nBooleanPropertyAttributeIds[] =
20 { // attribute flags
21 - CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP
22 + CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
23 };
24 static const ::rtl::OUString* pBooleanPropertyNames[] =
25 { // property names
26 - &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP
27 + &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP, &PROPERTY_ENABLEVISIBLE
28 };
29 static sal_Bool nBooleanPropertyAttrFlags[] =
30 { // attribute defaults
31 - BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID
32 + BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE
33 };
34 #if OSL_DEBUG_LEVEL > 0
35 sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
36 Index: xmloff/source/forms/strings.hxx
37 ===================================================================
38 --- xmloff/source/forms/strings.hxx (revision 271402)
39 +++ xmloff/source/forms/strings.hxx (working copy)
40 @@ -114,6 +114,7 @@
41 XMLFORM_CONSTASCII_STRING( PROPERTY_TABSTOP, "Tabstop" );
42 XMLFORM_CONSTASCII_STRING( PROPERTY_STATE, "State" );
43 XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
44 + XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
45 XMLFORM_CONSTASCII_STRING( PROPERTY_MAXTEXTLENGTH, "MaxTextLen" );
46 XMLFORM_CONSTASCII_STRING( PROPERTY_LINECOUNT, "LineCount" );
47 XMLFORM_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" );
48 Index: xmloff/source/forms/formattributes.cxx
49 ===================================================================
50 --- xmloff/source/forms/formattributes.cxx (revision 271402)
51 +++ xmloff/source/forms/formattributes.cxx (working copy)
52 @@ -60,6 +60,7 @@
53 case CCA_CURRENT_SELECTED: return "current-selected";
54 case CCA_CURRENT_VALUE: return "current-value";
55 case CCA_DISABLED: return "disabled";
56 + case CCA_ENABLEVISIBLE: return "visible";
57 case CCA_DROPDOWN: return "dropdown";
58 case CCA_FOR: return "for";
59 case CCA_IMAGE_DATA: return "image-data";
60 Index: sc/source/filter/excel/xeescher.cxx
61 ===================================================================
62 --- sc/source/filter/excel/xeescher.cxx (revision 271402)
63 +++ sc/source/filter/excel/xeescher.cxx (working copy)
64 @@ -391,6 +391,9 @@
65 rEscherEx.OpenContainer( ESCHER_SpContainer );
66 rEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT );
67 EscherPropertyContainer aPropOpt;
68 + bool bVisible = aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "EnableVisible" ) );
69 + aPropOpt.AddOpt( ESCHER_Prop_fPrint, bVisible ? 0x00080000 : 0x00080002 ); // visible flag
70 +
71 aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01000100 ); // bool field
72 aPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // Text ID
73 aPropOpt.AddOpt( ESCHER_Prop_WrapText, 0x00000001 );
74 Index: sc/source/filter/excel/xiescher.cxx
75 ===================================================================
76 --- sc/source/filter/excel/xiescher.cxx (revision 271402)
77 +++ sc/source/filter/excel/xiescher.cxx (working copy)
78 @@ -1702,7 +1702,7 @@
79 aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
81 // control visible and printable?
82 -// aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() ); // waiting for #i88878#
83 + aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
84 aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
86 // sheet links
87 Index: toolkit/source/helper/property.cxx
88 ===================================================================
89 --- toolkit/source/helper/property.cxx (revision 271402)
90 +++ toolkit/source/helper/property.cxx (working copy)
91 @@ -272,7 +272,8 @@
92 DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
93 DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
94 DECL_PROP_2 ( "WritingMode", WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT ),
95 - DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT )
96 + DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ),
97 + DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT )
98 };
99 pPropertyInfos = aImplPropertyInfos;
100 nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
101 Index: toolkit/source/controls/unocontrolmodel.cxx
102 ===================================================================
103 --- toolkit/source/controls/unocontrolmodel.cxx (revision 271402)
104 +++ toolkit/source/controls/unocontrolmodel.cxx (working copy)
105 @@ -345,6 +345,7 @@
106 case BASEPROPERTY_SCALEIMAGE:
107 case BASEPROPERTY_ENABLED:
108 case BASEPROPERTY_PRINTABLE:
109 + case BASEPROPERTY_ENABLEVISIBLE:
110 case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break;
112 case BASEPROPERTY_HELPTEXT:
113 Index: toolkit/source/controls/unocontrols.cxx
114 ===================================================================
115 --- toolkit/source/controls/unocontrols.cxx (revision 271402)
116 +++ toolkit/source/controls/unocontrols.cxx (working copy)
117 @@ -491,6 +491,7 @@
118 ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
119 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
120 ImplRegisterProperty( BASEPROPERTY_ENABLED );
121 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
122 ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
123 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
124 ImplRegisterProperty( BASEPROPERTY_HELPURL );
125 @@ -1788,6 +1789,7 @@
126 {
127 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
128 ImplRegisterProperty( BASEPROPERTY_ENABLED );
129 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
130 ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
131 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
132 ImplRegisterProperty( BASEPROPERTY_HELPURL );
133 @@ -3613,6 +3615,7 @@
134 ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
135 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
136 ImplRegisterProperty( BASEPROPERTY_ENABLED );
137 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
138 ImplRegisterProperty( BASEPROPERTY_FILLCOLOR );
139 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
140 ImplRegisterProperty( BASEPROPERTY_HELPURL );
141 @@ -3742,6 +3745,7 @@
142 ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
143 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
144 ImplRegisterProperty( BASEPROPERTY_ENABLED );
145 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
146 ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
147 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
148 ImplRegisterProperty( BASEPROPERTY_HELPURL );
149 Index: toolkit/source/controls/formattedcontrol.cxx
150 ===================================================================
151 --- toolkit/source/controls/formattedcontrol.cxx (revision 271402)
152 +++ toolkit/source/controls/formattedcontrol.cxx (working copy)
153 @@ -142,6 +142,7 @@
154 ImplRegisterProperty( BASEPROPERTY_EFFECTIVE_MAX );
155 ImplRegisterProperty( BASEPROPERTY_EFFECTIVE_MIN );
156 ImplRegisterProperty( BASEPROPERTY_ENABLED );
157 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
158 ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
159 ImplRegisterProperty( BASEPROPERTY_FORMATKEY );
160 ImplRegisterProperty( BASEPROPERTY_FORMATSSUPPLIER );
161 Index: toolkit/source/controls/tree/treecontrol.cxx
162 ===================================================================
163 --- toolkit/source/controls/tree/treecontrol.cxx (revision 271402)
164 +++ toolkit/source/controls/tree/treecontrol.cxx (working copy)
165 @@ -65,6 +65,7 @@
166 ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
167 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
168 ImplRegisterProperty( BASEPROPERTY_ENABLED );
169 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
170 ImplRegisterProperty( BASEPROPERTY_FILLCOLOR );
171 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
172 ImplRegisterProperty( BASEPROPERTY_HELPURL );
173 Index: toolkit/source/controls/unocontrol.cxx
174 ===================================================================
175 --- toolkit/source/controls/unocontrol.cxx (revision 271402)
176 +++ toolkit/source/controls/unocontrol.cxx (working copy)
177 @@ -1054,7 +1054,13 @@
178 }
180 if ( xDrawPeerView.is() )
181 + {
182 + Reference< XVclWindowPeer > xWindowPeer;
183 + xWindowPeer.set( xDrawPeer, UNO_QUERY );
184 + if ( xWindowPeer.is() )
185 + xWindowPeer->setDesignMode( mbDesignMode );
186 xDrawPeerView->draw( x, y );
187 + }
189 if ( bDisposeDrawPeer )
190 xDrawPeer->dispose();
191 @@ -1413,7 +1429,6 @@
192 // remember this
193 mbDesignMode = bOn;
194 xWindow = xWindow.query( getPeer() );
195 -
196 // dispose our current AccessibleContext, if we have one
197 // (changing the design mode implies having a new implementation for this context,
198 // so the old one must be declared DEFUNC)
199 Index: toolkit/source/controls/tkspinbutton.cxx
200 ===================================================================
201 --- toolkit/source/controls/tkspinbutton.cxx (revision 271402)
202 +++ toolkit/source/controls/tkspinbutton.cxx (working copy)
203 @@ -60,6 +60,7 @@
204 ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
205 ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
206 ImplRegisterProperty( BASEPROPERTY_ENABLED );
207 + ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
208 ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
209 ImplRegisterProperty( BASEPROPERTY_HELPURL );
210 ImplRegisterProperty( BASEPROPERTY_ORIENTATION );
211 Index: toolkit/source/awt/vclxwindow.cxx
212 ===================================================================
213 --- toolkit/source/awt/vclxwindow.cxx (revision 271402)
214 +++ toolkit/source/awt/vclxwindow.cxx (working copy)
215 @@ -226,6 +226,8 @@
216 ::toolkit::AccessibilityClient maAccFactory;
217 bool mbDisposed;
218 bool mbDrawingOntoParent; // no bit mask, is passed around by reference
219 + sal_Bool mbEnableVisible;
220 + sal_Bool mbDirectVisible;
222 ::osl::Mutex maListenerContainerMutex;
223 ::cppu::OInterfaceContainerHelper maWindow2Listeners;
224 @@ -273,6 +275,15 @@
225 */
226 VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex, bool _bWithDefaultProps );
228 + /** synchronously mbEnableVisible
229 + */
230 + void setEnableVisible( sal_Bool bEnableVisible ) { mbEnableVisible = bEnableVisible; }
231 + sal_Bool isEnableVisible() { return mbEnableVisible; }
232 + /** synchronously mbDirectVisible;
233 + */
234 + void setDirectVisible( sal_Bool bDirectVisible ) { mbDirectVisible = bDirectVisible; }
235 + sal_Bool isDirectVisible() { return mbDirectVisible; }
236 +
237 /** asynchronously notifies a mouse event to the VCLXWindow's XMouseListeners
238 */
239 void notifyMouseEvent( const awt::MouseEvent& _rMouseEvent, MouseEventType _nType );
240 @@ -347,6 +358,8 @@
241 ,mrMutex( _rMutex )
242 ,mbDisposed( false )
243 ,mbDrawingOntoParent( false )
244 + ,mbEnableVisible(sal_True)
245 + ,mbDirectVisible(sal_True)
246 ,maListenerContainerMutex( )
247 ,maWindow2Listeners( maListenerContainerMutex )
248 ,maDockableWindowListeners( maListenerContainerMutex )
249 @@ -623,7 +636,12 @@
250 SetOutputDevice( pWindow );
252 if ( GetWindow() )
253 + {
254 GetWindow()->AddEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
255 + sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
256 + mpImpl->setDirectVisible( bDirectVisible );
257 + }
258 +
259 }
261 void VCLXWindow::suspendVclEventListening( )
262 @@ -1224,7 +1242,8 @@
263 }
264 }
265 */
266 - pWindow->Show( bVisible );
267 + mpImpl->setDirectVisible( bVisible );
268 + pWindow->Show( bVisible && mpImpl->isEnableVisible() );
269 }
270 }
272 @@ -1527,6 +1546,7 @@
273 BASEPROPERTY_HELPURL,
274 BASEPROPERTY_TEXT,
275 BASEPROPERTY_PRINTABLE,
276 + BASEPROPERTY_ENABLEVISIBLE, // for visibility
277 BASEPROPERTY_TABSTOP,
278 0);
280 @@ -1670,6 +1690,21 @@
281 setEnable( b );
282 }
283 break;
284 + case BASEPROPERTY_ENABLEVISIBLE:
285 + {
286 + sal_Bool b = sal_False;
287 + if ( Value >>= b )
288 + {
289 + if( b != mpImpl->isEnableVisible() )
290 + {
291 + mpImpl->setEnableVisible( b );
292 + Window* pWindow = GetWindow();
293 + if ( pWindow )
294 + pWindow->Show( b && mpImpl->isDirectVisible() );
295 + }
296 + }
297 + }
298 + break;
299 case BASEPROPERTY_TEXT:
300 case BASEPROPERTY_LABEL:
301 case BASEPROPERTY_TITLE:
302 @@ -2135,6 +2170,10 @@
303 aProp <<= (sal_Bool) GetWindow()->IsEnabled();
304 break;
306 + case BASEPROPERTY_ENABLEVISIBLE:
307 + aProp <<= (sal_Bool) mpImpl->isEnableVisible();
308 + break;
309 +
310 case BASEPROPERTY_TEXT:
311 case BASEPROPERTY_LABEL:
312 case BASEPROPERTY_TITLE:
313 @@ -2408,8 +2447,8 @@
314 Window* pWindow = GetWindow();
315 if ( !pWindow )
316 return;
317 -
318 - if ( pWindow )
319 +
320 + if ( isDesignMode() || mpImpl->isEnableVisible() )
321 {
322 TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
323 if ( pTabPage )
324 Index: toolkit/source/awt/vclxwindows.cxx
325 ===================================================================
326 --- toolkit/source/awt/vclxwindows.cxx (revision 271402)
327 +++ toolkit/source/awt/vclxwindows.cxx (working copy)
328 @@ -386,6 +386,7 @@
329 BASEPROPERTY_DEFAULTBUTTON,
330 BASEPROPERTY_DEFAULTCONTROL,
331 BASEPROPERTY_ENABLED,
332 + BASEPROPERTY_ENABLEVISIBLE,
333 BASEPROPERTY_FONTDESCRIPTOR,
334 BASEPROPERTY_GRAPHIC,
335 BASEPROPERTY_HELPTEXT,
336 @@ -661,6 +662,7 @@
337 BASEPROPERTY_BORDERCOLOR,
338 BASEPROPERTY_DEFAULTCONTROL,
339 BASEPROPERTY_ENABLED,
340 + BASEPROPERTY_ENABLEVISIBLE,
341 BASEPROPERTY_GRAPHIC,
342 BASEPROPERTY_HELPTEXT,
343 BASEPROPERTY_HELPURL,
344 @@ -789,6 +791,7 @@
345 PushPropertyIds( rIds,
346 BASEPROPERTY_DEFAULTCONTROL,
347 BASEPROPERTY_ENABLED,
348 + BASEPROPERTY_ENABLEVISIBLE,
349 BASEPROPERTY_FONTDESCRIPTOR,
350 BASEPROPERTY_GRAPHIC,
351 BASEPROPERTY_HELPTEXT,
352 @@ -1088,6 +1091,7 @@
353 PushPropertyIds( rIds,
354 BASEPROPERTY_DEFAULTCONTROL,
355 BASEPROPERTY_ENABLED,
356 + BASEPROPERTY_ENABLEVISIBLE,
357 BASEPROPERTY_FONTDESCRIPTOR,
358 BASEPROPERTY_GRAPHIC,
359 BASEPROPERTY_HELPTEXT,
360 @@ -1505,6 +1509,7 @@
361 BASEPROPERTY_DEFAULTCONTROL,
362 BASEPROPERTY_DROPDOWN,
363 BASEPROPERTY_ENABLED,
364 + BASEPROPERTY_ENABLEVISIBLE,
365 BASEPROPERTY_FONTDESCRIPTOR,
366 BASEPROPERTY_HELPTEXT,
367 BASEPROPERTY_HELPURL,
368 @@ -2692,6 +2697,7 @@
369 BASEPROPERTY_BORDERCOLOR,
370 BASEPROPERTY_DEFAULTCONTROL,
371 BASEPROPERTY_ENABLED,
372 + BASEPROPERTY_ENABLEVISIBLE,
373 BASEPROPERTY_FONTDESCRIPTOR,
374 BASEPROPERTY_HELPTEXT,
375 BASEPROPERTY_HELPURL,
376 @@ -2720,6 +2726,7 @@
377 BASEPROPERTY_BORDERCOLOR,
378 BASEPROPERTY_DEFAULTCONTROL,
379 BASEPROPERTY_ENABLED,
380 + BASEPROPERTY_ENABLEVISIBLE,
381 BASEPROPERTY_FONTDESCRIPTOR,
382 BASEPROPERTY_HELPTEXT,
383 BASEPROPERTY_HELPURL,
384 @@ -2862,6 +2869,7 @@
385 BASEPROPERTY_BORDERCOLOR,
386 BASEPROPERTY_DEFAULTCONTROL,
387 BASEPROPERTY_ENABLED,
388 + BASEPROPERTY_ENABLEVISIBLE,
389 BASEPROPERTY_HELPTEXT,
390 BASEPROPERTY_HELPURL,
391 BASEPROPERTY_LINEINCREMENT,
392 @@ -3341,6 +3349,7 @@
393 BASEPROPERTY_DEFAULTCONTROL,
394 BASEPROPERTY_ECHOCHAR,
395 BASEPROPERTY_ENABLED,
396 + BASEPROPERTY_ENABLEVISIBLE,
397 BASEPROPERTY_FONTDESCRIPTOR,
398 BASEPROPERTY_HARDLINEBREAKS,
399 BASEPROPERTY_HELPTEXT,
400 @@ -3717,6 +3726,7 @@
401 BASEPROPERTY_DEFAULTCONTROL,
402 BASEPROPERTY_DROPDOWN,
403 BASEPROPERTY_ENABLED,
404 + BASEPROPERTY_ENABLEVISIBLE,
405 BASEPROPERTY_FONTDESCRIPTOR,
406 BASEPROPERTY_HELPTEXT,
407 BASEPROPERTY_HELPURL,
408 @@ -4226,6 +4236,7 @@
409 BASEPROPERTY_DEFAULTCONTROL,
410 BASEPROPERTY_DROPDOWN,
411 BASEPROPERTY_ENABLED,
412 + BASEPROPERTY_ENABLEVISIBLE,
413 BASEPROPERTY_EXTDATEFORMAT,
414 BASEPROPERTY_FONTDESCRIPTOR,
415 BASEPROPERTY_HELPTEXT,
416 @@ -4562,6 +4573,7 @@
417 BASEPROPERTY_BORDERCOLOR,
418 BASEPROPERTY_DEFAULTCONTROL,
419 BASEPROPERTY_ENABLED,
420 + BASEPROPERTY_ENABLEVISIBLE,
421 BASEPROPERTY_EXTTIMEFORMAT,
422 BASEPROPERTY_FONTDESCRIPTOR,
423 BASEPROPERTY_HELPTEXT,
424 @@ -4863,6 +4875,7 @@
425 BASEPROPERTY_DECIMALACCURACY,
426 BASEPROPERTY_DEFAULTCONTROL,
427 BASEPROPERTY_ENABLED,
428 + BASEPROPERTY_ENABLEVISIBLE,
429 BASEPROPERTY_FONTDESCRIPTOR,
430 BASEPROPERTY_HELPTEXT,
431 BASEPROPERTY_HELPURL,
432 @@ -5203,6 +5216,7 @@
433 BASEPROPERTY_DECIMALACCURACY,
434 BASEPROPERTY_DEFAULTCONTROL,
435 BASEPROPERTY_ENABLED,
436 + BASEPROPERTY_ENABLEVISIBLE,
437 BASEPROPERTY_FONTDESCRIPTOR,
438 BASEPROPERTY_HELPTEXT,
439 BASEPROPERTY_HELPURL,
440 @@ -5453,6 +5467,7 @@
441 BASEPROPERTY_DECIMALACCURACY,
442 BASEPROPERTY_DEFAULTCONTROL,
443 BASEPROPERTY_ENABLED,
444 + BASEPROPERTY_ENABLEVISIBLE,
445 BASEPROPERTY_FONTDESCRIPTOR,
446 BASEPROPERTY_HELPTEXT,
447 BASEPROPERTY_HELPURL,
448 @@ -5804,6 +5819,7 @@
449 BASEPROPERTY_DEFAULTCONTROL,
450 BASEPROPERTY_EDITMASK,
451 BASEPROPERTY_ENABLED,
452 + BASEPROPERTY_ENABLEVISIBLE,
453 BASEPROPERTY_FONTDESCRIPTOR,
454 BASEPROPERTY_HELPTEXT,
455 BASEPROPERTY_HELPURL,
456 Index: toolkit/inc/toolkit/helper/property.hxx
457 ===================================================================
458 --- toolkit/inc/toolkit/helper/property.hxx (revision 271402)
459 +++ toolkit/inc/toolkit/helper/property.hxx (working copy)
460 @@ -191,6 +191,7 @@
461 #define BASEPROPERTY_IMAGE_SCALE_MODE 137
462 #define BASEPROPERTY_WRITING_MODE 138
463 #define BASEPROPERTY_CONTEXT_WRITING_MODE 139
464 +#define BASEPROPERTY_ENABLEVISIBLE 140 // sal_Bool
466 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
467 #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
468 Index: extensions/source/propctrlr/formres.src
469 ===================================================================
470 --- extensions/source/propctrlr/formres.src (revision 271402)
471 +++ extensions/source/propctrlr/formres.src (working copy)
472 @@ -51,6 +51,10 @@
473 {
474 Text [ en-US ] = "Enabled" ;
475 };
476 +String RID_STR_ENABLE_VISIBLE
477 +{
478 + Text [ en-US ] = "Visible" ;
479 +};
480 String RID_STR_AUTOCOMPLETE
481 {
482 Text [ en-US ] = "AutoFill" ;
483 Index: extensions/source/propctrlr/formmetadata.cxx
484 ===================================================================
485 --- extensions/source/propctrlr/formmetadata.cxx (revision 271402)
486 +++ extensions/source/propctrlr/formmetadata.cxx (working copy)
487 @@ -149,6 +149,7 @@
488 DEF_INFO_3( LITERALMASK, LITERALMASK, LITERALMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
489 DEF_INFO_3( STRICTFORMAT, STRICTFORMAT, STRICTFORMAT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
490 DEF_INFO_3( ENABLED, ENABLED, ENABLED, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
491 + DEF_INFO_3( ENABLE_VISIBLE, ENABLE_VISIBLE, ENABLE_VISIBLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
492 DEF_INFO_3( READONLY, READONLY, READONLY, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
493 DEF_INFO_3( PRINTABLE, PRINTABLE, PRINTABLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
494 DEF_INFO_3( STEP, STEP, STEP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
495 Index: extensions/source/propctrlr/formresid.hrc
496 ===================================================================
497 --- extensions/source/propctrlr/formresid.hrc (revision 271402)
498 +++ extensions/source/propctrlr/formresid.hrc (working copy)
499 @@ -150,6 +150,7 @@
500 #define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 )
501 #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
502 #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
503 +#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 )
504 // FREE
505 // FREE
506 // FREE
507 @@ -158,7 +159,6 @@
508 // FREE
509 // FREE
510 // FREE
511 - // FREE
512 #define RID_STR_ENUM_NAVIGATION ( RID_FORMBROWSER_START + 131 )
513 #define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 )
514 #define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 )
515 Index: extensions/source/propctrlr/formstrings.hxx
516 ===================================================================
517 --- extensions/source/propctrlr/formstrings.hxx (revision 271402)
518 +++ extensions/source/propctrlr/formstrings.hxx (working copy)
519 @@ -57,6 +57,7 @@
520 PCR_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField");
521 PCR_CONSTASCII_STRING( PROPERTY_INPUT_REQUIRED, "InputRequired");
522 PCR_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled");
523 + PCR_CONSTASCII_STRING( PROPERTY_ENABLE_VISIBLE, "EnableVisible" );
524 PCR_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly");
525 PCR_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly");
526 PCR_CONSTASCII_STRING( PROPERTY_FILTER, "Filter");
527 Index: extensions/source/propctrlr/formmetadata.hxx
528 ===================================================================
529 --- extensions/source/propctrlr/formmetadata.hxx (revision 271402)
530 +++ extensions/source/propctrlr/formmetadata.hxx (working copy)
531 @@ -340,6 +340,7 @@
532 #define PROPERTY_ID_SCALE_MODE 196
533 #define PROPERTY_ID_INPUT_REQUIRED 197
534 #define PROPERTY_ID_WRITING_MODE 198
535 + #define PROPERTY_ID_ENABLE_VISIBLE 199
537 //............................................................................
538 } // namespace pcr
539 Index: extensions/inc/extensio.hrc
540 ===================================================================
541 --- extensions/inc/extensio.hrc (revision 271402)
542 +++ extensions/inc/extensio.hrc (working copy)
543 @@ -249,7 +249,7 @@
544 #define HID_PROP_ECHO_CHAR (HID_FORMS_START + 91)
545 #define HID_PROP_EMPTY_IS_NULL (HID_FORMS_START + 92)
546 #define HID_PROP_DECIMAL_ACCURACY (HID_FORMS_START + 93)
547 - // FREE
548 +#define HID_PROP_ENABLE_VISIBLE (HID_FORMS_START + 94)
549 #define HID_PROP_DEFAULT_BUTTON (HID_FORMS_START + 95)
550 #define HID_PROP_HIDDEN_VALUE (HID_FORMS_START + 96)
551 #define HID_PROP_TRISTATE (HID_FORMS_START + 97)
552 Index: extensions/util/hidother.src
553 ===================================================================
554 --- extensions/util/hidother.src (revision 271402)
555 +++ extensions/util/hidother.src (working copy)
556 @@ -308,3 +308,4 @@
557 hidspecial HID_PROP_NOLABEL { HelpId = HID_PROP_NOLABEL; }
558 hidspecial HID_PROP_INPUT_REQUIRED { HelpId = HID_PROP_INPUT_REQUIRED; }
559 hidspecial HID_PROP_WRITING_MODE { HelpId = HID_PROP_WRITING_MODE; }
560 +hidspecial HID_PROP_ENABLE_VISIBLE { HelpId = HID_PROP_ENABLE_VISIBLE; }
561 Index: xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
562 ===================================================================
563 --- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx (revision 271402)
564 +++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx (working copy)
565 @@ -33,6 +33,7 @@
566 #include "imp_share.hxx"
568 #include <osl/diagnose.h>
569 +#include <tools/diagnose_ex.h>
570 #include <osl/mutex.hxx>
572 #include <rtl/ustrbuf.hxx>
573 @@ -1612,6 +1613,23 @@
574 OUString( RTL_CONSTASCII_USTRINGPARAM("Enabled") ), makeAny( sal_False ) );
575 }
577 + sal_Bool bVisible = sal_True;
578 + if (getBoolAttr(
579 + &bVisible, OUString( RTL_CONSTASCII_USTRINGPARAM("visible") ),
580 + xAttributes, _pImport->XMLNS_DIALOGS_UID ) && !bVisible)
581 + {
582 + try
583 + {
584 +
585 + _xControlModel->setPropertyValue(
586 + OUString( RTL_CONSTASCII_USTRINGPARAM("EnableVisible") ), makeAny( sal_False ) );
587 + }
588 + catch( Exception& )
589 + {
590 + DBG_UNHANDLED_EXCEPTION();
591 + }
592 + }
593 +
594 if (!importLongProperty( nBaseX,
595 OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ),
596 OUString( RTL_CONSTASCII_USTRINGPARAM("left") ),
597 Index: xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
598 ===================================================================
599 --- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (revision 271402)
600 +++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (working copy)
601 @@ -33,6 +33,7 @@
602 #include "exp_share.hxx"
604 #include <rtl/ustrbuf.hxx>
605 +#include <tools/diagnose_ex.h>
607 #include <com/sun/star/awt/CharSet.hpp>
608 #include <com/sun/star/awt/FontFamily.hpp>
609 @@ -996,6 +997,24 @@
610 OSL_ENSURE( 0, "unexpected property type for \"Enabled\": not bool!" );
611 }
613 + sal_Bool bVisible = sal_True;
614 + try
615 + {
616 + if (_xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("EnableVisible") ) ) >>= bVisible)
617 + {
618 +
619 + // only write out the non default case
620 + if (! bVisible)
621 + {
622 + addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":visible") ),
623 + OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
624 + }
625 + }
626 + }
627 + catch( Exception& )
628 + {
629 + DBG_UNHANDLED_EXCEPTION();
630 + }
631 // force writing of pos/size
632 a = _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ) );
633 if (a.getValueTypeClass() == TypeClass_LONG)
634 Index: svx/source/msfilter/msocximex.cxx
635 ===================================================================
636 --- svx/source/msfilter/msocximex.cxx (revision 271402)
637 +++ svx/source/msfilter/msocximex.cxx (working copy)
638 @@ -623,7 +623,11 @@
639 pS->SeekRel( 4 );
640 // option flags
641 if( nContentFlags & 0x00000010 )
642 - pS->SeekRel( 4 );
643 + {
644 + sal_uInt32 nBitFlags = 0;
645 + *pS >> nBitFlags;
646 + rec.bVisible = ( ( nBitFlags & 0x02 ) == 0x02 );
647 + }
648 // substream size
649 if( nContentFlags & 0x00000020 )
650 *pS >> rec.nSubStreamLen;
651 @@ -1207,6 +1211,13 @@
652 xPropSet->setPropertyValue(WW8_ASCII2STR("Step"), aTmp);
653 }
655 + try
656 + {
657 + xPropSet->setPropertyValue(WW8_ASCII2STR("EnableVisible"), uno::makeAny( mbVisible ) );
658 + }
659 + catch( uno::Exception& )
660 + {
661 + }
662 return sal_True;
663 }
665 @@ -3606,6 +3617,7 @@
666 // reflect the ms tabbing from orig MS UserForm, see below
667 pControl->mnTabPos = rec.nTabPos;
668 pControl->SetInDialog(true);
669 + pControl->mbVisible = rec.bVisible;
670 if ( mnStep )
671 {
672 // If the container has a step then it should be
673 Index: svx/inc/svx/msocximex.hxx
674 ===================================================================
675 --- svx/inc/svx/msocximex.hxx (revision 271402)
676 +++ svx/inc/svx/msocximex.hxx (working copy)
677 @@ -230,7 +230,7 @@
678 {
679 public:
680 OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0),
681 - mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), sName(sN), pDocSh(0),
682 + mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), mbVisible(true), sName(sN), pDocSh(0),
683 bSetInDialog(FALSE), mpParent( parent ) {}
684 sal_Bool FullRead(SotStorageStream *pS)
685 {
686 @@ -287,6 +287,7 @@
687 sal_Int32 mnBackColor;
688 sal_Int32 mnForeColor;
689 sal_uInt16 mnTabPos;
690 + bool mbVisible;
691 UniString sName;
692 OCX_FontData aFontData;
693 SfxObjectShell *pDocSh;
694 @@ -482,7 +483,7 @@
695 };
696 struct ContainerRecord
697 {
698 - ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0) {}
699 + ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0), bVisible( true ) {}
701 ::rtl::OUString cName;
702 ::rtl::OUString controlTip;
703 @@ -493,6 +494,7 @@
704 sal_uInt32 nSubStreamLen;
705 sal_uInt16 nTabPos;
706 sal_uInt16 nTypeIdent;
707 + bool bVisible;
708 };
710 typedef std::vector<OCX_Control*>::iterator CtrlIterator;
711 Index: forms/source/component/navigationbar.hxx
712 ===================================================================
713 --- forms/source/component/navigationbar.hxx (revision 271402)
714 +++ forms/source/component/navigationbar.hxx (working copy)
715 @@ -70,6 +70,7 @@
716 sal_Int16 m_nBorder;
717 sal_Int32 m_nDelay;
718 sal_Bool m_bEnabled;
719 + sal_Bool m_bEnableVisible;
720 sal_Bool m_bShowPosition;
721 sal_Bool m_bShowNavigation;
722 sal_Bool m_bShowActions;
723 Index: forms/source/component/Grid.hxx
724 ===================================================================
725 --- forms/source/component/Grid.hxx (revision 271402)
726 +++ forms/source/component/Grid.hxx (working copy)
727 @@ -94,6 +94,7 @@
728 sal_Int16 m_nBorder;
729 sal_Int16 m_nWritingMode;
730 sal_Int16 m_nContextWritingMode;
731 + sal_Bool m_bEnableVisible;
732 sal_Bool m_bEnable : 1;
733 sal_Bool m_bNavigation : 1;
734 sal_Bool m_bRecordMarker : 1;
735 Index: forms/source/component/navigationbar.cxx
736 ===================================================================
737 --- forms/source/component/navigationbar.cxx (revision 271402)
738 +++ forms/source/component/navigationbar.cxx (working copy)
739 @@ -84,6 +84,7 @@
740 getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder;
741 getPropertyDefaultByHandle( PROPERTY_ID_DELAY ) >>= m_nDelay;
742 getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled;
743 + getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible;
744 getPropertyDefaultByHandle( PROPERTY_ID_SHOW_POSITION ) >>= m_bShowPosition;
745 getPropertyDefaultByHandle( PROPERTY_ID_SHOW_NAVIGATION ) >>= m_bShowNavigation;
746 getPropertyDefaultByHandle( PROPERTY_ID_SHOW_RECORDACTIONS ) >>= m_bShowActions;
747 @@ -107,6 +108,7 @@
748 m_sHelpText = _pOriginal->m_sHelpText;
749 m_sHelpURL = _pOriginal->m_sHelpURL;
750 m_bEnabled = _pOriginal->m_bEnabled;
751 + m_bEnableVisible = _pOriginal->m_bEnableVisible;
752 m_nIconSize = _pOriginal->m_nIconSize;
753 m_nBorder = _pOriginal->m_nBorder;
754 m_nDelay = _pOriginal->m_nDelay;
755 @@ -125,6 +127,7 @@
756 REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
757 REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
758 REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
759 + REGISTER_PROP_2( ENABLEVISIBLE, m_bEnableVisible, BOUND, MAYBEDEFAULT );
760 REGISTER_PROP_2( ICONSIZE, m_nIconSize, BOUND, MAYBEDEFAULT );
761 REGISTER_PROP_2( BORDER, m_nBorder, BOUND, MAYBEDEFAULT );
762 REGISTER_PROP_2( DELAY, m_nDelay, BOUND, MAYBEDEFAULT );
763 @@ -444,6 +447,7 @@
764 break;
766 case PROPERTY_ID_ENABLED:
767 + case PROPERTY_ID_ENABLEVISIBLE:
768 case PROPERTY_ID_SHOW_POSITION:
769 case PROPERTY_ID_SHOW_NAVIGATION:
770 case PROPERTY_ID_SHOW_RECORDACTIONS:
771 Index: forms/source/component/Grid.cxx
772 ===================================================================
773 --- forms/source/component/Grid.cxx (revision 271402)
774 +++ forms/source/component/Grid.cxx (working copy)
775 @@ -103,6 +103,7 @@
776 ,m_nBorder(1)
777 ,m_nWritingMode( WritingMode2::CONTEXT )
778 ,m_nContextWritingMode( WritingMode2::CONTEXT )
779 + ,m_bEnableVisible(sal_True)
780 ,m_bEnable(sal_True)
781 ,m_bNavigation(sal_True)
782 ,m_bRecordMarker(sal_True)
783 @@ -128,6 +129,7 @@
785 m_aDefaultControl = _pOriginal->m_aDefaultControl;
786 m_bEnable = _pOriginal->m_bEnable;
787 + m_bEnableVisible = _pOriginal->m_bEnableVisible;
788 m_bNavigation = _pOriginal->m_bNavigation;
789 m_nBorder = _pOriginal->m_nBorder;
790 m_nWritingMode = _pOriginal->m_nWritingMode;
791 @@ -415,7 +417,7 @@
792 //------------------------------------------------------------------------------
793 void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
794 {
795 - BEGIN_DESCRIBE_BASE_PROPERTIES( 36 )
796 + BEGIN_DESCRIBE_BASE_PROPERTIES( 37 )
797 DECL_PROP1(NAME, ::rtl::OUString, BOUND);
798 DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
799 DECL_PROP1(TAG, ::rtl::OUString, BOUND);
800 @@ -423,6 +425,7 @@
801 DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID);
802 DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT);
803 DECL_PROP1(ENABLED, sal_Bool, BOUND);
804 + DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT);
805 DECL_PROP1(BORDER, sal_Int16, BOUND);
806 DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID);
807 DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND);
808 @@ -496,6 +499,9 @@
809 case PROPERTY_ID_ENABLED:
810 setBOOL(rValue, m_bEnable);
811 break;
812 + case PROPERTY_ID_ENABLEVISIBLE:
813 + setBOOL(rValue, m_bEnableVisible);
814 + break;
815 case PROPERTY_ID_BORDER:
816 rValue <<= (sal_Int16)m_nBorder;
817 break;
818 @@ -574,6 +580,9 @@
819 case PROPERTY_ID_ENABLED:
820 bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnable);
821 break;
822 + case PROPERTY_ID_ENABLEVISIBLE:
823 + bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnableVisible);
824 + break;
825 case PROPERTY_ID_BORDER:
826 bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_nBorder);
827 break;
828 @@ -645,6 +654,9 @@
829 case PROPERTY_ID_ENABLED:
830 m_bEnable = getBOOL(rValue);
831 break;
832 + case PROPERTY_ID_ENABLEVISIBLE:
833 + m_bEnableVisible = getBOOL(rValue);
834 + break;
835 case PROPERTY_ID_RECORDMARKER:
836 m_bRecordMarker = getBOOL(rValue);
837 break;
838 @@ -702,6 +714,7 @@
839 case PROPERTY_ID_RECORDMARKER:
840 case PROPERTY_ID_DISPLAYSYNCHRON:
841 case PROPERTY_ID_ENABLED:
842 + case PROPERTY_ID_ENABLEVISIBLE:
843 aReturn = makeBoolAny(sal_True);
844 break;
846 Index: forms/source/inc/property.hrc
847 ===================================================================
848 --- forms/source/inc/property.hrc (revision 271402)
849 +++ forms/source/inc/property.hrc (working copy)
850 @@ -206,11 +206,11 @@
851 #define PROPERTY_ID_FILTERPROPOSAL (PROPERTY_ID_START +162) // BOOL
852 #define PROPERTY_ID_FIELDSOURCE (PROPERTY_ID_START +163) // String
853 #define PROPERTY_ID_TABLENAME (PROPERTY_ID_START +164) // String
854 +#define PROPERTY_ID_ENABLEVISIBLE (PROPERTY_ID_START +165) // BOOL
855 // FREE
856 // FREE
857 // FREE
858 // FREE
859 - // FREE
860 #define PROPERTY_ID_CONTROLLABEL (PROPERTY_ID_START +171) // XPropertySet
861 #define PROPERTY_ID_CURRSYM_POSITION (PROPERTY_ID_START +172) // String
862 // FREE
863 Index: forms/source/inc/frm_strings.hxx
864 ===================================================================
865 --- forms/source/inc/frm_strings.hxx (revision 271402)
866 +++ forms/source/inc/frm_strings.hxx (working copy)
867 @@ -113,6 +113,7 @@
868 FORMS_CONSTASCII_STRING( PROPERTY_CYCLE, "Cycle" );
869 FORMS_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField" );
870 FORMS_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
871 + FORMS_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
872 FORMS_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly" );
873 FORMS_CONSTASCII_STRING( PROPERTY_RELEVANT, "Relevant" );
874 FORMS_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly" );
875 Index: forms/source/richtext/richtextmodel.hxx
876 ===================================================================
877 --- forms/source/richtext/richtextmodel.hxx (revision 271402)
878 +++ forms/source/richtext/richtextmodel.hxx (working copy)
879 @@ -83,6 +83,7 @@
880 sal_Int16 m_nContextWritingMode;
881 sal_Int16 m_nBorder;
882 sal_Bool m_bEnabled;
883 + sal_Bool m_bEnableVisible;
884 sal_Bool m_bHardLineBreaks;
885 sal_Bool m_bHScroll;
886 sal_Bool m_bVScroll;
887 Index: forms/source/richtext/richtextmodel.cxx
888 ===================================================================
889 --- forms/source/richtext/richtextmodel.cxx (revision 271402)
890 +++ forms/source/richtext/richtextmodel.cxx (working copy)
891 @@ -88,6 +88,7 @@
892 getPropertyDefaultByHandle( PROPERTY_ID_DEFAULTCONTROL ) >>= m_sDefaultControl;
893 getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder;
894 getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled;
895 + getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible;
896 getPropertyDefaultByHandle( PROPERTY_ID_HARDLINEBREAKS ) >>= m_bHardLineBreaks;
897 getPropertyDefaultByHandle( PROPERTY_ID_HSCROLL ) >>= m_bHScroll;
898 getPropertyDefaultByHandle( PROPERTY_ID_VSCROLL ) >>= m_bVScroll;
899 @@ -124,6 +125,7 @@
900 m_sHelpURL = _pOriginal->m_sHelpURL;
901 m_nBorder = _pOriginal->m_nBorder;
902 m_bEnabled = _pOriginal->m_bEnabled;
903 + m_bEnableVisible = _pOriginal->m_bEnableVisible;
904 m_bHardLineBreaks = _pOriginal->m_bHardLineBreaks;
905 m_bHScroll = _pOriginal->m_bHScroll;
906 m_bVScroll = _pOriginal->m_bVScroll;
907 @@ -188,6 +190,7 @@
908 REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
909 REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
910 REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
911 + REGISTER_PROP_2( ENABLEVISIBLE, m_bEnableVisible, BOUND, MAYBEDEFAULT );
912 REGISTER_PROP_2( BORDER, m_nBorder, BOUND, MAYBEDEFAULT );
913 REGISTER_PROP_2( HARDLINEBREAKS, m_bHardLineBreaks, BOUND, MAYBEDEFAULT );
914 REGISTER_PROP_2( HSCROLL, m_bHScroll, BOUND, MAYBEDEFAULT );
915 @@ -456,6 +459,7 @@
916 break;
918 case PROPERTY_ID_ENABLED:
919 + case PROPERTY_ID_ENABLEVISIBLE:
920 case PROPERTY_ID_PRINTABLE:
921 case PROPERTY_ID_HIDEINACTIVESELECTION:
922 aDefault <<= (sal_Bool)sal_True;
923 Index: forms/source/misc/property.cxx
924 ===================================================================
925 --- forms/source/misc/property.cxx (revision 271402)
926 +++ forms/source/misc/property.cxx (working copy)
927 @@ -106,6 +106,7 @@
928 ADD_PROP_ASSIGNMENT(CYCLE);
929 ADD_PROP_ASSIGNMENT(CONTROLSOURCE);
930 ADD_PROP_ASSIGNMENT(ENABLED);
931 + ADD_PROP_ASSIGNMENT(ENABLEVISIBLE);
932 ADD_PROP_ASSIGNMENT(SPIN);
933 ADD_PROP_ASSIGNMENT(READONLY);
934 ADD_PROP_ASSIGNMENT(FILTER);