1 --- oo/xmloff/source/core/nmspmap.cxx.orig Fri May 23 20:15:24 2003
2 +++ oo/xmloff/source/core/nmspmap.cxx Fri May 23 20:15:46 2003
10 - * last change: $Author$ $Date$
11 + * last change: $Author$ $Date$
13 * The Contents of this file are made available subject to the terms of
14 * either of the following licenses
16 sQName.append ( (*aIter).second->sPrefix);
17 sQName.append ( sal_Unicode(':') );
18 sQName.append ( rLocalName );
19 - OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear();
20 + const OUString *pString = new OUString ( rLocalName ), &rString = sQName.makeStringAndClear();
21 const_cast < QNameCache * > (&aQNameCache)->operator[] ( QNamePair ( nKey, pString ) ) = rString;
24 --- oo/xmloff/source/text/XMLChangeImportContext.cxx.orig Fri May 23 20:17:24 2003
25 +++ oo/xmloff/source/text/XMLChangeImportContext.cxx Fri May 23 20:17:39 2003
33 - * last change: $Author$ $Date$
34 + * last change: $Author$ $Date$
36 * The Contents of this file are made available subject to the terms of
37 * either of the following licenses
40 UniReference<XMLTextImportHelper> rHelper =
41 GetImport().GetTextImport();
42 - OUString& rID = xAttrList->getValueByIndex(nAttr);
43 + const OUString& rID = xAttrList->getValueByIndex(nAttr);
45 // call for bStart and bEnd (may both be true)
48 // outside of paragraph and still open? set open redline ID
49 if (bIsOutsideOfParagraph)
51 - rHelper->SetOpenRedlineId(rID);
52 + OUString crID = rID;
53 + rHelper->SetOpenRedlineId(crID);
57 --- oo/xmloff/source/text/XMLChangedRegionImportContext.cxx.orig Fri May 23 20:18:38 2003
58 +++ oo/xmloff/source/text/XMLChangedRegionImportContext.cxx Fri May 23 20:18:52 2003
66 - * last change: $Author$ $Date$
67 + * last change: $Author$ $Date$
69 * The Contents of this file are made available subject to the terms of
70 * either of the following licenses
72 GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
75 - OUString& rValue = xAttrList->getValueByIndex(nAttr);
76 + const OUString& rValue = xAttrList->getValueByIndex(nAttr);
77 if ( XML_NAMESPACE_TEXT == nPrefix )
79 if( IsXMLToken( sLocalName, XML_ID ) )
80 --- oo/xmloff/source/text/txtflde.cxx.orig Fri May 23 20:24:58 2003
81 +++ oo/xmloff/source/text/txtflde.cxx Fri May 23 20:25:20 2003
89 - * last change: $Author$ $Date$
90 + * last change: $Author$ $Date$
92 * The Contents of this file are made available subject to the terms of
93 * either of the following licenses
95 case FIELD_ID_DATABASE_DISPLAY:
97 // get database, table and column name from field master
98 - Reference<XPropertySet> & xMaster = GetMasterPropertySet(rTextField);
99 + const Reference<XPropertySet> & xMaster = GetMasterPropertySet(rTextField);
100 ProcessString(XML_DATABASE_NAME,
101 GetStringProperty(sPropertyDataBaseName, xMaster));
102 ProcessString(XML_TABLE_NAME,