Index: autodoc/source/exes/adc_uni/cmd_sincedata.cxx =================================================================== --- autodoc/source/exes/adc_uni/cmd_sincedata.cxx (revision 271921) +++ autodoc/source/exes/adc_uni/cmd_sincedata.cxx (working copy) @@ -37,8 +37,8 @@ #include #include "adc_cmds.hxx" +#include - namespace autodoc { namespace command @@ -64,7 +64,8 @@ { if (DoesTransform()) { - const String * ret = csv::find_in_map(aTransformationTable, i_sVersionNumber); + ::rtl::OString sTrimmed( ::rtl::OString( i_sVersionNumber ).trim() ); + const String * ret = csv::find_in_map(aTransformationTable, String( sTrimmed )); return ret != 0 ? *ret : String::Null_(); Index: autodoc/source/exes/adc_uni/makefile.mk =================================================================== --- autodoc/source/exes/adc_uni/makefile.mk (revision 271921) +++ autodoc/source/exes/adc_uni/makefile.mk (working copy) @@ -80,13 +80,13 @@ APP1RPATH=SDK .IF "$(GUI)"=="WNT" -APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB) +APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB) $(SALLIB) .ELSE .IF "$(OS)"=="MACOSX" # See : -APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv +APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv -lsal .ELSE -APP1STDLIBS= -lcosv -ludm +APP1STDLIBS= -lcosv -ludm -lsal .ENDIF .ENDIF Index: autodoc/source/exes/adc_uni/adc_cmds.cxx =================================================================== --- autodoc/source/exes/adc_uni/adc_cmds.cxx (revision 271921) +++ autodoc/source/exes/adc_uni/adc_cmds.cxx (working copy) @@ -38,6 +38,7 @@ #include #include #include +#include namespace autodoc @@ -118,10 +119,20 @@ bool CreateHtml::do_Run() const { - if ( CommandLine::Get_().IdlUsed() ) - run_Idl(); - if ( CommandLine::Get_().CppUsed() ) - run_Cpp(); + try + { + if ( CommandLine::Get_().IdlUsed() ) + run_Idl(); + if ( CommandLine::Get_().CppUsed() ) + run_Cpp(); + } + catch ( const ary::inf::DocumentationError& e ) + { + e.Report( Cerr() ); + Cerr() << Endl(); + return false; + } + return true; } Index: autodoc/source/display/idl/hfi_tag.cxx =================================================================== --- autodoc/source/display/idl/hfi_tag.cxx (revision 271921) +++ autodoc/source/display/idl/hfi_tag.cxx (working copy) @@ -45,6 +45,7 @@ #include "hi_env.hxx" #include "hi_linkhelper.hxx" +#include using ary::inf::DocuTex2; @@ -162,11 +163,18 @@ } // Transform the value of the @since tag into the text to be displayed. + String sSinceValue( i_rTag.Text().TextOfFirstToken() ); String sDisplay = autodoc::CommandLine::Get_().DisplayOf_SinceTagValue( - i_rTag.Text().TextOfFirstToken() ); - if (sDisplay.empty()) - return; + sSinceValue ); + if ( sDisplay.empty() ) + { + ::rtl::OStringBuffer aErrorMsg; + aErrorMsg.append( "since-value '" ); + aErrorMsg.append( sSinceValue ); + aErrorMsg.append( "' not found in translation table" ); + throw ary::inf::DocuTag_Error( "since", String( aErrorMsg.getStr() ) ); + } *pTitleOut << "Since "; DocuTex2 aHelp; Index: autodoc/inc/ary_i/disdocum.hxx =================================================================== --- autodoc/inc/ary_i/disdocum.hxx (revision 271921) +++ autodoc/inc/ary_i/disdocum.hxx (working copy) @@ -99,7 +99,42 @@ i_rToken ) = 0; }; +/** this exception is thrown in case of an documentation error +*/ +class DocumentationError +{ + public: + DocumentationError() { } + virtual ~DocumentationError() { } + // TODO: this class should be derived from some general + virtual void Report( + std::ostream & o_rOut ) const = 0; +}; + +class DocuTag_Error : public DocumentationError +{ + public: + DocuTag_Error( + const char * i_sTagName, + const char * i_sExplanation + ) + :sTagName( i_sTagName ) + ,sExplanation( i_sExplanation ) + { + } + + virtual void Report( + std::ostream & o_rOut + ) const + { + o_rOut << "Error in tag '" << sTagName << "': " << sExplanation << Endl(); + } + private: + String sTagName; + String sExplanation; +}; + class DocuTag_Display : public DocumentationDisplay { public: Index: odk/pack/copying/apiref-autodoc.since =================================================================== --- odk/pack/copying/apiref-autodoc.since (revision 271921) +++ odk/pack/copying/apiref-autodoc.since (working copy) @@ -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" Index: offapi/com/sun/star/text/fieldmaster/Database.idl =================================================================== --- offapi/com/sun/star/text/fieldmaster/Database.idl (revision 271436) +++ offapi/com/sun/star/text/fieldmaster/Database.idl (working copy) @@ -85,7 +85,7 @@ //------------------------------------------------------------------------ /** contains the DataColumnName but it enables the fieldmaster and its depending fields to work without setting DataSourceName, DataTableName and CommandType - @since OOo 2.x + @since OOo 2.3 */ [optional, property] string Name; Index: offapi/com/sun/star/text/ViewSettings.idl =================================================================== --- offapi/com/sun/star/text/ViewSettings.idl (revision 271436) +++ offapi/com/sun/star/text/ViewSettings.idl (working copy) @@ -342,14 +342,18 @@ [optional, property] boolean ShowNonprintingCharacters; //------------------------------------------------------------------------- /** metric unit of the horizontal ruler + +

Uses values FieldUnit

+ @since OOo 3.1.0 -

Uses values from com::sun::star::awt::FieldUnit

*/ [optional, property] long HorizontalRulerMetric; //------------------------------------------------------------------------- /** metric unit of the vertical ruler + +

Uses values from FieldUnit

+ @since OOo 3.1.0 -

Uses values from com::sun::star::awt::FieldUnit

*/ [optional, property] long VerticalRulerMetric; }; Index: offapi/com/sun/star/text/NumberingLevel.idl =================================================================== --- offapi/com/sun/star/text/NumberingLevel.idl (revision 271436) +++ offapi/com/sun/star/text/NumberingLevel.idl (working copy) @@ -201,8 +201,6 @@ /** position and space mode - @since OOo 3.0 -

Specifies the position and space mode of the numbering level. For valid values see com::sun::star::text::PositionAndSpaceMode. @@ -211,53 +209,55 @@ If it equals LABEL_ALIGNMENT, properties Adjust, LabelFollowedBy, ListtabStopPosition, FirstLineIndent, IndentAt are used.

+ + @since OOo 3.0 */ [optional, property] short PositionAndSpaceMode; /** character following the list label - @since OOo 3.0 -

Specifies the character following the list label. For valid values see com::sun::star::text::LabelFollow. Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.

+ + @since OOo 3.0 */ [optional, property] short LabelFollowedBy; /** list tab position - @since OOo 3.0 -

Specifies the position of the list tab stop - only non-negative values are allowed. Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT and LabelFollowedBy equal LABELFOLLOW_LISTTAB

+ + @since OOo 3.0 */ [optional, property] long ListtabStopPosition; /** additional line indent for the first text line - @since OOo 3.0 -

Specifies the first line indent. Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.

+ + @since OOo 3.0 */ [optional, property] long FirstLineIndent; /** indentation of the text lines - @since OOo 3.0 -

Specifies the indent of the text lines Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.

+ + @since OOo 3.0 */ [optional, property] long IndentAt; }; Index: offapi/com/sun/star/text/DocumentSettings.idl =================================================================== --- offapi/com/sun/star/text/DocumentSettings.idl (revision 271436) +++ offapi/com/sun/star/text/DocumentSettings.idl (working copy) @@ -129,8 +129,6 @@ /** specifies if the former (till OpenOffice.org 1.1) or the new line spacing formatting is applied. - @since OOo 2.0.0 -

This property controls how a set line spacing at a paragraph influences the formatting of the text lines and the spacing between paragraphs. @@ -144,14 +142,13 @@ a proportional line spacing is only applied below a text line and it's always added to the paragraph spacing between two paragraphs.

+ @since OOo 2.0.0 */ [optional, property] boolean UseFormerLineSpacing; // ------------------------------------------------------------ /** specifies if paragraph and table spacing is added at the bottom of table cells - @since OOo 2.0.0 -

This property controls, if the spacing of the last paragraph respectively table of a table cell is added at the bottom of this table cells @@ -162,14 +159,13 @@ the spacing of the last paragraph respectively table of a table cell isn't added at the bottom of this table cell.

+ @since OOo 2.0.0 */ [optional, property] boolean AddParaSpacingToTableCells; // ------------------------------------------------------------ /** specifies if the former (till OpenOffice.org 1.1) or the new object positioning is applied. - @since OOo 2.0.0 -

This property controls how floating screen objects (Writer fly frames and drawing objects are positioned. If , the object positioning till OpenOffice.org 1.1 is @@ -181,6 +177,7 @@ its vertical position, doesn't include the lower spacing and the line spacing of the previous paragraph.

+ @since OOo 2.0.0 */ [optional, property] boolean UseFormerObjectPositioning; @@ -188,8 +185,6 @@ /** specifies if the text wrap of floating screen objects are considered in a specified way in the positioning algorithm. - @since OOo 2.0.0 -

This property controls how floating screen objects (Writer fly frames and drawing objects) are positioned. If , the object positioning algorithm will consider @@ -199,6 +194,7 @@ If (default value), the former object positioning algorithm (known from OpenOffice.org 1.1) is applied.

+ @since OOo 2.0.0 */ [optional, property] boolean ConsiderTextWrapOnObjPos; Index: offapi/com/sun/star/text/ReferenceFieldPart.idl =================================================================== --- offapi/com/sun/star/text/ReferenceFieldPart.idl (revision 271436) +++ offapi/com/sun/star/text/ReferenceFieldPart.idl (working copy) @@ -88,8 +88,6 @@ /** The numbering label and depending of the reference field context numbering lables of superior list levels of the reference are displayed. - @since OOo 3.0 -

This option is only valid, if the source of the reference is a bookmark or a set reference.

The contents of the list label of the paragraph, at which the bookmark respectively the set reference starts - named "referenced item" in the following - is displayed. To unambiguous @@ -102,23 +100,23 @@ be the level of the most superior level, then no list label content of superior levels greater or equal than X are added. If the referenced item isn't numbered, nothing is displayed.

+ + @since OOo 3.0 */ const short NUMBER = 8; //------------------------------------------------------------------------- /** The numbering label of the reference is displayed. - @since OOo 3.0 -

This option is only valid, if the source of the reference is a bookmark or a set reference.

The contents of the list label of the paragraph, at which the bookmark respectively the set reference starts, is displayed. If this paragraph isn't numbered, nothing is displayed.

+ + @since OOo 3.0 */ const short NUMBER_NO_CONTEXT = 9; //------------------------------------------------------------------------- /** The numbering label and numbering lables of superior list levels of the reference are displayed. - @since OOo 3.0 -

This option is only valid, if the source of the reference is a bookmark or a set reference.

The contents of the list label of the paragraph, at which the bookmark respectively the set reference starts - named "referenced item" in the following - is displayed and the contents @@ -128,6 +126,8 @@ be the level of the most superior level, then no list label content of superior levels greater or equal than X are added. If the referenced item is numbered nothing is displayed.

+ + @since OOo 3.0 */ const short NUMBER_FULL_CONTEXT = 10; }; Index: offapi/com/sun/star/linguistic2/XProofreader.idl =================================================================== --- offapi/com/sun/star/linguistic2/XProofreader.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/XProofreader.idl (working copy) @@ -65,7 +65,7 @@ //============================================================================= /** API for proofreading a text - @since OOo 3.01 + @since OOo 3.0.1 */ interface XProofreader: com::sun::star::linguistic2::XSupportedLocales { Index: offapi/com/sun/star/linguistic2/ProofreadingResult.idl =================================================================== --- offapi/com/sun/star/linguistic2/ProofreadingResult.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/ProofreadingResult.idl (working copy) @@ -58,7 +58,7 @@ //============================================================================= /** holds the results from proofreading a sentence. - @since OOo 3.01 + @since OOo 3.0.1 */ struct ProofreadingResult { Index: offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl =================================================================== --- offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl (working copy) @@ -62,7 +62,7 @@ //------------------------------------------------------------------------- /** Request new proofreading of the document - @since OOo 3.01 + @since OOo 3.0.1 */ const short PROOFREAD_AGAIN = 8; Index: offapi/com/sun/star/linguistic2/XProofreadingIterator.idl =================================================================== --- offapi/com/sun/star/linguistic2/XProofreadingIterator.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/XProofreadingIterator.idl (working copy) @@ -61,7 +61,7 @@ //============================================================================= /** API for the proofreading iterator that mediates between the document and the proofreader. - @since OOo 3.01 + @since OOo 3.0.1 */ interface XProofreadingIterator: com::sun::star::uno::XInterface { Index: offapi/com/sun/star/linguistic2/SingleProofreadingError.idl =================================================================== --- offapi/com/sun/star/linguistic2/SingleProofreadingError.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/SingleProofreadingError.idl (working copy) @@ -45,7 +45,7 @@ //============================================================================= /** holds a single error found by the proofreader. - @since OOo 3.01 + @since OOo 3.0.1 */ struct SingleProofreadingError { Index: offapi/com/sun/star/linguistic2/LinguProperties.idl =================================================================== --- offapi/com/sun/star/linguistic2/LinguProperties.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/LinguProperties.idl (working copy) @@ -66,7 +66,7 @@ thesaurus. @deprecated - @since OOo 3.01 + @since OOo 3.0.1 */ [property] boolean IsGermanPreReform; @@ -144,7 +144,7 @@ hidden or not. @deprecated - @since OOo 3.01 + @since OOo 3.0.1 */ [property] boolean IsSpellHide; @@ -153,7 +153,7 @@ languages. @deprecated - @since OOo 3.01 + @since OOo 3.0.1 */ [property] boolean IsSpellInAllLanguages; Index: offapi/com/sun/star/linguistic2/Dictionary.idl =================================================================== --- offapi/com/sun/star/linguistic2/Dictionary.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/Dictionary.idl (working copy) @@ -57,7 +57,7 @@ @see com::sun::star::linguistic2::DictionaryList @see com::sun::star::linguistic2::XSearchableDictionaryList - @since OOo 3.01 + @since OOo 3.0.1 */ service Dictionary { Index: offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl =================================================================== --- offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl (working copy) @@ -55,7 +55,7 @@ /** set the list of suggestions to be returned. - @since OOo 3.01 + @since OOo 3.0.1 */ void setAlternatives( [in] sequence< string > aAlternatives ); @@ -64,7 +64,7 @@ set the type of error found. @see SpellFailure - @since OOo 3.01 + @since OOo 3.0.1 */ void setFailureType( [in] short nFailureType ); Index: offapi/com/sun/star/linguistic2/XSearchableDictionary.idl =================================================================== --- offapi/com/sun/star/linguistic2/XSearchableDictionary.idl (revision 271436) +++ offapi/com/sun/star/linguistic2/XSearchableDictionary.idl (working copy) @@ -60,7 +60,7 @@ @see XDictionaryEntry @see XSearchableDictionaryList - @since OOo 3.01 + @since OOo 3.0.1 */ sequence< com::sun::star::linguistic2::XDictionaryEntry > searchSimilarEntries( [in] string aWord ); Index: offapi/com/sun/star/style/Style.idl =================================================================== --- offapi/com/sun/star/style/Style.idl (revision 271436) +++ offapi/com/sun/star/style/Style.idl (working copy) @@ -165,7 +165,7 @@ - @since OOo 2.0.1. + @since OOo 2.0.1 */ [optional, property] sequence< com::sun::star::beans::NamedValue > ParaStyleConditions; Index: offapi/com/sun/star/sheet/NamedRange.idl =================================================================== --- offapi/com/sun/star/sheet/NamedRange.idl (revision 271436) +++ offapi/com/sun/star/sheet/NamedRange.idl (working copy) @@ -84,7 +84,7 @@ @see com::sun::star::sheet::FormulaToken @see com::sun::star::sheet::FormulaMapGroupSpecialOffset::NAME - @since OOo 2.x + @since OOo 3.0 */ [optional, readonly, property] long TokenIndex; Index: offapi/com/sun/star/sheet/DatabaseRange.idl =================================================================== --- offapi/com/sun/star/sheet/DatabaseRange.idl (revision 271436) +++ offapi/com/sun/star/sheet/DatabaseRange.idl (working copy) @@ -160,7 +160,7 @@ @see com::sun::star::sheet::FormulaToken @see com::sun::star::sheet::FormulaMapGroupSpecialOffset::DB_AREA - @since OOo 2.x + @since OOo 3.0 */ [optional, readonly, property] long TokenIndex; };