[ooo-build-commit] 25 commits - AUTHORS autogen.sh bridges/unotypes buildenv.in build/prj build/stamp ChangeLog cli_ure/prj cli_ure/unotypes cli_ure/version configure.in COPYING cppuhelper/source cppuhelper/unotypes cpputools/source .gitignore idlc/source INSTALL io/source javaunohelper/source jvmfwk/plugins Makefile.am NEWS offapi/com offapi/prj offapi/type_reference offapi/util offuh/source pyuno/prj README remotebridges/source ridljar/javamaker ridljar/prj sal/inc sal/osl sal/prj sal/qa sal/systools sal/textenc stoc/source udkapi/com unoil/climaker unoil/javamaker unoil/prj ure/prj xml2cmp/prj

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Jul 3 01:57:45 PDT 2009


 .gitignore                                           |   21 +
 AUTHORS                                              |    1 
 COPYING                                              |  165 +++++++++++++
 ChangeLog                                            |    1 
 INSTALL                                              |  237 +++++++++++++++++++
 Makefile.am                                          |   39 +++
 README                                               |   12 
 autogen.sh                                           |   11 
 bridges/unotypes/makefile.mk                         |    4 
 build/prj/build.lst                                  |    1 
 build/stamp/.gitignore                               |    3 
 build/stamp/README.txt                               |    1 
 buildenv.in                                          |   10 
 cli_ure/prj/build.lst                                |    2 
 cli_ure/unotypes/makefile.mk                         |    2 
 cli_ure/version/version.txt                          |   24 -
 configure.in                                         |   16 +
 cppuhelper/source/makefile.mk                        |    2 
 cppuhelper/unotypes/makefile.mk                      |    6 
 cpputools/source/registercomponent/makefile.mk       |    4 
 cpputools/source/regsingleton/makefile.mk            |    4 
 cpputools/source/unoexe/makefile.mk                  |    4 
 idlc/source/scanner.ll                               |    6 
 io/source/acceptor/makefile.mk                       |    6 
 io/source/connector/makefile.mk                      |    6 
 io/source/stm/makefile.mk                            |    6 
 javaunohelper/source/makefile.mk                     |    4 
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx     |    2 
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx           |   15 +
 offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl  |   16 +
 offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl  |   16 +
 offapi/com/sun/star/chart2/RectangularDataSource.idl |   89 -------
 offapi/com/sun/star/chart2/data/DataProvider.idl     |    4 
 offapi/com/sun/star/chart2/data/DataSequence.idl     |    9 
 offapi/com/sun/star/form/component/CommandButton.idl |   37 +-
 offapi/com/sun/star/linguistic2/LinguProperties.idl  |   16 -
 offapi/com/sun/star/logging/DocumentIOLogRing.idl    |   66 +++++
 offapi/com/sun/star/logging/SimpleLogRing.idl        |   72 +++++
 offapi/com/sun/star/logging/XSimpleLogRing.idl       |   77 ++++++
 offapi/com/sun/star/logging/makefile.mk              |    5 
 offapi/com/sun/star/report/XReportControlFormat.idl  |   35 --
 offapi/com/sun/star/report/XReportEngine.idl         |    7 
 offapi/com/sun/star/sdb/ErrorCondition.idl           |   31 ++
 offapi/com/sun/star/sdb/RowSet.idl                   |    3 
 offapi/prj/build.lst                                 |    2 
 offapi/type_reference/typelibrary_history.txt        |    6 
 offapi/type_reference/types.rdb                      |binary
 offapi/util/makefile.mk                              |    8 
 offuh/source/makefile.mk                             |    3 
 pyuno/prj/build.lst                                  |    2 
 remotebridges/source/bridge/makefile.mk              |    1 
 remotebridges/source/dynamicloader/makefile.mk       |    1 
 remotebridges/source/factory/makefile.mk             |    1 
 remotebridges/source/unourl_resolver/makefile.mk     |    1 
 ridljar/javamaker/makefile.mk                        |    2 
 ridljar/prj/build.lst                                |    2 
 sal/inc/osl/diagnose.h                               |   20 +
 sal/inc/rtl/textenc.h                                |    1 
 sal/osl/unx/file.cxx                                 |    2 
 sal/osl/w32/file.cxx                                 |    2 
 sal/prj/build.lst                                    |    2 
 sal/qa/rtl/textenc/rtl_textcvt.cxx                   |   42 +++
 sal/systools/win32/uwinapi/makefile.mk               |    1 
 sal/textenc/convertadobe.tab                         |   75 +++++-
 sal/textenc/tencinfo.c                               |    2 
 sal/textenc/textenc.cxx                              |    3 
 stoc/source/cppumaker.mk                             |    1 
 udkapi/com/sun/star/container/EnumerableMap.idl      |  139 +++++++++++
 udkapi/com/sun/star/container/XEnumerableMap.idl     |  108 ++++++++
 udkapi/com/sun/star/container/XMap.idl               |  201 ++++++++++++++++
 udkapi/com/sun/star/container/makefile.mk            |    3 
 unoil/climaker/version.txt                           |    6 
 unoil/javamaker/makefile.mk                          |    4 
 unoil/prj/build.lst                                  |    4 
 ure/prj/build.lst                                    |    2 
 xml2cmp/prj/build.lst                                |    2 
 76 files changed, 1532 insertions(+), 215 deletions(-)

New commits:
commit e681cc1b9dad61d73104b39d8f0e9633fb0bd89c
Merge: 7e04afa... b33209a...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jul 3 08:49:33 2009 +0200

    Merge commit 'ooo/DEV300_m51'
    
    Conflicts:
    	offapi/prj/build.lst

diff --cc offapi/prj/build.lst
index 81a6525,ede720d..359dd49
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- oa	offapi	:	udkapi NULL
 -oa	offapi	:	udkapi idlc solenv NULL
++oa	offapi	:	udkapi idlc NULL
  oa	offapi									usr1	-	all	oa_mkout NULL
  oa	offapi\com\sun\star\script				nmake	-	all	oa_script oa_embed NULL
  oa	offapi\com\sun\star\script\browse	nmake	-	all	oa_sfbrowse NULL
commit 7e04afa6ed165c8d61e40c5720a464f2da6a97b4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jul 3 08:44:32 2009 +0200

    Split build: make install works.
    
    Needs the most recent changes from the bootstrap.
    
    * .gitignore: Ignore what is generated during make install.
    * Makefile.am: make install itself.

diff --git a/.gitignore b/.gitignore
index 5e61841..7a7ce93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,9 @@
 /config.status
 /configure
 /install-sh
+/logfile.log
 /missing
+/OpenOffice
 /solver
 
 /*/unxlng??.pro
diff --git a/Makefile.am b/Makefile.am
index 0333705..6c12716 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@
 stampdir = $(top_builddir)/build/stamp
 pkgconfigdir = $(libdir)/pkgconfig
 ooo_prefix = @OOO_PREFIX@
+solenvdir = $(ooo_prefix)/solenv
+buildsolverdir = "@abs_builddir@/solver"
 
 # what to add to the package
 
@@ -25,8 +27,13 @@ clean-local:
 # TODO
 distclean-local:
 
-# TODO
 install-data-local: $(stampdir)/all
+	( . buildenv -i ; \
+	  export PRODUCT="OpenOffice" ; \
+	  perl -w $(solenvdir)/bin/make_installer.pl \
+	       -f $(ooo_prefix)/instsetoo_native/util/openoffice.lst \
+	       -l 'en-US' -p "$$PRODUCT" -buildid "$$BUILD" \
+	       -dontstrip -verbose -simple $(DESTDIR)$(ooo_prefix) )
 
 $(stampdir)/all: buildenv
 	( . buildenv ; cd build ; build.pl --all ) && touch $@
commit 187b28805bf2c8086414671fae85c85813f03a5e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 30 10:44:56 2009 +0200

    Split build: Use BUILDSOLVER where appropriate.
    
    * bridges/unotypes/makefile.mk:
    * cppuhelper/source/makefile.mk:
    * cppuhelper/unotypes/makefile.mk:
    * cpputools/source/registercomponent/makefile.mk:
    * cpputools/source/regsingleton/makefile.mk:
    * cpputools/source/unoexe/makefile.mk:
    * io/source/acceptor/makefile.mk:
    * io/source/connector/makefile.mk:
    * io/source/stm/makefile.mk:
    * javaunohelper/source/makefile.mk:
    * offapi/util/makefile.mk:
    * offuh/source/makefile.mk:
    * remotebridges/source/bridge/makefile.mk:
    * remotebridges/source/dynamicloader/makefile.mk:
    * remotebridges/source/factory/makefile.mk:
    * remotebridges/source/unourl_resolver/makefile.mk:
    * ridljar/javamaker/makefile.mk:
    * stoc/source/cppumaker.mk:
    * unoil/javamaker/makefile.mk:

diff --git a/bridges/unotypes/makefile.mk b/bridges/unotypes/makefile.mk
index cf6420b..2bc7b93 100644
--- a/bridges/unotypes/makefile.mk
+++ b/bridges/unotypes/makefile.mk
@@ -40,8 +40,8 @@ TARGET=unotypes
 #-------------------------------------------------------------------
 
 CPPUMAKERFLAGS += -C
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb 
+UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb 
 UNOUCROUT=$(OUT)$/inc
 
 UNOTYPES = \
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 17dad41..84c7710 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -51,7 +51,7 @@ UNIXVERSIONNAMES=UDK
 
 # --- Files --------------------------------------------------------
 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 UNOUCRDEP=$(UNOUCRRDB)
 UNOUCROUT=$(OUT)$/inc$/$(TARGET)
 INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private
diff --git a/cppuhelper/unotypes/makefile.mk b/cppuhelper/unotypes/makefile.mk
index c2c835d..ce34e0d 100644
--- a/cppuhelper/unotypes/makefile.mk
+++ b/cppuhelper/unotypes/makefile.mk
@@ -40,7 +40,7 @@ UNOUCRRDB = $(BIN)$/$(TARGET).rdb
 UNOUCRDEP = $(UNOUCRRDB)
 UNOUCROUT = $(OUT)$/inc$/private
 
-CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb
+CPPUMAKERFLAGS += -C -X$(BUILDSOLARBINDIR)$/types.rdb
 
 UNOTYPES = \
     cppuhelper.detail.XExceptionThrower
@@ -50,7 +50,7 @@ ALLIDLFILES = \
 
 .INCLUDE : target.mk
 
-$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb
-    $(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
+$(UNOUCRRDB) : $(ALLIDLFILES) $(BUILDSOLARBINDIR)$/types.rdb
+    $(IDLC) -I. -I$(BUILDSOLARIDLDIR) -O$(UCR) $(ALLIDLFILES)
     $(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)}
     touch $@
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
index e03df02..471864d 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb 
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS += -C
diff --git a/cpputools/source/regsingleton/makefile.mk b/cpputools/source/regsingleton/makefile.mk
index be2c07d..541a5b3 100644
--- a/cpputools/source/regsingleton/makefile.mk
+++ b/cpputools/source/regsingleton/makefile.mk
@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb 
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS+= -C
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index 3ecab88..f44667d 100644
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -39,8 +39,8 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb 
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 NO_OFFUH=TRUE
 CPPUMAKERFLAGS+= -C
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index b537b20..955d89e 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -36,15 +36,15 @@ TARGET = acceptor.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = acceptor
-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+COMPRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 DLLPRE =
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(COMPRDB)
+UNOUCRRDB=$(COMPRDB)
 UNOUCROUT=$(OUT)$/inc$/acceptor
 INCPRE+= $(UNOUCROUT)
 
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index d726ac4..32b8e22 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -36,15 +36,15 @@ TARGET = connector.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = connectr
-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+COMPRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 DLLPRE =
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(COMPRDB)
+UNOUCRRDB=$(COMPRDB)
 UNOUCROUT=$(OUT)$/inc$/connector
 INCPRE+= $(UNOUCROUT)
 
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index e4b8ad3..0285fa7 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -35,14 +35,14 @@ TARGET = streams.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = stm
-COMPRDB=$(SOLARBINDIR)$/udkapi.rdb
+COMPRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
 DLLPRE =
 # --- Files --------------------------------------------------------
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(COMPRDB)
+UNOUCRRDB=$(COMPRDB)
 UNOUCROUT=$(OUT)$/inc$/stm
 INCPRE+= $(UNOUCROUT)
 
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk
index 4898c6a..a537a70 100644
--- a/javaunohelper/source/makefile.mk
+++ b/javaunohelper/source/makefile.mk
@@ -48,8 +48,8 @@ nojava:
 
 # ------------------------------------------------------------------
 
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
+UNOUCRDEP=$(BUILDSOLARBINDIR)$/udkapi.rdb
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb
 
 UNOUCROUT=$(OUT)$/inc$/comprehensive
 INCPRE+=$(OUT)$/inc$/comprehensive
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk
index 6e4a415..fa93975 100644
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -160,15 +160,15 @@ ALLTAR : $(UCR)$/types.db \
        $(REGISTRYCHECKFLAG) \
        $(UNOTYPE_STATISTICS)
 
-$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
+$(UCR)$/types.db : $(UCR)$/offapi.db $(BUILDSOLARBINDIR)$/udkapi.rdb
     -$(RM) $(REGISTRYCHECKFLAG)
     $(GNUCOPY) -f $(UCR)$/offapi.db $@
-    $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
+    $(REGMERGE) $@ / $(BUILDSOLARBINDIR)$/udkapi.rdb
 
-$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
+$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(BUILDSOLARBINDIR)$/udkapi_doc.rdb
     -$(RM) $(REGISTRYCHECKFLAG)
     $(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
-    $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
+    $(REGMERGE) $@ / $(BUILDSOLARBINDIR)$/udkapi_doc.rdb
 
 #JSC: The type library has changed, all temporary not checked types are removed
 #     and will be check from now on.
diff --git a/offuh/source/makefile.mk b/offuh/source/makefile.mk
index e7e19fd..5386c68 100644
--- a/offuh/source/makefile.mk
+++ b/offuh/source/makefile.mk
@@ -39,6 +39,9 @@ TARGET=		offuh
 
 # ------------------------------------------------------------------
 
+# during the split build, the path to types.rdb might differ
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/types.rdb
+
 $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
     @@-$(RM) $@
     $(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
diff --git a/remotebridges/source/bridge/makefile.mk b/remotebridges/source/bridge/makefile.mk
index ef02b1b..38a7211 100644
--- a/remotebridges/source/bridge/makefile.mk
+++ b/remotebridges/source/bridge/makefile.mk
@@ -35,6 +35,7 @@ PRJNAME=remotebridges
 TARGET = remotebridge.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = remotebridge
+UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
diff --git a/remotebridges/source/dynamicloader/makefile.mk b/remotebridges/source/dynamicloader/makefile.mk
index 1a4364c..7b6432b 100755
--- a/remotebridges/source/dynamicloader/makefile.mk
+++ b/remotebridges/source/dynamicloader/makefile.mk
@@ -35,6 +35,7 @@ PRJNAME=remotebridges
 TARGET = dynamicloader.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = dynamicloader
+UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk
index 280ed38..d8b3b61 100644
--- a/remotebridges/source/factory/makefile.mk
+++ b/remotebridges/source/factory/makefile.mk
@@ -35,6 +35,7 @@ PRJNAME=remotebridges
 TARGET = bridgefac.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = brdgfctr
+UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
index bb005dc..a2ff070 100644
--- a/remotebridges/source/unourl_resolver/makefile.mk
+++ b/remotebridges/source/unourl_resolver/makefile.mk
@@ -34,6 +34,7 @@ PRJNAME=remotebridges
 TARGET = uuresolver.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = uuresolver
+UNOUCRRDB = $(BUILDSOLARBINDIR)$/types.rdb
 
 # --- Settings -----------------------------------------------------
 
diff --git a/ridljar/javamaker/makefile.mk b/ridljar/javamaker/makefile.mk
index af254bc..8c0b704 100644
--- a/ridljar/javamaker/makefile.mk
+++ b/ridljar/javamaker/makefile.mk
@@ -35,7 +35,7 @@ TARGET := javamaker
 
 .INCLUDE: settings.mk
 
-RDB = $(SOLARBINDIR)$/udkapi.rdb
+RDB = $(BUILDSOLARBINDIR)$/udkapi.rdb
 
 .INCLUDE: target.mk
 
diff --git a/stoc/source/cppumaker.mk b/stoc/source/cppumaker.mk
index 39a5155..933ce70 100644
--- a/stoc/source/cppumaker.mk
+++ b/stoc/source/cppumaker.mk
@@ -43,3 +43,4 @@ CFLAGS += -Ob0
 
 .ENDIF
 
+UNOUCRRDB=$(BUILDSOLARBINDIR)$/types.rdb
diff --git a/unoil/javamaker/makefile.mk b/unoil/javamaker/makefile.mk
index 3a50e8b..b2c9811 100644
--- a/unoil/javamaker/makefile.mk
+++ b/unoil/javamaker/makefile.mk
@@ -35,8 +35,8 @@ TARGET := javamaker
 
 .INCLUDE: settings.mk
 
-RDB = $(SOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
+RDB = $(BUILDSOLARBINDIR)$/offapi.rdb
+EXTRA_RDB = $(BUILDSOLARBINDIR)$/udkapi.rdb
 
 .INCLUDE: target.mk
 
commit 9962e4914b9f467880591fb4ce6885ddd5ebb107
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 30 10:44:35 2009 +0200

    Split build: Fix build dependencies.
    
    * cli_ure/prj/build.lst:
    * offapi/prj/build.lst:
    * pyuno/prj/build.lst:
    * ridljar/prj/build.lst:
    * sal/prj/build.lst:
    * unoil/prj/build.lst:
    * ure/prj/build.lst:
    * xml2cmp/prj/build.lst:

diff --git a/cli_ure/prj/build.lst b/cli_ure/prj/build.lst
index 007a01a..144c22f 100644
--- a/cli_ure/prj/build.lst
+++ b/cli_ure/prj/build.lst
@@ -1,4 +1,4 @@
-ure	cli_ure	:	cppu cppuhelper sal codemaker stoc udkapi tools NULL
+ure	cli_ure	:	cppu cppuhelper sal codemaker stoc udkapi NULL
 ure	cli_ure						usr1	-	all	ure_mkout NULL
 ure	cli_ure\inc					nmake   -   all   ure_inc NULL
 ure	cli_ure\version				nmake   -   all   ure_source_version ure_inc NULL
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 094ca71..81a6525 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,4 +1,4 @@
-oa	offapi	:	udkapi solenv NULL
+oa	offapi	:	udkapi NULL
 oa	offapi									usr1	-	all	oa_mkout NULL
 oa	offapi\com\sun\star\script				nmake	-	all	oa_script oa_embed NULL
 oa	offapi\com\sun\star\script\browse	nmake	-	all	oa_sfbrowse NULL
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst
index 9244916..7c84124 100644
--- a/pyuno/prj/build.lst
+++ b/pyuno/prj/build.lst
@@ -1,4 +1,4 @@
-bgpu	pyuno	:	stoc cpputools cppuhelper bridges tools PYTHON:python NULL
+bgpu	pyuno	:	stoc cpputools cppuhelper bridges PYTHON:python NULL
 pu	pyuno				  usr1	-	all	br_mkout NULL
 pu	pyuno\zipcore	nmake	-	all	pu_zipcore NULL
 pu	pyuno\source\module	nmake	-	all	pu_module NULL
diff --git a/ridljar/prj/build.lst b/ridljar/prj/build.lst
index ac91c68..a43b9fb 100644
--- a/ridljar/prj/build.lst
+++ b/ridljar/prj/build.lst
@@ -1,4 +1,4 @@
-ri ridljar : codemaker solenv udkapi NULL
+ri ridljar : codemaker udkapi NULL
 ri ridljar\javamaker nmake - all javamaker NULL
 ri ridljar\com nmake - all com javamaker NULL
 ri ridljar\util nmake - all util javamaker com NULL
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 5622d80..4850162 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,4 +1,4 @@
-sa	sal	:	xml2cmp stlport external BOOST:boost NULL 
+sa	sal	:	xml2cmp BOOST:boost NULL 
 sa	sal										usr1	-	all	sa_mkout NULL
 sa	sal\inc									nmake	-	all	sa_inc NULL
 sa	sal\typesconfig							nmake	-	u	sa_tc sa_inc NULL
diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst
index c229639..6c91fe4 100644
--- a/unoil/prj/build.lst
+++ b/unoil/prj/build.lst
@@ -1,4 +1,4 @@
-ul unoil :: codemaker offapi ridljar solenv cli_ure NULL
+ul unoil :: codemaker offapi ridljar cli_ure NULL
 ul unoil\javamaker nmake - all ul_javamaker NULL
 ul unoil\util nmake - all ul_util ul_javamaker NULL
-ul unoil\climaker nmake - all  ul_climaker NULL
\ No newline at end of file
+ul unoil\climaker nmake - all  ul_climaker NULL
diff --git a/ure/prj/build.lst b/ure/prj/build.lst
index 07fbfc4..fa6a458 100644
--- a/ure/prj/build.lst
+++ b/ure/prj/build.lst
@@ -1,2 +1,2 @@
-ur ure : cli_ure solenv NULL
+ur ure : cli_ure NULL
 ur ure\source nmake - all ur_source NULL
diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst
index e9f2979..70c4a45 100644
--- a/xml2cmp/prj/build.lst
+++ b/xml2cmp/prj/build.lst
@@ -1,4 +1,4 @@
-xc  xml2cmp : soltools stlport NULL
+xc  xml2cmp : NULL
 xc  xml2cmp                         usr1    -	all	xc_mkout NULL
 xc  xml2cmp\prj                     get -	all	xc_prj NULL
 xc  xml2cmp\source\support                  nmake   -   all	xc_supp NULL
commit 82ac5fcd53eaef9a8a0bb4950ff73affc59a15fc
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 30 10:42:47 2009 +0200

    Split build: The build bits themselves.
    
    This makes ./configure ; make work.  make install is still a TODO.
    
    * Makefile.am:
    * autogen.sh:
    * build/prj/build.lst:
    * build/stamp/.gitignore:
    * build/stamp/README.txt:
    * buildenv.in:
    * configure.in:

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..0333705
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,32 @@
+# few needed variables
+
+stampdir = $(top_builddir)/build/stamp
+pkgconfigdir = $(libdir)/pkgconfig
+ooo_prefix = @OOO_PREFIX@
+
+# what to add to the package
+
+# TODO
+EXTRA_DIST = 
+
+# TODO more in dist-hook, likeremove .o's in dmake, stuff in build/stamp, etc.
+# [basically everything that we have in .gitignores ;-)]
+dist-hook:
+	git log --date=short --pretty="format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b" | sed -e "s|^\([^@]\)|\t\1|" -e "s|^@||" >$(distdir)/ChangeLog
+	rm -rf $(distdir)/*/unxlng*.pro
+
+# rules to execute
+
+all-local: $(stampdir)/all
+
+# TODO
+clean-local:
+
+# TODO
+distclean-local:
+
+# TODO
+install-data-local: $(stampdir)/all
+
+$(stampdir)/all: buildenv
+	( . buildenv ; cd build ; build.pl --all ) && touch $@
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..8183a7f
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+aclocal $ACLOCAL_FLAGS || exit 1
+automake --gnu --add-missing --copy || exit 1
+autoconf || exit 1
+
+if test "x$NOCONFIGURE" = "x"; then
+    ./configure "$@"
+else
+    echo "Skipping configure process."
+fi
diff --git a/build/prj/build.lst b/build/prj/build.lst
new file mode 100644
index 0000000..663e5e4
--- /dev/null
+++ b/build/prj/build.lst
@@ -0,0 +1 @@
+bu build : bridges cli_ure codemaker cppu cppuhelper cpputools idlc io javaunohelper jurt jvmaccess jvmfwk offapi offuh OOo:pyuno rdbmaker registry remotebridges ridljar sal salhelper stoc store udkapi unoil ure xml2cmp NULL
diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore
new file mode 100644
index 0000000..a9a95e9
--- /dev/null
+++ b/build/stamp/.gitignore
@@ -0,0 +1,3 @@
+/*
+!/README.txt
+!/.gitignore
diff --git a/build/stamp/README.txt b/build/stamp/README.txt
new file mode 100644
index 0000000..a28c9d7
--- /dev/null
+++ b/build/stamp/README.txt
@@ -0,0 +1 @@
+This directory is for storing the stamps generated by the toplevel Makefile.
diff --git a/buildenv.in b/buildenv.in
new file mode 100644
index 0000000..6c6c26e
--- /dev/null
+++ b/buildenv.in
@@ -0,0 +1,10 @@
+# Source this if you want to use build.pl directly, like:
+# . buildenv
+# or
+# source buildenv
+
+ooo_prefix="@OOO_PREFIX@"
+solverdir="$ooo_prefix/solver"
+buildsolverdir="@abs_builddir@/solver"
+
+. "$solverdir"/buildenv-common
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000..a496898
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,16 @@
+dnl Version X.Y.A.M
+dnl   X.Y - version
+dnl   A   - minor, or 97 for devel, 98 for alpha, 99 for beta
+dnl   M   - milestone, or micro version
+AC_INIT(OpenOffice.org-ure,3.1.97.50)
+
+AM_INIT_AUTOMAKE([1.8b tar-ustar])
+PKG_PROG_PKG_CONFIG
+
+dnl Where should be the OOo installed
+PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap)
+OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap)
+AC_SUBST(OOO_PREFIX)
+
+dnl Create what is necessary
+AC_OUTPUT([Makefile buildenv])
commit 6d1826b19457b26e18beb5ac242a18401f754851
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 30 10:39:26 2009 +0200

    Split build: Add files needed by automake.
    
    * AUTHORS:
    * COPYING:
    * ChangeLog:
    * INSTALL:
    * NEWS:
    * README:

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..120da2f
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+http://www.openoffice.org/welcome/credits.html
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..cca7fc2
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..73c8beb
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1 @@
+Please see the output of git log.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..d3c5b40
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,237 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
diff --git a/README b/README
new file mode 100644
index 0000000..cbf52ec
--- /dev/null
+++ b/README
@@ -0,0 +1,12 @@
+OpenOffice.org - split build
+============================
+
+This package provides the possibility to build OpenOffice.org by pieces.  This
+one is the URE (UNO Runtime Environment) stuff that you need to be able to
+build the rest of the OOo.
+
+To build, do the usual
+
+./autogen.sh or ./configure
+make
+make install
commit 31eb776b2e65516c587204a3e0f12fb6c18e5688
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 30 10:38:01 2009 +0200

    Split build: Ignore built stuff.
    
    * .gitignore: Add.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e61841
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+/Makefile
+/Makefile.in
+/aclocal.m4
+/autom4te.cache
+/buildenv
+/config.log
+/config.parms
+/config.status
+/configure
+/install-sh
+/missing
+/solver
+
+/*/unxlng??.pro
+
+localize.sdf
+
+# temp files
+.*.swp
commit b33209a76a55ca3d0bdf75043376f60ab5ed2ee9
Author: Release Engineers <releng at openoffice.org>
Date:   Mon Jun 29 10:25:28 2009 +0000

    Create DEV300_m51 milestone tag from trunk at 273467
commit 8f59055c9f52df21e1e4cb2b7d6ef24eae793b8e
Merge: de135cc... 902837f...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jun 23 16:54:14 2009 +0200

    Merge commit 'ooo/DEV300_m50'

commit 0a55b82e91ac06bd14d27b8c1eb490b862e9c701
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Jun 17 16:21:54 2009 +0000

    #i10000# add dependency

diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst
index 094ca71..ede720d 100644
--- a/offapi/prj/build.lst
+++ b/offapi/prj/build.lst
@@ -1,4 +1,4 @@
-oa	offapi	:	udkapi solenv NULL
+oa	offapi	:	udkapi idlc solenv NULL
 oa	offapi									usr1	-	all	oa_mkout NULL
 oa	offapi\com\sun\star\script				nmake	-	all	oa_script oa_embed NULL
 oa	offapi\com\sun\star\script\browse	nmake	-	all	oa_sfbrowse NULL
commit 199d55a0f18613d22800c86f53edd6995136fc87
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Jun 17 13:59:44 2009 +0000

    #i10000# add missing files from fwk103

diff --git a/offapi/com/sun/star/logging/DocumentIOLogRing.idl b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
new file mode 100644
index 0000000..05bd402
--- /dev/null
+++ b/offapi/com/sun/star/logging/DocumentIOLogRing.idl
@@ -0,0 +1,66 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocumentIOLogRing.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_logging_DocumentIOLogRing_idl__
+#define __com_sun_star_logging_DocumentIOLogRing_idl__
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module logging { 
+
+interface XSimpleLogRing;
+
+//=============================================================================
+
+/** This singleton is intended to log the IO events related to loading/storing
+    of documents.
+
+    <p>
+    Please do not use the singleton without communication with source owner!
+    </p>
+
+    @since OOo 3.2
+ */
+singleton DocumentIOLogRing : XSimpleLogRing;
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/logging/SimpleLogRing.idl b/offapi/com/sun/star/logging/SimpleLogRing.idl
new file mode 100644
index 0000000..5637cb7
--- /dev/null
+++ b/offapi/com/sun/star/logging/SimpleLogRing.idl
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: SimpleLogRing.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_logging_SimpleLogRing_idl__
+#define __com_sun_star_logging_SimpleLogRing_idl__
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include <com/sun/star/beans/NamedValue.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module logging { 
+
+interface XSimpleLogRing;
+
+//=============================================================================
+
+/** This service allows to log the events in a ring of specified size.
+
+    @since OOo 3.2
+ */
+service SimpleLogRing : XSimpleLogRing
+{
+    /** creates a ring of default size - 256 messages
+     */
+    create();
+
+    /** creates a ring of specified size
+        @param nSize
+            the number of messages in a ring
+     */
+    createWithSize( [in] long nSize );
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/logging/XSimpleLogRing.idl b/offapi/com/sun/star/logging/XSimpleLogRing.idl
new file mode 100644
index 0000000..b1b0ad6
--- /dev/null
+++ b/offapi/com/sun/star/logging/XSimpleLogRing.idl
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: XSimpleLogRing.idl,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef __com_sun_star_logging_XSimpleLogRing_idl__
+#define __com_sun_star_logging_XSimpleLogRing_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__ 
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module logging { 
+
+//=============================================================================
+
+/** a simple log ring allowing to collect a limited number of last events
+
+    <p>
+    The intention of this interface is to provide a simple possibility
+    for developer to collect the most important events without affecting
+    the performance. For this reasons the messages related API is quite
+    simple, the strings should be produced by the preprocessor mainly.
+    </p>
+
+    @since OOo 3.2
+ */
+interface XSimpleLogRing
+{
+    /** allows to add a message to the logger
+     */
+    void logString( [in] string aMessage );
+
+    /** allows to get the collected messages from the logger
+        
+        <p> 
+        It is up to logger implementation to provide only the limited
+        number of last messages.
+        </p>
+     */
+    sequence< string > getCollectedLog();
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
commit 2aeea591ddd9672857648acacd4d6b0daaef9a14
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Jun 16 18:11:49 2009 +0000

    CWS-TOOLING: integrate CWS ause102
    2009-06-16 19:22:59 +0200 hjs  r273039 : #i102607# don't kill mingw
    2009-06-12 15:17:22 +0200 ihi  r272921 : #i102607# add path before calling l10n tool
    2009-06-11 14:25:20 +0200 hjs  r272873 : #i102607# on EPM=internal call binary with full path
    2009-06-10 13:35:48 +0200 hjs  r272807 : #i102607# remove solver PATH entry from OOo env.
    2009-06-10 12:10:44 +0200 hjs  r272802 : #i102635# correct dependencies for all
    2009-06-10 11:58:53 +0200 hjs  r272801 : #i102607# call tools from solver with absolute path

diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk
index 7f99524..0f4d476 100644
--- a/cli_ure/unotypes/makefile.mk
+++ b/cli_ure/unotypes/makefile.mk
@@ -58,7 +58,7 @@ CLIMAKERFLAGS += --verbose
 
 #When changing the assembly version then this must also be done in scp2
 $(OUT)$/bin$/cli_uretypes.dll : $(BIN)$/climaker.exe $(SOLARBINDIR)$/types.rdb $(BIN)$/cliureversion.mk
-    $(WRAPCMD) $(BIN)$/climaker.exe $(CLIMAKERFLAGS) \
+    $(subst,$(SOLARBINDIR)$/climaker,$(BIN)$/climaker $(CLIMAKER)) $(CLIMAKERFLAGS) \
         --out $@ \
         --keyfile $(BIN)$/cliuno.snk \
         --assembly-version $(CLI_URETYPES_NEW_VERSION) \
commit f4e9ca79dadb88672ca9565c02503a53ec1bfc7d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Jun 16 17:37:30 2009 +0000

    CWS-TOOLING: integrate CWS mingwport20
    2009-06-13 05:03:46 +0200 tono  r272946 : i102723: Set WINVER abd _WIN32_IE to 0x500 in mingw build

diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index 1e6c419..e2a91cf 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -48,7 +48,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-CDEFS+=-UWINVER -DWINVER=0x0500
 CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
 .ENDIF
 
commit 6faa426d448e6cbde11dd2400600cdfdbf9d3d69
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Jun 16 16:15:54 2009 +0000

    CWS-TOOLING: integrate CWS fwk103
    2009-05-26 12:44:25 +0200 mst  r272292 : #i100727#
    - svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
      + fix warning: rename method to prevent overloading
    2009-05-19 13:42:31 +0200 mav  r272075 : #i101356# add comment
    2009-05-19 10:56:24 +0200 mav  r272062 : #i101356# register the singleton correctly
    2009-05-19 10:25:42 +0200 mav  r272060 : #i101356# register the singleton correctly
    2009-05-18 12:48:48 +0200 mav  r272013 : #i91306# fix the typo
    2009-05-14 08:50:06 +0200 mav  r271871 : #i101356# reduce the amount of macros
    2009-05-13 13:26:08 +0200 mav  r271858 : #i101356# reduce the amount of macros
    2009-05-13 11:29:16 +0200 mav  r271849 : #i101356# reduce the amount of macros
    2009-05-12 12:09:42 +0200 mav  r271815 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 12:03:20 +0200 mav  r271814 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:58:48 +0200 mav  r271813 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:53:05 +0200 mav  r271812 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:48:36 +0200 mav  r271810 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:43:45 +0200 mav  r271809 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:39:38 +0200 mav  r271808 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:37:38 +0200 mav  r271806 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:33:58 +0200 mav  r271805 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-12 11:30:01 +0200 mav  r271804 : #i101356# allow to generate a small log if a document can not be stored
    2009-05-06 17:43:38 +0200 mst  r271607 : #i100727#
    - svtools/source/svhtml/parhtml.cxx:
      + adapt code to renaming of HTML constants (sb107)
    2009-05-05 11:14:18 +0200 mav  r271507 : #i101222# avoid warning
    2009-05-05 10:27:23 +0200 mav  r271505 : #i101426# send the modified() notification only when the document can be modified
    2009-05-05 10:25:07 +0200 mav  r271504 : #i101426# send the modified() notification only when the document is modified
    2009-05-05 08:42:48 +0200 mav  r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk at 271427 (milestone: DEV300:m47)
    2009-04-30 13:32:11 +0200 mav  r271412 : #i100518# check the template folders quietly
    2009-04-29 20:04:25 +0200 mst  r271393 : - sw/source/filter/html/swhtml.cxx:
      + fix wrong initialization order in constructor
    2009-04-28 12:28:46 +0200 mav  r271319 : #i99142# set the error correctly
    2009-04-28 08:44:48 +0200 mav  r271305 : #i99050# clear hidden flag if necessary
    2009-04-28 08:40:10 +0200 mav  r271304 : #i99050# avoid crash
    2009-04-22 07:40:11 +0200 mav  r271056 : #i101093# lets not affect the performance
    2009-04-15 09:30:47 +0200 cd  r270820 : #i99771# Fix warnings for gcc 4.4
    2009-04-15 09:19:52 +0200 cd  r270819 : #i99771# Fix warnings for gcc 4.4
    2009-04-15 08:42:34 +0200 cd  r270817 : #i99771# Fix warnings for gcc 4.4
    2009-04-14 14:31:01 +0200 mav  r270768 : #i99493# fix typo
    2009-04-01 12:45:43 +0200 mst  r270317 : fix #i100727#
    - svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
      sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
      + move SvKeyValue stuff from sfx2 to svtools
    - svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
      sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
      + move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
        to HTMLParser (svtools)
      + make HTMLParser::ParseMetaOptions() a virtual function
      + HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
      + new template method HTMLParser::AddMetaUserDefined()
    - svtools/source/svhtml/makefile.mk:
      + enable exceptions for parhtml.cxx
    - dbaccess/source/ui/misc/HtmlReader.cxx,
      sc/source/filter/html/htmlpars.cxx:
      + remove encoding related code duplication
    - sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
      + new SwHTMLParser::AddMetaUserDefined() for import of
        DOCINFO field subtypes INFO[1-4]
      + do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
    2009-03-31 17:01:35 +0200 mav  r270288 : #i91214# fix typo
    2009-03-31 15:19:41 +0200 mav  r270285 : #i100123# allow to turn OOo locking mechanics off
    2009-03-31 15:00:36 +0200 mav  r270284 : #i100123# allow to turn OOo locking mechanics off
    2009-03-31 12:19:13 +0200 mav  r270270 : #i100123# taking the lock file over throws no exception
    2009-03-30 13:57:21 +0200 mav  r270227 : #i100351# fix the typo
    2009-03-30 13:47:26 +0200 mav  r270225 : #i99885# let OK be default button
    2009-03-29 19:38:55 +0200 mav  r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk at 270033 (milestone: DEV300:m45)
    2009-03-16 16:39:48 +0100 mav  r269558 : #i93558# convert the attributes as well
    2009-03-13 15:35:55 +0100 mav  r269488 : #i93558# improve manifest.xml parsing
    2009-03-13 08:47:00 +0100 mav  r269454 : #i96205# allow to remove password on SaveAs
    2009-03-12 13:36:07 +0100 mav  r269398 : #i91306# show special error in case of shared document
    2009-03-12 13:33:35 +0100 mav  r269397 : #i91306# introduce the new error-message
    2009-03-12 11:40:42 +0100 mst  r269378 : fix #i90877#
    - svtools/source/uno/unoevent.cxx:
      + use proper operator delete[]
    2009-02-26 15:23:10 +0100 mav  r268526 : #i91214# do not use ATL
    2009-02-26 14:19:06 +0100 mav  r268516 : #i98909# integrate the patch
    2009-02-10 17:29:52 +0100 cd  r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.

diff --git a/offapi/com/sun/star/logging/makefile.mk b/offapi/com/sun/star/logging/makefile.mk
index 2a92ba2..6686b04 100644
--- a/offapi/com/sun/star/logging/makefile.mk
+++ b/offapi/com/sun/star/logging/makefile.mk
@@ -40,17 +40,20 @@ PACKAGE := com$/sun$/star$/logging
 IDLFILES = \
     ConsoleHandler.idl\
     CsvLogFormatter.idl\
+    DocumentIOLogRing.idl\
     FileHandler.idl\
     LoggerPool.idl\
     LogLevel.idl\
     LogRecord.idl\
     PlainTextFormatter.idl\
+    SimpleLogRing.idl\
     XConsoleHandler.idl\
     XCsvLogFormatter.idl\
     XLogFormatter.idl\
     XLogger.idl\
     XLoggerPool.idl\
-    XLogHandler.idl
+    XLogHandler.idl\
+    XSimpleLogRing.idl
 
 .INCLUDE: target.mk
 .INCLUDE: $(PRJ)$/util$/target.pmk
diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index 20397ec..cd5b50c 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -80,6 +80,26 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #define OSL_THIS_FILE       __FILE__
 
+/* the macro OSL_THIS_FUNC is intended to be an office internal macro for now */
+#ifdef __func__
+#define OSL_THIS_FUNC __func__
+#elifdef __PRETTY_FUNCTION__
+#define OSL_THIS_FUNC __PRETTY_FUNCTION__
+#elifdef __FUNCTION__
+#define OSL_THIS_FUNC __FUNCTION__
+#else
+#define OSL_THIS_FUNC " "
+#endif
+
+/* the macro OSL_TO_STRING is intended to be an office internal macro for now */
+#define OSL_TO_STRING( x ) #x
+
+/* the macro OSL_MACRO_VALUE_TO_STRING is intended to be an office internal macro for now */
+#define OSL_MACRO_VALUE_TO_STRING( x ) OSL_TO_STRING( x )
+
+/* the macro OSL_LOG_PREFIX is intended to be an office internal macro for now */
+#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_THIS_FUNC ":" OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; "
+
 #define OSL_DEBUG_ONLY(s)	_OSL_DEBUG_ONLY(s)
 #define OSL_TRACE           _OSL_TRACE
 #define OSL_ASSERT(c) 	    _OSL_ASSERT(c, OSL_THIS_FILE, __LINE__)
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 8ba43d9..2451da3 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -695,7 +695,7 @@ oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal
                     /* remove the NONBLOCK flag again */
                     flags = fcntl(fd, F_GETFL, NULL);
                     flags &= ~O_NONBLOCK;
-                    if( 0 > fcntl(fd, F_GETFL, flags) )
+                    if( 0 > fcntl(fd, F_SETFL, flags) )
                    {
                         close(fd);
                         return oslTranslateFileError(OSL_FET_ERROR, errno);
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 8201609..b7eb4d5 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -2678,7 +2678,7 @@ oslFileError SAL_CALL osl_getFileSize(oslFileHandle Handle, sal_uInt64 *pSize)
 
 oslFileError SAL_CALL osl_setFileSize(oslFileHandle Handle, sal_uInt64 uSize)
 {
-    oslFileError	error = error = osl_setFilePos( Handle, osl_Pos_Absolut, uSize );
+    oslFileError	error = osl_setFilePos( Handle, osl_Pos_Absolut, uSize );
     if ( osl_File_E_None == error )
     {
         if ( !SetEndOfFile( (HANDLE)Handle ) )
commit 9d5c11bcd9816b38679ce1c4d97a3dc87856a5d5
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Jun 15 07:10:38 2009 +0000

    #i10000# build breaks for wntmsci12

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 2bf20dd..45f9e80 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -740,7 +740,9 @@ vector<Reference<VendorBase> > getAllJREInfos()
     //Otherwise in SDKs Java may be started twice
      createJavaInfoFromPath(vecInfos);
 
+#ifdef UNX
     createJavaInfoDirScan(vecInfos);
+#endif
 
     bubbleSortVersion(vecInfos);
     return vecInfos;
commit 10f78f8679257439a39de67a2f959926287b9ca1
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Fri Jun 12 20:38:47 2009 +0000

    CWS-TOOLING: integrate CWS ooo31osol_DEV300
    2009-05-14 15:49:09 +0200 ihi  r271896 : #i101913# added missing solaris entries
    2009-05-14 12:36:19 +0200 ihi  r271885 : #i101913# ARCH -> all
    2009-05-13 11:14:52 +0200 jl  r271846 : #i101457# Do not search for Java every time OOo starts
    2009-05-13 08:49:28 +0200 jl  r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
    2009-05-12 17:10:03 +0200 jl  r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
    2009-05-12 13:17:04 +0200 releng  r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
    2009-05-12 13:08:28 +0200 is  r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 2871541..5c2fff1 100755
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -106,7 +106,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         errcode = jfw_existJRE(pInfo, &bExist);
         if (errcode == JFW_E_NONE)
         {
-            if (false == findAndSelect(&pInfo))
+            if (!bExist && !findAndSelect(&pInfo))
                 return -1;
         }
         else
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 9963900..2bf20dd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -740,9 +740,8 @@ vector<Reference<VendorBase> > getAllJREInfos()
     //Otherwise in SDKs Java may be started twice
      createJavaInfoFromPath(vecInfos);
 
-#ifdef UNX    
     createJavaInfoDirScan(vecInfos);
-#endif
+
     bubbleSortVersion(vecInfos);
     return vecInfos;
 }
@@ -1114,6 +1113,15 @@ bool makeDriveLetterSame(OUString * fileURL)
 }
 
 #ifdef UNX
+#ifdef SOLARIS
+
+void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
+{
+    JFW_TRACE2(OUSTR("\n[Java framework] Checking \"/usr/jdk/latest\"\n"));
+    getJREInfoByPath(OUSTR("file:////usr/jdk/latest"), vecInfos);   
+}
+
+#else
 void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
 {
     OUString excMessage = OUSTR("[Java framework] sunjavaplugin: "
@@ -1236,5 +1244,6 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
         }
     }
 }
-#endif
+#endif // ifdef SOLARIS
+#endif // ifdef UNX
 }
commit e959c8bc9999944a1fa71d31957e9047c32b5945
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Fri Jun 12 19:50:49 2009 +0000

    CWS-TOOLING: integrate CWS jl126_DEV300
    2009-05-29 11:45:28 +0200 jl  r272444 : #i102355# new assembly versions
    2009-05-29 11:14:35 +0200 jl  r272441 : #i102355# new assembly versions
    2009-05-29 11:08:25 +0200 jl  r272439 : #i102355# test lib for 3.1 version
    2009-05-29 08:43:22 +0200 jl  r272432 : CWS-TOOLING: rebase CWS jl126 to branches/OOO310 at 272261 (milestone: OOO310:m12)
    2009-04-30 21:12:02 +0200 jl  r271426 : CWS-TOOLING: rebase CWS jl126 to branches/OOO310 at 271208 (milestone: OOO310:m11)

diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index a5b40dd..d6115b8 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -29,23 +29,23 @@
 #
 #*************************************************************************
 
-CLI_URETYPES_NEW_VERSION=1.0.2.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.1.0
-CLI_URETYPES_POLICY_VERSION=2.0.0.0	
+CLI_URETYPES_NEW_VERSION=1.0.3.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.2.0
+CLI_URETYPES_POLICY_VERSION=3.0.0.0	
 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
 
-CLI_BASETYPES_NEW_VERSION=1.0.13.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.12.0
-CLI_BASETYPES_POLICY_VERSION=13.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.14.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.13.0
+CLI_BASETYPES_POLICY_VERSION=14.0.0.0
 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
 
-CLI_URE_NEW_VERSION=1.0.16.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.15.0    
-CLI_URE_POLICY_VERSION=16.0.0.0
+CLI_URE_NEW_VERSION=1.0.17.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.16.0    
+CLI_URE_POLICY_VERSION=17.0.0.0
 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
 
-CLI_CPPUHELPER_NEW_VERSION=1.0.16.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.15.0
-CLI_CPPUHELPER_POLICY_VERSION=16.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.17.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.16.0
+CLI_CPPUHELPER_POLICY_VERSION=17.0.0.0
 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
 
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index bdab589..867c3d4 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -29,8 +29,8 @@
 #
 #*************************************************************************
 
-CLI_OOOTYPES_NEW_VERSION=1.0.2.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.1.0
-CLI_OOOTYPES_POLICY_VERSION=2.0.0.0	
+CLI_OOOTYPES_NEW_VERSION=1.0.3.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.2.0
+CLI_OOOTYPES_POLICY_VERSION=3.0.0.0	
 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes
 
commit 902837fe7d9e3c312f59959fe4c43899c5d35e8b
Author: Release Engineers <releng at openoffice.org>
Date:   Wed Jun 10 13:24:56 2009 +0000

    Create DEV300_m50 milestone tag from trunk at 272824
commit a48226fc07e3617c1307287b8a4e9592f5063f00
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri Jun 5 12:31:05 2009 +0000

    CWS-TOOLING: integrate CWS evoab2def
    2009-05-28 16:00:19 +0200 fs  r272412 : don't use createFalse - Evo 2.22 simply hangs when ask for all contacts without a first name. Instead, in the WHERE 0=1 case, simply create an empty result set
    2009-05-22 14:25:51 +0200 fs  r272193 : #i10000#
    2009-05-22 14:25:37 +0200 fs  r272192 : oops, ENABLE_EVOAB2 for some platforms only, not generically
    2009-05-22 14:19:00 +0200 fs  r272191 : #i10000#
    2009-05-22 12:42:38 +0200 fs  r272183 : when sorting, properly use a syslocale collator, instead of comparing the numerical values of the string's UTF-16 code points
    2009-05-20 15:09:00 +0200 fs  r272131 : clear/getWarnings: also allowed without cache
    2009-05-20 14:11:19 +0200 fs  r272128 : removed debug traces
    2009-05-20 14:03:31 +0200 fs  r272126 : #i55701# +STR_SORT_BY_COL_ONLY
    2009-05-20 14:02:29 +0200 fs  r272125 : implement sorting
    2009-05-20 10:10:19 +0200 fs  r272107 : #i10000#
    2009-05-19 16:02:17 +0200 fs  r272089 : #i10000#
    2009-05-19 16:02:02 +0200 fs  r272088 : #i55701# strings for new error condition DATA_CANNOT_SELECT_UNFILTERED
    2009-05-19 16:01:31 +0200 fs  r272087 : #i55701# use DATA_CANNOT_SELECT_UNFILTERED as standardized error code
    2009-05-19 15:59:59 +0200 fs  r272086 : #i55701# +DATA_CANNOT_SELECT_UNFILTERED
    2009-05-19 15:46:12 +0200 fs  r272084 : #i55701# recognize the DATA_CANNOT_SELECT_UNFILTERED error condition, and allow filtering in this case, even when the result set is empty
    2009-05-19 09:06:50 +0200 fs  r272059 : merging changes from CWS dba32b, to prevent future conflicts with upcoming local changes
    2009-05-18 21:48:58 +0200 fs  r272054 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
    2009-05-18 21:48:42 +0200 fs  r272053 : accessing a non-local unfiltered address book now returns an empty result set, and reports a warning, instead of ungracefully failing
    2009-05-18 21:47:41 +0200 fs  r272052 : +setExternalWarnings
    2009-05-18 21:47:12 +0200 fs  r272051 : #i55701# when re/loading the form, display any possible warnings
    2009-05-18 21:43:26 +0200 fs  r272050 : #i55701# implement XWarningsSupplier, exposing the warnings of our result set
    2009-05-18 21:42:51 +0200 fs  r272049 : #i55701# implement XWarningsSupplier, exposing the warnings of our aggregate RowSet
    2009-05-18 17:53:59 +0200 fs  r272041 : #i55701# moved the (I)WarningsContainer from dbaccess to connectivity, to be able to use it in the latter module, too
    2009-05-18 17:24:10 +0200 fs  r272040 : #i55701# properly enable the various Evolution types
    2009-05-18 14:52:19 +0200 fs  r272024 : #i55701# properly enable the Evolution types
    2009-05-18 13:57:10 +0200 fs  r272018 : fixed/extended whereAnalysis (column searching still not enabled, as neither LIKE nor = seem to work with my (somewhat older) Evolution version)
    2009-05-18 13:56:08 +0200 fs  r272017 : extended showParseTree
    2009-05-18 13:55:25 +0200 fs  r272016 : extended showParseTree
    2009-05-18 11:40:16 +0200 fs  r272008 : #i55701#
    2009-05-18 11:39:02 +0200 fs  r272006 : let the PreparedStatement return proper meta data, too
    2009-05-18 10:05:37 +0200 fs  r271999 : moved the XStatement interface to from OCommonStatement to OStatement - the former class is also the base for other classes which should not have this interface
    2009-05-15 21:53:22 +0200 fs  r271973 : collectColumnInformation: report invalid meta data as assertion
    2009-05-15 21:51:40 +0200 fs  r271972 : showParseTree should be const
    2009-05-15 21:51:26 +0200 fs  r271971 : showParseTree should be const
    2009-05-15 21:51:03 +0200 fs  r271970 : properly recognize the 'WHERE 0 = 1' clause, this way having proper statement meta data, this way saving much much calls from the DBA framework
    2009-05-15 20:29:03 +0200 fs  r271969 : cleaned up the mess with the statement classes
    2009-05-15 15:51:11 +0200 fs  r271944 : let the result set properly init its meta data
    2009-05-15 15:29:54 +0200 fs  r271939 : proper property implementations for the resultset class
    2009-05-15 15:01:31 +0200 fs  r271936 : proper property implementations for the statement class
    2009-05-08 14:46:33 +0200 fs  r271717 : component_foo must be PUBLIC
    2009-05-06 09:20:05 +0200 fs  r271565 : #i10000# (warnings on unxlngi6)
    2009-05-06 09:01:30 +0200 fs  r271564 : #i101493#
    2009-05-05 23:08:12 +0200 fs  r271560 : #i55701# merging the changes from the ancient (CVS-based) CWS evoab2default into this CWS here

diff --git a/offapi/com/sun/star/sdb/ErrorCondition.idl b/offapi/com/sun/star/sdb/ErrorCondition.idl
index 542674c..20c12f1 100644
--- a/offapi/com/sun/star/sdb/ErrorCondition.idl
+++ b/offapi/com/sun/star/sdb/ErrorCondition.idl
@@ -155,6 +155,23 @@ constants ErrorCondition
         with this name.</p>
     */
     const long AB_ADDRESSBOOK_NOT_FOUND = 500;
+
+    // ========================================================================
+    // = section DATA - data retrieval related error conditions
+    // =
+    // = next section should start with 600
+
+    /** used to indicate that a <code>SELECT</code> operation on a table needs a filter.
+
+        <p>Some database drivers are not able to <code>SELECT</code> from a table if the
+        statement does not contain a <code>WHERE</code> clause. In this case, a statement
+        like <code>SELECT * FROM "table"</cdeo> with fail with the error code
+        <code>DATA_CANNOT_SELECT_UNFILTERED</code>.</p>
+
+        <p>It is also legitimate for the driver to report this error condition as warning, and provide
+        an empty result set, instead of ungracefull failing.</p>
+    */
+    const long DATA_CANNOT_SELECT_UNFILTERED = 550;
 };
 
 //=============================================================================
commit 8a5e61c28f4b29ecb3a65b8b0885672c4db89030
Author: Kurt Zenker <kz at openoffice.org>
Date:   Fri Jun 5 09:47:55 2009 +0000

    CWS-TOOLING: integrate CWS dba32b
    2009-06-03 14:58:08 +0200 fs  r272581 : #i102439#
    2009-05-29 13:56:18 +0200 fs  r272456 : remove the sub form when the 'add subform' setting changes from <true/> to <false/>, not only its controls
    2009-05-29 13:19:27 +0200 fs  r272454 : display '(Default)' instead of an empty string when a control has the default font
    2009-05-28 20:49:18 +0200 fs  r272428 : #i98162# getFirstSelectedValue: do not return reference to a temporary
    2009-05-27 15:30:22 +0200 msc  r272353 : #102303#
    2009-05-26 13:03:06 +0200 fs  r272295 : spelling
    2009-05-26 12:59:54 +0200 fs  r272294 : merge m48 version to get latest cygwin related fixes
    2009-05-25 14:02:06 +0200 fs  r272239 : remove references to local files, needed for debugging sessions only
    2009-05-25 14:01:16 +0200 fs  r272238 : #i102021# ensure members such as bNumberFormat are initialized before actually returning them
    2009-05-25 13:10:20 +0200 fs  r272236 : #i10000# reset ENABLE_EVOAB2
    2009-05-22 06:44:45 +0200 oj  r272167 : #i99104# add import handler for calc-sett
    2009-05-22 06:42:27 +0200 oj  r272166 : #i99104# impl NullDate as member
    2009-05-22 06:36:22 +0200 oj  r272165 : #i99104# handle nulldate from parent model
    2009-05-22 06:33:13 +0200 oj  r272164 : #i99104# export and import calculation-settings and nulldate
    2009-05-22 06:27:50 +0200 oj  r272163 : #i99104# export and import calculation-settings and nulldate
    2009-05-20 13:29:58 +0200 oj  r272118 : #i99911# handle invalid name
    2009-05-20 13:28:49 +0200 oj  r272117 : #i101261# handle different rowsets
    2009-05-20 11:29:55 +0200 msc  r272111 : #i100000#
    2009-05-20 11:28:27 +0200 msc  r272110 : merge in change from dba32a
    2009-05-20 11:27:38 +0200 msc  r272109 : #102082# CTRL + C does not work
    2009-05-20 09:43:36 +0200 oj  r272106 : clean up includes
    2009-05-20 09:32:15 +0200 oj  r272105 : #i99060# merge error resovled now VERTICAL_ALIGN is in both stmt
    2009-05-20 08:37:21 +0200 msc  r272104 : add workaround for issue #102010#
    2009-05-20 08:10:12 +0200 oj  r272103 : #i99104# use numberformatkey
    2009-05-20 08:07:02 +0200 oj  r272102 : #i99104# use column info from rowset
    2009-05-20 08:04:43 +0200 oj  r272101 : #i102032# use a special column type where prec and scale are the values currently set at the column
    2009-05-20 08:03:04 +0200 oj  r272100 : #i102032# correct type info, we have to use SQL defined type names
    2009-05-19 10:27:02 +0200 oj  r272061 : #i99104# export null-date
    2009-05-19 08:26:53 +0200 oj  r272056 : #i99104# export null-date
    2009-05-18 13:15:10 +0200 msc  r272014 : add issue #102019#
    2009-05-18 11:33:07 +0200 msc  r272005 : add issue #102019#
    2009-05-18 08:59:45 +0200 msc  r271996 : add workaroud for issue #102010#
    2009-05-15 10:21:24 +0200 msc  r271929 : #101944#
    2009-05-11 21:18:30 +0200 fs  r271792 : #i99914#
    2009-05-08 13:52:06 +0200 oj  r271715 : #i96423# remember column span
    2009-05-08 11:26:19 +0200 oj  r271708 : #i98605# impl new scale mode
    2009-05-08 10:33:35 +0200 fs  r271706 : SendUserCall: only call into the shape notification routine for UserCall types where this is necessary (performance issue)
    2009-05-07 20:52:44 +0200 fs  r271698 : outsource ShapeProperty from shapepropertynotifier.hxx
    2009-05-07 20:43:33 +0200 fs  r271697 : #i99056# use notifyShapePropertyChange, instead of getShapePropertyChangeNotifier - the latter throws if no shape exists, yet
    2009-05-07 20:33:58 +0200 fs  r271696 : #i99056# +notifyShapePropertyChange: allow notifying chages without checking whether there actually already exists an SvxShape
    2009-05-07 16:22:15 +0200 fs  r271679 : #i10000# cygwin needs quotes around the classpath
    2009-05-07 16:21:37 +0200 fs  r271678 : #i10000# cygwin needs quotes around the classpath
    2009-05-07 16:01:11 +0200 oj  r271677 : #i99914# notify parent handler
    2009-05-07 15:54:54 +0200 fs  r271676 : #i10000# cygwin needs some quoting
    2009-05-07 14:49:48 +0200 oj  r271672 : #i99277# quote alias name
    2009-05-07 14:48:12 +0200 oj  r271671 : #i92538# add ~ in front of type
    2009-05-07 14:37:13 +0200 oj  r271667 : #i99118# change type from char to varchar
    2009-05-07 14:36:23 +0200 oj  r271666 : #i99118# clear dest columns when changing to create new table
    2009-05-07 13:35:32 +0200 oj  r271657 : #i94467# handle type 0 as double as well
    2009-05-07 13:20:49 +0200 oj  r271655 : i99743# setNull when varchar is no text
    2009-05-07 12:58:06 +0200 fs  r271651 : initialize the SdrObject's property change notifier after the ctor, if necessary
    2009-05-07 11:47:18 +0200 fs  r271647 : #i10000#
    2009-05-07 10:57:16 +0200 fs  r271639 : OPropertyBrowserController::propertyChange: care for the current property state, too, and properly forward it to the UI
    2009-05-07 10:18:14 +0200 fs  r271636 : onNewComponent: do not ask the map for grid columns, it will throw
    2009-05-07 10:09:55 +0200 fs  r271634 : #i101623#
    2009-05-07 09:53:44 +0200 fs  r271631 : #i101622#
    2009-05-06 21:55:53 +0200 fs  r271615 : #i10000#
    2009-05-06 21:10:42 +0200 fs  r271611 : #i10000#
    2009-05-06 13:11:48 +0200 fs  r271583 : #i10000#
    2009-05-05 22:29:31 +0200 fs  r271559 : proper assertion message
    2009-05-05 22:29:03 +0200 fs  r271558 : diagnostics
    2009-05-05 22:16:16 +0200 fs  r271557 : #i10000#
    2009-05-05 13:50:32 +0200 fs  r271513 : #i10000#
    2009-05-05 10:21:50 +0200 fs  r271503 : #i10000#
    2009-05-05 09:30:26 +0200 fs  r271501 : why did those survive the rebase -C step?
    2009-05-05 09:18:12 +0200 fs  r271500 : #i10000#
    2009-05-04 17:08:17 +0200 fs  r271475 : CWS-TOOLING: rebase CWS dba32b to trunk at 271427 (milestone: DEV300:m47)
    2009-05-04 14:51:26 +0200 fs  r271456 : line ends
    2009-04-30 15:55:27 +0200 fs  r271418 : NewURL -> PublicConnectionURL
    2009-04-22 21:18:34 +0200 fs  r271141 : #i100944#
    2009-04-22 09:12:26 +0200 oj  r271071 : #i101261# little code change
    2009-04-22 09:11:43 +0200 oj  r271070 : #i101261# only ask for parameters which aren't set before
    2009-04-22 09:11:25 +0200 oj  r271069 : #i101261# new grabage container for nodes
    2009-04-22 09:11:02 +0200 oj  r271068 : #i101261# new grabage container for nodes
    2009-04-22 09:10:44 +0200 oj  r271067 : #i101261# new grabage container for nodes
    2009-04-22 09:10:21 +0200 oj  r271066 : #i101261# only ask for parameters which aren't set before
    2009-04-22 09:08:24 +0200 oj  r271065 : #i101261# only ask for parameters which aren't set before
    2009-04-22 09:07:25 +0200 oj  r271064 : #i101261# only ask for parameters which aren't set before
    2009-04-22 08:49:07 +0200 oj  r271062 : #i77501# preview only when needed
    2009-04-22 08:45:44 +0200 oj  r271061 : #i101261# new prop max rows
    2009-04-22 08:44:18 +0200 oj  r271060 : #i101261# create dataprovider earlier to avoid the wrong legend in chart
    2009-04-22 08:42:48 +0200 oj  r271059 : #i101261# handle parameter
    2009-04-17 21:00:23 +0200 fs  r270954 : #i98350#
    2009-04-17 13:54:19 +0200 fs  r270942 : #i99565#
    2009-04-17 13:51:34 +0200 fs  r270940 : #i101153# only localize the (potentially) localizable properties when there really is support at the control model
    2009-04-17 11:43:14 +0200 fs  r270932 : removed superfluous include
    2009-04-17 10:10:15 +0200 fs  r270926 : #i10000#
    2009-04-17 10:02:36 +0200 fs  r270925 : #i10000#
    2009-04-17 09:15:13 +0200 fs  r270918 : #i99056# some more refactoring of the recently introduced property change notification mechanism for UNO shapes
    2009-04-17 09:14:56 +0200 fs  r270917 : #i99056# some more refactoring of the recently introduced property change notification mechanism for UNO shapes
    2009-04-17 09:13:25 +0200 fs  r270915 : #i99056# some more refactoring of the recently introduced property change notification mechanism for UNO shapes
    2009-04-17 08:30:34 +0200 fs  r270914 : removed unotools/servicehelper.hxx in favour of the (duplicated) comphelper/servicehelper.hxx
    2009-04-16 21:05:25 +0200 fs  r270903 : #i10000#
    2009-04-16 20:43:43 +0200 fs  r270902 : #i99056# shape notification outsourced to the SdrObject, this is what all other shape implementations (which only aggregate an SvxShape) have access to, too
    2009-04-16 15:57:36 +0200 fs  r270891 : #i99056# make SetUnoControlModel virtual
    2009-04-16 15:44:02 +0200 fs  r270890 : #i99056# let the ScShapeObj notify changes in its Anchor property
    2009-04-16 15:36:47 +0200 fs  r270889 : #i99056# enable the sheet anchor type property, too
    2009-04-16 15:33:45 +0200 fs  r270887 : #i99056# shape notification outsourced to the SdrObject, this is what all other shape implementations (which only aggregate an SvxShape) have access to, too
    2009-04-15 14:53:13 +0200 fs  r270844 : #i10000#
    2009-04-15 13:08:29 +0200 fs  r270836 : #i10000#
    2009-04-15 12:28:14 +0200 fs  r270832 : #i10000#
    2009-04-15 10:59:14 +0200 fs  r270827 : #i10000#
    2009-04-15 09:41:08 +0200 oj  r270823 : fix issues found with findbugs and pmd
    2009-04-14 21:08:04 +0200 fs  r270808 : #i99056# implement SheetAnchorType - now the only thing missing to enable it is the proper notification when it is modified
    2009-04-14 17:09:00 +0200 fs  r270799 : #i99056# implement XServiceInfo for the ScShapeObj
    2009-04-14 17:07:55 +0200 fs  r270798 : #i99056# implement TextAnchorType, partially implement SheetAnchorType
    2009-04-14 15:54:05 +0200 fs  r270786 : #i99056# SwXShape: notify changes of the AnchorType property
    2009-04-14 15:47:32 +0200 fs  r270785 : #i99056# deliver shapepropertynotifier.hxx
    2009-04-14 15:46:54 +0200 fs  r270784 : diagnostics
    2009-04-14 15:08:28 +0200 fs  r270781 : #i99056# outsourced the SvxShape's property change notification code into a dedicated class
    2009-04-14 14:41:09 +0200 fs  r270773 : #i99056# outsourced the SvxShape's property change notification code into a dedicated class
    2009-04-14 14:37:23 +0200 fs  r270772 : in dtor, remove the properties from the temporary component context
    2009-04-14 14:36:34 +0200 fs  r270771 : getWeakUnoShape made const
    2009-04-14 12:23:08 +0200 oj  r270757 : #i101064# add missing braces
    2009-04-14 12:21:25 +0200 oj  r270756 : #i101065# add braces for gcc 4.3.2
    2009-04-14 12:17:45 +0200 oj  r270755 : #i101059# add dep for manifest
    2009-04-09 12:06:58 +0200 oj  r270686 : #i93100# use OptimalSize from control to get height
    2009-04-08 09:56:55 +0200 oj  r270619 : #i92537# handle calculations in the select columns as well
    2009-04-08 09:30:39 +0200 oj  r270615 : #i96657# throw error message when the key doesn't have any columns
    2009-04-07 12:08:26 +0200 oj  r270592 : #i77501# impl preview of the executed report
    2009-04-07 12:01:56 +0200 oj  r270591 : #i77501# impl preview of the executed report
    2009-04-07 11:41:03 +0200 oj  r270590 : #i77501# impl preview of the executed report
    2009-04-07 11:39:32 +0200 oj  r270589 : #i77501# impl preview of the executed report
    2009-04-07 11:29:25 +0200 oj  r270588 : #i77501# convert dos to unix lineends
    2009-04-07 11:28:23 +0200 oj  r270587 : #i77501# impl preview of the executed report
    2009-04-07 11:16:50 +0200 oj  r270586 : #i77501# impl preview of the executed report
    2009-04-07 11:16:00 +0200 oj  r270585 : #i77501# impl preview of the executed report
    2009-04-07 11:15:44 +0200 oj  r270584 : #i77501# impl preview of the executed report
    2009-04-07 11:15:28 +0200 oj  r270583 : #i77501# impl preview of the executed report
    2009-04-07 11:15:04 +0200 oj  r270582 : #i77501# impl preview of the executed report
    2009-04-06 15:38:54 +0200 fs  r270559 : merge changes from CWS dba32a herein
    2009-04-03 15:56:16 +0200 fs  r270494 : ImpSvMEdit::Resize: do multiple iterations, if necessary
    2009-04-03 14:35:49 +0200 fs  r270487 : #i10000#
    2009-04-03 13:17:16 +0200 fs  r270476 : #i99056# display geometry information for controls, too
    2009-04-03 13:16:37 +0200 fs  r270475 : #i99056# better ordering of the geometry properties
    2009-04-03 13:16:07 +0200 fs  r270473 : #i99056# now that SvxShape supports property change listeners, forward add/remove requests to it
    2009-04-03 13:13:18 +0200 fs  r270472 : #i99056# at SvxShape, allow for PropertyChangeListeners for Size/Position
    2009-04-03 09:29:27 +0200 oj  r270456 : #i94571# use correct prop name
    2009-04-03 09:14:54 +0200 fs  r270451 : merge changes from CWS dba32a herein
    2009-04-02 17:00:51 +0200 fs  r270424 : better diagnostics
    2009-04-02 16:35:19 +0200 fs  r270421 : diagnostics
    2009-04-02 16:34:50 +0200 fs  r270420 : #i99056# mxUnoShape not accessible anymore, use impl_setUnoShape instead
    2009-04-02 16:32:48 +0200 fs  r270419 : #i99056# make getUnoShape cheaper: keep the pointer to the SvxShape all the time, so there's no need to ask for it in getUnoShape. As a consequence, we will later be able to use the pointer in scenarious where performance (potentially) matters
    2009-04-02 16:31:13 +0200 fs  r270417 : merge changes from CWS dba32a herein
    2009-04-02 16:23:16 +0200 fs  r270414 : merge changes from CWS dba32a herein
    2009-04-02 14:10:35 +0200 fs  r270405 : #i10000#
    2009-04-02 14:06:26 +0200 fs  r270404 : merge changes from CWS dba32a herein
    2009-04-02 14:03:03 +0200 fs  r270401 : #i10000#
    2009-04-02 13:58:13 +0200 fs  r270400 : #i10000#
    2009-04-02 12:59:44 +0200 fs  r270397 : merge changes from CWS dba32a herein
    2009-04-02 12:46:30 +0200 fs  r270396 : #i99056# let the form page maintain a mapping between control models and control shapes
    2009-04-02 12:44:07 +0200 fs  r270395 : merge changes from CWS dba32a herein
    2009-04-02 12:42:06 +0200 fs  r270394 : merge changes from CWS dba32a herein
    2009-04-02 12:35:20 +0200 fs  r270393 : #i10000# precompiled header
    2009-04-02 12:05:31 +0200 fs  r270392 : merge changes from CWS dba32a herein
    2009-04-02 12:00:42 +0200 fs  r270391 : merge changes from CWS dba32a herein
    2009-04-02 11:47:26 +0200 fs  r270390 : merge changes from CWS dba32a herein
    2009-04-02 11:39:15 +0200 oj  r270389 : #i94467# foxpro impl several new types
    2009-04-02 11:35:58 +0200 fs  r270387 : merge changes from CWS dba32a herein
    2009-04-01 14:10:51 +0200 fs  r270329 : merge changes from CWS dba32a herein
    2009-03-31 17:29:50 +0200 fs  r270290 : merge changes from CWS dba32a herein
    2009-03-30 14:53:56 +0200 fs  r270233 : #i100417# don't set grid column widths to 0, but to <void/>
    2009-03-30 12:31:03 +0200 oj  r270213 : #i100552# wrong orb used
    2009-03-30 12:19:20 +0200 oj  r270212 : #i98303# convertlike corrected to sal_Unicode
    2009-03-30 11:58:25 +0200 fs  r270210 : merge changes from CWS dba32a herein
    2009-03-30 11:38:16 +0200 oj  r270205 : remove duplicate code from merge
    2009-03-30 11:02:27 +0200 fs  r270202 : merge changes from CWS dba32a herein
    2009-03-30 11:02:19 +0200 fs  r270201 : merge changes from CWS dba32a herein
    2009-03-30 10:31:26 +0200 oj  r270200 : #i100665# only throw exception and do not drop table
    2009-03-30 09:36:24 +0200 fs  r270195 : assertion text
    2009-03-28 20:21:58 +0100 fs  r270187 : #ii10000#
    2009-03-28 20:19:54 +0100 fs  r270186 : removed unused help ids
    2009-03-28 20:19:40 +0100 fs  r270185 : removed unused help ids
    2009-03-28 20:19:10 +0100 fs  r270184 : #i100237# +DefaultState/XReset
    2009-03-28 00:29:29 +0100 fs  r270177 : CWS-TOOLING: rebase CWS dba32b to trunk at 270033 (milestone: DEV300:m45)
    2009-03-27 22:56:46 +0100 fs  r270173 : #i100237# DEFAULT_CHECKED -> DEFAULT_STATE
    2009-03-27 22:55:52 +0100 fs  r270172 : #i100237# DefaultState property for buttons, enabled only when Toggle=Yes
    2009-03-27 22:54:15 +0100 fs  r270171 : #i100237# DEFAULT_CHECKED -> DEFAULT_STATE
    2009-03-27 22:53:54 +0100 fs  r270170 : #i100237# introduce a DefaultState property for buttons, which implies buttongs supporting XReset, which needed some refactoring
    2009-03-27 13:31:41 +0100 fs  r270152 : ignore output paths
    2009-03-27 11:23:44 +0100 fs  r270139 : tuned behavior with respect to invalid keys/values
    2009-03-27 09:57:14 +0100 fs  r270136 : don't allow Double.NaN
    2009-03-27 09:56:16 +0100 fs  r270135 : talk about Double.NaN
    2009-03-26 12:14:30 +0100 fs  r270067 : removed unused parameter
    2009-03-26 12:14:02 +0100 fs  r270066 : removed widening conversion when checking keys
    2009-03-26 09:17:34 +0100 fs  r270053 : separated the enumerator functionality into a dedicated interface, this way not burdening XMap with it
    2009-03-26 09:17:11 +0100 fs  r270052 : separated the enumerator functionality into a dedicated interface, this way not burdening XMap with it
    2009-03-26 09:16:49 +0100 fs  r270051 : separated the enumerator functionality into a dedicated interface, this way not burdening XMap with it
    2009-03-25 21:55:20 +0100 fs  r270044 : #i100541# properly calculat bNeedScrollBox
    2009-03-25 12:56:17 +0100 fs  r270019 : renamed the previously introduced error condition
    2009-03-25 12:11:48 +0100 fs  r270015 : #i100095# when the error messages contain non-trivial details (SQLState/ErrorCode), then always display the 'Details' button
    2009-03-25 12:10:05 +0100 fs  r270012 : renamed the previously introduced error condition
    2009-03-25 12:01:04 +0100 fs  r270011 : #i100095# when no address book (or respective profile) can be found, then use a dedicated ErrorCondition
    2009-03-25 10:29:07 +0100 fs  r270003 : add missing localization
    2009-03-25 10:23:12 +0100 fs  r270001 : in preparation of #i1000095#:
    rework the error handling, allow using css.sdb.ErrorCondition values, plus
    allow propagating the nsresult
    2009-03-25 10:21:55 +0100 fs  r270000 : in preparation of #i1000095#:
    rework the error handling, allow using css.sdb.ErrorCondition values, plus
    allow propagating the nsresult
    2009-03-20 23:05:38 +0100 fs  r269829 : XMap::getSize removed
    2009-03-20 23:05:19 +0100 fs  r269828 : changes as suggested by sb
    2009-03-20 23:04:56 +0100 fs  r269827 : enhanced documentation
    2009-03-20 15:31:40 +0100 fs  r269815 : changes as suggested by sb
    2009-03-20 13:23:52 +0100 oj  r269804 : #i92538# correct the zorder that fixedtext is infront of control
    2009-03-20 12:59:38 +0100 oj  r269801 : #i94571# paraadjust now supports BLOCK
    2009-03-20 12:58:11 +0100 oj  r269800 : #i94571# export style with data style
    2009-03-20 12:57:05 +0100 oj  r269799 : #i94571# text align is now paraadjust
    2009-03-20 12:37:02 +0100 fs  r269797 : enum keys only accepted if they have the exact type, not if they have *any* enum type
    2009-03-20 12:28:31 +0100 fs  r269794 : some changes requested by sb
    2009-03-20 08:52:47 +0100 fs  r269780 : doc
    2009-03-20 07:37:31 +0100 oj  r269779 : #i99913# only notifiy when values are different
    2009-03-20 07:36:58 +0100 oj  r269778 : #i99913# add undoenv as listener at the dataprovider
    2009-03-19 22:52:52 +0100 fs  r269771 : added comment
    2009-03-19 22:40:06 +0100 fs  r269770 : +testEnumeration
    2009-03-19 22:39:41 +0100 fs  r269769 : implemented enumeration, getKeySet, and getValues. Should be finished now.
    2009-03-19 14:01:01 +0100 oj  r269743 : #i99913# reset the modified state when selecting an object
    2009-03-19 12:19:54 +0100 lla  r269739 : #i72390# cleanups
    2009-03-19 09:25:27 +0100 fs  r269727 : #i10000#
    2009-03-18 23:37:02 +0100 fs  r269708 : extended checks for value type acceptance
    2009-03-18 23:36:41 +0100 fs  r269707 : fixed value type checks
    2009-03-18 14:59:56 +0100 fs  r269678 : initial complex test case for the new css.container.Map implementation
    2009-03-18 14:59:24 +0100 fs  r269677 : verifyExpectedException moved to base class (in complexlib), and renamed to assureException for consistency
    2009-03-18 14:58:35 +0100 fs  r269676 : removed unused imports
    2009-03-18 14:58:03 +0100 fs  r269675 : first implementation of the new css.container.Map service (not completed, yet)
    2009-03-18 14:57:17 +0100 fs  r269674 : base class for UNO components, freeing you from some repeating work
    2009-03-18 14:55:53 +0100 fs  r269672 : +assureException: call a given method with given parameters on a given object, ensure that a given exception is thrown by the method implementation
    2009-03-18 14:54:58 +0100 fs  r269671 : +getComponentContext
    2009-03-18 14:54:00 +0100 fs  r269670 : isEmpty returns a boolean, not a long
    2009-03-18 14:14:43 +0100 oj  r269663 : #i99743# now text also supports null
    2009-03-18 13:54:14 +0100 oj  r269660 : #i99223# remove check for 2 params
    2009-03-18 13:33:35 +0100 oj  r269659 : #i99060# replace text::ParagraphVertAlign with style::VerticalAlignment
    2009-03-18 13:32:18 +0100 oj  r269658 : #i99060# don't set void property when void isn't allowed
    2009-03-18 13:31:11 +0100 oj  r269657 : #i99060# handle vertical alignment
    2009-03-18 13:28:28 +0100 oj  r269656 : #i99060# remove unused elements from sytle
    2009-03-18 09:35:42 +0100 lla  r269639 : #i72390# cleanups
    2009-03-18 09:31:20 +0100 lla  r269638 : #i72390# add ButtonList
    2009-03-18 09:30:46 +0100 lla  r269637 : #i72390# renamed interface
    2009-03-18 09:30:15 +0100 lla  r269636 : #i72390# use ButtonList instead of ImageList
    2009-03-18 09:29:05 +0100 lla  r269635 : #i72390# new ButtonList, cleanups
    2009-03-18 09:26:34 +0100 lla  r269634 : #i72390# cleanups
    2009-03-17 12:21:20 +0100 oj  r269590 : #i99222# remove assertion
    2009-03-17 12:17:22 +0100 oj  r269589 : #i98605# impl scale mode
    2009-03-17 12:10:42 +0100 oj  r269588 : #i98605# impl scale mode
    2009-03-17 11:40:15 +0100 oj  r269584 : #i96944# doesn't create equation for shapes
    2009-03-17 11:33:16 +0100 oj  r269583 : #i96423# switch calc from float to long
    2009-03-16 15:19:18 +0100 fs  r269550 : #i41930# enable zoom for embedded/outplace documents
    2009-03-16 14:25:54 +0100 oj  r269542 : #i93734# remove ContextSensitive
    2009-03-16 14:21:58 +0100 oj  r269541 : #i99274# page header before group header
    2009-03-16 14:18:23 +0100 oj  r269539 : #i99110# fix value type
    2009-03-16 14:14:16 +0100 fs  r269537 : line ends
    2009-03-16 14:11:06 +0100 fs  r269535 : line ends
    2009-03-16 14:08:34 +0100 fs  r269534 : #i100087# (provided my np): allow for polymorphic types with more than one parameter
    2009-03-16 12:30:31 +0100 oj  r269521 : compile error
    2009-03-16 12:19:12 +0100 oj  r269519 : compile error
    2009-03-16 10:39:28 +0100 oj  r269511 : compile error under linux with swap
    2009-03-13 10:33:04 +0100 oj  r269462 : CWS-TOOLING: rebase CWS dba32b to trunk at 269297 (milestone: DEV300:m43)
    2009-03-12 14:37:25 +0100 fs  r269416 : interface SequenceOutputStreamTest is unneeded, and pollutes the namespace here :)
    2009-03-12 14:35:07 +0100 fs  r269414 : not needed
    2009-03-12 14:34:15 +0100 fs  r269413 : preparation for multiple tests in this module
    2009-03-12 14:33:02 +0100 fs  r269412 : ShowTargets was moved from module integration.forms to module complexlib
    2009-03-12 14:32:48 +0100 fs  r269411 : helper class for projects containing multiple complex test cases (and following a certain structure)
    2009-03-12 14:00:14 +0100 fs  r269407 : proper module after the move
    2009-03-12 13:59:10 +0100 fs  r269406 : superseded by ../makefile.mk
    2009-03-12 13:47:38 +0100 fs  r269403 : not needed anymore
    2009-03-12 13:45:46 +0100 fs  r269402 : moved, in preparation of adding more test cases here, with a common infrastructure
    2009-03-12 13:45:07 +0100 fs  r269401 : moved from ../
    2009-03-12 13:43:59 +0100 fs  r269400 : moved to ./comphelper, in preparation of adding more test cases here, with a common infrastructure
    2009-03-12 13:29:47 +0100 oj  r269396 : #i99914# set parent on dataprovider
    2009-03-12 13:10:35 +0100 oj  r269393 : #i99832# check thrown exception and show error
    2009-03-12 13:08:10 +0100 fs  r269392 : reorganizing tests
    2009-03-12 12:52:55 +0100 oj  r269390 : #i99118# convert formatkey in numberformat
    2009-03-12 12:34:53 +0100 fs  r269388 : new API tests
    2009-03-12 12:29:05 +0100 fs  r269386 : Map not yet committed
    2009-03-12 12:28:36 +0100 fs  r269385 : oops, forgot the SequenceInputStream during the previous refactoring
    2009-03-12 12:12:39 +0100 oj  r269384 : #i99104# set HasCategories prop
    2009-03-12 12:12:08 +0100 oj  r269383 : #i99104# check HasCategories even for internal dataprovider
    2009-03-12 12:10:40 +0100 oj  r269382 : #i99104# set HasCategories prop
    2009-03-12 10:51:49 +0100 fs  r269373 : #i10000# exception specifications
    2009-03-12 10:49:18 +0100 fs  r269372 : #i10000# exception specifications
    2009-03-12 10:44:02 +0100 fs  r269371 : #i10000# exception specifications
    2009-03-12 10:30:55 +0100 fs  r269368 : refactored the UNO service registration in this module, using the helper classes provided by comphelper itself, so you have less effort when extending the list of to-be-registered components
    2009-03-12 10:30:37 +0100 fs  r269367 : module-local includes
    2009-03-12 07:05:54 +0100 oj  r269357 : #i99104# database dataprovider doesn't need dataranges and diagramdata
    2009-03-11 10:58:28 +0100 oj  r269306 : #i99911# check if name of the report is a valid file name
    2009-03-11 10:03:23 +0100 oj  r269299 : #i99666# the report is new when the HierarchicalDocumentName is empty
    2009-03-10 11:32:45 +0100 oj  r269258 : #i99221# use fallback for language
    2009-03-10 10:48:40 +0100 oj  r269255 : #i99433# now use OStringBuffer
    2009-03-10 10:36:21 +0100 fs  r269252 : initial version of (X)Map
    2009-03-10 09:52:23 +0100 oj  r269246 : #i99433# now use OStringBuffer
    2009-03-10 08:56:13 +0100 oj  r269240 : #i99655# patch applied
    2009-03-09 07:35:33 +0100 lla  r269058 : #i10000# wrong variable assignment fixed
    2009-03-06 17:20:40 +0100 fs  r269030 : some explicit defaults
    2009-03-06 17:20:30 +0100 fs  r269029 : #i98600#
    2009-03-06 14:40:34 +0100 fs  r269009 : #i87692# during reload, prevent the document being modified just because of some control content changes ...
    2009-03-06 12:52:20 +0100 lla  r268997 : #i10000# ambigous problem with FontWeight fixed
    2009-03-06 11:39:32 +0100 fs  r268989 : #i10000# (approved by pl): use --without-t1-library configure option
    2009-03-06 10:55:43 +0100 fs  r268986 : #i99953# depends on xmlscript module now
    2009-03-06 10:54:04 +0100 fs  r268985 : #i99953# also adjust the event names found in dialogs embedded in the forms
    2009-03-06 09:53:41 +0100 fs  r268977 : #i10000#
    2009-03-06 09:30:41 +0100 lla  r268973 : #i10000# merge problems
    2009-03-05 17:52:34 +0100 fs  r268932 : #i98593# for sub components which are actually controlled by a DocumentDefinition (aka XComponentSupplier aka XCommandProcessor), close them by executing the 'close' command, not by suspending/closing the controller (which cannot be intercepted)
    2009-03-05 11:41:56 +0100 fs  r268889 : default the drop down line count for list/combo boxes to 20
    2009-03-05 11:39:10 +0100 fs  r268887 : do not display empty error messages
    2009-03-02 10:13:57 +0100 lla  r268639 : #i91541# CWS rebase m41 to m42
    2009-03-02 09:06:27 +0100 lla  r268635 : #i10000# add ';' to strings
    2009-02-26 11:18:00 +0100 fs  r268492 : reportdesign depends on REPORTBUILDER, not REPORTDESIGN
    2009-02-26 10:11:38 +0100 lla  r268489 : CWS-TOOLING: rebase CWS dba32b to trunk at 268395 (milestone: DEV300:m42)
    2009-02-26 09:04:11 +0100 lla  r268488 : CWS-TOOLING: rebase CWS dba32b to trunk at 268395 (milestone: DEV300:m42)
    2009-02-24 12:09:13 +0100 lla  r268392 : #i91541# #i91542# cleanups
    2009-02-24 08:08:06 +0100 lla  r268382 : merge all dba32a changes into dba32b
    2009-02-24 07:14:55 +0100 lla  r268381 : merge all dba32a changes into dba32b
    2009-02-23 21:44:28 +0100 fs  r268377 : oops ... don't tamper with m_aListSourceValues at the end of loadData
    2009-02-23 20:57:05 +0100 fs  r268376 : #i98162# don't hold the values as strings, but as ORowSetValue, this way preserving their type, and being agnostic to different result/rowset implementations doing different to-string-conversations
    2009-02-23 20:55:44 +0100 fs  r268375 : getObject: throwFunctionNotSupportedException, instead of silently returning NULL
    2009-02-23 20:55:20 +0100 fs  r268374 : #i98162# some more supported types
    2009-02-23 20:54:43 +0100 fs  r268373 : #i98162# +operator !=
    2009-02-20 09:35:39 +0100 fs  r268306 : #i99422# for a font, display the font name, the style, and the size
    2009-02-20 09:33:45 +0100 fs  r268305 : #i99422# in the property browser, FONT supersedes CHARFONTNAME: the aggregated FormComponentHandler displays them more nicely now
    2009-02-19 16:12:06 +0100 fs  r268293 : #i99372# recognize DataType::FLOAT as numeric
    2009-02-19 15:43:12 +0100 fs  r268291 : #i99415#
    2009-02-19 15:40:15 +0100 fs  r268290 : #i99242# lcl_firstFocussableControl: take disabled controls into account
    2009-02-19 15:34:36 +0100 fs  r268289 : #i99396# properly decode the base name of the URL when using it as title
    2009-02-19 15:19:05 +0100 fs  r268287 : #i98247#

diff --git a/offapi/com/sun/star/form/component/CommandButton.idl b/offapi/com/sun/star/form/component/CommandButton.idl
index 650b1bd..f6c4de8 100644
--- a/offapi/com/sun/star/form/component/CommandButton.idl
+++ b/offapi/com/sun/star/form/component/CommandButton.idl
@@ -30,25 +30,12 @@
 #ifndef __com_sun_star_form_component_CommandButton_idl__ 
 #define __com_sun_star_form_component_CommandButton_idl__ 
  
-#ifndef __com_sun_star_form_FormControlModel_idl__ 
 #include <com/sun/star/form/FormControlModel.idl> 
-#endif 
- 
-#ifndef __com_sun_star_awt_UnoControlButtonModel_idl__ 
 #include <com/sun/star/awt/UnoControlButtonModel.idl> 
-#endif 
- 
-#ifndef __com_sun_star_form_XImageProducerSupplier_idl__ 
 #include <com/sun/star/form/XImageProducerSupplier.idl> 
-#endif 
- 
-#ifndef __com_sun_star_form_XApproveActionBroadcaster_idl__ 
 #include <com/sun/star/form/XApproveActionBroadcaster.idl> 
-#endif 
- 
-#ifndef __com_sun_star_form_FormButtonType_idl__ 
 #include <com/sun/star/form/FormButtonType.idl> 
-#endif 
+#include <com/sun/star/form/XReset.idl> 
  
  
 //============================================================================= 
@@ -101,6 +88,28 @@ published service CommandButton
         @see com::sun::star::form::FormButtonType
      */
     [property] string TargetURL; 
+
+    /** specifies the default toggle state for the button, used when it is reset.
+
+        <p>This property is meaningful only when <member scope="com::sun::star::awt">UnoControlButtonModel::Toggle</member>
+        is <TRUE/>. In this case, the <code>DefaultState</code> controls to which <code>State</code> the button will
+        be reset.</p>
+
+        <p>For a given implementation of the interface, if this (optional) property is present, then also the optional
+        interface <type scope="com::sun::star::form">XReset</type> must be present.</p>
+    */
+    [optional, property] boolean DefaultState;
+
+    /** allows resetting the button
+
+        <p>This property is meaningful only when <member scope="com::sun::star::awt">UnoControlButtonModel::Toggle</member>
+        is <TRUE/>. In this case, the <code>DefaultState</code> controls to which <code>State</code> the button will
+        be reset, when <member scope="com::sun::star::form">XReset::reset</member> is invoked.</p>
+
+        <p>For a given implementation of the interface, if this (optional) interface is present, then also the optional
+        property <member>DefaultState</member> must be present.</p>
+    */
+    [optional] interface ::com::sun::star::form::XReset;
 }; 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/report/XReportControlFormat.idl b/offapi/com/sun/star/report/XReportControlFormat.idl
index caaa410..55e8590 100644
--- a/offapi/com/sun/star/report/XReportControlFormat.idl
+++ b/offapi/com/sun/star/report/XReportControlFormat.idl
@@ -30,21 +30,14 @@
 #ifndef __com_sun_star_report_XReportControlFormat_idl__ 
 #define __com_sun_star_report_XReportControlFormat_idl__ 
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__
 #include <com/sun/star/awt/FontDescriptor.idl>
-#endif
-#ifndef __com_sun_star_util_Color_idl__
-#include <com/sun/star/util/Color.idl>
-#endif
-#ifndef __com_sun_star_beans_XPropertySet_idl__ 
-#include <com/sun/star/beans/XPropertySet.idl> 
-#endif
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#include <com/sun/star/awt/FontSlant.idl>
+#include <com/sun/star/beans/XPropertySet.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl> 
-#endif
 #include <com/sun/star/lang/Locale.idl>
-#include <com/sun/star/awt/FontSlant.idl>
-
+#include <com/sun/star/style/ParagraphAdjust.idl>
+#include <com/sun/star/style/VerticalAlignment.idl>
+#include <com/sun/star/util/Color.idl>
 //============================================================================= 
  
  module com {  module sun {  module star {  module report {  
@@ -70,15 +63,8 @@ interface XReportControlFormat
         get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
-    /** specifies the horizontal alignment of the text in the control. 
-                
-        <pre>
-        0: left
-        1: center
-        2: right
-        </pre>
-
-        @since OOo 2.0.0
+    /** specifies the horizontal alignment of the text. 
+        @see ::com::sun::star::style::ParagraphAdjust
      */
     [attribute,bound] short ParaAdjust
     {
@@ -414,11 +400,12 @@ interface XReportControlFormat
     };
 
     /** specifies the vertical alignment of the text in the control.
-        @see com::sun::star::text::ParagraphVertAlign
+        @see com::sun::star::style::VerticalAlignment
      */
-    [attribute,bound] short ParaVertAlignment
+    [attribute,bound] com::sun::star::style::VerticalAlignment VerticalAlign
     {
-        set raises ( com::sun::star::lang::IllegalArgumentException );
+        set raises ( com::sun::star::lang::IllegalArgumentException,com::sun::star::beans::UnknownPropertyException );
+        get raises ( com::sun::star::beans::UnknownPropertyException );
     };
 
     //-------------------------------------------------------------------------
diff --git a/offapi/com/sun/star/report/XReportEngine.idl b/offapi/com/sun/star/report/XReportEngine.idl
index 3be2683..1e12f32 100644
--- a/offapi/com/sun/star/report/XReportEngine.idl
+++ b/offapi/com/sun/star/report/XReportEngine.idl
@@ -153,6 +153,13 @@ interface XReportEngine
     /** specifies the status indicator which shows the progress of the report generation process.
     */
     [attribute] com::sun::star::task::XStatusIndicator StatusIndicator;
+
+    /** defines the maximum number of rows which should be fetched for the report.
+        If the limit is exceeded, the excess rows are silently dropped.
+        <br/>
+        There is no limitation, if set to zero.
+     */
+    [attribute,bound] long MaxRows;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/ErrorCondition.idl b/offapi/com/sun/star/sdb/ErrorCondition.idl
index 0c288d8..542674c 100644
--- a/offapi/com/sun/star/sdb/ErrorCondition.idl
+++ b/offapi/com/sun/star/sdb/ErrorCondition.idl
@@ -141,6 +141,20 @@ constants ErrorCondition
         database, which did not exist at that time.
     */
     const long DB_NOT_CONNECTED = 304;
+
+    // ========================================================================
+    // = section AB - address book access related error conditions
+    // =
+    // = next section should start with 550
+
+    /** used by the component implementing address book access to indicate that a requested address book could
+        not be accessed.
+
+        <p>For instance, this error code is used when you try to access the address book
+        in a Thunderbird profile named <q>MyProfile</q>,  but there does not exist a profile
+        with this name.</p>
+    */
+    const long AB_ADDRESSBOOK_NOT_FOUND = 500;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/sdb/RowSet.idl b/offapi/com/sun/star/sdb/RowSet.idl
index 1c36a86..07a16fd 100644
--- a/offapi/com/sun/star/sdb/RowSet.idl
+++ b/offapi/com/sun/star/sdb/RowSet.idl
@@ -216,7 +216,8 @@ published service RowSet
         the <type scope="com::sun::star::sdbc">XParameters</type> interface.<br/>
         However, you can also choose to let an interaction handler supply such data. For this, you may
         for instance instantiate an <type>InteractionHandler</type>, which asks the user for the
-        data, or you may write your own one, which supplies the data from somewhere else.</p>
+        data, or you may write your own one, which supplies the data from somewhere else.
+        The default implementation will only ask for parameters which aren't set before through the <type scope="com::sun::star::sdbc">XParameters</type> interface.</p>
 
         @see com::sun::star::sdb::InteractionHandler
     */
diff --git a/udkapi/com/sun/star/container/EnumerableMap.idl b/udkapi/com/sun/star/container/EnumerableMap.idl
new file mode 100644
index 0000000..77183a6
--- /dev/null
+++ b/udkapi/com/sun/star/container/EnumerableMap.idl
@@ -0,0 +1,139 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef __com_sun_star_container_Map_idl__
+#define __com_sun_star_container_Map_idl__
+
+#include <com/sun/star/beans/IllegalTypeException.idl>
+#include <com/sun/star/beans/Pair.idl>
+#include <com/sun/star/container/XEnumerableMap.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module container { 
+
+//=============================================================================
+
+/** provides a default <type>XEnumerableMap</type> implementation
+
+    <p>For the keys put into the map using <member>XMap::put</member> or <member>createImmutable</member>,
+    the following rules apply:
+    <a name="keyrules"></a>
+    <ul><li>A <VOID/> key is not allowed.</li>
+        <li>If the key type is <code>BOOLEAN</code>, <code>CHAR</code>, <code>FLOAT</code>, <code>DOUBLE</code>,
+            <code>STRING</code>, <code>TYPE</code>, or <code>UNSIGNED HYPER</code>, then only keys of exactly this
+            type are accepted.</li>
+        <li>If the key type is <code>DOUBLE</code> or <code>FLOAT</code>, then <code>Double.NaN</code> respectively
+            <code>Float.NaN</code> is not accepted as key.</li>
+        <li>If the key type's class is <member scope="com::sun::star::uno">TypeClass::ENUM</member>, then only keys
+            of exactly this type are accepted.</li>
+        <li>If the key type is any of <code>BYTE</code>, <code>SHORT</code>, <code>UNSIGNED SHORT</code>,
+            <code>LONG</code>, <code>UNSIGNED LONG</code>, or <code>HYPER</code>, then all keys which can losslessly
+            be converted to this type (possibly using widening conversions) are accepted.</li>
+        <li>If the key type is an interface type, then all key values denoting objects which can be queried for
+            the given interface are accepted.</li>
+        <li>All other key types are rejected.</li>
+    </ul></p>
+
+    <p>For the values put into the map using <member>XMap::put</member> or <member>createImmutable</member>,
+    the following rules apply:
+    <a name="valuerules"></a>
+    <ul><li>The <VOID/> value will be accepted to be put into the map.</p>
+        <li>If the value type's class is <member scope="com::sun::star::uno">TypeClass::ANY</member>, any value
+            will be accepted.</li>
+        <li>If the value type is an interface type, then all values denoting objects which can be queried for
+            the given interface are accepted.</li>
+        <li>If the value type's class is <member scope="com::sun::star::uno">TypeClass::EXCEPTION</member>
+            or <member scope="com::sun::star::uno">TypeClass::STRUCT</member>, then values whose type equals the
+            value type, or is a sub class of the value type, are accepted.</li>
+        <li>For all other value types, only values whose type matches exactly are accepted.</li>
+        <li>If the value type is <code>DOUBLE</code> or <code>FLOAT</code>, then <code>Double.NaN</code> respectively
+            <code>Float.NaN</code> is not accepted.</li>
+    </ul></p>
+
+    <p>The factory methods of the <code>XEnumerableMap</code> interface support both <em>isolated</em>
+    and <em>non-isolated</em> enumerators. The latter one will be automatically disposed when the map changes
+    after enumerator creation, so every attempt to use them will result in a
+    <type scope="com::sun::star::lang">DisposedException</type> being thrown.</p>
+
+    @see http://udk.openoffice.org/common/man/typesystem.html
+*/
+service EnumerableMap : XEnumerableMap
+{
+    /** creates an instance mapping from the given key type to the given value type
+
+        @param KeyType
+            denotes the type of the keys in the to-be-created map
+        @param ValueType
+            denotes the type of the values in the to-be-created map
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if <arg>KeyType</arg> or <arg>ValueType</arg> are unsupported types.
+            For values, all type classes except <member scope="com::sun::star::uno">TypeClass::VOID</member>
+            and <member scope="com::sun::star::uno">TypeClass::UNKNOWN</member> are accepted.
+            For keys, scalar types, strings, <type scope="com::sun::star::uno">Type</type> itself, and interface
+            types are accepted.
+    */
+    create( [in] type KeyType, [in] type ValueType )
+        raises( ::com::sun::star::beans::IllegalTypeException );
+
+    /** creates an instance mapping from the given key type to the given value type
+
+        <p>The resulting map is immutable, so later alter operations on it will fail
+        with a <type scope="com::sun::star::lang">NoSupportException</type>.</p>
+
+        @param KeyType
+            denotes the type of the keys in the to-be-created map
+        @param ValueType
+            denotes the type of the values in the to-be-created map
+        @param Values
+            denote the values contained in the to-be-created map
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if <arg>KeyType</arg> or <arg>ValueType</arg> are unsupported types.
+            For values, all type classes except <member scope="com::sun::star::uno">TypeClass::VOID</member>
+            are accepted.<br/>
+            For keys, scalar types, strings, <type scope="com::sun::star::uno">Type</type> itself, and interface
+            types are accepted.
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            if any of the given values or keys violates the <a href="#keyrules">key rules</a> or
+            <a href="#valuerules">value rules</a>.
+    */
+    createImmutable(
+        [in] type KeyType,
+        [in] type ValueType,
+        [in] sequence< ::com::sun::star::beans::Pair< any, any > > Values
+    )
+        raises( ::com::sun::star::beans::IllegalTypeException,
+                ::com::sun::star::lang::IllegalArgumentException );
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/udkapi/com/sun/star/container/XEnumerableMap.idl b/udkapi/com/sun/star/container/XEnumerableMap.idl
new file mode 100644
index 0000000..23b420d
--- /dev/null
+++ b/udkapi/com/sun/star/container/XEnumerableMap.idl
@@ -0,0 +1,108 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef __com_sun_star_container_XEnumerableMap_idl__
+#define __com_sun_star_container_XEnumerableMap_idl__
+
+#include <com/sun/star/container/XMap.idl>
+#include <com/sun/star/container/XEnumeration.idl>
+#include <com/sun/star/lang/NoSupportException.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module container { 
+
+//=============================================================================
+
+/** extends <type>XMap</type> with enumeration capabilities.
+
+    <p>No assumption should be made about the ordering of the elements returned by the various enumerators.
+    In particular, you cannot assume the elements are returned in the same order as they were inserted. Also,
+    you should not expect the <code>XMap</code> implementation to make use of a possibly existing strict ordering
+    defined on the domain of all possible key values.</p>
+
+    <p>You can create enumerators for the keys of the map, its values, and its key-value pairs.</p>
+
+    <p>In all cases, you can create an <em>isolated</em> enumerator, which works on a copy of the
+    map's content. Such an iterator is not affected by changes done to the map after creation of
+    the enumerator.</p>
+
+    <p>On the contrary, an enumerator which is <em>non-isolated</em> works directly on the map data.
+    This is less expensive than an <em>isolated</em> enumerator, but means that changes to the map while
+    an enumeration is running potentially invalidate your enumerator. The concrete behavior in this
+    case is undefined, it's up to the service implementing the <code>XEnumerableMap</code> interface
+    to specify it in more detail.</p>
+
+    <p>Implementations of this interface might decide to support only <em>isolated</em> enumerators, or
+    only <em>non-isolated</em> enumerators. Again, it's up to the service to specify this. Requesting an
+    enumerator type which is not supported will generally result in an <type scope="com::sun::star::lang">NoSupportException</type>
+    being thrown.</p>
+ */
+interface XEnumerableMap : XMap
+{
+    /** creates a enumerator for the keys of the map
+
+        @param Isolated
+            controls whether the newly create enumerator should be isolated from the map.
+
+        @throws ::com::sun::star::lang::NoSupportException
+            if the specified enumerator method is not supported by the implementation.
+    */
+    XEnumeration createKeyEnumeration( [in] boolean Isolated )
+        raises ( ::com::sun::star::lang::NoSupportException );
+
+    /** creates a enumerator for the values of the map
+
+        @param Isolated
+            controls whether the newly create enumerator should be isolated from the map.
+
+        @throws ::com::sun::star::lang::NoSupportException
+            if the specified enumerator method is not supported by the implementation.
+    */
+    XEnumeration createValueEnumeration( [in] boolean Isolated )
+        raises ( ::com::sun::star::lang::NoSupportException );
+
+    /** creates a enumerator for the key-value pairs of the map
+
+        <p>The elements returned by the enumerator are instances of <type scope="com::sun::star::beans">Pair</type>,
+        holding the key-value-pairs which are part of the map.</p>
+
+        @param Isolated
+            controls whether the newly create enumerator should be isolated from the map.
+
+        @throws ::com::sun::star::lang::NoSupportException
+            if the specified enumerator method is not supported by the implementation.
+    */
+    XEnumeration createElementEnumeration( [in] boolean Isolated )
+        raises ( ::com::sun::star::lang::NoSupportException );
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/udkapi/com/sun/star/container/XMap.idl b/udkapi/com/sun/star/container/XMap.idl
new file mode 100644
index 0000000..8cb3fa6
--- /dev/null
+++ b/udkapi/com/sun/star/container/XMap.idl
@@ -0,0 +1,201 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* 
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef __com_sun_star_container_XMap_idl__
+#define __com_sun_star_container_XMap_idl__
+
+#include <com/sun/star/beans/IllegalTypeException.idl>
+#include <com/sun/star/lang/IllegalArgumentException.idl>
+#include <com/sun/star/container/NoSuchElementException.idl>
+#include <com/sun/star/lang/NoSupportException.idl>
+#include <com/sun/star/container/XElementAccess.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module container { 
+
+//=============================================================================
+
+/** describes a map between keys and values.
+
+    <p>Keys in the map are unique, and each key maps to exactly one value.</p>
+
+    <p>Locating elements in the map, both values and keys, requires a notion of equality of two objects.
+    In conformance with the <a href="http://udk.openoffice.org/common/man/typesystem.html">UNO type system</a>,
+    two values are said to be equal if and only if they have the same type, and both denote the same element of this
+    type's value set.</p>
+
+    @see <type>Map</type> for a default implementation of this interface
+*/
+interface XMap
+{
+    interface XElementAccess;
+
+    /** denotes the type of the keys in the map.
+
+        <p>Implementations are free to accept any supertype of <code>KeyType</code> as keys.</p>
+    */
+    [attribute, readonly]   type    KeyType;
+
+    /** denotes the type of the values in the map.
+
+        <p>Implementations are free to accept any supertype of the <code>ValueType</code> as values.</p>
+    */
+    [attribute, readonly]   type    ValueType;
+
+    /** clears the map, removing all key-value pairs from it.
+
+        @throws ::com::sun::star::beans::NoSupportException
+            if the map is not mutable.
+    */
+    void clear()
+        raises( ::com::sun::star::lang::NoSupportException );
+
+    /** determines whether a mapping for he given key exists in the map
+
+        @param Key
+            is the key whose presence in the map is to be tested.
+        @return
+            <TRUE/> if and only if the map contains a mapping for the given key.
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if the given key is not of a type which is accepted by the map
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            if the given key is not supported to be put into the map. It's up to the service
+            implementing the <code>XMap</code> interface to specify which special values are not
+            supported. For instances, implementations might decide to not allow <VOID/> keys, or
+            to reject <code>Double.NaN</code> (<em>not a number</em>) to due its problematic
+            behavior with respect to equality.
+    */
+    boolean containsKey( [in] any Key )
+        raises( ::com::sun::star::beans::IllegalTypeException,
+                ::com::sun::star::lang::IllegalArgumentException );
+
+    /** determines whether the map contains a mapping to a given value.
+
+        @param Value
+            is the value whose presence in the map is to be tested.
+        @return
+            <TRUE/> if and only one or more keys map to the given value.
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if the given value is not of a type which is accepted by the map. It's up to the service
+            implementing the <code>XMap</code> interface to specify which special values are not
+            supported. For instances, implementations might decide to not allow <code>Double.NaN</code>
+            (<em>not a number</em>) to due its problematic behavior with respect to equality.
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            if the given value is not supported to be put into the map.
+    */
+    boolean containsValue( [in] any Value )
+        raises( ::com::sun::star::beans::IllegalTypeException,
+                ::com::sun::star::lang::IllegalArgumentException );
+
+    /** gets the value to which a given key maps.
+
+        @param Key
+            they key whose associated value is to be returned.
+        @return
+            the value which is associated with the given key.
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if the given key is not of a type which is accepted by the map
+        @throws ::com::sun::star::beans::IllegalArgumentException
+            if the given key is not supported to be put into the map. It's up to the service
+            implementing the <code>XMap</code> interface to specify which special values are not
+            supported. For instances, implementations might decide to not allow <VOID/> keys, or
+            to reject <code>Double.NaN</code> (<em>not a number</em>) to due its problematic
+            behavior with respect to equality.
+        @throws ::com::sun::star::container::NoSuchElementException
+            if there is no value associated with the given key
+    */
+    any     get( [in] any Key )
+        raises( ::com::sun::star::beans::IllegalTypeException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::container::NoSuchElementException );
+
+    /** associates a given key with a given value
+
+        <p>If the map already contains a mapping for the given key, then the old value is replaced by the
+        given new value.</p>
+
+        @param Key
+            is the key which the given value should be associated with
+        @param Value
+            is the value which should be associated with the given key
+        @return
+            the value which was previously associated with the given key, or <VOID/>
+            if there was no such previous association.
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if the given key is not of a type which is accepted by the map
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            if the given key, or the given value, is not supported to be put into the map. It's up to
+            the service implementing the <code>XMap</code> interface to specify which special values
+            are not supported.<br/>
+            For instances, implementations might decide to not allow <VOID/> keys or values, or to
+            reject <code>Double.NaN</code> (<em>not a number</em>) to due its problematic behavior
+            with respect to equality.
+        @throws ::com::sun::star::beans::NoSupportException
+            if the map does not support putting new mappings into it
+    */
+    any     put( [in] any Key, [in] any Value )
+        raises( ::com::sun::star::lang::NoSupportException,
+                ::com::sun::star::beans::IllegalTypeException,
+                ::com::sun::star::lang::IllegalArgumentException );
+
+    /** removes a key-value mapping, given by key, from the map.
+
+        @param Key
+            is the key whose mapping should be removed from the map
+        @return
+            the value which was associated with the given key before the removal
+
+        @throws ::com::sun::star::beans::IllegalTypeException
+            if the given key is not of a type which is accepted by the map
+        @throws ::com::sun::star::lang::IllegalArgumentException
+            if the given key is not supported to be put into the map. It's up to the service
+            implementing the <code>XMap</code> interface to specify which special values are not
+            supported. For instances, implementations might decide to not allow <VOID/> keys, or
+            to reject <code>Double.NaN</code> (<em>not a number</em>) to due its problematic
+            behavior with respect to equality.
+        @throws ::com::sun::star::beans::NoSupportException
+            if the map does not support removing mappings
+        @throws ::com::sun::star::container::NoSuchElementException
+            if there is no value associated with the given key
+    */
+    any     remove( [in] any Key )
+        raises( ::com::sun::star::lang::NoSupportException,
+                ::com::sun::star::beans::IllegalTypeException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::container::NoSuchElementException );
+};
+
+//=============================================================================
+
+}; }; }; }; 
+
+//=============================================================================
+
+#endif
diff --git a/udkapi/com/sun/star/container/makefile.mk b/udkapi/com/sun/star/container/makefile.mk
index f78f338..07b4362 100644
--- a/udkapi/com/sun/star/container/makefile.mk
+++ b/udkapi/com/sun/star/container/makefile.mk
@@ -47,6 +47,7 @@ IDLFILES=\
     XIdentifierContainer.idl\
     ContainerEvent.idl\
     ElementExistException.idl\
+    EnumerableMap.idl\
     NoSuchElementException.idl\
     XChild.idl\
     XUniqueIDAccess.idl\
@@ -59,6 +60,7 @@ IDLFILES=\
     XContainerQuery.idl\
     XContentEnumerationAccess.idl\
     XElementAccess.idl\
+    XEnumerableMap.idl\
     XEnumeration.idl\
     XEnumerationAccess.idl\
     XHierarchicalName.idl\
@@ -71,6 +73,7 @@ IDLFILES=\
     XIndexAccess.idl\
     XIndexContainer.idl\
     XIndexReplace.idl\
+    XMap.idl\
     XNameAccess.idl\
     XNameContainer.idl\
     XNamed.idl\
commit 0fc6865f6d31609f2f912a5cbd08174c0d3ce318
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jun 4 09:41:18 2009 +0000

    CWS-TOOLING: integrate CWS chart37
    2009-05-22 09:10:36 +0200 iha  r272170 : #i102130# color of pies is not loaded correctly
    2009-04-27 17:16:20 +0200 iha  r271294 : #i24203# compiler problem
    2009-04-27 16:43:21 +0200 iha  r271292 : #i101281# missing API documentation for secondary axis title properties
    2009-04-27 15:26:05 +0200 hde  r271276 : #i100987
    2009-04-27 15:24:42 +0200 hde  r271273 : #i100987
    2009-04-24 15:08:33 +0200 iha  r271214 : #i100995# crash with some logarithmic scalings
    2009-04-22 18:50:56 +0200 dr  r271134 : #i82177# write out deleted point labels
    2009-04-22 18:40:48 +0200 iha  r271133 : #i101281# missing API documentation for secondary axis title properties
    2009-04-22 16:39:42 +0200 dr  r271128 : #i82177# extensions for bubble charts
    2009-04-22 14:37:00 +0200 dr  r271114 : #i82177# import/export data label type and separator
    2009-04-22 14:36:24 +0200 dr  r271113 : #i82177# import/export data label type and separator
    2009-04-21 15:25:26 +0200 dr  r271038 : #i82177# import data label type and separator from BIFF8 CHFR records
    2009-04-21 14:37:16 +0200 dr  r271037 : #i82177# dump BIFF8 chart future records
    2009-04-20 17:44:27 +0200 iha  r271002 : #i96898# reduce library exports
    2009-04-20 13:01:13 +0200 iha  r270975 : #i24203# rotate data labels - help ids
    2009-04-20 11:40:33 +0200 dr  r270969 : #i96600# export of axis scaling/positioning properties
    2009-04-16 16:02:31 +0200 dr  r270892 : #i69599# keep Y axis left in 3d charts
    2009-04-15 18:16:46 +0200 dr  r270859 : #i69599# import of axis position settings
    2009-04-15 18:16:01 +0200 dr  r270858 : #i69599# correct handling of logarithmic crossing axes
    2009-04-14 16:27:48 +0200 dr  r270794 : #i96599# handle auto axis position on logarithmic axes
    2009-04-09 19:59:51 +0200 dr  r270722 : #i96599# import axis crossing settings, fix import of logarithmic scaling settings
    2009-04-09 18:26:00 +0200 iha  r270720 : #i96898# reduce library exports
    2009-04-09 15:17:04 +0200 iha  r270710 : #i96898# reduce library exports
    2009-04-09 10:50:14 +0200 dr  r270682 : #i24203# import/export of data label rotation, fixed some other broken stuff too
    2009-04-08 16:54:54 +0200 dr  r270657 : #i24203# import rotation for data point labels
    2009-04-06 18:19:17 +0200 iha  r270571 : #i100876# Axis scaling settings dialog wrong after API usage (anys different from double type)
    2009-04-06 15:57:05 +0200 iha  r270567 : #i100105# #i58585# leftover  ->
    2009-04-06 15:55:48 +0200 iha  r270564 : #i58585# leftover  ->
    2009-04-02 16:41:07 +0200 iha  r270422 : #i99721# remove unused code
    2009-04-02 14:29:03 +0200 iha  r270407 : #i99721# remove unused code
    2009-03-26 10:58:23 +0100 iha  r270059 : #i96898# reduce library exports
    2009-03-26 10:13:49 +0100 iha  r270055 : #i96898# reduce library exports
    2009-03-25 09:39:13 +0100 iha  r269998 : CWS-TOOLING: rebase CWS chart37 to trunk at 269781 (milestone: DEV300:m44)
    2009-03-24 17:56:56 +0100 iha  r269986 : #i96898# reduce library exports
    2009-03-24 16:56:44 +0100 iha  r269974 : #i99721# remove unused code
    2009-03-24 16:48:48 +0100 iha  r269970 : #i89731# remove unused string
    2009-03-24 15:44:04 +0100 iha  r269961 : remove unused code
    2009-03-24 15:22:45 +0100 iha  r269959 : remove unused code
    2009-03-24 15:17:17 +0100 iha  r269957 : remove unused code
    2009-03-24 11:14:53 +0100 iha  r269923 : #i24203# rotate data labels
    2009-03-09 12:10:25 +0100 hde  r269076 : #i99300#
    2009-03-06 15:56:26 +0100 iha  r269011 : #i93953# Source Format for secondary axis without data
    2009-02-17 15:59:05 +0100 iha  r268177 : avoid warning during build
    2009-02-17 15:01:59 +0100 iha  r268173 : avoid warning during build
    2009-02-13 09:39:03 +0100 ufi  r267693 : i96999
    2009-02-11 15:12:35 +0100 iha  r267604 : removed unused string
    2009-02-11 14:00:29 +0100 iha  r267600 : #i96999# Corrected wording from 'correlation coefficient' to 'coefficient of determination'
    2009-02-11 10:56:45 +0100 iha  r267584 : #i89731# typo in resource string
    2009-02-11 10:01:29 +0100 iha  r267582 : #i89031# compile error on asian windows systems
    2009-02-10 16:15:16 +0100 iha  r267552 : #i24203# rotate data labels
    2009-02-04 18:00:33 +0100 iha  r267395 : #i98893# don't export defaults to file
    2009-02-04 15:48:15 +0100 iha  r267390 : #i92128# asian typography for chart elements
    2009-02-04 15:17:41 +0100 iha  r267386 : #i92128# asian typography for chart elements
    2009-01-30 14:41:10 +0100 iha  r267197 : CWS-TOOLING: rebase CWS chart37 to trunk at 267171 (milestone: DEV300:m41)

diff --git a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
index 0ccc272..07cf56a 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisXSupplier.idl
@@ -66,10 +66,20 @@ published service ChartTwoAxisXSupplier
  
     //------------------------------------------------------------------------- 
      
-    /** determines if the description of the secondary x-axis
-        is shown or hidden.
-     */
+    /** determines for the secondary x-axis
+        if the labels at the tick marks are shown or hidden.
+    */
     [property] boolean HasSecondaryXAxisDescription; 
+
+    //------------------------------------------------------------------------- 
+
+    /** determines if the title of the secondary X-axis is shown or hidden.
+
+        @see ChartTitle
+
+        @since OOo 3.0
+    */
+    [optional, property] boolean HasSecondaryXAxisTitle; 
  
 }; 
  
diff --git a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
index e48ae2d..971dc1d 100644
--- a/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
+++ b/offapi/com/sun/star/chart/ChartTwoAxisYSupplier.idl
@@ -67,10 +67,20 @@ published service ChartTwoAxisYSupplier
  
     //------------------------------------------------------------------------- 
      
-    /** determines if the description of the secondary
-        y-axis is shown or hidden.
-     */
+    /** determines for the secondary y-axis
+        if the labels at the tick marks are shown or hidden.
+    */
     [property] boolean HasSecondaryYAxisDescription; 
+
+    //------------------------------------------------------------------------- 
+
+    /** determines if the title of the secondary y-axis is shown or hidden.
+
+        @see ChartTitle
+
+        @since OOo 3.0
+    */
+    [optional, property] boolean HasSecondaryYAxisTitle; 
  
 }; 
  
diff --git a/offapi/com/sun/star/chart2/RectangularDataSource.idl b/offapi/com/sun/star/chart2/RectangularDataSource.idl
deleted file mode 100644
index 6ff8fb8..0000000
--- a/offapi/com/sun/star/chart2/RectangularDataSource.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: RectangularDataSource.idl,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef com_sun_star_chart2_RectangularDataSource_idl
-#define com_sun_star_chart2_RectangularDataSource_idl
-
-#include <com/sun/star/chart/ChartDataRowSource.idl>
-#include <com/sun/star/chart/ChartDataArray.idl>
-
-#include <com/sun/star/chart2/DataSource.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/** describes a data source that bases on a two-dimensional range of
-    data, like a cell range in a spreadsheet.
-
-    <p>Components supporting this service have the duty to interpret
-    the given range in an appropriate way to represent a
-    <type>DataSource</type>.</p>
- */
-service RectangularDataSource
-{
-    /** A RectangularDataSource is certainly also a DataSource.
-     */
-    service DataSource;
-
-    service ::com::sun::star::chart::ChartDataArray;
-
-    /** contains a range string in the format specified by the Office
-        XML format for tables, that refers to data in the table of a
-        spreadsheet or a text document.
-
-        <p>This range is used to determine the rectangular range
-        chosen.  The <member>DataSequence::SourceRange</member>
-        properties of the <type>DataSequence</type>s are ignored for
-        this type of <type>DataSource</type>.</p>
-    */
-    [property] string                                         SourceRange;
-
-    /** determines if the data referred to in
-       <member>SourceRange</member> is split up into
-       <type>DataSequence</type>s using rows
-       (<member-scope="com::sun::star::chart">ChartDataRowSource::ROWS</member>)
-       or columns
-       (<member-scope="com::sun::star::chart">ChartDataRowSource::COLUMNS</member>).
-     */
-    [property] ::com::sun::star::chart::ChartDataRowSource    DataRowSource;
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-
-#endif
commit 624958763984d3f84078257a164c7e68239d02ab
Author: Kurt Zenker <kz at openoffice.org>
Date:   Wed Jun 3 15:45:09 2009 +0000

    CWS-TOOLING: integrate CWS vcl101
    2009-04-30 16:05:34 +0200 pl  r271420 : #i95591# need a poll timer so XtTimers work properly
    2009-04-30 11:25:52 +0200 hdu  r271406 : #i100929# avoid unneeded colormap reallocation
    2009-04-30 11:21:16 +0200 hdu  r271405 : #i100929# use improved SetDrawable() also for salframe updates
    2009-04-30 11:12:41 +0200 hdu  r271404 : i100929# invalidate cached renderpic also for changed vdev
    2009-04-29 14:31:40 +0200 hdu  r271375 : i100929# use cached renderpic also for alpha-rect/bitmap drawing
    2009-04-29 14:16:51 +0200 hdu  r271370 : i100929# notify only GtkSalFrame's valid X11SalFrames
    2009-04-29 13:58:10 +0200 hdu  r271369 : i100929# notify GtkSalFrame's X11SalGraphics that their drawables will become obsolete
    2009-04-29 13:53:48 +0200 hdu  r271367 : #i100929# release cached renderpic whenever the corresponding drawable changes
    2009-04-28 11:56:07 +0200 pl  r271317 : fix a snafu
    2009-04-27 16:52:29 +0200 hdu  r271293 : #i100000# WAE fix for debug=true compilation
    2009-04-27 12:38:11 +0200 hdu  r271260 : #i101367# disable vdev mapmode when measuring pixel size
    2009-04-27 12:28:37 +0200 hdu  r271259 : #i101367# speedup svclcanvas::CanvasBitmapHelper::getSize()
    2009-04-23 15:11:25 +0200 hdu  r271175 : #i91685# ignore trailing space in last cell
    2009-04-23 12:55:14 +0200 pl  r271156 : #i101032# check for empty bitmap
    2009-04-23 11:04:50 +0200 pl  r271144 : #101184# add a paranoia check
    2009-04-21 19:12:25 +0200 pl  r271055 : #i101184# add: recognize added/removed monitors in xinerama configuration for gtk plugin (thanks cmc)
    2009-04-21 17:04:44 +0200 pl  r271046 : #i101089# remove unused method (thanks cmc)
    2009-04-21 16:41:38 +0200 hdu  r271042 : #i99842# set text decoration color
    2009-04-20 22:57:37 +0200 pl  r271015 : #i101063# fix warnings
    2009-04-20 22:55:39 +0200 pl  r271014 : #i101063# fix warnings
    2009-04-20 11:35:24 +0200 hdu  r270968 : #i1001102# remove dependency to psprint module
    2009-04-20 11:31:08 +0200 hdu  r270967 : #i100929# keep cached render Picture in X11SalGraphics removes
    2009-04-20 11:24:57 +0200 hdu  r270966 : #i100929# cache render Picture in X11SalGraphics
    2009-04-18 14:53:22 +0200 hdu  r270959 : CWS-TOOLING: rebase CWS vcl101 to trunk at 270723 (milestone: DEV300:m46)
    2009-04-17 12:00:50 +0200 hdu  r270934 : #i100951# b2d-polygon clipping handles bezier-segments nowadays => performance opt possible
    2009-04-17 11:50:49 +0200 hdu  r270933 : #i100922# count b2d-polypoly-points to avoid priority-queue reallocations
    2009-04-17 11:07:03 +0200 hdu  r270930 : #i101145# match dpi-sanity check with gnome-UI (thanks Caolan!)
    2009-04-17 10:44:41 +0200 hdu  r270929 : #i100603# dingbats-encoded PDF-builtin fonts are symbol fonts too
    2009-04-17 10:36:10 +0200 hdu  r270928 : #i101145# check sanity of resolution reported by Xft-dpi (thanks CMC!)
    2009-04-08 13:53:35 +0200 hdu  r270644 : #i100951# avoid expensive calls to basegfx::tools::clipPolygonOnRange() if possible
    2009-04-08 13:19:26 +0200 hdu  r270637 : #i100922# prevent needless stl::priority_queue reallacations by reserving
    2009-04-08 11:14:30 +0200 hdu  r270627 : #i100929# use X11SalGraphics::GetXRenderPicture() also for text drawing
    2009-04-08 10:00:42 +0200 hdu  r270620 : #i100929# add and use X11SalGraphics::GetXRenderPicture() for polygon drawing
    2009-04-06 15:52:47 +0200 hdu  r270563 : #i100885# add and use AquaSalGraphics::copyResolution() to speed up virdev creation
    2009-04-02 14:39:06 +0200 pl  r270408 : #i95873# do not set LD_LIBRARY_PATH for external apps
    2009-03-31 18:43:19 +0200 pl  r270292 : #i99783# transparency of closer image changed to mask in the meantime
    2009-03-27 15:42:37 +0100 hdu  r270158 : #i100591# fix binary search in dingbats encoding converter
    2009-03-27 13:06:34 +0100 hdu  r270151 : #i100603# only PDF builtin text fonts use WinAnsiEncoding
    2009-03-27 12:05:35 +0100 hdu  r270147 : #i100603# use correct encoding for all PDF builtin fonts
    2009-03-27 09:04:07 +0100 hdu  r270133 : #i100603# use proper encoding for PDF builtin symbol fonts
    2009-03-26 17:19:38 +0100 hdu  r270090 : #i100591# support RTL_TEXTENCODING_ADOBE_DINGBATS encoding
    2009-03-25 09:02:18 +0100 hdu  r269995 : #i100521# prefer osl_getAsciiFunctionSymbol() when dynloading SAGE and extra USER32 symbols
    2009-03-25 08:55:49 +0100 hdu  r269994 : #i100521# prefer osl_getAsciiFunctionSymbol() when dynloading LUNA symbols
    2009-03-24 16:15:54 +0100 hdu  r269965 : #i100521# prefer osl_getAsciiFunctionSymbol() when dynloading vclplugin symbols
    2009-03-24 16:10:29 +0100 hdu  r269963 : #i100521# prefer osl_getAsciiFunctionSymbol() when dynloading USP symbols
    2009-03-24 15:54:30 +0100 hdu  r269962 : #i100521# prefer osl_getAsciiFunctionSymbol() when dynloading xrender symbols
    2009-03-24 10:46:55 +0100 hdu  r269920 : #i100506# fix WAE build breakers on unxsols4 for debug=true
    2009-03-23 16:36:43 +0100 hdu  r269884 : #159477# fix crash for PDFs with big zlib-chunks
    2009-03-20 17:36:56 +0100 pl  r269821 : #i96568# add recent files to mac quickstarter
    2009-03-20 14:39:41 +0100 pl  r269809 : #i35482# no HC mode detection, automatically done in independent part
    2009-03-19 20:01:37 +0100 pl  r269768 : #i95591# do not reuse UnxPloginComm because of connection loss problems
    2009-03-19 18:08:23 +0100 pl  r269765 : #i95588# change default visibility that was ignored everywhere but unix anyway

diff --git a/sal/inc/rtl/textenc.h b/sal/inc/rtl/textenc.h
index 691f53c..1735e3e 100644
--- a/sal/inc/rtl/textenc.h
+++ b/sal/inc/rtl/textenc.h
@@ -149,6 +149,7 @@ typedef sal_uInt16 rtl_TextEncoding;
 #define RTL_TEXTENCODING_ADOBE_STANDARD         (RTL_TEXTENC_CAST( 91 ))
 #define RTL_TEXTENCODING_ADOBE_SYMBOL           (RTL_TEXTENC_CAST( 92 ))
 #define RTL_TEXTENCODING_PT154                  (RTL_TEXTENC_CAST( 93 ))
+#define RTL_TEXTENCODING_ADOBE_DINGBATS         (RTL_TEXTENC_CAST( 94 ))
 /* ATTENTION!  Whenever some encoding is added here, make sure to update
  * rtl_isOctetTextEncoding in tencinfo.c.
  */
diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index c4b9f76..2e192ea 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -1175,7 +1175,7 @@ void Test::testSingleByte() {
                 0xFFFF,0x00E6,0xFFFF,0xFFFF,0xFFFF,0x0131,0xFFFF,0xFFFF,
                 0x0142,0x00F8,0x0153,0x00DF,0xFFFF,0xFFFF,0xFFFF,0xFFFF } },
             { RTL_TEXTENCODING_ADOBE_SYMBOL,
-              { 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+               { 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
                 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
                 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
                 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
@@ -1207,6 +1207,46 @@ void Test::testSingleByte() {
                 0x239D,0x23A1,0x23A2,0x23A3,0x23A7,0x23A8,0x23A9,0x23AA,
                 0xFFFF,0x232A,0x222B,0x2320,0x23AE,0x2321,0x239E,0x239F,
                 0x23A0,0x23A4,0x23A5,0x23A6,0x23AB,0x23AC,0x23AD,0xFFFF } },
+            { RTL_TEXTENCODING_ADOBE_DINGBATS,
+              { 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+// 20
+                0x0020,0x2701,0x2702,0x2703,0x2704,0x260E,0x2706,0x2707,
+                0x2708,0x2709,0x261B,0x261E,0x270C,0x270D,0x270E,0x270F,
+                0x2710,0x2711,0x2712,0x2713,0x2714,0x2715,0x2716,0x2717,
+                0x2718,0x2719,0x271A,0x271B,0x271C,0x271D,0x271E,0x271F,
+// 40
+                0x2720,0x2721,0x2722,0x2723,0x2724,0x2725,0x2726,0x2727,
+                0x2605,0x2729,0x272A,0x272B,0x272C,0x272D,0x272E,0x272F,
+                0x2730,0x2731,0x2732,0x2733,0x2734,0x2735,0x2736,0x2737,
+                0x2738,0x2739,0x273A,0x273B,0x273C,0x273D,0x273E,0x273F,
+// 60
+                0x2740,0x2741,0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,
+                0x2748,0x2749,0x274A,0x274B,0x27CF,0x274D,0x25A0,0x274F,
+                0x2750,0x2751,0x2752,0x25B2,0x25BC,0x25C6,0x2756,0x25D7,
+                0x2758,0x2759,0x275A,0x275B,0x275C,0x275D,0x275E,0xFFFF,
+// 80
+                0xF8D7,0xF8D8,0xF8D9,0xF8DA,0xF8DB,0xF8DC,0xF8DD,0xF8DE,
+                0xF8DF,0xF8E0,0xF8E1,0xF8E2,0xF8E3,0xF8E4,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+                0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+// A0
+                0xFFFF,0x2761,0x2762,0x2763,0x2764,0x2765,0x2766,0x2767,
+                0x2663,0x2666,0x2665,0x2660,0x2460,0x2461,0x2462,0x2463,
+                0x2464,0x2465,0x2466,0x2467,0x2468,0x2469,0x2776,0x2777,
+                0x2778,0x2779,0x277A,0x277B,0x277C,0x277D,0x277E,0x277F,
+// C0
+                0x2780,0x2781,0x2782,0x2783,0x2784,0x2785,0x2786,0x2787,
+                0x2788,0x2789,0x278A,0x278B,0x278C,0x278D,0x278E,0x278F,
+                0x2790,0x2791,0x2792,0x2793,0x2794,0x2795,0x2796,0x2797,
+                0x2798,0x2799,0x279A,0x279B,0x279C,0x279D,0x279E,0x279F,
+// E0
+                0x27A0,0x27A1,0x27A2,0x27A3,0x27A4,0x27A5,0x27A6,0x27A7,
+                0x27A8,0x27A9,0x27AA,0x27AB,0x27AC,0x27AD,0x27AE,0x27AF,
+                0xFFFF,0x27B1,0x27B2,0x27B3,0x27B4,0x27B5,0x27B6,0x27B7,
+                0x27B8,0x27B9,0x27BA,0x27BB,0x27BC,0x27BD,0x27BE,0xFFFF } },
             { RTL_TEXTENCODING_PT154,
               { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
                 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab
index 8df2d27..31438a4 100644
--- a/sal/textenc/convertadobe.tab
+++ b/sal/textenc/convertadobe.tab
@@ -110,7 +110,7 @@ adobeStandardEncodingConverterData = {
      / sizeof unicodeToAdobeStandardEncoding[0]),
     unicodeToAdobeStandardEncoding };
 
-// RTL_TEXTENCODING_ADOBE_STANDARD is based on
+// RTL_TEXTENCODING_ADOBE_SYMBOL is based on
 // <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt> revision
 // "v0.2, 30 March 1999," with the modification that some mappings go to code
 // points newly assigned in Unicode 3.2/4.0, instead of to PUA:
@@ -231,6 +231,68 @@ adobeSymbolEncodingConverterData = {
      / sizeof unicodeToAdobeSymbolEncoding[0]),
     unicodeToAdobeSymbolEncoding };
 
+// RTL_TEXTENCODING_ADOBE_DINGBATS is based on
+// <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/zdingbat.txt> revision
+// "v0.2, 30 March 1999"
+
+//TODO: Contains Unicode PUA mappings
+rtl::textenc::BmpUnicodeToSingleByteRange const unicodeToAdobeDingbatsEncoding[]
+= { { 0x0020, 0x0020 - 0x0020, 0x20 }, { 0x00A0, 0x00A0 - 0x00A0, 0x20 },
+    { 0x2192, 0x2192 - 0x2192, 0xD5 }, { 0x2194, 0x2195 - 0x2194, 0xD6 },
+    { 0x2460, 0x2469 - 0x2460, 0xAB }, 
+    { 0x25A0, 0x25A0 - 0x25A0, 0x6E },
+    { 0x25B2, 0x25B2 - 0x25B2, 0x73 }, { 0x25BC, 0x25BC - 0x25BC, 0x74 },
+    { 0x25C6, 0x25C6 - 0x25C6, 0x75 }, { 0x25CF, 0x25CF - 0x25CF, 0x6C },
+    { 0x25D7, 0x25D7 - 0x25D7, 0x77 },
+    { 0x2605, 0x2605 - 0x2605, 0x48 }, { 0x260E, 0x260E - 0x260E, 0x25 },
+    { 0x261B, 0x261B - 0x261B, 0x2A }, { 0x261E, 0x261E - 0x261E, 0x2B },
+    { 0x2660, 0x2660 - 0x2660, 0xAB }, { 0x2663, 0x2663 - 0x2663, 0xA8 },
+    { 0x2665, 0x2665 - 0x2665, 0xAA }, { 0x2666, 0x2666 - 0x2666, 0xA9 },
+    { 0x2701, 0x2704 - 0x2701, 0x21 }, { 0x2706, 0x2709 - 0x2706, 0x26 },
+    { 0x270C, 0x2727 - 0x270C, 0x2C }, { 0x2729, 0x274B - 0x2729, 0x49 },
+    { 0x274D, 0x274D - 0x274D, 0x6D }, { 0x274F, 0x2752 - 0x274F, 0x6F },
+    { 0x2756, 0x2756 - 0x2756, 0x76 }, { 0x2758, 0x275E - 0x2758, 0x78 },
+    { 0x2761, 0x2767 - 0x2761, 0xA1 }, { 0x2776, 0x2794 - 0x2776, 0xB6 },
+    { 0x2798, 0x27AF - 0x2798, 0xD8 }, { 0x27B1, 0x27BE - 0x27B1, 0xF1 },
+    { 0xF8D7, 0xF8E4 - 0xF8D7, 0x80 }};
+
+rtl::textenc::BmpUnicodeToSingleByteConverterData const
+adobeDingbatsEncodingConverterData = {
+    { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x00
+      0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
+      0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x10
+      0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
+      0x0020, 0x2701, 0x2702, 0x2703, 0x2704, 0x260E, 0x2706, 0x2707, // 0x20
+      0x2708, 0x2709, 0x261B, 0x261E, 0x270C, 0x270D, 0x270E, 0x270F,
+      0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, // 0x30
+      0x2718, 0x2719, 0x271A, 0x271B, 0x271C, 0x271D, 0x271E, 0x271F,
+      0x2720, 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2727, // 0x40
+      0x2605, 0x2729, 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F,
+      0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, // 0x50
+      0x2738, 0x2739, 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F,
+      0x2740, 0x2741, 0x2742, 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, // 0x60
+      0x2748, 0x2749, 0x274A, 0x274B, 0x27CF, 0x274D, 0x25A0, 0x274F,
+      0x2750, 0x2751, 0x2752, 0x25B2, 0x25BC, 0x25C6, 0x2756, 0x25D7, // 0x70
+      0x2758, 0x2759, 0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0xFFFF,
+      0xF8D7, 0xF8D8, 0xF8D9, 0xF8DA, 0xF8DB, 0xF8DC, 0xF8DD, 0xF8DE, // 0x80
+      0xF8DF, 0xF8E0, 0xF8E1, 0xF8E2, 0xF8E3, 0xF8E4, 0xFFFF, 0xFFFF,
+      0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x090
+      0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
+      0xFFFF, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, // 0xA0
+      0x2663, 0x2666, 0x2665, 0x2660, 0x2460, 0x2461, 0x2462, 0x2463,
+      0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x2776, 0x2777, // 0xB0
+      0x2778, 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E, 0x277F,
+      0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, // 0xC0
+      0x2788, 0x2789, 0x278A, 0x278B, 0x278C, 0x278D, 0x278E, 0x278F,
+      0x2790, 0x2791, 0x2792, 0x2793, 0x2794, 0x2795, 0x2796, 0x2797, // 0xD0
+      0x2798, 0x2799, 0x279A, 0x279B, 0x279C, 0x279D, 0x279E, 0x279F,
+      0x27A0, 0x27A1, 0x27A2, 0x27A3, 0x27A4, 0x27A5, 0x27A6, 0x27A7, // 0xE0
+      0x27A8, 0x27A9, 0x27AA, 0x27AB, 0x27AC, 0x27AD, 0x27AE, 0x27AF,
+      0xFFFF, 0x27B1, 0x27B2, 0x27B3, 0x27B4, 0x27B5, 0x27B6, 0x27B7, // 0xF0
+      0x27B8, 0x27B9, 0x27BA, 0x27BB, 0x27BC, 0x27BD, 0x27BE, 0xFFFF },
+    (sizeof(unicodeToAdobeDingbatsEncoding) / sizeof(*unicodeToAdobeDingbatsEncoding)),
+    unicodeToAdobeDingbatsEncoding };
+
 ImplTextEncodingData const adobeStandardEncodingData
 = { { &adobeStandardEncodingConverterData,
       &rtl_textenc_convertSingleByteToBmpUnicode,
@@ -253,4 +315,15 @@ ImplTextEncodingData const adobeSymbolEncodingData
     0, 0, "Adobe-Symbol-Encoding",
     RTL_TEXTENCODING_INFO_SYMBOL | RTL_TEXTENCODING_INFO_MIME };
 
+ImplTextEncodingData const adobeDingbatsEncodingData
+= { { &adobeDingbatsEncodingConverterData,
+      &rtl_textenc_convertSingleByteToBmpUnicode,
+      &rtl_textenc_convertBmpUnicodeToSingleByte,
+      0, 0, 0,
+      ImplCreateUnicodeToTextContext, ImplDestroyContext,
+      ImplResetUnicodeToTextContext },
+    1, 1, 1,
+    0, 0, "Adobe-ZapfDingbats-Encoding",
+    0 }; // TODO: RTL_TEXTENCODING_INFO_DINGBATS
+
 }
diff --git a/sal/textenc/tencinfo.c b/sal/textenc/tencinfo.c
index cff8d12..8524a09 100644
--- a/sal/textenc/tencinfo.c
+++ b/sal/textenc/tencinfo.c
@@ -49,7 +49,7 @@ sal_Bool SAL_CALL rtl_isOctetTextEncoding(rtl_TextEncoding nEncoding)
 {
     return (sal_Bool)
         (nEncoding > RTL_TEXTENCODING_DONTKNOW
-         && nEncoding <= RTL_TEXTENCODING_PT154
+         && (nEncoding <= RTL_TEXTENCODING_ADOBE_DINGBATS)
              /* always update this! */
          && nEncoding != 9); /* RTL_TEXTENCODING_SYSTEM */
 }
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index ef58446..386333e 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -222,7 +222,8 @@ Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C()
             &aImplJavaUtf8TextEncodingData, /* JAVA_UTF8 */
             &adobeStandardEncodingData, /* ADOBE_STANDARD */
             &adobeSymbolEncodingData, /* ADOBE_SYMBOL */
-            &aImplPT154TextEncodingData }; /* PT154 */
+            &aImplPT154TextEncodingData, /* PT154 */
+            &adobeDingbatsEncodingData }; /* ADOBE_DINGBATS */
     return
         nEncoding < sizeof aData / sizeof aData[0] ? aData[nEncoding] : NULL;
 }
commit a0d19fcf0e365833ed8cbd8daef7c5ebadfde018
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu May 28 16:03:55 2009 +0000

    CWS-TOOLING: integrate CWS ause101
    2009-05-11 14:39:16 +0200 hjs  r271770 : #i101204# more selective copy
    2009-05-07 19:16:08 +0200 hjs  r271693 : #i101651# embed windows manifest
    2009-05-07 18:43:17 +0200 hjs  r271692 : #i101650# fix CHECKZIPRESULT for bash
    2009-05-07 18:25:43 +0200 hjs  r271690 : #i101649# workaround warnings in generated code

diff --git a/idlc/source/scanner.ll b/idlc/source/scanner.ll
index ea122c5..74f5c82 100644
--- a/idlc/source/scanner.ll
+++ b/idlc/source/scanner.ll
@@ -254,6 +254,12 @@ static void parseLineAndFile(sal_Char* pBuf)
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
+/**/
+#ifdef yywrap
+#undef  yywrap
+#define yywrap() 1
+#endif
+/**/
 #endif
 %}
 
commit 18323e12d415869c44de261b6b9230bd0f84cb94
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Tue May 19 09:31:27 2009 +0000

    CWS-TOOLING: integrate CWS tl66
    2009-05-15 12:28:55 +0200 tl  r271932 : #i91812# include fixed
    2009-05-07 16:52:41 +0200 tl  r271680 : #i97200# one more MathML export problem to fix
    2009-05-05 08:33:29 +0200 tl  r271494 : #i99401# positiv user-dicts vs negativ user-dicts
    2009-05-04 14:14:03 +0200 tl  r271452 : #i97200# warning free code; MathML 2.0 export
    2009-05-04 13:26:30 +0200 tl  r271448 : #i97200# write valid MathML 2.0 on export
    2009-04-29 14:21:54 +0200 tl  r271371 : #i97200# new MathML token
    2009-04-29 11:12:07 +0200 tl  r271360 : #i97200# inroducing separate files for import and export
    2009-04-28 16:47:42 +0200 tl  r271331 : #i97200# better MathML pretty printing
    2009-04-28 11:21:57 +0200 tl  r271315 : #i97200# MathML attributes and default namespace for MathML
    2009-04-28 11:21:24 +0200 tl  r271314 : #i97200# MathML attributes and default namespace for MathML
    2009-04-23 12:44:18 +0200 tl  r271154 : #i97200# math.dtd removed
    2009-04-23 12:31:56 +0200 tl  r271151 : #i97200# MathML: don't use namespace on attributes
    2009-04-22 13:21:11 +0200 tl  r271099 : warning-free code
    2009-04-22 12:20:13 +0200 tl  r271092 : #i100757# loop fixed
    2009-04-22 11:29:51 +0200 tl  r271086 : #97327# adding mongolian fingerprint for language guessing
    2009-04-22 11:25:56 +0200 tl  r271083 : #97327# adding mongolian fingerprint for language guessing
    2009-04-21 10:39:21 +0200 tl  r271025 : #99599# code fix for LRE/RLE embedding
    2009-04-20 16:36:33 +0200 tl  r270992 : #i99604# HasDigits fixed
    2009-04-20 14:44:19 +0200 tl  r270985 : #i99604# warning-free code for Windows
    2009-04-20 13:48:13 +0200 tl  r270980 : #i99604# HasDigits fix for non-ASCII characters
    2009-04-20 13:47:50 +0200 tl  r270979 : #i99604# HasDigits fix for non-ASCII characters
    2009-04-20 12:28:15 +0200 tl  r270973 : warning-free code after merging
    2009-04-20 10:16:19 +0200 tl  r270964 : warning-free code after merging
    2009-04-17 14:43:36 +0200 tl  r270948 : #i96846#
    2009-04-16 13:09:15 +0200 tl  r270883 : CWS-TOOLING: rebase CWS tl66 to trunk at 270723 (milestone: DEV300:m46)
    2009-04-14 14:34:08 +0200 tl  r270770 : #101067# warning-free code
    2009-04-02 09:07:44 +0200 tl  r270368 : #i100757# performance patch for start-up (initialize language guessing on demand only)
    2009-03-11 10:37:59 +0100 tl  r269301 : #i100083# fixed system dictionary lookup
    2009-03-06 13:10:23 +0100 tl  r268998 : warning-free code for Windows non-pro
    2009-02-23 14:01:23 +0100 tl  r268355 : #i99401# winning rules for user-dictionaries changed
    2009-02-19 14:05:57 +0100 tl  r268281 : #i98644# suggestion improvement when first checker does not know any suggestions
    2009-02-19 14:05:02 +0100 tl  r268280 : #i98644# suggestion improvement when first checker does not know any suggestions
    2009-02-19 13:58:51 +0100 tl  r268279 : #i98644# suggestion improvement when first checker does not know any suggestions
    2009-02-19 11:38:03 +0100 tl  r268266 : #i98644# suggestion improvement when first checker does not know any suggestions
    2009-02-12 11:58:34 +0100 tl  r267642 : #i96846# some properties declared as maybevoid
    2009-02-06 12:43:55 +0100 tl  r267454 : #i98644# provide sugestions from secondary spell checkers if the primary does not provide ones
    2009-02-05 13:02:26 +0100 tl  r267418 : #i98880# a bit clean-up in the grammar checking framework
    2009-02-04 12:15:37 +0100 tl  r267363 : #i91812# remove unused/duplicate code
    2009-02-04 12:09:34 +0100 tl  r267362 : #i91812# remove unused/duplicate code
    2009-02-04 11:07:57 +0100 tl  r267355 : #i91812# remove unused code
    2009-02-04 11:06:48 +0100 tl  r267354 : #i91812# remove unused code
    2009-02-03 14:52:43 +0100 tl  r267331 : #i91812# remove unused code
    2009-02-03 14:26:00 +0100 tl  r267324 : #i91198# adding fingerprint for luxembourgish
    2009-02-03 14:20:58 +0100 tl  r267323 : #i91198# adding fingerprint for luxembourgish
    2009-02-03 14:18:33 +0100 tl  r267322 : #i91198# adding fingerprint for luxembourgish
    2009-02-03 13:56:39 +0100 tl  r267319 : #i91812# remove unused code
    2009-02-03 12:41:50 +0100 tl  r267314 : #i48400# auto-spellcheck improvement when deleting wrong chars
    2009-02-03 11:48:51 +0100 tl  r267310 : #i91812# remove unused code
    2009-02-03 11:14:29 +0100 tl  r267307 : warning free code
    2009-02-03 10:45:21 +0100 tl  r267306 : #i91812# remove unused code
    2009-02-03 10:37:04 +0100 tl  r267304 : #i33387# name change for 'View/Selection'
    2009-02-03 10:36:17 +0100 tl  r267303 : #i33387# name change for 'View/Selection'
    2009-02-03 10:32:12 +0100 tl  r267302 : #i30642# spelling error in context menu fixed
    2009-02-03 10:27:34 +0100 tl  r267301 : #i92210# remove unused code types.cxx cfgitem.*

diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index f1fc2e1..9df0833 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -27,6 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
+
 #ifndef __com_sun_star_linguistic2_LinguProperties_idl__
 #define __com_sun_star_linguistic2_LinguProperties_idl__
 
@@ -65,10 +66,9 @@ published service LinguProperties
          text or not when doing spellchecking or hyphenation, or using the 
          thesaurus.
 
-        @deprecated
-        @since OOo 3.01
+        @deprecated since OOo 3.0.1
       */
-    [property] boolean IsGermanPreReform;
+    [property, maybevoid] boolean IsGermanPreReform;
 
     //-------------------------------------------------------------------------
     /**	defines if the dictionary-list should be used for spellchecking
@@ -143,19 +143,17 @@ published service LinguProperties
     /**	indicates whether the markings for incorrectly spelled text should be
          hidden or not.
         
-        @deprecated
-        @since OOo 3.01
+        @deprecated since OOo 3.0.1
     */
-    [property] boolean IsSpellHide;
+    [property, maybevoid] boolean IsSpellHide;
     
     //-------------------------------------------------------------------------
     /**	indicates if spellchecking should be performed in all available
          languages.
     
-        @deprecated
-        @since OOo 3.01
+        @deprecated since OOo 3.0.1
     */
-    [property] boolean IsSpellInAllLanguages;
+    [property, maybevoid] boolean IsSpellInAllLanguages;
 
     //-------------------------------------------------------------------------
     /**	defines whether spellchecking should be done in special regions of
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 830cb80..e21ecd3 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -135,3 +135,9 @@
   
 04/12/08 (JSC): TaskID=i96902
   update reference rdb with the released version from OO.org 3.0 (ooo300m9)
+  
+04/17/09 (tl, JSC): TaskID=i96846
+  changed old and not longer used properties in css.linguistic2.LinguProperties
+  to maybevoid and deprecate. They should be removed in a future version. The 
+  implementation will never return them.
+  
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index b75cd71..237e399 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
commit 920689a64520cfb49239e43c35db84fa8b240745
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Mon May 18 16:46:40 2009 +0000

    CWS-TOOLING: integrate CWS koheichart01
    2009-05-15 06:32:38 +0200 hde  r271925 : header fixed
    2009-04-14 16:23:35 +0200 hde  r270792 : #100231#
    2009-04-14 16:13:48 +0200 hde  r270790 : #100231#
    2009-04-14 15:56:14 +0200 hde  r270787 : #100231#
    2009-04-14 14:28:40 +0200 hde  r270767 : #100231#
    2009-04-14 14:27:30 +0200 hde  r270766 : #100231#
    2009-04-14 09:43:07 +0200 hde  r270749 : #100231#
    2009-04-14 09:25:52 +0200 hde  r270748 : #100231#
    2009-03-25 16:18:26 +0100 iha  r270034 : #i91578# removed compiler warning
    2009-03-25 03:20:36 +0100 kohei  r269992 : fixed a silly typo in in-line comment.
    2009-03-24 17:03:57 +0100 kohei  r269977 : Let's use row and column's hidden flags, instead of width/height, to determine cell's
    hidden state.
    2009-03-24 16:53:10 +0100 kohei  r269973 : The chart positioner no longer needs to skip hidden cells, as hidden cells are handled
    elsewhere.
    2009-03-24 16:50:12 +0100 kohei  r269971 : the index should be 0-based (although chart2 doesn't appear to make use of this data any more).
    2009-03-24 16:47:56 +0100 kohei  r269969 : Skip hidden cells during cache (re-)build, when the include hidden cells flag is
    false.  Also avoid adding data cache when the cell is hidden.
    2009-03-24 06:05:53 +0100 kohei  r269909 : fixed the build breakage after the resync.
    2009-03-24 06:05:34 +0100 kohei  r269908 : fixed the build breakage after the resync.
    2009-03-23 23:38:36 +0100 kohei  r269900 : CWS-TOOLING: rebase CWS koheichart01 to trunk at 269781 (milestone: DEV300:m44)
    2009-03-17 13:11:40 +0100 iha  r269597 : #i91578# import IncludeHiddenCells from xlsx
    2009-03-17 12:56:09 +0100 iha  r269594 : #i91578# import IncludeHiddenCells from xls correctly
    2009-03-17 12:49:13 +0100 iha  r269592 : #i91578# import IncludeHiddenCells from xls correctly
    2009-03-16 17:03:55 +0100 iha  r269561 : #i91578# remove unused variable
    2009-03-16 10:22:30 +0100 iha  r269509 : #i91578# changed wording
    2009-03-04 17:07:16 +0100 iha  r268846 : #i91578# display of hidden cells - remove unused property 'IsHidden'
    2009-03-04 17:04:22 +0100 iha  r268845 : #i91578# display of hidden cells - remove unused property 'IsHidden'
    2009-03-04 17:03:43 +0100 iha  r268844 : #i91578# display of hidden cells - remove unused property 'IsHidden'
    2009-03-04 16:24:30 +0100 iha  r268843 : #i91578# display of hidden cells - added missing property description
    2009-03-04 15:13:04 +0100 iha  r268835 : #i91578# display of hidden cells - remove unused code
    2009-03-04 14:38:44 +0100 iha  r268832 : #i91578# display of hidden cells - reset state corretly when doing undo/redo
    2009-03-04 13:42:10 +0100 iha  r268822 : #i81209# #i91578# display of hidden cells - don't show hidden cells per default but keep the hidden ranges
    2009-03-04 13:40:10 +0100 iha  r268821 : #i81209# #i91578# display of hidden cells - don't show hidden cells per default but keep the hidden ranges
    2009-03-04 13:37:05 +0100 iha  r268820 : #i81209# #i91578# display of hidden cells - don't show hidden cells per default but keep the hidden ranges
    2009-03-03 11:18:39 +0100 iha  r268713 : #i91578# display of hidden cells - hide control if the functionality is not offered by the data provider
    2009-03-02 17:41:37 +0100 kohei  r268684 : removed unintended change from DEV300_m38, which was probably introduced due to some sort of
    problem during rebase.
    2009-02-27 18:51:34 +0100 iha  r268613 : #i91578# display of hidden cells - interface redesign: data provider+sequences are now controlled by the chart via a new parameter 'IncludeHiddenCells' thus unwanted values can be removed early in the communication
    2009-02-27 18:45:48 +0100 iha  r268612 : #i91578# display of hidden cells - interface redesign: data provider+sequences are now controlled by the chart via a new parameter 'IncludeHiddenCells' thus unwanted values can be removed early in the communication
    2009-02-27 18:44:17 +0100 iha  r268611 : #i91578# display of hidden cells - interface redesign: data provider+sequences are now controlled by the chart via a new parameter 'IncludeHiddenCells' thus unwanted values can be removed early in the communication
    2009-02-27 18:35:09 +0100 iha  r268610 : #i91578# display of hidden cells - copy-paste-scenario: export hidden flag per column on copy for migration to locale table during import upon paste
    2009-02-19 06:47:56 +0100 kohei  r268257 : also, set the default value of a cached cell to NaN just in case.
    2009-02-19 06:42:08 +0100 kohei  r268256 : Set the IsValue flag to false by default so that an empty cell is properly flaged as non-value.
    This fixes the broken missing value treatment.
    2009-02-18 20:16:30 +0100 iha  r268255 : #i91578# display of hidden cells - radio button 'leave gap' was not clickable anymore
    2009-02-17 17:57:24 +0100 iha  r268185 : #i91578# display of hidden cells - corrected range highlighting
    2009-02-17 15:39:52 +0100 iha  r268174 : #i91578# display of hidden cells - still display data point value in tip help of data points in writer
    2009-02-17 11:21:00 +0100 iha  r267861 : #i91578# display of hidden cells - do not show a space nor a legend entry for hidden series
    2009-02-17 11:15:14 +0100 iha  r267853 : #i91578# display of hidden cells - do not show a space nor a legend entry for hidden series
    2009-02-16 16:48:10 +0100 iha  r267826 : #i91578# display of hidden cells - group related ids and minimize changes
    2009-02-16 14:32:11 +0100 iha  r267813 : #i91578# display of hidden cells - don't share resource identifier as this easily produces conflicts -> move IDs for series options page into a separate file
    2009-02-16 13:21:44 +0100 iha  r267795 : #i91578# display of hidden cells - remove unused member
    2009-02-16 13:13:40 +0100 iha  r267794 : #i91578# display of hidden cells - remove unused methods
    2009-02-16 13:00:10 +0100 iha  r267792 : #i91578# display of hidden - avoid unnecessary data copy
    2009-02-16 11:40:41 +0100 iha  r267785 : #i91578# display of hidden - corrected typo
    2009-02-16 11:28:39 +0100 iha  r267783 : #i91578# display of hidden - set correct dirty state in method setIncludeHiddenCells
    2009-02-13 17:04:50 +0100 iha  r267734 : #i91578# corrected position and visibility of the controls for display of hidden cells in case of stock charts
    2009-02-13 15:30:17 +0100 iha  r267724 : #i91578# charts without category range and charts with data from writer table were broken causes by features changes for display of hidden cells
    2009-01-14 19:47:28 +0100 kohei  r266330 : #i91578# Fixed the issue with incorrect tooltip category values.
    2009-01-05 22:27:03 +0100 kohei  r265887 : fixed a regression where the x-axis failed to display values when they were numeric or dates.
    2008-12-24 17:01:15 +0100 kohei  r265800 : CWS-TOOLING: rebase CWS koheichart01 to trunk at 265758 (milestone: DEV300:m38)
    2008-12-24 16:03:08 +0100 kohei  r265799 : a little more code cleanup, mostly on tab to whitespace conversion on
    modified lines and removal of unnecessary 'using' statements.
    2008-12-24 15:52:00 +0100 kohei  r265798 : removed unnecessary header inclusion & remove hidden data *only when* the 'include hidden cells'
    options it false!  I'm glad I caught this.
    2008-12-24 07:41:23 +0100 kohei  r265796 : replaced duplicated local functions with a single template function.
    2008-12-24 06:37:15 +0100 kohei  r265795 : reverted my last commit, because it was not the right approach.
    Instead of using the original data point index in the object name,
    leave that index alone, and remove hidden data in the tooltip text
    value lookup code.
    2008-12-23 23:10:42 +0100 kohei  r265793 : fixed the tooltips so that they would display correct values, taking into account
    the hidden data points (if any).
    2008-12-20 05:26:07 +0100 kohei  r265739 : CWS-TOOLING: rebase CWS koheichart01 to trunk at 264807 (milestone: DEV300:m37)
    2008-12-18 15:49:59 +0100 kohei  r265696 : removed markRangeDirty() for now, since that method is still a bit controvertial per Niklas's comment in i#91578.
    2008-12-05 20:27:24 +0100 kohei  r264918 : removed a compiler warning.
    2008-12-05 20:24:02 +0100 kohei  r264917 : removed a compilar warning.
    2008-12-03 17:06:22 +0100 kohei  r264800 : recovered the original keyword file before it was stripped.
    2008-12-01 22:00:24 +0100 kohei  r264640 : by default, "include hidden cells" attribute is true.
    2008-12-01 19:03:07 +0100 kohei  r264628 : added accelerator for the plot hidden values check box.
    2008-12-01 18:32:02 +0100 kohei  r264626 : changed wording per Ingrid's suggestion.
    2008-11-26 08:09:36 +0100 kohei  r264341 : the 'Starnding angle' fixed line was 6 pixel short.
    2008-11-26 08:02:47 +0100 kohei  r264340 : added include-hidden-cells check box for the pie chart type too & some code cleanup.
    2008-11-26 07:41:45 +0100 kohei  r264339 : relocate the controls correctly for line chart types.
    2008-11-26 07:14:26 +0100 kohei  r264337 : #i95714# fixed typos that caused incorrect scaling of the y-axis under some conditions.
    2008-11-26 07:11:54 +0100 kohei  r264336 : added "Include hidden cells" check box in the data series options tab page.
    2008-11-25 21:04:58 +0100 kohei  r264333 : don't check for the number of charts; when importing from xls, the count may be
    zero even when the document has charts.
    2008-11-25 19:55:50 +0100 kohei  r264332 : patch from ooo-build applied.  This implements chart listener
    that listens on cells show/hide state for the chart's data areas.
    2008-11-25 19:52:38 +0100 kohei  r264331 : patch from ooo-build applied.
    2008-11-25 19:29:54 +0100 kohei  r264329 : new xml token for include-hidden-cells attribute.

diff --git a/offapi/com/sun/star/chart2/data/DataProvider.idl b/offapi/com/sun/star/chart2/data/DataProvider.idl
index c83199e..d07cf8d 100644
--- a/offapi/com/sun/star/chart2/data/DataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/DataProvider.idl
@@ -57,6 +57,10 @@ service DataProvider
         internally into valid XML.
      */
     [optional] interface ::com::sun::star::chart2::data::XRangeXMLConversion;
+
+    /** If set to false <FALSE/>, values from hidden cells are not returned.
+     */
+    [optional, property] boolean                  IncludeHiddenCells;
 };
 
 } ; // data
diff --git a/offapi/com/sun/star/chart2/data/DataSequence.idl b/offapi/com/sun/star/chart2/data/DataSequence.idl
index 9702545..c97f179 100644
--- a/offapi/com/sun/star/chart2/data/DataSequence.idl
+++ b/offapi/com/sun/star/chart2/data/DataSequence.idl
@@ -140,14 +140,11 @@ service DataSequence
      */
     [property] DataSequenceRole                   Role;
 
-    /** If <TRUE/>, the values are hidden, and should therefore not be
-        used.  This may result in omitting a complete data series
-        object on rendering.
+    /** If set to false <FALSE/>, values from hidden cells are not returned.
      */
-    [optional, property] boolean                  IsHidden;
+    [optional, property] boolean                  IncludeHiddenCells;
 
-    /** a sequence of indexes that identify data points that should
-        not be rendered, because they are hidden in the underlying
+    /** a sequence of indexes that identify values that are hidden in the underlying
         data provider.
      */
     [optional, property] sequence< long >         HiddenValues;


More information about the ooo-build-commit mailing list