CWS-TOOLING: integrate CWS dv12

7 files changed, 14 insertions, 9 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
index 63364622c4ce..cf45f0aea0f0 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
@@ -45,9 +45,11 @@
 /** specifies a simple animation control.
 
     <p>The model of an <type>UnoControlSimpleAnimation</type> control must support
-    the <type>UnoControlSimpleAnimationModel</type> service.
+    the <type>UnoControlSimpleAnimationModel</type> service.</p>
+
+    @since OOo 2.2
  */
-service UnoControlSimpleAnimation
+published service UnoControlSimpleAnimation
 {
     service com::sun::star::awt::UnoControl;
 
diff --git a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
index 1460adaa49d1..ca301483263f 100644
--- a/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
@@ -45,9 +45,10 @@
     <p> </p>
 
     @see UnoControlScrollBarModel
+    @since OOo 2.2
  */
 
-service UnoControlSimpleAnimationModel
+published service UnoControlSimpleAnimationModel
 {
     service com::sun::star::awt::UnoControlModel;
 
diff --git a/offapi/com/sun/star/awt/UnoControlThrobber.idl b/offapi/com/sun/star/awt/UnoControlThrobber.idl
index a798d1d842e2..f5194075019a 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobber.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobber.idl
@@ -45,9 +45,11 @@
 /** specifies a simple animation control.
 
     <p>The model of an <type>UnoControlThrobber</type> control must support
-    the <type>UnoControlThrobberModel</type> service.
+    the <type>UnoControlThrobberModel</type> service.</p>
+
+    @since OOo 2.2
  */
-service UnoControlThrobber
+published service UnoControlThrobber
 {
     service com::sun::star::awt::UnoControl;
 
diff --git a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
index 9b2f31853f2d..f2eacad5b76b 100644
--- a/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlThrobberModel.idl
@@ -45,9 +45,10 @@
     <p> </p>
 
     @see UnoControlScrollBarModel
+    @since OOo 2.2
  */
 
-service UnoControlThrobberModel
+published service UnoControlThrobberModel
 {
     service com::sun::star::awt::UnoControlModel;
 };
diff --git a/offapi/com/sun/star/awt/XSimpleAnimation.idl b/offapi/com/sun/star/awt/XSimpleAnimation.idl
index 174e69c8184c..1cfd758590b9 100644
--- a/offapi/com/sun/star/awt/XSimpleAnimation.idl
+++ b/offapi/com/sun/star/awt/XSimpleAnimation.idl
@@ -43,7 +43,7 @@
 
 /** Controls the animation control.
  */
-interface XSimpleAnimation: com::sun::star::uno::XInterface
+published interface XSimpleAnimation: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/awt/XThrobber.idl b/offapi/com/sun/star/awt/XThrobber.idl
index 934f85e8aa22..0a4ac133524a 100644
--- a/offapi/com/sun/star/awt/XThrobber.idl
+++ b/offapi/com/sun/star/awt/XThrobber.idl
@@ -43,7 +43,7 @@
 
 /** Controls the animation control.
  */
-interface XThrobber: com::sun::star::uno::XInterface
+published interface XThrobber: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
diff --git a/sal/osl/w32/diagnose.c b/sal/osl/w32/diagnose.c
index 239628abcecc..b46bff44b73c 100644
--- a/sal/osl/w32/diagnose.c
+++ b/sal/osl/w32/diagnose.c
@@ -87,7 +87,6 @@ void SAL_CALL osl_trace(const sal_Char* lpszFormat, ...)
     if ( IsDebuggerPresent() )
     {
         sal_Char    szMessage[512];
-        szMessage[sizeof(szMessage)-1] = 0;
         written = _vsnprintf( szMessage, sizeof(szMessage) - 2, lpszFormat, args );
         if ( written == -1 )
             written = sizeof(szMessage) - 2;