INTEGRATION: CWS oihelp (1.3.140); FILE MERGED

2006/11/13 12:46:03 fs 1.3.140.1: #i71485# support for an optional help section in the object inspector

2 files changed, 13 insertions, 30 deletions

diff --git a/offapi/com/sun/star/inspection/XPropertyControl.idl b/offapi/com/sun/star/inspection/XPropertyControl.idl
index 9d1821798..f9cbc3182 100644
--- a/offapi/com/sun/star/inspection/XPropertyControl.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControl.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XPropertyControl.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2006-03-31 12:04:31 $
+ *  last change: $Author: kz $ $Date: 2006-12-13 11:46:36 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -81,6 +81,9 @@ interface XPropertyControl
     [attribute, readonly] type ValueType;
 
     /** specifies the context of the control within the <type>ObjectInspector</type>.
+
+        <p>The property control should actively notify its state changes to the context.
+        In particular, changes in the focus and the value of the control must be notified.
     */
     [attribute] XPropertyControlContext ControlContext;
 
@@ -94,7 +97,7 @@ interface XPropertyControl
 
         @see notifyModifiedValue
         @see ControlContext
-        @see XPropertyControlContext::controlValueChanged
+        @see XPropertyControlContext::valueChanged
     */
     boolean isModified();
 
@@ -103,7 +106,7 @@ interface XPropertyControl
 
         @see isModified
         @see ControlContext
-        @see XPropertyControlListener::controlValueChanged
+        @see XPropertyControlListener::valueChanged
     */
     void notifyModifiedValue();
 
diff --git a/offapi/com/sun/star/inspection/XPropertyControlContext.idl b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
index 98d4e0ebb..570d8397a 100644
--- a/offapi/com/sun/star/inspection/XPropertyControlContext.idl
+++ b/offapi/com/sun/star/inspection/XPropertyControlContext.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XPropertyControlContext.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2006-03-31 12:04:42 $
+ *  last change: $Author: kz $ $Date: 2006-12-13 11:46:49 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,15 +36,13 @@
 #ifndef __com_sun_star_inspection_XPropertyControlContext_idl__
 #define __com_sun_star_inspection_XPropertyControlContext_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__ 
-#include <com/sun/star/uno/XInterface.idl>
+#ifndef __com_sun_star_inspection_XPropertyControlObserver_idl__
+#include <com/sun/star/inspection/XPropertyControlObserver.idl>
 #endif
 
 //=============================================================================
 module com {  module sun {  module star {  module inspection {
 
-interface XPropertyControl;
-
 //-----------------------------------------------------------------------------
 /** specifies the interface of the context of an <type>XPropertyControl</type>.
 
@@ -52,29 +50,11 @@ interface XPropertyControl;
 
     @since OOo 2.0.3
 */
-interface XPropertyControlContext
+interface XPropertyControlContext : XPropertyControlObserver
 {
-    /** notifies the context that a certain <type>XPropertyControl</type>'s UI
-        representation gained the focus.
-
-        @param Control
-            denotes the control whose UI representation gained the focus
-    */
-    [oneway] void   focusGained( [in] XPropertyControl Control );
-
-    /** notifies the context that a certain <type>XPropertyControl</type>'s value
-        changed.
-
-        @param Control
-            denotes the control whose value changed.
-
-        @see XPropertyControl::Value
-    */
-    [oneway] void   controlValueChanged( [in] XPropertyControl Control );
-
     /** instructs the <type>XPropertyControlContext</type> to active the next control
 
-        @param Control
+        @param CurrentControl
             denotes the control which initiated the request.
     */
     [oneway] void   activateNextControl( [in] XPropertyControl CurrentControl );