Merge commit 'ooo/DEV300_m106' into libreoffice-3-4integration/dev300_m106

Conflicts:
	offapi/com/sun/star/animations/XAnimationNode.idl
	offapi/com/sun/star/awt/grid/XGridColumn.idl
	offapi/com/sun/star/drawing/framework/XPaneBorderPainter.idl
	offapi/com/sun/star/frame/ModuleManager.idl
	offapi/com/sun/star/frame/XLayoutManager.idl
	offapi/com/sun/star/frame/XLayoutManagerListener.idl
	offapi/com/sun/star/rendering/FontInfo.idl
	offapi/com/sun/star/rendering/XBezierPolyPolygon2D.idl
	offapi/com/sun/star/rendering/XCanvas.idl
	offapi/com/sun/star/rendering/XSprite.idl
	offapi/com/sun/star/report/ForceNewPage.idl
	offapi/com/sun/star/report/ReportPrintOption.idl
	offapi/com/sun/star/report/XFunctionsSupplier.idl
	offapi/com/sun/star/report/XReportControlFormat.idl
	offapi/com/sun/star/resource/StringResourceWithLocation.idl
	offapi/com/sun/star/resource/XStringResourceResolver.idl
	offapi/com/sun/star/resource/XStringResourceWithLocation.idl
	offapi/com/sun/star/sdb/XSingleSelectQueryComposer.idl
	offapi/com/sun/star/security/XCertificateContainer.idl
	offapi/com/sun/star/ui/UIElementFactory.idl
	offapi/com/sun/star/ui/XImageManager.idl
	offapi/com/sun/star/ui/XUIConfigurationManager.idl
	offapi/com/sun/star/ui/XUIElementFactory.idl
	offapi/com/sun/star/ui/XUIElementSettings.idl
	offapi/com/sun/star/xml/crypto/SEInitializer.idl
	offapi/com/sun/star/xml/crypto/XSEInitializer.idl
	offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl
	offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl
	sal/rtl/source/alloc_arena.c
	udkapi/com/sun/star/task/XInteractionHandler2.idl

1 files changed, 32 insertions, 32 deletions

diff --git a/offapi/com/sun/star/util/XModifiable2.idl b/offapi/com/sun/star/util/XModifiable2.idl
index e4934d1dd..ecbe5e2be 100644
--- a/offapi/com/sun/star/util/XModifiable2.idl
+++ b/offapi/com/sun/star/util/XModifiable2.idl
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,26 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
 ************************************************************************/
-#ifndef __com_sun_star_util_XModifiable2_idl__ 
-#define __com_sun_star_util_XModifiable2_idl__ 
- 
-#ifndef __com_sun_star_util_XModifiable_idl__ 
-#include <com/sun/star/util/XModifiable.idl> 
-#endif 
- 
-#ifndef __com_sun_star_beans_PropertyVetoException_idl__ 
-#include <com/sun/star/beans/PropertyVetoException.idl> 
-#endif 
- 
- 
-//============================================================================= 
- 
-module com {  module sun {  module star {  module util {  
- 
-//============================================================================= 
- 
+#ifndef __com_sun_star_util_XModifiable2_idl__
+#define __com_sun_star_util_XModifiable2_idl__
+
+#ifndef __com_sun_star_util_XModifiable_idl__
+#include <com/sun/star/util/XModifiable.idl>
+#endif
+
+#ifndef __com_sun_star_beans_PropertyVetoException_idl__
+#include <com/sun/star/beans/PropertyVetoException.idl>
+#endif
+
+
+//=============================================================================
+
+module com {  module sun {  module star {  module util {
+
+//=============================================================================
+
 /** allows to control modifiable state change.
-    
+
     <p>
     This interface allows to prevent changing of the modified state of the
     object. It is introduced for performance optimizations, to allow to prevent
@@ -51,9 +51,9 @@ module com {  module sun {  module star {  module util {
     Please use this interface very carefully.
     </p>
  */
-interface XModifiable2: com::sun::star::util::XModifiable
-{ 
-    //------------------------------------------------------------------------- 
+published interface XModifiable2: com::sun::star::util::XModifiable
+{
+    //-------------------------------------------------------------------------
     /** disable possibility to change modified state of the document
 
         @returns the value that says whether the modified state change was
@@ -64,7 +64,7 @@ interface XModifiable2: com::sun::star::util::XModifiable
      */
     boolean disableSetModified();
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     /** enable possibility to change modified state of the document
 
         @returns the value that says whether the modified state change was
@@ -74,15 +74,15 @@ interface XModifiable2: com::sun::star::util::XModifiable
      */
     boolean enableSetModified();
 
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
     /** allows to detect whether the modified state change is enabled
      */
     boolean isSetModifiedEnabled();
-}; 
- 
-//============================================================================= 
- 
-}; }; }; };  
- 
-#endif 
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif