[ooo-build-commit] .: 2 commits - offapi/com offapi/util

[Jan Holesovsky]

 offapi/com/sun/star/drawing/TextFitToSizeType.idl |    7 ++++---
 offapi/util/makefile.mk                           |    9 ++++++---
 offapi/util/types-whitelist                       |    1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 36287b2a9dbff1561e393692e0d42a19c5f6bcfe
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Sep 17 10:26:53 2010 +0200

    offapi-typecheck-whitelist.diff: Removed blunt instrument from offapi types.
    
    Added whitelist file that contains the typenames which are permitted to change.

diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 016180d..2518876 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -176,13 +176,16 @@ $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udk
 #
 #JSC: i have removed the doc rdb because all type information is already in the
 #     types.rdb, even the service and singleton type info. IDL docu isn't checked.
-$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
-    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db \
+#
+#Use the types-whitelist to exclude published API from signalling incompatibility.
+#Handle with care.
+$(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db types-whitelist
+    $(COMMAND_ECHO)$(REGCOMPARE) -f -t -r1 $(REFERENCE_RDB) -r2 $(UCR)$/types.db @types-whitelist \
         && echo > $(REGISTRYCHECKFLAG)
 
 #JSC: new target to prepare some UNO type statistics, the ouput will be later used
 #     for versioning of UNO cli type libraries
-$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
+$(UNOTYPE_STATISTICS) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
     $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@
 
 .INCLUDE :  target.mk
diff --git a/offapi/util/types-whitelist b/offapi/util/types-whitelist
new file mode 100644
index 0000000..343bede
--- /dev/null
+++ b/offapi/util/types-whitelist
@@ -0,0 +1 @@
+-x /UCR/com/sun/star/drawing/TextFitToSizeType
commit 27b947313e8a68209588d2517757a17dac9ef644
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Sep 17 10:11:33 2010 +0200

    fit-list-to-size.diff: Shrink font automatically when text overflows.
    
    i#94086
    
    Scale-font-down if typing text in Impress and the text box becomes too small.

diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index 248090b..91d28b7 100644
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -60,9 +60,10 @@ published enum TextFitToSizeType
  
     //------------------------------------------------------------------------- 
 
-    /** if the shape is scaled, the font attributes are scaled and hard set
-        on the text */
-    RESIZEATTR 
+    /** if the shape is scaled, the font is scaled isotrophically to
+        fit the avaiable space. Auto line-breaks will keep working
+   */
+    AUTOFIT
  
 };