From b40706813bbc27bcf42cafd9c51b6a3271de00d3 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 14 Sep 2009 11:18:01 +0000 Subject: CWS-TOOLING: integrate CWS dba32g 2009-09-09 07:53:55 +0200 oj r275964 : replace strlen with rtl_str_getLength 2009-09-07 20:59:10 +0200 fs r275913 : disable the CopyTableWizard test until issue 104869 is fixed 2009-09-07 12:17:31 +0200 oj r275885 : #i104810# remove de as lang 2009-09-05 22:26:21 +0200 fs r275857 : protect StateChanged against re-entrance 2009-09-05 22:25:52 +0200 fs r275856 : don't attempt to classify the parent of a form as control 2009-09-05 22:25:29 +0200 fs r275855 : protect against re-entrance 2009-09-05 00:11:40 +0200 fs r275835 : #i10000# 2009-09-04 23:25:50 +0200 fs r275834 : #i10000# 2009-09-04 23:23:47 +0200 fs r275833 : #i10000# 2009-09-04 21:49:37 +0200 fs r275830 : #i10000# correct wrong conflict resolution 2009-09-04 20:59:51 +0200 fs r275829 : CWS-TOOLING: rebase CWS dba32g to trunk@275801 (milestone: DEV300:m57) 2009-09-04 11:08:32 +0200 oj r275791 : #i104780# new version 1.2.0 2009-09-03 22:29:21 +0200 fs r275775 : OSL_TRACE doesn't need \n anymore 2009-09-03 08:33:21 +0200 fs r275743 : CWS-TOOLING: rebase CWS dba32g to trunk@275331 (milestone: DEV300:m56) 2009-09-02 13:48:12 +0200 fs r275708 : removed useless include 2009-09-02 13:45:43 +0200 fs r275707 : more since tags, which are used across offapi/udkapi 2009-09-02 13:23:04 +0200 fs r275705 : should *not* have the dtor, copy ctor, and assignment operator compiler-generated, else we run into trouble as soon as the compiler creates different versions of our singleton member's static data in different libraries 2009-09-02 12:32:45 +0200 fs r275704 : AutoIncrementIsPrimaryKey is a driver setting, not a data source setting 2009-09-02 11:42:49 +0200 fs r275701 : URL meta data are meta data which are valid for all connections of this type, not per-data-source properties. Settings them as data source properties is a hack. 2009-09-02 08:43:34 +0200 fs r275696 : 3.x.x is not a valid 'since' tag 2009-09-01 16:05:24 +0200 fs r275665 : #i104686# don't treat controls bound to read-only columns as required 2009-09-01 13:10:22 +0200 fs r275657 : #i104574# use PageUp/Down to scroll through the complete page 2009-09-01 07:04:48 +0200 oj r275641 : #i104104# correct line ends 2009-08-31 15:52:34 +0200 fs r275612 : #i104410# 2009-08-31 12:29:05 +0200 fs r275596 : #i104364# 2009-08-31 12:28:56 +0200 fs r275595 : #i104364# 2009-08-31 11:43:09 +0200 fs r275593 : #i104649# JavaDriverClassPath is also a known JDBC-bridge setting 2009-08-31 11:41:37 +0200 fs r275592 : #i104649# 2009-08-28 21:48:27 +0200 fs r275552 : during #i96862#: renamed the configuration data which controls availability of certain DBA-related UI 2009-08-28 21:48:17 +0200 fs r275551 : #i96862# do not show the 'Create a new database' option when a) no embedded/dBase driver is installed or b) the configuration requests to hide the option 2009-08-28 21:47:19 +0200 fs r275550 : during #i96862#: renamed the configuration data which controls availability of certain DBA-related UI 2009-08-28 21:46:41 +0200 fs r275549 : #i96862# renamed and extended the configuration data which controls availability of certain DBA-related UI 2009-08-28 15:10:19 +0200 fs r275535 : #i96862# if no embedded driver is installed, use dBase for creating new DBs. If no dBase driver is installed, too, do not offer the 'Create new database' option 2009-08-28 14:03:04 +0200 fs r275532 : #i104454# allow multiple fields to display the same column 2009-08-28 13:14:00 +0200 fs r275528 : #i104584# driver meta data do not belong into a data source's settings 2009-08-28 13:09:57 +0200 fs r275527 : properly chech the MySQL type buttons (else next/back in the wizard leads to state with two buttons checked) 2009-08-28 13:09:17 +0200 fs r275526 : #i104584# driver meta data do not belong into a data source's settings 2009-08-28 13:07:18 +0200 fs r275525 : BooleanComparisonMode is a property, or a feature - but not a driver meta data 2009-08-28 11:00:31 +0200 fs r275521 : #i104580# 2009-08-28 10:40:05 +0200 fs r275519 : #i104577# correct assertion: If the template node type is ANY, then any value type is allowed 2009-08-28 10:09:30 +0200 fs r275518 : #i104575# implement Named Pipe UI 2009-08-28 10:09:07 +0200 fs r275517 : pass the trigger-event to IWindowOperator::operateOn / work with VclWindowEvents, not VclSimpleEvents 2009-08-27 14:27:36 +0200 fs r275484 : ImplPosTabPage: respect mbEmptyViewMargin for WINDOWALIGN_LEFT 2009-08-27 13:43:56 +0200 fs r275480 : merging latest changes from CWS dba32f herein 2009-08-27 13:23:07 +0200 fs r275475 : #i103882# 2009-08-27 11:56:55 +0200 fs r275466 : #i104544# SetState: Do not call Update at the window which we just set text for. It should (sic\!) not be needed, but causes trouble 2009-08-27 11:55:34 +0200 fs r275465 : #i104544# do not allow re-entrance for impl_ensureControl_nothrow Actually, this is part of the fix only. I also removed the code which triggered this re-entrance (from the grid control implementation), but to ensure it won't happen, again, I added some safety herein. 2009-08-27 10:14:11 +0200 fs r275459 : preparations for supporting a 'NamedPipe' parameter for the MySQL Connector/OOo 2009-08-27 10:13:21 +0200 fs r275458 : preparations for supporting a 'NamedPipe' setting for the MySQL Connector/OOo 2009-08-27 10:11:14 +0200 fs r275456 : outsourced the MySQLNative settings into a dedicated class, to not duplicate all the code in two tab page implementations 2009-08-26 14:18:13 +0200 fs r275422 : #i10000# 2009-08-26 13:26:36 +0200 fs r275419 : ignore output paths 2009-08-26 13:23:38 +0200 fs r275417 : support the LocalSocket property for the MySQL native driver 2009-08-26 13:17:05 +0200 fs r275416 : some re-factoring, to outsource the tab page for setting up the MySQLNative connection, into a dedicated class (needed later) 2009-08-26 13:15:15 +0200 fs r275415 : support a NoThousandSep property for NumericFormatters - I'm tired of correcting this at runtime, instead of controlling it in the resource 2009-08-26 11:45:08 +0200 fs r275410 : oops, 'flat' shouldn't have got lost 2009-08-26 09:38:57 +0200 fs r275398 : #i102631# when saving the document fails, ensure that the interaction handler really can handle/display the error 2009-08-26 09:37:05 +0200 fs r275397 : #i102631# don't let non-IO/RuntimeExceptions escape from DatabaseDocument::store*, wrap them into an IOException 2009-08-26 09:35:39 +0200 fs r275395 : let the default interaction handler implement XInteractionHandler2 2009-08-25 13:51:34 +0200 fs r275352 : #i102631# createTempFile: pass URL through FileHelper.getOOoCompatibleFileURL 2009-08-25 13:49:23 +0200 fs r275351 : #i102631# createTempFileURL: immediately delete the file implicitly created by createTempFile, we really only need the URL 2009-08-24 14:49:07 +0200 fs r275318 : #i10000# 2009-08-24 14:36:03 +0200 fs r275315 : properly terminate message with 0 character 2009-08-24 14:35:45 +0200 fs r275314 : trace method concepts in non-pro, if special flag is enabled 2009-08-24 14:24:17 +0200 fs r275312 : #i98973# filter some more events for grid control columns 2009-08-24 14:15:23 +0200 fs r275311 : #i98973# implement XComboBox for combo box cells 2009-08-24 13:39:24 +0200 fs r275308 : #i98973# do not display the 'actionPerformed' event for grid combo box columns 2009-08-24 12:52:03 +0200 fs r275303 : #i98973# implement XCheckBox and XButton for check box cells 2009-08-24 11:56:05 +0200 oj r275300 : #i104447# wrong default for orientation 2009-08-24 10:51:21 +0200 fs r275296 : in the script selector dialog, interpret a double click onto a function as OK 2009-08-24 10:50:56 +0200 fs r275295 : localize some to-be-displayed names, consolidate some code regarding form/control naming 2009-08-21 14:28:05 +0200 fs r275255 : #i98973# implement KeyListeners 2009-08-21 14:27:20 +0200 fs r275254 : #i98973# move the conversion VCL[Mouse|Key]Event->Awt[Mouse|Key]Event from vclxwindow.cxx to VCLUnoHelper 2009-08-21 14:08:50 +0200 fs r275248 : #i98973# implement Mouse- and MouseMotion-broadcasting 2009-08-21 13:31:08 +0200 fs r275244 : #i98973# implement text and change listeners at text cells 2009-08-21 12:47:38 +0200 fs r275234 : #i104399# some refactoring: If the MySQL Connector/OOo is installed, it registers for the sdbc:mysqlc: protocol (now known as DST_MYSQL_NATIVE_DIRECT). However, we do not want to display this in the UI, instead we display "MySQL" only, which collects DST_MYSQL_ODBC, DST_MYSQL_JDBC, and DST_MYSQL_NATIVE. 2009-08-21 12:45:18 +0200 fs r275232 : #i104399# also register for the sdbc:mysql:mysqlc protocol, decide at runtime (depending on the availability of sdbc:mysqlc:), whether it is really accepted. This prevents that the C/OOo extension needs to register *our* implementation name for the sdbc:mysql:mysqlc: protocol, which would be somewhat weird 2009-08-20 16:18:48 +0200 fs r275190 : merging the latest changes from CWS dba32f (which this CWS was created from) 2009-08-19 20:19:59 +0200 fs r275160 : add some spacing between the radios 2009-08-19 14:50:15 +0200 fs r275150 : #i98973# slightly refactoring the grid cell implementations, to prepare for proper events being fired. Implement focus events for the moment, more to come. 2009-08-19 10:53:38 +0200 fs r275142 : #i99936# initialize newly created models 2009-08-18 23:03:48 +0200 fs r275132 : merging latest changes from CWS dba32f 2009-08-18 15:14:08 +0200 fs r275110 : #i102819# SetColumnPos: SCROLL_CLIP is deadly here --- odk/pack/copying/apiref-autodoc.since | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/odk/pack/copying/apiref-autodoc.since b/odk/pack/copying/apiref-autodoc.since index 76f505da4c72..576df44c7708 100644 --- a/odk/pack/copying/apiref-autodoc.since +++ b/odk/pack/copying/apiref-autodoc.since @@ -1,12 +1,21 @@ +"3.2.0" "OpenOffice 3.2.0" +"3.2" "OpenOffice 3.2" +"3.1.0" "OpenOffice 3.1.0" +"3.1" "OpenOffice 3.1" +"3.0.1" "OpenOffice 3.0.1" "3.0.0" "OpenOffice 3.0.0" "3.0" "OpenOffice 3.0" "2.4.1" "OpenOffice 2.4.1" +"2.4.0" "OpenOffice 2.4.0" "2.4" "OpenOffice 2.4" "2.3.1" "OpenOffice 2.3.1" +"2.3.0" "OpenOffice 2.3.0" "2.3" "OpenOffice 2.3" "2.2.1" "OpenOffice 2.2.1" +"2.2.0" "OpenOffice 2.2.0" "2.2" "OpenOffice 2.2" "2.1" "OpenOffice 2.1" +"2.0.6" "OpenOffice 2.0.6" "2.0.4" "OpenOffice 2.0.4" "2.0.3" "OpenOffice 2.0.3" "2.0.2" "OpenOffice 2.0.2" -- cgit From 7dbe377ade4654f4d127717f5b99e4cc1f2e954e Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 16 Sep 2009 11:45:54 +0000 Subject: CWS-TOOLING: integrate CWS l10nframework01 --- odk/pack/checkbin/makefile.mk | 7 +++++++ odk/pack/checkidl/makefile.mk | 7 +++++++ odk/pack/checkinc/makefile.mk | 5 +++++ odk/pack/checkinc2/makefile.mk | 5 +++++ odk/pack/copying/makefile.mk | 5 +++++ odk/pack/gendocu/makefile.mk | 5 +++++ odk/util/makefile.mk | 7 +++++-- 7 files changed, 39 insertions(+), 2 deletions(-) diff --git a/odk/pack/checkbin/makefile.mk b/odk/pack/checkbin/makefile.mk index abc2687f2749..38183ff1c766 100644 --- a/odk/pack/checkbin/makefile.mk +++ b/odk/pack/checkbin/makefile.mk @@ -36,6 +36,8 @@ TARGET=checkbin .INCLUDE: settings.mk .INCLUDE: $(PRJ)$/util$/makefile.pmk #---------------------------------------------------------------- +.IF "$(L10N_framework)"=="" + ODKCHECKFILE=$(MISC)$/$(TARGET).txt all: $(ODKCHECKFILE) @@ -46,3 +48,8 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES) $(PERL) $(PRJ)$/util$/check.pl $(DESTDIR) $(DESTPLATFROM) "$(EXEPOSTFIX)" $(ODKCHECKFILE) # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE cat $(ODKCHECKFILE) + +.ELSE +pseudo: + +.ENDIF diff --git a/odk/pack/checkidl/makefile.mk b/odk/pack/checkidl/makefile.mk index e0fcd53924bd..707c89df66ed 100644 --- a/odk/pack/checkidl/makefile.mk +++ b/odk/pack/checkidl/makefile.mk @@ -36,6 +36,8 @@ TARGET=checkidl .INCLUDE: settings.mk .INCLUDE: $(PRJ)$/util$/makefile.pmk #---------------------------------------------------------------- + +.IF "$(L10N_framework)"=="" ODKCHECKFILE=$(MISC)$/$(TARGET).txt all : $(ODKCHECKFILE) @@ -46,3 +48,8 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES) -diff -br $(DESTDIRIDL) $(SOLARIDLDIR) $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE cat $(ODKCHECKFILE) + +.ELSE +pseudo: + +.ENDIF diff --git a/odk/pack/checkinc/makefile.mk b/odk/pack/checkinc/makefile.mk index d61b46fb3676..9c1e67bbc55a 100644 --- a/odk/pack/checkinc/makefile.mk +++ b/odk/pack/checkinc/makefile.mk @@ -36,6 +36,7 @@ TARGET=checkinc .INCLUDE: settings.mk .INCLUDE: $(PRJ)$/util$/makefile.pmk #---------------------------------------------------------------- +.IF "$(L10N_framework)"=="" ODKCHECKFILE=$(MISC)$/$(TARGET).txt all : $(ODKCHECKFILE) @@ -51,3 +52,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES) -diff -br $(DESTDIRINC)$/vos $(SOLARINCDIR)$/vos $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE cat $(ODKCHECKFILE) +.ELSE +pseudo: + +.ENDIF diff --git a/odk/pack/checkinc2/makefile.mk b/odk/pack/checkinc2/makefile.mk index cac17f49838e..933591907aa6 100644 --- a/odk/pack/checkinc2/makefile.mk +++ b/odk/pack/checkinc2/makefile.mk @@ -36,6 +36,7 @@ TARGET=checkinc2 .INCLUDE: settings.mk .INCLUDE: $(PRJ)$/util$/makefile.pmk #---------------------------------------------------------------- +.IF "$(L10N_framework)"=="" ODKCHECKFILE=$(MISC)$/$(TARGET).txt all : $(ODKCHECKFILE) @@ -51,3 +52,7 @@ $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES) -diff -br $(DESTDIRINC)$/cppuhelper $(SOLARINCDIR)$/cppuhelper $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE) # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE cat $(ODKCHECKFILE) +.ELSE +pseudo: + +.ENDIF diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 24bbdc271a40..f67cbd193a9d 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -214,10 +214,15 @@ MYZIPLIST=com$/* win$/* #-------------------------------------------------- # TARGETS #-------------------------------------------------- + +.IF "$(L10N_framework)"=="" + all : CLEAN_DKVERSION_CHECK \ $(DIR_FILE_LIST) \ $(DIR_FILE_FLAG) \ +.ENDIF + #-------------------------------------------------- # use global rules #-------------------------------------------------- diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 697d5cbfc34c..5b070ca043f6 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -37,6 +37,7 @@ TARGET=gendocu .INCLUDE: settings.mk .INCLUDE: $(PRJ)$/util$/makefile.pmk #---------------------------------------------------------------- +.IF "$(L10N_framework)"=="" CPPDOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) C/C++ API Reference" JAVADOCREFNAME="UDK $(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO) Java API Reference" @@ -120,3 +121,7 @@ $(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES) -$(MKDIRHIER) $(@:d) $(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG) .ENDIF + +.ELSE +pseudo: +.ENDIF diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk index 078ecb987157..a2e62ad17891 100644 --- a/odk/util/makefile.mk +++ b/odk/util/makefile.mk @@ -6,18 +6,21 @@ TARGET=odk .INCLUDE: settings.mk .INCLUDE: makefile.pmk # ------------------------------------------------------------------ +.IF "$(L10N_framework)"=="" ZIP1TARGET=odkexamples ZIP1FLAGS=-u -r ZIP1DIR=$(PRJ) ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html" -.INCLUDE : target.mk +.ENDIF +.INCLUDE : target.mk +.IF "$(L10N_framework)"=="" ALLTAR:\ $(BIN)$/$(PRODUCTZIPFILE) # $(BIN)$/odk_oo.zip - +.ENDIF $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS) cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT) -- cgit From be29d7f7e574e990bf322b808cbc64d4808b1178 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 16 Sep 2009 14:37:52 +0000 Subject: CWS-TOOLING: integrate CWS sb113 2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012 2009-08-28 sb #i102469# change back to just on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;) 2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012 2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph) 2009-08-26 sb merged in DEV300_m56 2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc) 2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora) 2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader 2009-08-17 Juergen Schmidt #i103749# integrate patch 2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8") 2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter 2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec 2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc) 2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc) 2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2) 2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly 2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH) 2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued") --- odk/source/com/sun/star/lib/loader/Loader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index b499aef33f30..1e116c399f87 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -135,6 +135,7 @@ public final class Loader { // invoke the main method if ( className != null ) { ClassLoader cl = getCustomLoader(); + Thread.currentThread().setContextClassLoader(cl); Class c = cl.loadClass( className ); Method m = c.getMethod( "main", new Class[] { String[].class } ); m.invoke( null, new Object[] { args } ); -- cgit From 5f489dd4dcd6b402d3b13b45971fa4a968710e24 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Fri, 18 Sep 2009 09:05:17 +0000 Subject: CWS-TOOLING: integrate CWS adc25 2009-09-10 12:20:49 +0200 np r276029 : #i100671# 2009-09-10 11:25:02 +0200 np r276025 : #i100671# 2009-09-10 11:22:03 +0200 np r276024 : #i100671# --- autodoc/source/exes/adc_uni/cmd_sincedata.cxx | 14 ++++-- autodoc/source/parser/inc/x_docu.hxx | 61 +++++++++++++++++++++++++ autodoc/source/parser/kernel/makefile.mk | 3 +- autodoc/source/parser/kernel/x_docu.cxx | 64 +++++++++++++++++++++++++++ autodoc/source/parser_i/idl/unoidl.cxx | 8 ++++ autodoc/source/parser_i/idoc/docu_pe2.cxx | 42 +++++++++++++++--- 6 files changed, 182 insertions(+), 10 deletions(-) create mode 100644 autodoc/source/parser/inc/x_docu.hxx create mode 100644 autodoc/source/parser/kernel/x_docu.cxx diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx index 895a1b0853df..0a577eb8ef8f 100644 --- a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx +++ b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx @@ -60,18 +60,26 @@ SinceTagTransformationData::DoesTransform() const } const String & -SinceTagTransformationData::DisplayOf( const String & i_sVersionNumber ) const +SinceTagTransformationData::DisplayOf( const String & i_versionNumber ) const { if (DoesTransform()) { - const String * ret = csv::find_in_map(aTransformationTable, i_sVersionNumber); + StreamLock + sl(200); + sl() << i_versionNumber; + sl().strip_frontback_whitespace(); + String + sVersionNumber(sl().c_str()); + + const String * + ret = csv::find_in_map(aTransformationTable, sVersionNumber); return ret != 0 ? *ret : String::Null_(); } else { - return i_sVersionNumber; + return i_versionNumber; } } diff --git a/autodoc/source/parser/inc/x_docu.hxx b/autodoc/source/parser/inc/x_docu.hxx new file mode 100644 index 000000000000..36185dbac4ab --- /dev/null +++ b/autodoc/source/parser/inc/x_docu.hxx @@ -0,0 +1,61 @@ +/************************************************************************* + * + * 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: x_parse.hxx,v $ + * $Revision: 1.4 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef ADC_X_DOCU_HXX +#define ADC_X_DOCU_HXX + +// BASE CLASSES +#include + + + + +class X_Docu : public autodoc::X_Parser_Ifc +{ + public: + // LIFECYCLE + X_Docu( + const char * i_tag, + const char * i_explanation ); + ~X_Docu(); + // INQUIRY + virtual E_Event GetEvent() const; + virtual void GetInfo( + std::ostream & o_rOutputMedium ) const; + + private: + String sTagName; + String sExplanation; +}; + + + + +#endif diff --git a/autodoc/source/parser/kernel/makefile.mk b/autodoc/source/parser/kernel/makefile.mk index df4b6a74bf84..340136565c7d 100644 --- a/autodoc/source/parser/kernel/makefile.mk +++ b/autodoc/source/parser/kernel/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -50,6 +50,7 @@ PRJINC=$(PRJ)$/source OBJFILES= \ $(OBJ)$/parsefct.obj \ + $(OBJ)$/x_docu.obj \ $(OBJ)$/x_parse.obj diff --git a/autodoc/source/parser/kernel/x_docu.cxx b/autodoc/source/parser/kernel/x_docu.cxx new file mode 100644 index 000000000000..992d1cb511d0 --- /dev/null +++ b/autodoc/source/parser/kernel/x_docu.cxx @@ -0,0 +1,64 @@ +/************************************************************************* + * + * 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: x_parse.cxx,v $ + * $Revision: 1.7 $ + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include +#include + +// NOT FULLY DECLARED SERVICES + + + +X_Docu::X_Docu( const char * i_tag, + const char * i_explanation ) + : sTagName(i_tag), + sExplanation(i_explanation) +{ +} + +X_Docu::~X_Docu() +{ +} + +X_Docu::E_Event +X_Docu::GetEvent() const +{ + return x_Any; +} + +void +X_Docu::GetInfo( std::ostream & o_rOutputMedium ) const +{ + o_rOutputMedium + << "Error in tag '" + << sTagName + << "': " + << sExplanation + << Endl(); +} diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx index aa1c0ecd3521..e8f86c885363 100644 --- a/autodoc/source/parser_i/idl/unoidl.cxx +++ b/autodoc/source/parser_i/idl/unoidl.cxx @@ -38,6 +38,7 @@ #include #include #include +#include <../parser/inc/x_docu.hxx> #include #include #include @@ -113,6 +114,13 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles ) = new FileParsePerformers(*pRepository, static_cast< ParserInfo& >(*this)); } + catch (X_Docu & xd) + { + // Currently thic catches only wrong since tags, while since tags are + // transformed. In this case the program shall be terminated. + Cerr() << xd << Endl(); + exit(1); + } catch (...) { Cout() << "Unknown error." << Endl(); diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx index b03e33491b92..687b189cf894 100644 --- a/autodoc/source/parser_i/idoc/docu_pe2.cxx +++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx @@ -38,6 +38,7 @@ #include #include #include +#include <../parser/inc/x_docu.hxx> #include #include #include @@ -511,15 +512,44 @@ SapiDocu_PE::SetCurSinceAtTagVersion( DYN ary::inf::DocuToken & let_drNewToken ) return; } - char cFirst = *pToken->GetText(); - const char cCiphersend = '9' + 1; - if ( autodoc::CommandLine::Get_().DoesTransform_SinceTag() - AND NOT csv::in_range('0', cFirst, cCiphersend) ) + const String + sVersion(pToken->GetText()); + const char + cFirst = *sVersion.begin(); + const char + cCiphersend = '9' + 1; + const autodoc::CommandLine & + rCommandLine = autodoc::CommandLine::Get_(); + + + if ( rCommandLine.DoesTransform_SinceTag()) { - delete &let_drNewToken; - return; + // The @since version number shall be interpreted, + + if ( NOT csv::in_range('0', cFirst, cCiphersend) ) + { + // But this is a non-number-part, so we wait for + // the next one. + delete &let_drNewToken; + return; + } + else if (rCommandLine.DisplayOf_SinceTagValue(sVersion).empty()) + { + // This is the numbered part, but we don't know it. + delete &let_drNewToken; + + StreamLock + sl(200); + sl() + << "Since-value '" + << sVersion + << "' not found in translation table."; + throw X_Docu("since", sl().c_str()); + } } + // Either since tags are not specially interpreted, or + // we got a known one. pCurAtTag->AddToken(let_drNewToken); fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2SinceAtTag; } -- cgit -- cgit