diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-06-08 15:27:40 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-06-08 15:27:40 +0200 |
| commit | 0de390d94080af03bdc9a49a97b18852598f7297 (patch) | |
| tree | 8de530ce4e7275ab91a0365c2c117fe453b69493 | |
| parent | 3f67e32d8113c35c2bd5f1cbeb4780fdc4c12e24 (diff) | |
| parent | 68c7f8fae5659753748eead42d12ed64db84702e (diff) | |
rebase to DEV300_m80
80 files changed, 137 insertions, 131 deletions
diff --git a/apache-commons/download/README b/apache-commons/download/README deleted file mode 100644 index 38fc135536d7..000000000000 --- a/apache-commons/download/README +++ /dev/null @@ -1,16 +0,0 @@ -commons-codec-1.3-src.tar.gz -commons-logging-1.1.1-src.tar.gz -commons-lang-2.3-src.tar.gz - -downloaded from - -http://archive.apache.org/dist/commons - ---- - -commons-httpclient-3.1-src.tar.gz - -downloaded from - -http://hc.apache.org/downloads.cgi - diff --git a/apache-commons/download/commons-codec-1.3-src.tar.gz b/apache-commons/download/commons-codec-1.3-src.tar.gz Binary files differdeleted file mode 100644 index 13e0063fbdf9..000000000000 --- a/apache-commons/download/commons-codec-1.3-src.tar.gz +++ /dev/null diff --git a/apache-commons/download/commons-httpclient-3.1-src.tar.gz b/apache-commons/download/commons-httpclient-3.1-src.tar.gz Binary files differdeleted file mode 100644 index f52b40704b2f..000000000000 --- a/apache-commons/download/commons-httpclient-3.1-src.tar.gz +++ /dev/null diff --git a/apache-commons/download/commons-lang-2.3-src.tar.gz b/apache-commons/download/commons-lang-2.3-src.tar.gz Binary files differdeleted file mode 100644 index f517cbd8ab4f..000000000000 --- a/apache-commons/download/commons-lang-2.3-src.tar.gz +++ /dev/null diff --git a/apache-commons/download/commons-logging-1.1.1-src.tar.gz b/apache-commons/download/commons-logging-1.1.1-src.tar.gz Binary files differdeleted file mode 100644 index 14a9371be57a..000000000000 --- a/apache-commons/download/commons-logging-1.1.1-src.tar.gz +++ /dev/null diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk index 208bb2970dd3..6976731477de 100644 --- a/apache-commons/java/codec/makefile.mk +++ b/apache-commons/java/codec/makefile.mk @@ -43,6 +43,7 @@ ANT_BUILDFILE=build.xml # --- Files -------------------------------------------------------- TARFILE_NAME=commons-codec-1.3-src +TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1 TARFILE_ROOTDIR=commons-codec-1.3 diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk index 338c1832b164..6e05150c7c20 100644 --- a/apache-commons/java/httpclient/makefile.mk +++ b/apache-commons/java/httpclient/makefile.mk @@ -45,6 +45,7 @@ TAR!:=$(GNUTAR) # --- Files -------------------------------------------------------- TARFILE_NAME=commons-httpclient-3.1-src +TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776f39b TARFILE_ROOTDIR=commons-httpclient-3.1 diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk index 97501563e242..0bf15d0020ce 100644 --- a/apache-commons/java/lang/makefile.mk +++ b/apache-commons/java/lang/makefile.mk @@ -45,6 +45,7 @@ TAR!:=$(GNUTAR) # --- Files -------------------------------------------------------- TARFILE_NAME=commons-lang-2.3-src +TARFILE_MD5=2ae988b339daec234019a7066f96733e TARFILE_ROOTDIR=commons-lang-2.3-src diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk index 6e3a1d2314d9..5df8c34dde3a 100644 --- a/apache-commons/java/logging/makefile.mk +++ b/apache-commons/java/logging/makefile.mk @@ -43,6 +43,7 @@ ANT_BUILDFILE=build.xml # --- Files -------------------------------------------------------- TARFILE_NAME=commons-logging-1.1.1-src +TARFILE_MD5=3c219630e4302863a9a83d0efde889db TARFILE_ROOTDIR=commons-logging-1.1.1-src diff --git a/jfreereport/download/core.zip b/jfreereport/download/core.zip Binary files differdeleted file mode 100644 index 813d87d49573..000000000000 --- a/jfreereport/download/core.zip +++ /dev/null diff --git a/jfreereport/download/flute.zip b/jfreereport/download/flute.zip Binary files differdeleted file mode 100644 index ff1ade906ad4..000000000000 --- a/jfreereport/download/flute.zip +++ /dev/null diff --git a/jfreereport/download/libbase.zip b/jfreereport/download/libbase.zip Binary files differdeleted file mode 100644 index 88f555d9ef7c..000000000000 --- a/jfreereport/download/libbase.zip +++ /dev/null diff --git a/jfreereport/download/libfonts.zip b/jfreereport/download/libfonts.zip Binary files differdeleted file mode 100644 index 91fbac87b3a6..000000000000 --- a/jfreereport/download/libfonts.zip +++ /dev/null diff --git a/jfreereport/download/libformula.zip b/jfreereport/download/libformula.zip Binary files differdeleted file mode 100644 index c819c963767e..000000000000 --- a/jfreereport/download/libformula.zip +++ /dev/null diff --git a/jfreereport/download/liblayout.zip b/jfreereport/download/liblayout.zip Binary files differdeleted file mode 100644 index 1311fae496f5..000000000000 --- a/jfreereport/download/liblayout.zip +++ /dev/null diff --git a/jfreereport/download/libloader.zip b/jfreereport/download/libloader.zip Binary files differdeleted file mode 100644 index 505329e0b6ea..000000000000 --- a/jfreereport/download/libloader.zip +++ /dev/null diff --git a/jfreereport/download/librepository.zip b/jfreereport/download/librepository.zip Binary files differdeleted file mode 100644 index 9541579941cf..000000000000 --- a/jfreereport/download/librepository.zip +++ /dev/null diff --git a/jfreereport/download/libserializer.zip b/jfreereport/download/libserializer.zip Binary files differdeleted file mode 100644 index 94823b28e614..000000000000 --- a/jfreereport/download/libserializer.zip +++ /dev/null diff --git a/jfreereport/download/libxml.zip b/jfreereport/download/libxml.zip Binary files differdeleted file mode 100644 index be5cecb2490e..000000000000 --- a/jfreereport/download/libxml.zip +++ /dev/null diff --git a/jfreereport/download/sacjava-1.3.zip b/jfreereport/download/sacjava-1.3.zip Binary files differdeleted file mode 100644 index 20eb8012eb2a..000000000000 --- a/jfreereport/download/sacjava-1.3.zip +++ /dev/null diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk index bd85abb96b84..9444d75fb692 100644 --- a/jfreereport/java/flute/makefile.mk +++ b/jfreereport/java/flute/makefile.mk @@ -40,6 +40,7 @@ VERSION=-1.3.0 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=$(TARGET) +TARFILE_MD5=f3e2febd267c8e4b13df00dac211dd6d TARFILE_ROOTDIR=$(TARGET) # PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch # CONVERTFILES=build.xml diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk index c8352e4f477a..b527d28973e9 100644 --- a/jfreereport/java/jfreereport/makefile.mk +++ b/jfreereport/java/jfreereport/makefile.mk @@ -40,6 +40,7 @@ VERSION=-0.9.2 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=core +TARFILE_MD5=d4c4d91ab3a8e52a2e69d48d34ef4df4 TARFILE_ROOTDIR=core PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch # ADDITIONAL_FILES=MANIFEST.MF diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk index 047ca0ff012a..1cbfc11de0da 100644 --- a/jfreereport/java/libbase/makefile.mk +++ b/jfreereport/java/libbase/makefile.mk @@ -39,6 +39,7 @@ VERSION=-1.0.0 # --- Files -------------------------------------------------------- TARFILE_NAME=$(TARGET) +TARFILE_MD5=8ea307d71d11140574bfb9fcc2487e33 TARFILE_ROOTDIR=$(TARGET) # PATCH_FILES=$(PRJ)$/patches$/libbase.patch diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk index 7db3570933dd..f59b3cc0963f 100644 --- a/jfreereport/java/libfonts/makefile.mk +++ b/jfreereport/java/libfonts/makefile.mk @@ -40,6 +40,7 @@ VERSION=-1.0.0 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=$(TARGET) +TARFILE_MD5=f7925ba8491fe570e5164d2c72791358 TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk index 78af09d38b7b..4372ce2b764d 100644 --- a/jfreereport/java/libformula/makefile.mk +++ b/jfreereport/java/libformula/makefile.mk @@ -40,6 +40,7 @@ VERSION=-0.2.0 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=$(TARGET) +TARFILE_MD5=d1a3205871c3c52e8a50c9f18510ae12 TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml \ diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk index 9413ad56e435..0340e43ccbd7 100644 --- a/jfreereport/java/liblayout/makefile.mk +++ b/jfreereport/java/liblayout/makefile.mk @@ -40,6 +40,7 @@ VERSION=-0.2.9 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=$(TARGET) +TARFILE_MD5=79600e696a98ff95c2eba976f7a8dfbb TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk index 82a3b9afa6c4..ce97b402d1dd 100644 --- a/jfreereport/java/libloader/makefile.mk +++ b/jfreereport/java/libloader/makefile.mk @@ -40,6 +40,7 @@ VERSION=-1.0.0 # --- Files -------------------------------------------------------- TARFILE_NAME=$(TARGET) +TARFILE_MD5=a06a496d7a43cbdc35e69dbe678efadb TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk index 21df8971ce4d..e11639c7ae62 100644 --- a/jfreereport/java/librepository/makefile.mk +++ b/jfreereport/java/librepository/makefile.mk @@ -40,6 +40,7 @@ VERSION=-1.0.0 # --- Files -------------------------------------------------------- TARFILE_NAME=$(TARGET) +TARFILE_MD5=dbb3757275dc5cc80820c0b4dd24ed95 TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk index f3d1810eda02..12a301edc9e6 100644 --- a/jfreereport/java/libserializer/makefile.mk +++ b/jfreereport/java/libserializer/makefile.mk @@ -40,6 +40,7 @@ VERSION=-1.0.0 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=$(TARGET) +TARFILE_MD5=5aba06ede2daa9f2c11892fbd7bc3057 TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk index 165d184760fd..d0c8bb427103 100644 --- a/jfreereport/java/libxml/makefile.mk +++ b/jfreereport/java/libxml/makefile.mk @@ -40,6 +40,7 @@ VERSION=-1.0.0 # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" TARFILE_NAME=$(TARGET) +TARFILE_MD5=67b42915c8432abf0a922438f00860a2 TARFILE_ROOTDIR=$(TARGET) PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch CONVERTFILES=build.xml diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk index 4a50ab0456a9..44cb28435142 100644 --- a/jfreereport/java/sac/makefile.mk +++ b/jfreereport/java/sac/makefile.mk @@ -45,6 +45,7 @@ ANT_BUILDFILE=build.xml # --- Files -------------------------------------------------------- TARFILE_NAME=sacjava-1.3 +TARFILE_MD5=39bb3fcea1514f1369fcfc87542390fd TARFILE_ROOTDIR=$(TARGET) diff --git a/mysqlc/images/sun_extension.png b/mysqlc/images/sun_extension.png Binary files differdeleted file mode 100644 index a018f1710ea5..000000000000 --- a/mysqlc/images/sun_extension.png +++ /dev/null diff --git a/mysqlc/images/sun_extension_hc.png b/mysqlc/images/sun_extension_hc.png Binary files differdeleted file mode 100644 index 418cd1479298..000000000000 --- a/mysqlc/images/sun_extension_hc.png +++ /dev/null diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml index dbd64aa1a7e1..bc7563d39177 100644..100755 --- a/mysqlc/source/description.xml +++ b/mysqlc/source/description.xml @@ -17,11 +17,11 @@ <OpenOffice.org-minimal-version value="3.1" d:name="OpenOffice.org 3.1"/> </dependencies> <publisher> - <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name> + <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <icon> - <default xlink:href="images/sun_extension.png" /> - <high-contrast xlink:href="images/sun_extension_hc.png" /> + <default xlink:href="images/extension_32.png" /> + <high-contrast xlink:href="images/extension_32_h.png" /> </icon> <extension-description> <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/> diff --git a/mysqlc/source/description/description_en-US.txt b/mysqlc/source/description/description_en-US.txt index bb3cf174a772..a8ddd5985cfc 100644..100755 --- a/mysqlc/source/description/description_en-US.txt +++ b/mysqlc/source/description/description_en-US.txt @@ -1 +1 @@ -The MySQL Connector for Oracle Open Office (formerly StarOffice) and OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base. +The MySQL Connector for OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base. diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index bfe46afe05e0..49c67344698f 100644..100755 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -116,6 +116,9 @@ CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\" .ELSE CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\" +.IF "$(USE_SYSTEM_STL)"!="YES" +CDEFS += -DADAPT_EXT_STL +.ENDIF .ENDIF # --------------- MySQL settings ------------------ @@ -222,8 +225,8 @@ COMPONENT_LIBRARIES=\ $(COMPONENT_LIBRARY) COMPONENT_IMAGES= \ - $(EXTENSIONDIR)$/images$/sun_extension.png \ - $(EXTENSIONDIR)$/images$/sun_extension_hc.png + $(EXTENSIONDIR)$/images$/extension_32.png \ + $(EXTENSIONDIR)$/images$/extension_32_h.png # ........ component description ........ @@ -264,9 +267,9 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE) .INCLUDE : target.mk .INCLUDE : extension_post.mk -$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) - @$(COPY) $< $@ > $(NULLDEV) + $(COPY) $< $@ # existing descriptions: just copy $(EXTENSIONDIR)$/description$/%.txt: .$/description$/%.txt diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index c839e235f369..267f16558233 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -26,12 +26,6 @@ * for a copy of the LGPLv3 License. ************************************************************************/ -#include <cppconn/driver.h> -#include <cppconn/connection.h> -#include <cppconn/statement.h> -#include <cppconn/metadata.h> -#include <cppconn/exception.h> - #include "mysqlc_connection.hxx" #include "mysqlc_databasemetadata.hxx" @@ -41,6 +35,14 @@ #include "mysqlc_preparedstatement.hxx" #include "mysqlc_general.hxx" +#include <tools/preextstl.h> +#include <cppconn/driver.h> +#include <cppconn/connection.h> +#include <cppconn/statement.h> +#include <cppconn/metadata.h> +#include <cppconn/exception.h> +#include <tools/postextstl.h> + #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> @@ -186,10 +188,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > if (bEmbedded == sal_False) { try { sql::ConnectOptionsMap connProps; - std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr(); - std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr(); - std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr(); - std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr(); + ext_std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr(); + ext_std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr(); + ext_std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr(); + ext_std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr(); connProps["hostName"] = sql::ConnectPropertyVal(host_str); connProps["userName"] = sql::ConnectPropertyVal(user_str); connProps["password"] = sql::ConnectPropertyVal(pass_str); diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 0b17a0a362e2..b59fb630ac37 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -46,7 +46,9 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> +#include <tools/preextstl.h> #include <cppconn/driver.h> +#include <tools/postextstl.h> #include <cppuhelper/compbase3.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/string.hxx> diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 30911dda97cf..076435c01d9b 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -54,13 +54,15 @@ using namespace com::sun::star::sdbc; using ::rtl::OUString; using mysqlc_sdbc_driver::getStringFromAny; +#include <tools/preextstl.h> #include <cppconn/connection.h> #include <cppconn/resultset.h> #include <cppconn/metadata.h> #include <cppconn/statement.h> #include <cppconn/prepared_statement.h> +#include <tools/postextstl.h> -static std::string wild("%"); +static ext_std::string wild("%"); using ::rtl::OUStringToOString; @@ -114,7 +116,7 @@ ODatabaseMetaData::~ODatabaseMetaData() /* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */ -OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ) +OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() ) { OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OUString stringMetaData; @@ -133,7 +135,7 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, /* {{{ ODatabaseMetaData::impl_getStringMetaData() -I- */ -OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ) +OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, ext_std::string (sql::DatabaseMetaData::*_Method)() ) { OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OUString stringMetaData; @@ -1654,7 +1656,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()), cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1696,7 +1698,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( OSL_TRACE("ODatabaseMetaData::getColumns"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()), cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1750,11 +1752,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); - std::list<sql::SQLString> tabTypes; + ext_std::list<sql::SQLString> tabTypes; for (const OUString *pStart = types.getConstArray(), *p = pStart, *pEnd = pStart + nLength; p != pEnd; ++p) { tabTypes.push_back(OUStringToOString(*p, m_rConnection.getConnectionEncoding()).getStr()); } @@ -1822,7 +1824,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1882,7 +1884,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( OSL_TRACE("ODatabaseMetaData::getExportedKeys"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -1924,7 +1926,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -1965,7 +1967,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2008,7 +2010,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2051,7 +2053,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2092,7 +2094,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -2157,7 +2159,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""), pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()), pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()), diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 8e6680c3ac20..f7f659ce97b8 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -39,7 +39,9 @@ #include <cppuhelper/implbase1.hxx> #endif +#include <tools/preextstl.h> #include <cppconn/metadata.h> +#include <tools/postextstl.h> namespace connectivity { @@ -67,8 +69,8 @@ namespace connectivity bool identifier_quote_string_set; private: - OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ); - OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ); + OUString impl_getStringMetaData( const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() ); + OUString impl_getStringMetaData( const sal_Char* _methodName, ext_std::string (sql::DatabaseMetaData::*_Method)() ); OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ); OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ); sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() ); diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index af312af89d00..3513b8072d60 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -38,11 +38,13 @@ using namespace connectivity::mysqlc; using ::rtl::OUString; #include <stdio.h> +#include <tools/preextstl.h> #include <cppconn/exception.h> #ifdef SYSTEM_MYSQL_CPPCONN #include <mysql_driver.h> #endif +#include <tools/postextstl.h> /* {{{ MysqlCDriver::MysqlCDriver() -I- */ diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index ede8eb9002f0..06e399ca6542 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -36,7 +36,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase2.hxx> +#include <tools/preextstl.h> #include <cppconn/driver.h> +#include <tools/postextstl.h> #include <osl/module.h> namespace connectivity diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index 54058f0cef8c..ff37568aba64 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -162,14 +162,14 @@ int mysqlToOOOType(int cppConnType) } -::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) +::rtl::OUString convert(const ::ext_std::string& _string, const rtl_TextEncoding encoding) { return ::rtl::OUString( _string.c_str(), _string.size(), encoding ); } -::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding) +::ext_std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding) { - return ::std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() ); + return ::ext_std::string( ::rtl::OUStringToOString( _string, encoding ).getStr() ); } diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index 43cf1c8ef86e..632fb75dd65f 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -30,11 +30,13 @@ #ifndef _MYSQLC_GENERAL_ #define _MYSQLC_GENERAL_ -#include <cppconn/exception.h> - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/sdbc/SQLException.hpp> +#include <tools/preextstl.h> +#include <cppconn/exception.h> +#include <tools/postextstl.h> + namespace mysqlc_sdbc_driver { rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny); @@ -58,9 +60,9 @@ namespace mysqlc_sdbc_driver int mysqlToOOOType(int mysqlType) throw (); - ::rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); + ::rtl::OUString convert(const ::ext_std::string& _string, const rtl_TextEncoding encoding); - ::std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding); + ::ext_std::string convert(const ::rtl::OUString& _string, const rtl_TextEncoding encoding); } #endif diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index a6c1cedb2acb..0bf2f6fdab7a 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -234,7 +234,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& checkParameterIndex(parameter); try { - std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr()); + ext_std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr()); ((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie); } catch (sql::MethodNotImplementedException) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); @@ -344,7 +344,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - std::string dateStr; + ext_std::string dateStr; char buf[20]; dateStr.append(my_i_to_a(buf, sizeof(buf)-1, aData.Year)); dateStr.append("-", 1); @@ -372,7 +372,7 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - std::string timeStr; + ext_std::string timeStr; char buf[20]; timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Hours)); timeStr.append(":", 1); @@ -400,7 +400,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - std::string timeStr; + ext_std::string timeStr; char buf[20]; timeStr.append(my_i_to_a(buf, sizeof(buf)-1, aVal.Year)); timeStr.append("-", 1); @@ -805,7 +805,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - std::string blobby((char *)x.getConstArray(), x.getLength()); + ext_std::string blobby((char *)x.getConstArray(), x.getLength()); try { ((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby); } catch (sql::MethodNotImplementedException) { diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx index f58e59982aaa..eb53bdcbd839 100644 --- a/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/mysqlc/source/mysqlc_preparedstatement.hxx @@ -48,7 +48,9 @@ #include <com/sun/star/io/XInputStream.hpp> #endif +#include <tools/preextstl.h> #include <cppconn/prepared_statement.h> +#include <tools/postextstl.h> namespace connectivity { diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index 7793179a0844..ca3844d63351 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -35,7 +35,9 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> +#include <tools/preextstl.h> #include <cppconn/resultset_metadata.h> +#include <tools/postextstl.h> namespace connectivity { @@ -62,7 +64,7 @@ namespace connectivity { } - inline ::rtl::OUString convert( const ::std::string& _string ) const + inline ::rtl::OUString convert( const ::ext_std::string& _string ) const { return ::rtl::OUString( _string.c_str(), _string.size(), m_encoding ); } diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index e33244e987fd..34273f617d58 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -13,7 +13,9 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XCancellable.hpp> +#include <tools/preextstl.h> #include <cppconn/statement.h> +#include <tools/postextstl.h> #include <cppuhelper/compbase5.hxx> #include <list> diff --git a/reportbuilder/images/em47.png b/reportbuilder/images/em47.png Binary files differdeleted file mode 100644 index a018f1710ea5..000000000000 --- a/reportbuilder/images/em47.png +++ /dev/null diff --git a/reportbuilder/images/em47_hc.png b/reportbuilder/images/em47_hc.png Binary files differdeleted file mode 100644 index 418cd1479298..000000000000 --- a/reportbuilder/images/em47_hc.png +++ /dev/null diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk index 99c80bd919b7..d68a2f8cedc8 100644 --- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk @@ -35,9 +35,9 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" -CLASSPATH!:==$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR) +EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR) .ELSE -JARFILES += libbase-1.0.0.jar libformula-0.2.0.jar +JARFILES = libbase-1.0.0.jar libformula-0.2.0.jar .ENDIF JAVAFILES := AuthorFunction.java \ diff --git a/reportbuilder/java/com/sun/star/report/makefile.mk b/reportbuilder/java/com/sun/star/report/makefile.mk index f72daadb2f57..1b96e9904ea0 100644 --- a/reportbuilder/java/com/sun/star/report/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/makefile.mk @@ -36,7 +36,7 @@ PACKAGE = com$/sun$/star$/report JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar .IF "$(SYSTEM_APACHE_COMMONS)" == "YES" -XCLASSPATH!:==$(XCLASSPATH)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR) +EXTRAJARFILES = $(COMMONS_LOGGING_JAR) .ELSE JARFILES += commons-logging-1.1.1.jar .ENDIF diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk index 2927967886a6..9280fcd71b70 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk @@ -37,13 +37,13 @@ nodep=true #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar .IF "$(SYSTEM_JFREEREPORT)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR) +EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR) .ELSE JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar .ENDIF .IF "$(SYSTEM_APACHE_COMMONS)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR) +EXTRAJARFILES += $(COMMONS_LOGGING_JAR) .ELSE JARFILES += commons-logging-1.1.1.jar .ENDIF diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk index d7c84fcbaca3..8361ee6bfbf7 100644 --- a/reportbuilder/java/com/sun/star/report/util/makefile.mk +++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk @@ -35,7 +35,7 @@ PACKAGE = com$/sun$/star$/report$/util #----- compile .java files ----------------------------------------- .IF "$(SYSTEM_JFREEREPORT)" == "YES" -CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR) +EXTRAJARFILES = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) .ELSE JARFILES = libbase-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar .ENDIF diff --git a/reportbuilder/util/component.txt b/reportbuilder/util/component.txt index 3b6ba3156efc..21a1f1e2d145 100644..100755 --- a/reportbuilder/util/component.txt +++ b/reportbuilder/util/component.txt @@ -1 +1 @@ -Create with the Oracle Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports. +Create with the Report Builder stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers and even calculation fields are available to accomplish complex database reports. diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index 82ae8544b48b..a96d41bbe6af 100644..100755 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -3,8 +3,7 @@ xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> <display-name> - <name lang="en-US">Oracle Report Builder</name> - <!-- <name lang="en-US">Sun(TM) Report Builder</name> --> + <name lang="en-US">Report Builder</name> </display-name> <registration> <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > @@ -17,11 +16,11 @@ <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/> </dependencies> <publisher> - <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name> + <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <icon> - <default xlink:href="images/em47.png" /> - <high-contrast xlink:href="images/em47_hc.png" /> + <default xlink:href="images/extension_32.png" /> + <high-contrast xlink:href="images/extension_32_h.png" /> </icon> <extension-description> <src xlink:href="help/component.txt" lang="en" /> diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk index 7ff8f64e7938..c52e85841f68 100644..100755 --- a/reportbuilder/util/makefile.mk +++ b/reportbuilder/util/makefile.mk @@ -41,8 +41,8 @@ EXTENSION_VERSION_BASE=1.2.1 .IF "$(L10N_framework)"=="" # ------------------------------------------------------------------ # calready set in util$/makefile.pmk -# EXTENSIONNAME:=oracle-report-builder -EXTENSION_ZIPNAME:=oracle-report-builder +# EXTENSIONNAME:=report-builder +EXTENSION_ZIPNAME:=report-builder # create Extension ----------------------------- @@ -76,8 +76,8 @@ COMPONENT_OTR_FILES= \ $(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr COMPONENT_IMAGES= \ - $(EXTENSIONDIR)$/images$/em47.png \ - $(EXTENSIONDIR)$/images$/em47_hc.png + $(EXTENSIONDIR)$/images$/extension_32.png \ + $(EXTENSIONDIR)$/images$/extension_32_h.png COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \ $(EXTENSIONDIR)$/readme_en-US.html \ @@ -133,7 +133,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.% @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 922d47096e6b..64a67a05b343 100644..100755 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -22,7 +22,7 @@ <platform value="UPDATED_SUPPORTED_PLATFORM"/> <publisher> - <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name> + <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <display-name> @@ -30,8 +30,8 @@ </display-name> <icon> - <default xlink:href="bitmaps/em47.png" /> - <high-contrast xlink:href="bitmaps/em47_hc.png" /> + <default xlink:href="bitmaps/extension_32.png" /> + <high-contrast xlink:href="bitmaps/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/minimizer/exports.map b/sdext/source/minimizer/exports.map deleted file mode 100644 index c673092ae700..000000000000 --- a/sdext/source/minimizer/exports.map +++ /dev/null @@ -1,9 +0,0 @@ -PDFFILTER_1_0 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -};
\ No newline at end of file diff --git a/sdext/source/minimizer/images/em47.png b/sdext/source/minimizer/images/em47.png Binary files differdeleted file mode 100644 index a018f1710ea5..000000000000 --- a/sdext/source/minimizer/images/em47.png +++ /dev/null diff --git a/sdext/source/minimizer/images/em47_hc.png b/sdext/source/minimizer/images/em47_hc.png Binary files differdeleted file mode 100644 index 418cd1479298..000000000000 --- a/sdext/source/minimizer/images/em47_hc.png +++ /dev/null diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk index 18c7a0a435c5..8a3a385fc8f2 100644..100755 --- a/sdext/source/minimizer/makefile.mk +++ b/sdext/source/minimizer/makefile.mk @@ -77,7 +77,7 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP= exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) @@ -103,8 +103,8 @@ COMPONENT_BITMAPS= \ $(EXTENSIONDIR)$/bitmaps$/minimizepresi_80_h.png COMPONENT_IMAGES=\ - $(EXTENSIONDIR)$/bitmaps$/em47.png \ - $(EXTENSIONDIR)$/bitmaps$/em47_hc.png + $(EXTENSIONDIR)$/bitmaps$/extension_32.png \ + $(EXTENSIONDIR)$/bitmaps$/extension_32_h.png # rather freestyle or common to all? COMPONENT_HELP= \ @@ -129,7 +129,7 @@ $(COMPONENT_BITMAPS) : $(SOLARSRC)$/$(RSCDEFIMG)$/minimizer$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_IMAGES) : images$/$$(@:f) +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index 9c2dc76c62d1..b22b81587fc7 100644..100755 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -21,7 +21,7 @@ <platform value="UPDATED_SUPPORTED_PLATFORM" /> <publisher> - <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name> + <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <display-name> @@ -29,8 +29,8 @@ </display-name> <icon> - <default xlink:href="images/pdfiext.png" /> - <high-contrast xlink:href="images/pdfiext_hc.png" /> + <default xlink:href="images/extension_32.png" /> + <high-contrast xlink:href="images/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/pdfimport/exports.map b/sdext/source/pdfimport/exports.map deleted file mode 100644 index c673092ae700..000000000000 --- a/sdext/source/pdfimport/exports.map +++ /dev/null @@ -1,9 +0,0 @@ -PDFFILTER_1_0 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -};
\ No newline at end of file diff --git a/sdext/source/pdfimport/images/pdfiext.png b/sdext/source/pdfimport/images/pdfiext.png Binary files differdeleted file mode 100644 index a018f1710ea5..000000000000 --- a/sdext/source/pdfimport/images/pdfiext.png +++ /dev/null diff --git a/sdext/source/pdfimport/images/pdfiext_hc.png b/sdext/source/pdfimport/images/pdfiext_hc.png Binary files differdeleted file mode 100644 index 418cd1479298..000000000000 --- a/sdext/source/pdfimport/images/pdfiext_hc.png +++ /dev/null diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 318ff6bfda1f..8a7f7de20e18 100644..100755 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -90,7 +90,7 @@ SHL1STDLIBS=\ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH=OXT DEF1NAME=$(SHL1TARGET) @@ -125,8 +125,8 @@ COMPONENT_LIBRARIES= \ $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST) COMPONENT_IMAGES=\ - $(EXTENSIONDIR)$/images$/pdfiext.png \ - $(EXTENSIONDIR)$/images$/pdfiext_hc.png + $(EXTENSIONDIR)$/images$/extension_32.png \ + $(EXTENSIONDIR)$/images$/extension_32_h.png EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(COMPONENT_DIALOGS) $(COMPONENT_HELP) $(COMPONENT_IMAGES) makefile.mk @@ -148,7 +148,7 @@ $(COMPONENT_HELP) : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_IMAGES) : images$/$$(@:f) +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ .ENDIF # L10N_framework diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pdfimport/test/export.map index 709047ae63e5..7321bbca16ad 100755 --- a/sdext/source/pdfimport/test/export.map +++ b/sdext/source/pdfimport/test/export.map @@ -25,7 +25,7 @@ # #************************************************************************* -UDK_3.1 { +UDK_3_0_0 { global: registerAllTestFunction; diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk index 3d525d2e38b4..d0b05912d22e 100755 --- a/sdext/source/pdfimport/test/makefile.mk +++ b/sdext/source/pdfimport/test/makefile.mk @@ -42,6 +42,8 @@ ENABLE_EXCEPTIONS=TRUE @echo "PDF Import extension disabled." .ENDIF +CFLAGSCXX += $(CPPUNIT_CFLAGS) + .IF "$(SYSTEM_ZLIB)" == "YES" CFLAGS+=-DSYSTEM_ZLIB .ENDIF diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx index b920b5da778b..15f70f7647ec 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.hxx +++ b/sdext/source/presenter/PresenterGeometryHelper.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> +#include <com/sun/star/geometry/RealRectangle2D.hpp> #include <vector> namespace css = ::com::sun::star; diff --git a/sdext/source/presenter/bitmaps/em47.png b/sdext/source/presenter/bitmaps/em47.png Binary files differdeleted file mode 100644 index a018f1710ea5..000000000000 --- a/sdext/source/presenter/bitmaps/em47.png +++ /dev/null diff --git a/sdext/source/presenter/bitmaps/em47_hc.png b/sdext/source/presenter/bitmaps/em47_hc.png Binary files differdeleted file mode 100644 index 418cd1479298..000000000000 --- a/sdext/source/presenter/bitmaps/em47_hc.png +++ /dev/null diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 8a56838ad263..ede52f0bf1bb 100644..100755 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -22,7 +22,7 @@ <platform value="UPDATED_PLATFORM" /> <publisher> - <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name> + <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> <display-name> @@ -30,8 +30,8 @@ </display-name> <icon> - <default xlink:href="bitmaps/em47.png" /> - <high-contrast xlink:href="bitmaps/em47_hc.png" /> + <default xlink:href="bitmaps/extension_32.png" /> + <high-contrast xlink:href="bitmaps/extension_32_h.png" /> </icon> </description> diff --git a/sdext/source/presenter/exports.map b/sdext/source/presenter/exports.map deleted file mode 100644 index c673092ae700..000000000000 --- a/sdext/source/presenter/exports.map +++ /dev/null @@ -1,9 +0,0 @@ -PDFFILTER_1_0 { - global: - component_getImplementationEnvironment; - component_getFactory; - component_writeInfo; - - local: - *; -};
\ No newline at end of file diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index c6dbe7185ec9..08a3470fc24d 100644..100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -103,7 +103,7 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP= exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) @@ -231,9 +231,11 @@ COMPONENT_BITMAPS= \ \ $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png \ $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png \ - $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png \ - $(ZIP1DIR)$/bitmaps$/em47.png \ - $(ZIP1DIR)$/bitmaps$/em47_hc.png + $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png + +COMPONENT_IMAGES=\ + $(ZIP1DIR)$/bitmaps$/extension_32.png \ + $(ZIP1DIR)$/bitmaps$/extension_32_h.png COMPONENT_MANIFEST= \ $(ZIP1DIR)$/META-INF$/manifest.xml @@ -257,6 +259,7 @@ ZIP1DEPS= \ $(COMPONENT_MANIFEST) \ $(COMPONENT_FILES) \ $(COMPONENT_BITMAPS) \ + $(COMPONENT_IMAGES) \ $(COMPONENT_LIBRARY) \ $(COMPONENT_HELP) # $(COMPONENT_MERGED_XCU) \ @@ -290,6 +293,10 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ +$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) @-$(MKDIRHIER) $(@:d) +$(COPY) $< $@ diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml index 30863c07e63c..369efc141274 100644 --- a/swext/mediawiki/src/description.xml +++ b/swext/mediawiki/src/description.xml @@ -14,6 +14,6 @@ <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/> </dependencies> <publisher> - <name xlink:href="http://www.sun.com/software/star/staroffice/extensions.jsp?cid=925095" lang="en">Oracle</name> + <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> </publisher> </description> diff --git a/tomcat/download/jakarta-tomcat-5.0.30-src.tar.gz b/tomcat/download/jakarta-tomcat-5.0.30-src.tar.gz Binary files differdeleted file mode 100644 index 5882f95b0c24..000000000000 --- a/tomcat/download/jakarta-tomcat-5.0.30-src.tar.gz +++ /dev/null diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk index f7c3dd7724d1..a4d8236b267f 100755 --- a/tomcat/makefile.mk +++ b/tomcat/makefile.mk @@ -39,6 +39,7 @@ TARGET=servlet # --- Files -------------------------------------------------------- TARFILE_NAME=jakarta-tomcat-5.0.30-src +TARFILE_MD5=2a177023f9ea8ec8bd00837605c5df1b TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src diff --git a/xpdf/download/xpdf-3.02.tar.gz b/xpdf/download/xpdf-3.02.tar.gz Binary files differdeleted file mode 100644 index 1411a877d33d..000000000000 --- a/xpdf/download/xpdf-3.02.tar.gz +++ /dev/null diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk index c3a935033951..0a138b8d84aa 100644 --- a/xpdf/makefile.mk +++ b/xpdf/makefile.mk @@ -47,6 +47,7 @@ dummy: # --- Files -------------------------------------------------------- TARFILE_NAME=xpdf-3.02 +TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2 PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_DIR= |
