diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:21:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-09 12:21:59 +0000 |
| commit | edd3bc5b01cf58f1851bca942276eea313f0f8ac (patch) | |
| tree | c659d45416d93662e97b338f98415ca56030ed6a | |
| parent | d3c35b966c31434fc308e22c3a3eb021873108ae (diff) | |
INTEGRATION: CWS os95 (1.61.16); FILE MERGED
2007/03/29 07:47:51 os 1.61.16.2: #146800# init of property name added
2007/03/16 08:37:27 os 1.61.16.1: #145711# load Content string of DDE field masters
| -rw-r--r-- | xmloff/source/text/txtfldi.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 1ef3d571b55f..e2ca98cb683d 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtfldi.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: obo $ $Date: 2007-03-09 13:06:55 $ + * last change: $Author: kz $ $Date: 2007-05-09 13:21:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3396,6 +3396,7 @@ XMLDdeFieldImportContext::XMLDdeFieldImportContext( XMLTextFieldImportContext(rImport, rHlp, sAPI_dde, nPrfx, sLocalName), sName() + ,sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)) { } @@ -3432,7 +3433,8 @@ void XMLDdeFieldImportContext::EndElement() Reference<XPropertySet> xMaster; Any aAny = xFieldMasterNameAccess->getByName(sMasterName); aAny >>= xMaster; - + //apply the content to the master + xMaster->setPropertyValue( sPropertyContent, uno::makeAny( GetContent())); // master exists: create text field and attach Reference<XPropertySet> xField; sBuf.appendAscii(sAPI_textfield_prefix); |