diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-06-13 06:56:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-06-13 06:56:20 +0000 |
| commit | de14c58d37f7e81bc0d078e42f203fadbd3d8b2d (patch) | |
| tree | 01d908c2674fbdcbc36abe2bdd8239c0bacc99c3 /xmloff/source/text/XMLChangeImportContext.cxx | |
| parent | cfb6507ad889ba9c140285eae8332475521511b8 (diff) | |
#100000# Rewinded last change, which concflicted with those before (wrongly resolved merge conflict?)
Diffstat (limited to 'xmloff/source/text/XMLChangeImportContext.cxx')
| -rw-r--r-- | xmloff/source/text/XMLChangeImportContext.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index 2c305ce06655..5995115e958d 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLChangeImportContext.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2003-06-12 11:27:06 $ + * last change: $Author: rt $ $Date: 2003-06-13 07:56:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ void XMLChangeImportContext::StartElement( // prepare parameters UniReference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); - const OUString& rID = xAttrList->getValueByIndex(nAttr); + OUString sID = xAttrList->getValueByIndex(nAttr); // call for bStart and bEnd (may both be true) if (bIsStart) @@ -145,8 +145,6 @@ void XMLChangeImportContext::StartElement( if (bIsOutsideOfParagraph) { rHelper->SetOpenRedlineId(sID); - OUString crID = rID; - rHelper->SetOpenRedlineId(crID); } } // else: ignore |