diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-04-27 14:46:50 +0200 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-04-27 14:46:50 +0200 |
| commit | a28cfc92f8f719648fa39eba1431a2768ddfadb0 (patch) | |
| tree | 6b2ac9d30ffc93f54f67d8b26c5ff65ca95def60 /ucbhelper | |
| parent | e590adb726cb05135bcd04e43117e2a77ec6f41f (diff) | |
| parent | c5934ada09feec288519cbdfbe1c0c988a2fceec (diff) | |
cws tl79: merge with DEV300_m77
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/client/content.cxx | 6 | ||||
| -rw-r--r-- | ucbhelper/workben/myucp/exports.map | 8 | ||||
| -rw-r--r-- | ucbhelper/workben/myucp/makefile.mk | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 451c629694c6..4debb1728bfe 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -337,12 +337,14 @@ static Reference< XContent > getContent( if ( xProvider.is() ) { Reference< XContent > xContent; + rtl::OUString msg; try { xContent = xProvider->queryContent( xId ); } - catch ( IllegalIdentifierException const & ) + catch ( IllegalIdentifierException const & e ) { + msg = e.Message; // handled below. } @@ -355,7 +357,7 @@ static Reference< XContent > getContent( throw ContentCreationException( rtl::OUString::createFromAscii( - "Unable to create Content!" ), + "Unable to create Content! " ) + msg, Reference< XInterface >(), ContentCreationError_CONTENT_CREATION_FAILED ); } diff --git a/ucbhelper/workben/myucp/exports.map b/ucbhelper/workben/myucp/exports.map deleted file mode 100644 index f4ed78b9e970..000000000000 --- a/ucbhelper/workben/myucp/exports.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/ucbhelper/workben/myucp/makefile.mk b/ucbhelper/workben/myucp/makefile.mk index 0d7f273fe877..77faad2e0396 100644 --- a/ucbhelper/workben/myucp/makefile.mk +++ b/ucbhelper/workben/myucp/makefile.mk @@ -68,7 +68,7 @@ LIB1OBJFILES=$(SLOFILES) SHL1TARGET=$(TARGET) SHL1IMPLIB=i$(TARGET) -SHL1VERSIONMAP=exports.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # @@@ Add additional libs here. SHL1STDLIBS=\ |