Attachment #62287 for issue #100671

View | Details | Raw Unified | Return to issue 100671
Collapse All | Expand All




#include <cosv/tpl/tpltools.hxx>
#include "adc_cmds.hxx"

#include <rtl/string.hxx>


namespace autodoc
{
namespace command

{
    if (DoesTransform())
    {
        ::rtl::OString sTrimmed( ::rtl::OString( i_sVersionNumber ).trim() );
        const String * ret = csv::find_in_map(aTransformationTable, String( sTrimmed ));
        return ret != 0
                ?   *ret
                :   String::Null_();




APP1RPATH=SDK

.IF "$(GUI)"=="WNT"
APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB) $(SALLIB)
.ELSE
.IF "$(OS)"=="MACOSX"
# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv -lsal
.ELSE
APP1STDLIBS= -lcosv -ludm -lsal
.ENDIF
.ENDIF





#include <autodoc/dsp_html_std.hxx>
#include <display/corframe.hxx>
#include <adc_cl.hxx>
#include <ary_i/disdocum.hxx>


namespace autodoc

bool
CreateHtml::do_Run() const
{
    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;
}





#include "hi_env.hxx"
#include "hi_linkhelper.hxx"

#include <rtl/strbuf.hxx>

using ary::inf::DocuTex2;


    }

    // 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(
                                        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;




												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:

Lines 1-12 Link Here

(-)odk/pack/copying/apiref-autodoc.since (+9 lines)
		1	"3.2.0" "OpenOffice 3.2.0"
		2	"3.2" "OpenOffice 3.2"
		3	"3.1.0" "OpenOffice 3.1.0"
		4	"3.1" "OpenOffice 3.1"
		5	"3.0.1" "OpenOffice 3.0.1"
1	"3.0.0" "OpenOffice 3.0.0"	6	"3.0.0" "OpenOffice 3.0.0"
2	"3.0" "OpenOffice 3.0"	7	"3.0" "OpenOffice 3.0"
3	"2.4.1" "OpenOffice 2.4.1"	8	"2.4.1" "OpenOffice 2.4.1"
		9	"2.4.0" "OpenOffice 2.4.0"
4	"2.4" "OpenOffice 2.4"	10	"2.4" "OpenOffice 2.4"
5	"2.3.1" "OpenOffice 2.3.1"	11	"2.3.1" "OpenOffice 2.3.1"
		12	"2.3.0" "OpenOffice 2.3.0"
6	"2.3" "OpenOffice 2.3"	13	"2.3" "OpenOffice 2.3"
7	"2.2.1" "OpenOffice 2.2.1"	14	"2.2.1" "OpenOffice 2.2.1"
		15	"2.2.0" "OpenOffice 2.2.0"
8	"2.2" "OpenOffice 2.2"	16	"2.2" "OpenOffice 2.2"
9	"2.1" "OpenOffice 2.1"	17	"2.1" "OpenOffice 2.1"
		18	"2.0.6" "OpenOffice 2.0.6"
10	"2.0.4" "OpenOffice 2.0.4"	19	"2.0.4" "OpenOffice 2.0.4"
11	"2.0.3" "OpenOffice 2.0.3"	20	"2.0.3" "OpenOffice 2.0.3"
12	"2.0.2" "OpenOffice 2.0.2"	21	"2.0.2" "OpenOffice 2.0.2"

Lines 85-91 Link Here

(-)offapi/com/sun/star/text/fieldmaster/Database.idl (-1 / +1 lines)
85	//------------------------------------------------------------------------	85	//------------------------------------------------------------------------
86	/** contains the DataColumnName but it enables the fieldmaster and its	86	/** contains the DataColumnName but it enables the fieldmaster and its
87	depending fields to work without setting DataSourceName, DataTableName and CommandType	87	depending fields to work without setting DataSourceName, DataTableName and CommandType
88	@since OOo 2.x	88	@since OOo 2.3
89	*/	89	*/
90	[optional, property] string Name;	90	[optional, property] string Name;
91		91

Lines 342-355 Link Here

(-)offapi/com/sun/star/text/ViewSettings.idl (-2 / +6 lines)
342	[optional, property] boolean ShowNonprintingCharacters;	342	[optional, property] boolean ShowNonprintingCharacters;
343	//-------------------------------------------------------------------------	343	//-------------------------------------------------------------------------
344	/** metric unit of the horizontal ruler	344	/** metric unit of the horizontal ruler
		345
		346	<p>Uses values <type scope="com::sun::star::awt">FieldUnit</type></p>
		347
345	@since OOo 3.1.0	348	@since OOo 3.1.0
346	<p>Uses values from com::sun::star::awt::FieldUnit</p>
347	*/	349	*/
348	[optional, property] long HorizontalRulerMetric;	350	[optional, property] long HorizontalRulerMetric;
349	//-------------------------------------------------------------------------	351	//-------------------------------------------------------------------------
350	/** metric unit of the vertical ruler	352	/** metric unit of the vertical ruler
		353
		354	<p>Uses values from <type scope="com::sun::star::awt">FieldUnit</type></p>
		355
351	@since OOo 3.1.0	356	@since OOo 3.1.0
352	<p>Uses values from com::sun::star::awt::FieldUnit</p>
353	*/	357	*/
354	[optional, property] long VerticalRulerMetric;	358	[optional, property] long VerticalRulerMetric;
355	};	359	};





        /** position and space mode

                @since OOo 3.0

                <p>
                Specifies the position and space mode of the numbering level.
                For valid values see com::sun::star::text::PositionAndSpaceMode.

                If it equals LABEL_ALIGNMENT, properties Adjust, LabelFollowedBy,
                ListtabStopPosition, FirstLineIndent, IndentAt are used.
                </p>

                @since OOo 3.0
        */
        [optional, property] short PositionAndSpaceMode;

        /** character following the list label

                @since OOo 3.0

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

                @since OOo 3.0
        */
        [optional, property] short LabelFollowedBy;

        /** list tab position

                @since OOo 3.0

                <p>
                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
                </p>

                @since OOo 3.0
        */
        [optional, property] long ListtabStopPosition;

        /** additional line indent for the first text line

                @since OOo 3.0

                <p>
                Specifies the first line indent.
                Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
                </p>

                @since OOo 3.0
        */
        [optional, property] long FirstLineIndent;

        /** indentation of the text lines

                @since OOo 3.0

                <p>
                Specifies the indent of the text lines
                Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
                </p>

                @since OOo 3.0
        */
        [optional, property] long IndentAt;
};




    /** specifies if the former (till OpenOffice.org 1.1) or the new
        line spacing formatting is applied.

        @since OOo 2.0.0

        <p>This property controls how a set line spacing at a paragraph
        influences the formatting of the text lines and the spacing between
        paragraphs.

        a proportional line spacing is only applied below a text line and
        it's always added to the paragraph spacing between two paragraphs.</p>

        @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

        <p>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

        the spacing of the last paragraph respectively table of a table
        cell isn't added at the bottom of this table cell.</p>

        @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

        <p>This property controls how floating screen objects (Writer
        fly frames and drawing objects are positioned.
        If <TRUE/>, the object positioning till OpenOffice.org 1.1 is

        its vertical position, doesn't include the lower spacing and the
        line spacing of the previous paragraph.</p>

        @since OOo 2.0.0
    */
    [optional, property] boolean UseFormerObjectPositioning;


    /** specifies if the text wrap of floating screen objects are
        considered in a specified way in the positioning algorithm.

        @since OOo 2.0.0

        <p>This property controls how floating screen objects (Writer
        fly frames and drawing objects) are positioned.
        If <TRUE/>, the object positioning algorithm will consider

        If <FALSE/> (default value), the former object positioning
        algorithm (known from OpenOffice.org 1.1) is applied.</p>

        @since OOo 2.0.0
    */
    [optional, property] boolean ConsiderTextWrapOnObjPos;





        /** 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

            <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
            <p>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

            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.</p>

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

            @since OOo 3.0

            <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
            <p>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.</p>

            @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

            <p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
            <p>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

            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.</p>

            @since OOo 3.0
        */
        const short NUMBER_FULL_CONTEXT = 10;
};

Lines 65-71 Link Here

(-)offapi/com/sun/star/linguistic2/XProofreader.idl (-1 / +1 lines)
65	//=============================================================================	65	//=============================================================================
66	/** API for proofreading a text	66	/** API for proofreading a text
67		67
68	@since OOo 3.01	68	@since OOo 3.0.1
69	*/	69	*/
70	interface XProofreader: com::sun::star::linguistic2::XSupportedLocales	70	interface XProofreader: com::sun::star::linguistic2::XSupportedLocales
71	{	71	{

Lines 58-64 Link Here

(-)offapi/com/sun/star/linguistic2/ProofreadingResult.idl (-1 / +1 lines)
58	//=============================================================================	58	//=============================================================================
59	/** holds the results from proofreading a sentence.	59	/** holds the results from proofreading a sentence.
60		60
61	@since OOo 3.01	61	@since OOo 3.0.1
62	*/	62	*/
63	struct ProofreadingResult	63	struct ProofreadingResult
64	{	64	{

Lines 62-68 Link Here

(-)offapi/com/sun/star/linguistic2/LinguServiceEventFlags.idl (-1 / +1 lines)
62	//-------------------------------------------------------------------------	62	//-------------------------------------------------------------------------
63	/** Request new proofreading of the document	63	/** Request new proofreading of the document
64		64
65	@since OOo 3.01	65	@since OOo 3.0.1
66	*/	66	*/
67	const short PROOFREAD_AGAIN = 8;	67	const short PROOFREAD_AGAIN = 8;
68		68

Lines 61-67 Link Here

(-)offapi/com/sun/star/linguistic2/XProofreadingIterator.idl (-1 / +1 lines)
61	//=============================================================================	61	//=============================================================================
62	/** API for the proofreading iterator that mediates between the document and the proofreader.	62	/** API for the proofreading iterator that mediates between the document and the proofreader.
63		63
64	@since OOo 3.01	64	@since OOo 3.0.1
65	*/	65	*/
66	interface XProofreadingIterator: com::sun::star::uno::XInterface	66	interface XProofreadingIterator: com::sun::star::uno::XInterface
67	{	67	{

Lines 45-51 Link Here

(-)offapi/com/sun/star/linguistic2/SingleProofreadingError.idl (-1 / +1 lines)
45	//=============================================================================	45	//=============================================================================
46	/** holds a single error found by the proofreader.	46	/** holds a single error found by the proofreader.
47		47
48	@since OOo 3.01	48	@since OOo 3.0.1
49	*/	49	*/
50	struct SingleProofreadingError	50	struct SingleProofreadingError
51	{	51	{




	 	thesaurus.

        @deprecated
        @since OOo 3.0.1
	  */
	[property] boolean IsGermanPreReform;


	 	hidden or not.
        
        @deprecated
        @since OOo 3.0.1
	*/
	[property] boolean IsSpellHide;
	

	 	languages.
    
        @deprecated
        @since OOo 3.0.1
    */
	[property] boolean IsSpellInAllLanguages;


Lines 57-63 Link Here

(-)offapi/com/sun/star/linguistic2/Dictionary.idl (-1 / +1 lines)
57	@see com::sun::star::linguistic2::DictionaryList	57	@see com::sun::star::linguistic2::DictionaryList
58	@see com::sun::star::linguistic2::XSearchableDictionaryList	58	@see com::sun::star::linguistic2::XSearchableDictionaryList
59		59
60	@since OOo 3.01	60	@since OOo 3.0.1
61	*/	61	*/
62	service Dictionary	62	service Dictionary
63	{	63	{

Lines 55-61 Link Here

(-)offapi/com/sun/star/linguistic2/XSetSpellAlternatives.idl (-2 / +2 lines)
55	/**	55	/**
56	set the list of suggestions to be returned.	56	set the list of suggestions to be returned.
57		57
58	@since OOo 3.01	58	@since OOo 3.0.1
59	*/	59	*/
60	void setAlternatives( [in] sequence< string > aAlternatives );	60	void setAlternatives( [in] sequence< string > aAlternatives );
61		61
Lines 64-70 Link Here
64	set the type of error found.	64	set the type of error found.
65		65
66	@see <tyoe scope="com::sun::star::linguistic2">SpellFailure</type>	66	@see <tyoe scope="com::sun::star::linguistic2">SpellFailure</type>
67	@since OOo 3.01	67	@since OOo 3.0.1
68	*/	68	*/
69	void setFailureType( [in] short nFailureType );	69	void setFailureType( [in] short nFailureType );
70		70

Lines 60-66 Link Here

(-)offapi/com/sun/star/linguistic2/XSearchableDictionary.idl (-1 / +1 lines)
60		60
61	@see <type scope="com::sun::star::linguistic2">XDictionaryEntry</type>	61	@see <type scope="com::sun::star::linguistic2">XDictionaryEntry</type>
62	@see <type scope="com::sun::star::linguistic2">XSearchableDictionaryList</type>	62	@see <type scope="com::sun::star::linguistic2">XSearchableDictionaryList</type>
63	@since OOo 3.01	63	@since OOo 3.0.1
64	*/	64	*/
65	sequence< com::sun::star::linguistic2::XDictionaryEntry > searchSimilarEntries( [in] string aWord );	65	sequence< com::sun::star::linguistic2::XDictionaryEntry > searchSimilarEntries( [in] string aWord );
66		66

Lines 165-171 Link Here

(-)offapi/com/sun/star/style/Style.idl (-1 / +1 lines)
165	</ul>	165	</ul>
166		166
167		167
168	@since OOo 2.0.1.	168	@since OOo 2.0.1
169	*/	169	*/
170	[optional, property] sequence< com::sun::star::beans::NamedValue > ParaStyleConditions;	170	[optional, property] sequence< com::sun::star::beans::NamedValue > ParaStyleConditions;
171		171

Lines 84-90 Link Here

(-)offapi/com/sun/star/sheet/NamedRange.idl (-1 / +1 lines)
84	@see com::sun::star::sheet::FormulaToken	84	@see com::sun::star::sheet::FormulaToken
85	@see com::sun::star::sheet::FormulaMapGroupSpecialOffset::NAME	85	@see com::sun::star::sheet::FormulaMapGroupSpecialOffset::NAME
86		86
87	@since OOo 2.x	87	@since OOo 3.0
88	*/	88	*/
89	[optional, readonly, property] long TokenIndex;	89	[optional, readonly, property] long TokenIndex;
90		90

Lines 160-166 Link Here

(-)offapi/com/sun/star/sheet/DatabaseRange.idl (-1 / +1 lines)
160	@see com::sun::star::sheet::FormulaToken	160	@see com::sun::star::sheet::FormulaToken
161	@see com::sun::star::sheet::FormulaMapGroupSpecialOffset::DB_AREA	161	@see com::sun::star::sheet::FormulaMapGroupSpecialOffset::DB_AREA
162		162
163	@since OOo 2.x	163	@since OOo 3.0
164	*/	164	*/
165	[optional, readonly, property] long TokenIndex;	165	[optional, readonly, property] long TokenIndex;
166	};	166	};

Return to issue 100671

Lines 38-43 Link Here

(-)autodoc/source/exes/adc_uni/adc_cmds.cxx (-4 / +15 lines)
38	#include <autodoc/dsp_html_std.hxx>	38	#include <autodoc/dsp_html_std.hxx>
39	#include <display/corframe.hxx>	39	#include <display/corframe.hxx>
40	#include <adc_cl.hxx>	40	#include <adc_cl.hxx>
		41	#include <ary_i/disdocum.hxx>
41		42
42		43
43	namespace autodoc	44	namespace autodoc
Lines 118-127 Link Here
118	bool	119	bool
119	CreateHtml::do_Run() const	120	CreateHtml::do_Run() const
120	{	121	{
121	if ( CommandLine::Get_().IdlUsed() )	122	try
122	run_Idl();	123	{
123	if ( CommandLine::Get_().CppUsed() )	124	if ( CommandLine::Get_().IdlUsed() )
124	run_Cpp();	125	run_Idl();
		126	if ( CommandLine::Get_().CppUsed() )
		127	run_Cpp();
		128	}
		129	catch ( const ary::inf::DocumentationError& e )
		130	{
		131	e.Report( Cerr() );
		132	Cerr() << Endl();
		133	return false;
		134	}
		135
125	return true;	136	return true;
126	}	137	}
127		138

Lines 99-105 Link Here

(-)autodoc/inc/ary_i/disdocum.hxx (+35 lines)
99	i_rToken ) = 0;	99	i_rToken ) = 0;
100	};	100	};
101		101
		102	/** this exception is thrown in case of an documentation error
		103	*/
		104	class DocumentationError
		105	{
		106	public:
		107	DocumentationError() { }
		108	virtual ~DocumentationError() { }
102		109
		110	// TODO: this class should be derived from some general
		111	virtual void Report(
		112	std::ostream & o_rOut ) const = 0;
		113	};
		114
		115	class DocuTag_Error : public DocumentationError
		116	{
		117	public:
		118	DocuTag_Error(
		119	const char * i_sTagName,
		120	const char * i_sExplanation
		121	)
		122	:sTagName( i_sTagName )
		123	,sExplanation( i_sExplanation )
		124	{
		125	}
		126
		127	virtual void Report(
		128	std::ostream & o_rOut
		129	) const
		130	{
		131	o_rOut << "Error in tag '" << sTagName << "': " << sExplanation << Endl();
		132	}
		133	private:
		134	String sTagName;
		135	String sExplanation;
		136	};
		137
103	class DocuTag_Display : public DocumentationDisplay	138	class DocuTag_Display : public DocumentationDisplay
104	{	139	{
105	public:	140	public:

Lines 201-208 Link Here

(-)offapi/com/sun/star/text/NumberingLevel.idl (-10 / +10 lines)
201		201
202	/** position and space mode	202	/** position and space mode
203		203
204	@since OOo 3.0
205
206	<p>	204	<p>
207	Specifies the position and space mode of the numbering level.	205	Specifies the position and space mode of the numbering level.
208	For valid values see com::sun::star::text::PositionAndSpaceMode.	206	For valid values see com::sun::star::text::PositionAndSpaceMode.
Lines 211-263 Link Here
211	If it equals LABEL_ALIGNMENT, properties Adjust, LabelFollowedBy,	209	If it equals LABEL_ALIGNMENT, properties Adjust, LabelFollowedBy,
212	ListtabStopPosition, FirstLineIndent, IndentAt are used.	210	ListtabStopPosition, FirstLineIndent, IndentAt are used.
213	</p>	211	</p>
		212
		213	@since OOo 3.0
214	*/	214	*/
215	[optional, property] short PositionAndSpaceMode;	215	[optional, property] short PositionAndSpaceMode;
216		216
217	/** character following the list label	217	/** character following the list label
218		218
219	@since OOo 3.0
220
221	<p>	219	<p>
222	Specifies the character following the list label.	220	Specifies the character following the list label.
223	For valid values see com::sun::star::text::LabelFollow.	221	For valid values see com::sun::star::text::LabelFollow.
224	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.	222	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
225	</p>	223	</p>
		224
		225	@since OOo 3.0
226	*/	226	*/
227	[optional, property] short LabelFollowedBy;	227	[optional, property] short LabelFollowedBy;
228		228
229	/** list tab position	229	/** list tab position
230		230
231	@since OOo 3.0
232
233	<p>	231	<p>
234	Specifies the position of the list tab stop - only non-negative	232	Specifies the position of the list tab stop - only non-negative
235	values are allowed.	233	values are allowed.
236	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT	234	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT
237	and LabelFollowedBy equal LABELFOLLOW_LISTTAB	235	and LabelFollowedBy equal LABELFOLLOW_LISTTAB
238	</p>	236	</p>
		237
		238	@since OOo 3.0
239	*/	239	*/
240	[optional, property] long ListtabStopPosition;	240	[optional, property] long ListtabStopPosition;
241		241
242	/** additional line indent for the first text line	242	/** additional line indent for the first text line
243		243
244	@since OOo 3.0
245
246	<p>	244	<p>
247	Specifies the first line indent.	245	Specifies the first line indent.
248	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.	246	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
249	</p>	247	</p>
		248
		249	@since OOo 3.0
250	*/	250	*/
251	[optional, property] long FirstLineIndent;	251	[optional, property] long FirstLineIndent;
252		252
253	/** indentation of the text lines	253	/** indentation of the text lines
254		254
255	@since OOo 3.0
256
257	<p>	255	<p>
258	Specifies the indent of the text lines	256	Specifies the indent of the text lines
259	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.	257	Only of relevance, if PositionAndSpaceMode equals LABEL_ALIGNMENT.
260	</p>	258	</p>
		259
		260	@since OOo 3.0
261	*/	261	*/
262	[optional, property] long IndentAt;	262	[optional, property] long IndentAt;
263	};	263	};

Lines 37-44 Link Here

(-)autodoc/source/exes/adc_uni/cmd_sincedata.cxx (-2 / +3 lines)
37	#include <cosv/tpl/tpltools.hxx>	37	#include <cosv/tpl/tpltools.hxx>
38	#include "adc_cmds.hxx"	38	#include "adc_cmds.hxx"
39		39
		40	#include <rtl/string.hxx>
40		41
41
42	namespace autodoc	42	namespace autodoc
43	{	43	{
44	namespace command	44	namespace command
Lines 64-70 Link Here
64	{	64	{
65	if (DoesTransform())	65	if (DoesTransform())
66	{	66	{
67	const String * ret = csv::find_in_map(aTransformationTable, i_sVersionNumber);	67	::rtl::OString sTrimmed( ::rtl::OString( i_sVersionNumber ).trim() );
		68	const String * ret = csv::find_in_map(aTransformationTable, String( sTrimmed ));
68	return ret != 0	69	return ret != 0
69	? *ret	70	? *ret
70	: String::Null_();	71	: String::Null_();

Lines 80-92 Link Here

(-)autodoc/source/exes/adc_uni/makefile.mk (-3 / +3 lines)
80	APP1RPATH=SDK	80	APP1RPATH=SDK
81		81
82	.IF "$(GUI)"=="WNT"	82	.IF "$(GUI)"=="WNT"
83	APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB)	83	APP1STDLIBS= $(LIBSTLPORT) $(COSVLIB) $(UDMLIB) $(SALLIB)
84	.ELSE	84	.ELSE
85	.IF "$(OS)"=="MACOSX"	85	.IF "$(OS)"=="MACOSX"
86	# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:	86	# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
87	APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv	87	APP1STDLIBS= $(LIBSTLPORT) -Wl,-all_load -ludm -lcosv -lsal
88	.ELSE	88	.ELSE
89	APP1STDLIBS= -lcosv -ludm	89	APP1STDLIBS= -lcosv -ludm -lsal
90	.ENDIF	90	.ENDIF
91	.ENDIF	91	.ENDIF
92		92

Lines 45-50 Link Here

(-)autodoc/source/display/idl/hfi_tag.cxx (-3 / +11 lines)
45	#include "hi_env.hxx"	45	#include "hi_env.hxx"
46	#include "hi_linkhelper.hxx"	46	#include "hi_linkhelper.hxx"
47		47
		48	#include <rtl/strbuf.hxx>
48		49
49	using ary::inf::DocuTex2;	50	using ary::inf::DocuTex2;
50		51
Lines 162-172 Link Here
162	}	163	}
163		164
164	// Transform the value of the @since tag into the text to be displayed.	165	// Transform the value of the @since tag into the text to be displayed.
		166	String sSinceValue( i_rTag.Text().TextOfFirstToken() );
165	String sDisplay =	167	String sDisplay =
166	autodoc::CommandLine::Get_().DisplayOf_SinceTagValue(	168	autodoc::CommandLine::Get_().DisplayOf_SinceTagValue(
167	i_rTag.Text().TextOfFirstToken() );	169	sSinceValue );
168	if (sDisplay.empty())	170	if ( sDisplay.empty() )
169	return;	171	{
		172	::rtl::OStringBuffer aErrorMsg;
		173	aErrorMsg.append( "since-value '" );
		174	aErrorMsg.append( sSinceValue );
		175	aErrorMsg.append( "' not found in translation table" );
		176	throw ary::inf::DocuTag_Error( "since", String( aErrorMsg.getStr() ) );
		177	}
170		178
171	*pTitleOut << "Since ";	179	*pTitleOut << "Since ";
172	DocuTex2 aHelp;	180	DocuTex2 aHelp;

Lines 129-136 Link Here

(-)offapi/com/sun/star/text/DocumentSettings.idl (-8 / +4 lines)
129	/** specifies if the former (till OpenOffice.org 1.1) or the new	129	/** specifies if the former (till OpenOffice.org 1.1) or the new
130	line spacing formatting is applied.	130	line spacing formatting is applied.
131		131
132	@since OOo 2.0.0
133
134	<p>This property controls how a set line spacing at a paragraph	132	<p>This property controls how a set line spacing at a paragraph
135	influences the formatting of the text lines and the spacing between	133	influences the formatting of the text lines and the spacing between
136	paragraphs.	134	paragraphs.
Lines 144-157 Link Here
144	a proportional line spacing is only applied below a text line and	142	a proportional line spacing is only applied below a text line and
145	it's always added to the paragraph spacing between two paragraphs.</p>	143	it's always added to the paragraph spacing between two paragraphs.</p>
146		144
		145	@since OOo 2.0.0
147	*/	146	*/
148	[optional, property] boolean UseFormerLineSpacing;	147	[optional, property] boolean UseFormerLineSpacing;
149	// ------------------------------------------------------------	148	// ------------------------------------------------------------
150	/** specifies if paragraph and table spacing is added at the	149	/** specifies if paragraph and table spacing is added at the
151	bottom of table cells	150	bottom of table cells
152		151
153	@since OOo 2.0.0
154
155	<p>This property controls, if the spacing of the last paragraph	152	<p>This property controls, if the spacing of the last paragraph
156	respectively table of a table cell is added at the bottom of this	153	respectively table of a table cell is added at the bottom of this
157	table cells	154	table cells
Lines 162-175 Link Here
162	the spacing of the last paragraph respectively table of a table	159	the spacing of the last paragraph respectively table of a table
163	cell isn't added at the bottom of this table cell.</p>	160	cell isn't added at the bottom of this table cell.</p>
164		161
		162	@since OOo 2.0.0
165	*/	163	*/
166	[optional, property] boolean AddParaSpacingToTableCells;	164	[optional, property] boolean AddParaSpacingToTableCells;
167	// ------------------------------------------------------------	165	// ------------------------------------------------------------
168	/** specifies if the former (till OpenOffice.org 1.1) or the new	166	/** specifies if the former (till OpenOffice.org 1.1) or the new
169	object positioning is applied.	167	object positioning is applied.
170		168
171	@since OOo 2.0.0
172
173	<p>This property controls how floating screen objects (Writer	169	<p>This property controls how floating screen objects (Writer
174	fly frames and drawing objects are positioned.	170	fly frames and drawing objects are positioned.
175	If <TRUE/>, the object positioning till OpenOffice.org 1.1 is	171	If <TRUE/>, the object positioning till OpenOffice.org 1.1 is
Lines 181-186 Link Here
181	its vertical position, doesn't include the lower spacing and the	177	its vertical position, doesn't include the lower spacing and the
182	line spacing of the previous paragraph.</p>	178	line spacing of the previous paragraph.</p>
183		179
		180	@since OOo 2.0.0
184	*/	181	*/
185	[optional, property] boolean UseFormerObjectPositioning;	182	[optional, property] boolean UseFormerObjectPositioning;
186		183
Lines 188-195 Link Here
188	/** specifies if the text wrap of floating screen objects are	185	/** specifies if the text wrap of floating screen objects are
189	considered in a specified way in the positioning algorithm.	186	considered in a specified way in the positioning algorithm.
190		187
191	@since OOo 2.0.0
192
193	<p>This property controls how floating screen objects (Writer	188	<p>This property controls how floating screen objects (Writer
194	fly frames and drawing objects) are positioned.	189	fly frames and drawing objects) are positioned.
195	If <TRUE/>, the object positioning algorithm will consider	190	If <TRUE/>, the object positioning algorithm will consider
Lines 199-204 Link Here
199	If <FALSE/> (default value), the former object positioning	194	If <FALSE/> (default value), the former object positioning
200	algorithm (known from OpenOffice.org 1.1) is applied.</p>	195	algorithm (known from OpenOffice.org 1.1) is applied.</p>
201		196
		197	@since OOo 2.0.0
202	*/	198	*/
203	[optional, property] boolean ConsiderTextWrapOnObjPos;	199	[optional, property] boolean ConsiderTextWrapOnObjPos;
204		200

Lines 88-95 Link Here

(-)offapi/com/sun/star/text/ReferenceFieldPart.idl (-6 / +6 lines)
88	/** The numbering label and depending of the reference field context numbering lables of	88	/** The numbering label and depending of the reference field context numbering lables of
89	superior list levels of the reference are displayed.	89	superior list levels of the reference are displayed.
90		90
91	@since OOo 3.0
92
93	<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>	91	<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
94	<p>The contents of the list label of the paragraph, at which the bookmark respectively the	92	<p>The contents of the list label of the paragraph, at which the bookmark respectively the
95	set reference starts - named "referenced item" in the following - is displayed. To unambiguous	93	set reference starts - named "referenced item" in the following - is displayed. To unambiguous
Lines 102-124 Link Here
102	be the level of the most superior level, then no list label content of superior levels greater or	100	be the level of the most superior level, then no list label content of superior levels greater or
103	equal than X are added.	101	equal than X are added.
104	If the referenced item isn't numbered, nothing is displayed.</p>	102	If the referenced item isn't numbered, nothing is displayed.</p>
		103
		104	@since OOo 3.0
105	*/	105	*/
106	const short NUMBER = 8;	106	const short NUMBER = 8;
107	//-------------------------------------------------------------------------	107	//-------------------------------------------------------------------------
108	/** The numbering label of the reference is displayed.	108	/** The numbering label of the reference is displayed.
109		109
110	@since OOo 3.0
111
112	<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>	110	<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
113	<p>The contents of the list label of the paragraph, at which the bookmark respectively the	111	<p>The contents of the list label of the paragraph, at which the bookmark respectively the
114	set reference starts, is displayed. If this paragraph isn't numbered, nothing is displayed.</p>	112	set reference starts, is displayed. If this paragraph isn't numbered, nothing is displayed.</p>
		113
		114	@since OOo 3.0
115	*/	115	*/
116	const short NUMBER_NO_CONTEXT = 9;	116	const short NUMBER_NO_CONTEXT = 9;
117	//-------------------------------------------------------------------------	117	//-------------------------------------------------------------------------
118	/** The numbering label and numbering lables of superior list levels of the reference are displayed.	118	/** The numbering label and numbering lables of superior list levels of the reference are displayed.
119		119
120	@since OOo 3.0
121
122	<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>	120	<p>This option is only valid, if the source of the reference is a bookmark or a set reference.</p>
123	<p>The contents of the list label of the paragraph, at which the bookmark respectively the	121	<p>The contents of the list label of the paragraph, at which the bookmark respectively the
124	set reference starts - named "referenced item" in the following - is displayed and the contents	122	set reference starts - named "referenced item" in the following - is displayed and the contents
Lines 128-133 Link Here
128	be the level of the most superior level, then no list label content of superior levels greater or	126	be the level of the most superior level, then no list label content of superior levels greater or
129	equal than X are added.	127	equal than X are added.
130	If the referenced item is numbered nothing is displayed.</p>	128	If the referenced item is numbered nothing is displayed.</p>
		129
		130	@since OOo 3.0
131	*/	131	*/
132	const short NUMBER_FULL_CONTEXT = 10;	132	const short NUMBER_FULL_CONTEXT = 10;
133	};	133	};

Lines 66-72 Link Here

(-)offapi/com/sun/star/linguistic2/LinguProperties.idl (-3 / +3 lines)
66	thesaurus.	66	thesaurus.
67		67
68	@deprecated	68	@deprecated
69	@since OOo 3.01	69	@since OOo 3.0.1
70	*/	70	*/
71	[property] boolean IsGermanPreReform;	71	[property] boolean IsGermanPreReform;
72		72
Lines 144-150 Link Here
144	hidden or not.	144	hidden or not.
145		145
146	@deprecated	146	@deprecated
147	@since OOo 3.01	147	@since OOo 3.0.1
148	*/	148	*/
149	[property] boolean IsSpellHide;	149	[property] boolean IsSpellHide;
150		150
Lines 153-159 Link Here
153	languages.	153	languages.
154		154
155	@deprecated	155	@deprecated
156	@since OOo 3.01	156	@since OOo 3.0.1
157	*/	157	*/
158	[property] boolean IsSpellInAllLanguages;	158	[property] boolean IsSpellInAllLanguages;
159		159