]>
Commit | Line | Data |
---|---|---|
1442b4e3 | 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 | |
3 | @@ -2,9 +2,9 @@ | |
4 | * | |
5 | * $RCSfile$ | |
6 | * | |
7 | - * $Revision$ | |
8 | + * $Revision$ | |
9 | * | |
10 | - * last change: $Author$ $Date$ | |
11 | + * last change: $Author$ $Date$ | |
12 | * | |
13 | * The Contents of this file are made available subject to the terms of | |
14 | * either of the following licenses | |
15 | @@ -256,7 +256,7 @@ | |
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; | |
22 | return rString; | |
23 | } | |
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 | |
26 | @@ -2,9 +2,9 @@ | |
27 | * | |
28 | * $RCSfile$ | |
29 | * | |
30 | - * $Revision$ | |
31 | + * $Revision$ | |
32 | * | |
33 | - * last change: $Author$ $Date$ | |
34 | + * last change: $Author$ $Date$ | |
35 | * | |
36 | * The Contents of this file are made available subject to the terms of | |
37 | * either of the following licenses | |
38 | @@ -133,7 +133,7 @@ | |
39 | // prepare parameters | |
40 | UniReference<XMLTextImportHelper> rHelper = | |
41 | GetImport().GetTextImport(); | |
42 | - OUString& rID = xAttrList->getValueByIndex(nAttr); | |
43 | + const OUString& rID = xAttrList->getValueByIndex(nAttr); | |
44 | ||
45 | // call for bStart and bEnd (may both be true) | |
46 | if (bIsStart) | |
47 | @@ -144,7 +144,8 @@ | |
48 | // outside of paragraph and still open? set open redline ID | |
49 | if (bIsOutsideOfParagraph) | |
50 | { | |
51 | - rHelper->SetOpenRedlineId(rID); | |
52 | + OUString crID = rID; | |
53 | + rHelper->SetOpenRedlineId(crID); | |
54 | } | |
55 | } | |
56 | // else: ignore | |
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 | |
59 | @@ -2,9 +2,9 @@ | |
60 | * | |
61 | * $RCSfile$ | |
62 | * | |
63 | - * $Revision$ | |
64 | + * $Revision$ | |
65 | * | |
66 | - * last change: $Author$ $Date$ | |
67 | + * last change: $Author$ $Date$ | |
68 | * | |
69 | * The Contents of this file are made available subject to the terms of | |
70 | * either of the following licenses | |
71 | @@ -137,7 +137,7 @@ | |
72 | GetKeyByAttrName( xAttrList->getNameByIndex(nAttr), | |
73 | &sLocalName ); | |
74 | ||
75 | - OUString& rValue = xAttrList->getValueByIndex(nAttr); | |
76 | + const OUString& rValue = xAttrList->getValueByIndex(nAttr); | |
77 | if ( XML_NAMESPACE_TEXT == nPrefix ) | |
78 | { | |
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 | |
82 | @@ -2,9 +2,9 @@ | |
83 | * | |
84 | * $RCSfile$ | |
85 | * | |
86 | - * $Revision$ | |
87 | + * $Revision$ | |
88 | * | |
89 | - * last change: $Author$ $Date$ | |
90 | + * last change: $Author$ $Date$ | |
91 | * | |
92 | * The Contents of this file are made available subject to the terms of | |
93 | * either of the following licenses | |
94 | @@ -1506,7 +1506,7 @@ | |
95 | case FIELD_ID_DATABASE_DISPLAY: | |
96 | { | |
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, |