Kaydet (Commit) 2ea2af77 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.8.4); FILE MERGED

2005/11/01 12:47:09 cd 1.8.4.1: #i53898# Warning free code for sun solaris compiler
üst 8ab590db
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: translatechanges.cxx,v $ * $RCSfile: translatechanges.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 03:21:34 $ * last change: $Author: hr $ $Date: 2006-06-19 23:16:54 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -213,11 +213,11 @@ bool resolveUnoObjects(UnoChange& aUnoChange, NodeChangeData const& aChange, ...@@ -213,11 +213,11 @@ bool resolveUnoObjects(UnoChange& aUnoChange, NodeChangeData const& aChange,
if (aChange.isReplaceSetChange() ) if (aChange.isReplaceSetChange() )
{ {
Tree aTree = aChange.getOldElementTree(aAccessor); Tree aOldTree = aChange.getOldElementTree(aAccessor);
aNodeRef = aTree.getRootNode(); aNodeRef = aOldTree.getRootNode();
OSL_ENSURE(!configuration::isStructuralNode(aTree, aNodeRef), "resolveUnoObject types mismatch"); OSL_ENSURE(!configuration::isStructuralNode(aOldTree, aNodeRef), "resolveUnoObject types mismatch");
aUnoChange.oldValue = configuration::getSimpleElementValue(aTree, aNodeRef); aUnoChange.oldValue = configuration::getSimpleElementValue(aOldTree, aNodeRef);
} }
bool bFound = aUnoChange.newValue.hasValue() || aUnoChange.oldValue.hasValue(); bool bFound = aUnoChange.newValue.hasValue() || aUnoChange.oldValue.hasValue();
return bFound; return bFound;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment