Merge commit 'ooo/DEV300_m103'

Conflicts:
jfreereport/java/flute/makefile.mk
jfreereport/java/libbase/makefile.mk
jfreereport/java/libfonts/makefile.mk
jfreereport/java/libformula/makefile.mk
jfreereport/java/libloader/makefile.mk
jfreereport/java/librepository/makefile.mk
jfreereport/java/libserializer/makefile.mk
jfreereport/java/libxml/makefile.mk
jfreereport/java/sac/makefile.mk
mysqlc/source/mysqlc_connection.cxx
mysqlc/source/mysqlc_connection.hxx
mysqlc/source/mysqlc_databasemetadata.cxx
mysqlc/source/mysqlc_databasemetadata.hxx
mysqlc/source/mysqlc_driver.cxx
mysqlc/source/mysqlc_driver.hxx
mysqlc/source/mysqlc_general.hxx
mysqlc/source/mysqlc_preparedstatement.hxx
mysqlc/source/mysqlc_resultsetmetadata.hxx
mysqlc/source/mysqlc_statement.hxx
sdext/source/minimizer/impoptimizer.cxx
sdext/source/pdfimport/config/description.xml
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/presenter/PresenterWindowManager.cxx
swext/prj/build.lst

4 files changed, 12 insertions, 156 deletions

diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 17f894e35e31..17f894e35e31 100755..100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
diff --git a/reportbuilder/util/hidother.src b/reportbuilder/util/hidother.src
deleted file mode 100644
index a06b9d89a4ec..000000000000
--- a/reportbuilder/util/hidother.src
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
-************************************************************************/
-
-#include "../inc/helpids.hrc"
-#include "../inc/rptui_slotid.hrc"
-
-#ifndef _SBASLTID_HRC
-#include <svx/svxids.hrc>
-#endif
-
-hidspecial UID_RPT_RPT_APP_VIEW                                 { HelpId = UID_RPT_RPT_APP_VIEW     ; };
-hidspecial UID_RPT_SCROLLWINDOW                                 { HelpId = UID_RPT_SCROLLWINDOW ; };
-hidspecial UID_RPT_REPORTWINDOW                                 { HelpId = UID_RPT_REPORTWINDOW ; };
-hidspecial HID_RPT_HORZ_RULER                                   { HelpId = HID_RPT_HORZ_RULER       ; };
-hidspecial UID_RPT_SECTIONSWINDOW                               { HelpId = UID_RPT_SECTIONSWINDOW   ; };
-hidspecial UID_RPT_VIEWSWINDOW                                  { HelpId = UID_RPT_VIEWSWINDOW      ; };
-hidspecial HID_RPT_ENDMARKER                                    { HelpId = HID_RPT_ENDMARKER        ; };
-hidspecial HID_RPT_SPLITTER                                     { HelpId = HID_RPT_SPLITTER     ; };
-hidspecial HID_REPORTSECTION                                { HelpId = HID_REPORTSECTION    ; };
-hidspecial HID_RPT_HORZ_SCROLLBAR                               { HelpId = HID_RPT_HORZ_SCROLLBAR   ; };
-hidspecial HID_RPT_VERT_SCROLLBAR                               { HelpId = HID_RPT_VERT_SCROLLBAR   ; };
-hidspecial HID_RPT_STARTMARKER                                  { HelpId = HID_RPT_STARTMARKER      ; };
-
-hidspecial SID_RPT_SHOWREPORTEXPLORER                       { HelpId = SID_RPT_SHOWREPORTEXPLORER   ; };
-hidspecial SID_PAGEHEADERFOOTER                             { HelpId = SID_PAGEHEADERFOOTER         ; };
-hidspecial SID_REPORTHEADERFOOTER                           { HelpId = SID_REPORTHEADERFOOTER       ; };
-hidspecial SID_SORTINGANDGROUPING                           { HelpId = SID_SORTINGANDGROUPING       ; };
-hidspecial SID_INSERT_FLD_PGNUMBER                          { HelpId = SID_INSERT_FLD_PGNUMBER      ; };
-hidspecial SID_CONDITIONALFORMATTING                        { HelpId = SID_CONDITIONALFORMATTING    ; };
-hidspecial SID_PAGEDIALOG                                   { HelpId = SID_PAGEDIALOG               ; };
-hidspecial SID_SETCONTROLDEFAULTS                           { HelpId = SID_SETCONTROLDEFAULTS       ; };
-hidspecial SID_INSERTBREAK                                  { HelpId = SID_INSERTBREAK              ; };
-hidspecial HID_RPT_FIELDEXPRESSION                              { HelpId = HID_RPT_FIELDEXPRESSION          ; };
-hidspecial HID_RPT_SORTORDER                                    { HelpId = HID_RPT_SORTORDER                ; };
-hidspecial HID_RPT_GROUPSBRW                                    { HelpId = HID_RPT_GROUPSBRW                ; };
-hidspecial HID_RPT_GROUPSSORTING_DLG                            { HelpId = HID_RPT_GROUPSSORTING_DLG        ; };
-hidspecial HID_RPT_PAGENUMBERS_DLG                              { HelpId = HID_RPT_PAGENUMBERS_DLG          ; };
-hidspecial HID_RPT_DATETIME_DLG                                 { HelpId = HID_RPT_DATETIME_DLG             ; };
-hidspecial HID_RPT_CONDFORMAT_DLG                               { HelpId = HID_RPT_CONDFORMAT_DLG           ; };
-hidspecial HID_RPT_CRTL_FORMAT_PREVIEW                          { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW      ; };
-hidspecial HID_RPT_COND_DLG                                     { HelpId = HID_RPT_COND_DLG                 ; };
-hidspecial HID_RPT_POPUP_COLOR_CTRL                         { HelpId = HID_RPT_POPUP_COLOR_CTRL     ; };
-hidspecial HID_RPT_POPUP_COLOR                              { HelpId = HID_RPT_POPUP_COLOR          ; };
-hidspecial SID_ESCAPE                                       { HelpId = SID_ESCAPE                   ; };
-hidspecial HID_RPT_PROPDLG_TAB_GENERAL                          { HelpId = HID_RPT_PROPDLG_TAB_GENERAL      ; };
-hidspecial HID_RPT_PROPDLG_TAB_DATA                             { HelpId = HID_RPT_PROPDLG_TAB_DATA         ; };
-
-hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; };
-hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; };
-hidspecial HID_RPT_PROP_KEEPTOGETHER { HelpId = HID_RPT_PROP_KEEPTOGETHER; };
-hidspecial HID_RPT_PROP_CANGROW { HelpId = HID_RPT_PROP_CANGROW; };
-hidspecial HID_RPT_PROP_CANSHRINK { HelpId = HID_RPT_PROP_CANSHRINK; };
-hidspecial HID_RPT_PROP_REPEATSECTION { HelpId = HID_RPT_PROP_REPEATSECTION; };
-hidspecial HID_RPT_PROP_PRINTREPEATEDVALUES { HelpId = HID_RPT_PROP_PRINTREPEATEDVALUES; };
-hidspecial HID_RPT_PROP_CONDITIONALPRINTEXPRESSION { HelpId = HID_RPT_PROP_CONDITIONALPRINTEXPRESSION; };
-hidspecial HID_RPT_PROP_STARTNEWCOLUMN { HelpId = HID_RPT_PROP_STARTNEWCOLUMN; };
-hidspecial HID_RPT_PROP_STARTNEWPAGE { HelpId = HID_RPT_PROP_STARTNEWPAGE; };
-hidspecial HID_RPT_PROP_RESETPAGENUMBER { HelpId = HID_RPT_PROP_RESETPAGENUMBER; };
-hidspecial HID_RPT_PROP_MINHEIGHTNEWPAGE { HelpId = HID_RPT_PROP_MINHEIGHTNEWPAGE; };
-hidspecial HID_RPT_PROP_PRINTWHENGROUPCHANGE { HelpId = HID_RPT_PROP_PRINTWHENGROUPCHANGE; };
-hidspecial HID_RPT_PROP_VISIBLE { HelpId = HID_RPT_PROP_VISIBLE; };
-hidspecial HID_RPT_PROP_GROUPKEEPTOGETHER { HelpId = HID_RPT_PROP_GROUPKEEPTOGETHER; };
-hidspecial HID_RPT_PROP_PAGEHEADEROPTION { HelpId = HID_RPT_PROP_PAGEHEADEROPTION; };
-hidspecial HID_RPT_PROP_PAGEFOOTEROPTION { HelpId = HID_RPT_PROP_PAGEFOOTEROPTION; };
-hidspecial UID_RPT_PROP_DLG_LINE_STYLE { HelpId = UID_RPT_PROP_DLG_LINE_STYLE; };
-hidspecial HID_RPT_PROP_RPT_POSITIONX { HelpId = HID_RPT_PROP_RPT_POSITIONX; };
-hidspecial HID_RPT_PROP_RPT_POSITIONY { HelpId = HID_RPT_PROP_RPT_POSITIONY; };
-hidspecial HID_RPT_PROP_RPT_WIDTH { HelpId = HID_RPT_PROP_RPT_WIDTH; };
-hidspecial HID_RPT_PROP_RPT_HEIGHT { HelpId = HID_RPT_PROP_RPT_HEIGHT; };
-hidspecial HID_RPT_START_TITLE { HelpId = HID_RPT_START_TITLE; };
-hidspecial HID_RPT_START_IMAGE { HelpId = HID_RPT_START_IMAGE; };
-hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; };
-
-hidspecial SID_RPT_TEXTDOCUMENT { HelpId = SID_RPT_TEXTDOCUMENT; };
-hidspecial SID_RPT_SPREADSHEET { HelpId = SID_RPT_SPREADSHEET; };
-hidspecial HID_RPT_PROP_DEEPTRAVERSING { HelpId = HID_RPT_PROP_DEEPTRAVERSING; };
-hidspecial HID_RPT_PROP_PREEVALUATED { HelpId = HID_RPT_PROP_PREEVALUATED; };
-hidspecial HID_RPT_NAVIGATOR_DLG { HelpId = HID_RPT_NAVIGATOR_DLG; };
-hidspecial HID_REPORT_NAVIGATOR_TREE { HelpId = HID_REPORT_NAVIGATOR_TREE; };
-hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; };
-hidspecial HID_RPT_PROP_FORMULA { HelpId = HID_RPT_PROP_FORMULA; };
-hidspecial HID_RPT_PROP_INITIALFORMULA { HelpId = HID_RPT_PROP_INITIALFORMULA; };x
-hidspecial HID_RPT_PROP_DATAFIELD { HelpId = HID_RPT_PROP_DATAFIELD; };
-hidspecial HID_RPT_PROP_RPT_FONT { HelpId = HID_RPT_PROP_RPT_FONT; };
-hidspecial UID_RPT_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_RPT_PROP_DLG_FONT_TYPE; };
-hidspecial HID_RPT_PROP_BACKCOLOR { HelpId = HID_RPT_PROP_BACKCOLOR; };
-hidspecial HID_RPT_PROP_PRESERVEIRI { HelpId = HID_RPT_PROP_PRESERVEIRI; };
-
-hidspecial SID_OBJECT_SMALLESTWIDTH     { HelpId = SID_OBJECT_SMALLESTWIDTH; };
-hidspecial SID_OBJECT_SMALLESTHEIGHT    { HelpId = SID_OBJECT_SMALLESTHEIGHT; };
-hidspecial SID_OBJECT_GREATESTWIDTH     { HelpId = SID_OBJECT_GREATESTWIDTH; };
-hidspecial SID_OBJECT_GREATESTHEIGHT    { HelpId = SID_OBJECT_GREATESTHEIGHT; };
-
-hidspecial HID_RPT_PROP_BACKTRANSPARENT    { HelpId = HID_RPT_PROP_BACKTRANSPARENT; };
-hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT    { HelpId = HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT; };
-
-hidspecial SID_ARRANGEMENU    { HelpId = SID_ARRANGEMENU; };
-hidspecial SID_SELECTALL_IN_SECTION    { HelpId = SID_SELECTALL_IN_SECTION; };
-hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; };
-hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; };
-hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; };
-hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; };
-hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; };
-hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; };
-hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; };
-hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; };
-hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; };
-
-hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; };
-hidspecial HID_RPT_PROP_CHARTTYPE { HelpId = HID_RPT_PROP_CHARTTYPE; };
-hidspecial HID_RPT_FIELD_SEL_WIN { HelpId = HID_RPT_FIELD_SEL_WIN; };
-hidspecial HID_RPT_FIELD_SEL { HelpId = HID_RPT_FIELD_SEL; };
-hidspecial HID_RPT_PROP_FORMULALIST { HelpId = HID_RPT_PROP_FORMULALIST; };
-hidspecial HID_RPT_PROP_SCOPE { HelpId = HID_RPT_PROP_SCOPE; };
-hidspecial HID_RPT_PROP_TYPE { HelpId = HID_RPT_PROP_TYPE; };
-hidspecial UID_RPT_PROP_DLG_LINKFIELDS { HelpId = UID_RPT_PROP_DLG_LINKFIELDS; };
-hidspecial HID_RPT_PROP_MASTERFIELDS { HelpId = HID_RPT_PROP_MASTERFIELDS; };
-hidspecial HID_RPT_PROP_DETAILFIELDS { HelpId = HID_RPT_PROP_DETAILFIELDS; };
-hidspecial HID_RPT_PROP_PREVIEW_COUNT { HelpId = HID_RPT_PROP_PREVIEW_COUNT; };
-hidspecial HID_RPT_PROP_AREA { HelpId = HID_RPT_PROP_AREA; };
-hidspecial UID_RPT_RPT_PROP_DLG_AREA { HelpId = UID_RPT_RPT_PROP_DLG_AREA; };
-hidspecial HID_RPT_PROP_MIMETYPE { HelpId = HID_RPT_PROP_MIMETYPE; };
\ No newline at end of file
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 55ba88c3cf6f..9dcb8b41326f 100755..100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -38,6 +38,8 @@ EXTENSION_VERSION_BASE=1.2.1
 
 # --- Settings ----------------------------------
 .INCLUDE :  makefile.pmk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
 # calready set in util$/makefile.pmk
@@ -94,16 +96,16 @@ COMPONENT_EXTJARFILES = \
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
 COMPONENT_EXTJARFILES += \
-    $(EXTENSIONDIR)$/flute-1.3.0.jar				            \
-    $(EXTENSIONDIR)$/libserializer-1.0.0.jar				    \
-    $(EXTENSIONDIR)$/libbase-1.0.0.jar                          \
-    $(EXTENSIONDIR)$/libfonts-1.0.0.jar							\
-    $(EXTENSIONDIR)$/libformula-0.2.0.jar						\
-    $(EXTENSIONDIR)$/liblayout-0.2.9.jar						\
-    $(EXTENSIONDIR)$/libloader-1.0.0.jar						\
-    $(EXTENSIONDIR)$/librepository-1.0.0.jar					\
-    $(EXTENSIONDIR)$/libxml-1.0.0.jar							\
-    $(EXTENSIONDIR)$/flow-engine-0.9.2.jar 	                    \
+    $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar				            \
+    $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar			\
+    $(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar                     \
+    $(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar					\
+    $(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar						\
+    $(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar					\
+    $(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar					\
+    $(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar			\
+    $(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar						\
+    $(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar 	        \
     $(EXTENSIONDIR)$/sac.jar
 .ENDIF
 .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
index 566132247f9f..566132247f9f 100644..100755
--- a/reportbuilder/util/makefile.pmk
+++ b/reportbuilder/util/makefile.pmk