commit 575222083e058a740f5ad69e14e18622c3d4f7af
author Jens-Heiner Rechtien <hr@openoffice.org> Fri Aug 03 11:55:10 2007 +0000
committer Jens-Heiner Rechtien <hr@openoffice.org> Fri Aug 03 11:55:10 2007 +0000
tree 93f4942b38f99ee1a0b5e9006d0770a748c321d6
parent 77ec0ffdefb8feae3dca73e6e0b47c3e8b03144a

INTEGRATION: CWS oasisrng03 (1.73.40); FILE MERGED
2007/07/10 09:41:46 ama 1.73.40.4: RESYNC: (1.73-1.75); FILE MERGED
2007/07/06 13:09:06 ama 1.73.40.3: #139736#: page-continuation
2007/07/05 09:14:35 os 1.73.40.2: #139836# don't export value-type of GetVariable fields
2007/07/02 14:20:37 ama 1.73.40.1: #139736#: page-continuation

xmloff/source/text/txtflde.cxx

diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 799b2c6..216ec3a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -4,9 +4,9 @@
 *
 *  $RCSfile: txtflde.cxx,v $
 *
 *  $Revision: 1.76 $
 *  $Revision: 1.77 $
 *
 *  last change: $Author: hr $ $Date: 2007-08-02 18:19:49 $
 *  last change: $Author: hr $ $Date: 2007-08-03 12:55:10 $
 *
 *  The Contents of this file are made available subject to
 *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1240,7 +1240,9 @@ void XMLTextFieldExport::ExportFieldHelper(
        ProcessValueAndType(IsStringField(nToken, rPropSet),
                            GetIntProperty(sPropertyNumberFormat, rPropSet),
                            sEmpty, sEmpty, 0.0, // values not used
                            sal_False, !bCmd, !bCmd,
                            sal_False,
                            sal_False, //#148500# value_type not exported anymore
                            !bCmd,
                            ! GetOptionalBoolProperty(
                                 sPropertyIsFixedLanguage,
                                 rPropSet, xPropSetInfo, sal_False ) );
@@ -1473,7 +1475,10 @@ void XMLTextFieldExport::ExportFieldHelper(
                      sPresentation);
        sal_Int32 nDummy = 0; // MapPageNumberName need int
        ProcessString(XML_SELECT_PAGE, MapPageNumberName(rPropSet, nDummy));
        ExportElement(XML_PAGE_CONTINUATION_STRING, sPresentation);
        if( 0 == ( GetExport().getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ) )
            ExportElement(XML_PAGE_CONTINUATION, sPresentation);
        else
            ExportElement(XML_PAGE_CONTINUATION_STRING, sPresentation);
        break;
    }