Attachment #82538 for issue #123862

View | Details | Raw Unified | Return to issue 123862
Collapse All | Expand All




{
    comphelper::SequenceAsVector< T > seq;
    xmlreader::Span sep;
    if ( separator.isEmpty() ) {
        sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));
    } else {
        sep = xmlreader::Span(separator.getStr(), separator.getLength());

        case STATE_IT:
            return
                (type_ == TYPE_STRING || type_ == TYPE_STRING_LIST ||
                 !separator_.isEmpty())
                ? xmlreader::XmlReader::TEXT_RAW
                : xmlreader::XmlReader::TEXT_NORMALIZED;
        default:

    case STATE_TEXT:
        if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
            name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&
            isListType(type_) && separator_.isEmpty())
        {
            pad_.clear();
                // before first <it>, characters are not ignored; assume they

Lines 197-203 Link Here

(-)configmgr/source/childaccess.cxx (-2 / +2 lines)
197	throw ()	197	throw ()
198	{	198	{
199	OSL_ASSERT(	199	OSL_ASSERT(
200	!parent_.is() && root.is() && parent.is() && name.getLength() != 0);	200	!parent_.is() && root.is() && parent.is() && !name.isEmpty());
201	root_ = root;	201	root_ = root;
202	parent_ = parent;	202	parent_ = parent;
203	name_ = name;	203	name_ = name;
Lines 285-291 Link Here
285	rtl::Reference< ChildAccess > child;	285	rtl::Reference< ChildAccess > child;
286	for (;;) {	286	for (;;) {
287	child = getChild(locale);	287	child = getChild(locale);
288	if (child.is() \|\| locale.getLength() == 0) {	288	if (child.is() \|\| locale.isEmpty()) {
289	break;	289	break;
290	}	290	}
291	sal_Int32 i = locale.getLength() - 1;	291	sal_Int32 i = locale.getLength() - 1;




            attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
        {
            external = reader.getAttributeValue(true).convertFromUtf8();
            if ( external.isEmpty() ) {
                throw css::uno::RuntimeException(
                    (rtl::OUString(
                        RTL_CONSTASCII_USTRINGPARAM(

                 reader.getUrl()),
                css::uno::Reference< css::uno::XInterface >());
        }
        if ( !external.isEmpty() ) {
            throw css::uno::RuntimeException(
                (rtl::OUString(
                    RTL_CONSTASCII_USTRINGPARAM(

        }
        prop->setValue(valueParser_.getLayer(), css::uno::Any());
        state_.push(State(false));
    } else if ( external.isEmpty() ) {
        valueParser_.separator_ = separator;
        valueParser_.start(prop);
    } else {




        } else if (Arguments.getLength() == 1 && (Arguments[i] >>= nodepath)) {
            // For backwards compatibility, allow a single string argument that
            // denotes nodepath.
            if ( nodepath.isEmpty()) {
                badNodePath();
            }
            break;

        if (name.equalsIgnoreAsciiCaseAsciiL(
                RTL_CONSTASCII_STRINGPARAM("nodepath")))
        {
            if ( !nodepath.isEmpty() || !(value >>= nodepath) ||
                 nodepath.isEmpty() )
            {
                badNodePath();
            }
        } else if (name.equalsIgnoreAsciiCaseAsciiL(
                       RTL_CONSTASCII_STRINGPARAM("locale")))
        {
            if ( !locale.isEmpty() || !(value >>= locale) ||
                 locale.isEmpty() )
            {
                throw css::uno::Exception(
                    rtl::OUString(

            }
        }
    }
    if ( nodepath.isEmpty() ) {
        badNodePath();
    }
    // For backwards compatibility, allow a nodepath that misses the leading

    if (nodepath[0] != '/') {
        nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;
    }
    if ( locale.isEmpty() ) {
        //TODO: should the Access use the dynamically changing locale_ instead?
        locale = locale_;
        if ( locale.isEmpty() ) {
            locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
        }
    }

    css::lang::Locale loc;
    if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {
        loc.Language = locale_;
    } else if ( !locale_.isEmpty() ) {
        try {
            comphelper::Locale l(locale_);
            loc.Language = l.getLanguage();

            if (name.equalsIgnoreAsciiCaseAsciiL(
                    RTL_CONSTASCII_STRINGPARAM("locale")))
            {
                if ( !locale.isEmpty() || !(value >>= locale) ||
                     locale.isEmpty() )
                {
                    throw css::uno::Exception(
                        rtl::OUString(




    case Node::KIND_LOCALIZED_VALUE:
        {
            writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));
            if ( !name.isEmpty() ) {
                writeData(handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
                writeAttributeValue(handle, name);
                writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));

    case Node::KIND_SET:
        writeData(handle, RTL_CONSTASCII_STRINGPARAM("<node oor:name=\""));
        writeAttributeValue(handle, name);
        if ( !node->getTemplateName().isEmpty() ) { // set member
            writeData(
                handle, RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"replace"));
        }

            switch (parent->kind()) {
            case Node::KIND_LOCALIZED_PROPERTY:
                writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));
                if ( !nodeName.isEmpty() ) {
                    writeData(
                        handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
                    writeAttributeValue(handle, nodeName);




rtl::OUString Data::createSegment(
    rtl::OUString const & templateName, rtl::OUString const & name)
{
    if ( templateName.isEmpty() ) {
        return name;
    }
    rtl::OUStringBuffer buf(templateName);

    rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
    const
{
    if ( pathRepresentation.isEmpty() || pathRepresentation[0] != '/') {
        throw css::uno::RuntimeException(
            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
             pathRepresentation),

        if (setElement) {
            switch (parent->kind()) {
            case Node::KIND_LOCALIZED_PROPERTY:
                if ( !templateName.isEmpty() ) {
                    throw css::uno::RuntimeException(
                        (rtl::OUString(
                            RTL_CONSTASCII_USTRINGPARAM("bad path ")) +

                }
                break;
            case Node::KIND_SET:
                if ( !templateName.isEmpty() &&
                    !dynamic_cast< SetNode * >(parent.get())->isValidTemplate(
                        templateName))
                {

                     pathRepresentation),
                    css::uno::Reference< css::uno::XInterface >());
            }
            if ( !templateName.isEmpty() && p != 0) {
                OSL_ASSERT( !p->getTemplateName().isEmpty() );
                if (!equalTemplateNames(templateName, p->getTemplateName())) {
                    throw css::uno::RuntimeException(
                        (rtl::OUString(

Lines 64-70 Link Here

(-)configmgr/source/propertynode.cxx (-2 / +2 lines)
64	}	64	}
65		65
66	css::uno::Any PropertyNode::getValue(Components & components) {	66	css::uno::Any PropertyNode::getValue(Components & components) {
67	if (externalDescriptor_.getLength() != 0) {	67	if ( !externalDescriptor_.isEmpty() ) {
68	css::beans::Optional< css::uno::Any > val(	68	css::beans::Optional< css::uno::Any > val(
69	components.getExternalValue(externalDescriptor_));	69	components.getExternalValue(externalDescriptor_));
70	if (val.IsPresent) {	70	if (val.IsPresent) {
Lines 82-88 Link Here
82	}	82	}
83		83
84	void PropertyNode::setExternal(int layer, rtl::OUString const & descriptor) {	84	void PropertyNode::setExternal(int layer, rtl::OUString const & descriptor) {
85	OSL_ASSERT(descriptor.getLength() != 0);	85	OSL_ASSERT( !descriptor.isEmpty() );
86	setLayer(layer);	86	setLayer(layer);
87	externalDescriptor_ = descriptor;	87	externalDescriptor_ = descriptor;
88	}	88	}

Lines 82-88 Link Here

(-)configmgr/source/xcdparser.cxx (-2 / +2 lines)
82	if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&	82	if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
83	name.equals(RTL_CONSTASCII_STRINGPARAM("dependency")))	83	name.equals(RTL_CONSTASCII_STRINGPARAM("dependency")))
84	{	84	{
85	if (dependency_.getLength() == 0) {	85	if ( dependency_.isEmpty() ) {
86	xmlreader::Span attrFile;	86	xmlreader::Span attrFile;
87	for (;;) {	87	for (;;) {
88	int attrNsId;	88	int attrNsId;
Lines 106-112 Link Here
106	css::uno::Reference< css::uno::XInterface >());	106	css::uno::Reference< css::uno::XInterface >());
107	}	107	}
108	dependency_ = attrFile.convertFromUtf8();	108	dependency_ = attrFile.convertFromUtf8();
109	if (dependency_.getLength() == 0) {	109	if ( dependency_.isEmpty() ) {
110	throw css::uno::RuntimeException(	110	throw css::uno::RuntimeException(
111	(rtl::OUString(	111	(rtl::OUString(
112	RTL_CONSTASCII_USTRINGPARAM(	112	RTL_CONSTASCII_USTRINGPARAM(

Lines 654-660 Link Here

(-)configmgr/source/components.cxx (-1 / +1 lines)
654	{	654	{
655	for (sal_Int32 i = 0;;) {	655	for (sal_Int32 i = 0;;) {
656	rtl::OUString url(urls.getToken(0, ' ', i));	656	rtl::OUString url(urls.getToken(0, ' ', i));
657	if (url.getLength() != 0) {	657	if ( !url.isEmpty() ) {
658	ini.expandMacrosFrom(url); //TODO: detect failure	658	ini.expandMacrosFrom(url); //TODO: detect failure
659	Additions * adds = 0;	659	Additions * adds = 0;
660	if (recordAdditions) {	660	if (recordAdditions) {




            case Node::KIND_GROUP:
            case Node::KIND_SET:
                if (i->second.children.empty()) {
                    if ( child->getNode()->getTemplateName().isEmpty() == false ) {
                        for (ContainerListeners::iterator j(
                                 containerListeners_.begin());
                             j != containerListeners_.end(); ++j)

        path.append(root->getAbsolutePathRepresentation());
    }
    rtl::OUString rel(getRelativePathRepresentation());
    if (path.getLength() != 0 && !rel.isEmpty()) {
        path.append(sal_Unicode('/'));
    }
    path.append(rel);

    OSL_ASSERT(thisIs(IS_ANY));
    osl::MutexGuard g(lock);
    checkLocalizedPropertyAccess();
    if (aRelativeName.isEmpty() || aRelativeName[0] == '/') {
        throw css::lang::IllegalArgumentException(
            rtl::OUString(
                RTL_CONSTASCII_USTRINGPARAM(

                rtl::Reference< Access > parent(getParentAccess());
                if (parent.is()) {
                    rtl::Reference< Node > node(getNode());
                    if ( !node->getTemplateName().isEmpty() ) {
                        rtl::Reference< ChildAccess > other(
                            parent->getChild(aName));
                        if (other.get() == this) {

rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
    sal_Int32 i = 0;
    // For backwards compatibility, allow absolute paths where meaningful:
    if (!path.isEmpty() && path[0] == '/') {
        ++i;
        if (!getRootAccess().is()) {
            return rtl::Reference< ChildAccess >();

            switch (p->kind()) {
            case Node::KIND_LOCALIZED_PROPERTY:
                if (!Components::allLocales(getRootAccess()->getLocale()) ||
                    !templateName.isEmpty())
                {
                    return rtl::Reference< ChildAccess >();
                }
                break;
            case Node::KIND_SET:
                if (!templateName.isEmpty() &&
                    !dynamic_cast< SetNode * >(p.get())->isValidTemplate(
                        templateName))
                {

}

void Access::checkKnownProperty(rtl::OUString const & descriptor) {
    if ( descriptor.isEmpty() ) {
        return;
    }
    rtl::Reference< ChildAccess > child(getChild(descriptor));

Return to issue 123862

Lines 189-195 Link Here

(-)configmgr/source/valueparser.cxx (-3 / +3 lines)
189	{	189	{
190	comphelper::SequenceAsVector< T > seq;	190	comphelper::SequenceAsVector< T > seq;
191	xmlreader::Span sep;	191	xmlreader::Span sep;
192	if (separator.getLength() == 0) {	192	if ( separator.isEmpty() ) {
193	sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));	193	sep = xmlreader::Span(RTL_CONSTASCII_STRINGPARAM(" "));
194	} else {	194	} else {
195	sep = xmlreader::Span(separator.getStr(), separator.getLength());	195	sep = xmlreader::Span(separator.getStr(), separator.getLength());
Lines 280-286 Link Here
280	case STATE_IT:	280	case STATE_IT:
281	return	281	return
282	(type_ == TYPE_STRING \|\| type_ == TYPE_STRING_LIST \|\|	282	(type_ == TYPE_STRING \|\| type_ == TYPE_STRING_LIST \|\|
283	separator_.getLength() != 0)	283	!separator_.isEmpty())
284	? xmlreader::XmlReader::TEXT_RAW	284	? xmlreader::XmlReader::TEXT_RAW
285	: xmlreader::XmlReader::TEXT_NORMALIZED;	285	: xmlreader::XmlReader::TEXT_NORMALIZED;
286	default:	286	default:
Lines 300-306 Link Here
300	case STATE_TEXT:	300	case STATE_TEXT:
301	if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&	301	if (nsId == xmlreader::XmlReader::NAMESPACE_NONE &&
302	name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&	302	name.equals(RTL_CONSTASCII_STRINGPARAM("it")) &&
303	isListType(type_) && separator_.getLength() == 0)	303	isListType(type_) && separator_.isEmpty())
304	{	304	{
305	pad_.clear();	305	pad_.clear();
306	// before first <it>, characters are not ignored; assume they	306	// before first <it>, characters are not ignored; assume they

Lines 489-495 Link Here

(-)configmgr/source/xcuparser.cxx (-3 / +3 lines)
489	attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))	489	attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
490	{	490	{
491	external = reader.getAttributeValue(true).convertFromUtf8();	491	external = reader.getAttributeValue(true).convertFromUtf8();
492	if (external.getLength() == 0) {	492	if ( external.isEmpty() ) {
493	throw css::uno::RuntimeException(	493	throw css::uno::RuntimeException(
494	(rtl::OUString(	494	(rtl::OUString(
495	RTL_CONSTASCII_USTRINGPARAM(	495	RTL_CONSTASCII_USTRINGPARAM(
Lines 508-514 Link Here
508	reader.getUrl()),	508	reader.getUrl()),
509	css::uno::Reference< css::uno::XInterface >());	509	css::uno::Reference< css::uno::XInterface >());
510	}	510	}
511	if (external.getLength() != 0) {	511	if ( !external.isEmpty() ) {
512	throw css::uno::RuntimeException(	512	throw css::uno::RuntimeException(
513	(rtl::OUString(	513	(rtl::OUString(
514	RTL_CONSTASCII_USTRINGPARAM(	514	RTL_CONSTASCII_USTRINGPARAM(
Lines 518-524 Link Here
518	}	518	}
519	prop->setValue(valueParser_.getLayer(), css::uno::Any());	519	prop->setValue(valueParser_.getLayer(), css::uno::Any());
520	state_.push(State(false));	520	state_.push(State(false));
521	} else if (external.getLength() == 0) {	521	} else if ( external.isEmpty() ) {
522	valueParser_.separator_ = separator;	522	valueParser_.separator_ = separator;
523	valueParser_.start(prop);	523	valueParser_.start(prop);
524	} else {	524	} else {

Lines 199-205 Link Here

(-)configmgr/source/configurationprovider.cxx (-11 / +11 lines)
199	} else if (Arguments.getLength() == 1 && (Arguments[i] >>= nodepath)) {	199	} else if (Arguments.getLength() == 1 && (Arguments[i] >>= nodepath)) {
200	// For backwards compatibility, allow a single string argument that	200	// For backwards compatibility, allow a single string argument that
201	// denotes nodepath.	201	// denotes nodepath.
202	if (nodepath.getLength() == 0) {	202	if ( nodepath.isEmpty()) {
203	badNodePath();	203	badNodePath();
204	}	204	}
205	break;	205	break;
Lines 216-231 Link Here
216	if (name.equalsIgnoreAsciiCaseAsciiL(	216	if (name.equalsIgnoreAsciiCaseAsciiL(
217	RTL_CONSTASCII_STRINGPARAM("nodepath")))	217	RTL_CONSTASCII_STRINGPARAM("nodepath")))
218	{	218	{
219	if (nodepath.getLength() != 0 \|\| !(value >>= nodepath) \|\|	219	if ( !nodepath.isEmpty() \|\| !(value >>= nodepath) \|\|
220	nodepath.getLength() == 0)	220	nodepath.isEmpty() )
221	{	221	{
222	badNodePath();	222	badNodePath();
223	}	223	}
224	} else if (name.equalsIgnoreAsciiCaseAsciiL(	224	} else if (name.equalsIgnoreAsciiCaseAsciiL(
225	RTL_CONSTASCII_STRINGPARAM("locale")))	225	RTL_CONSTASCII_STRINGPARAM("locale")))
226	{	226	{
227	if (locale.getLength() != 0 \|\| !(value >>= locale) \|\|	227	if ( !locale.isEmpty() \|\| !(value >>= locale) \|\|
228	locale.getLength() == 0)	228	locale.isEmpty() )
229	{	229	{
230	throw css::uno::Exception(	230	throw css::uno::Exception(
231	rtl::OUString(	231	rtl::OUString(
Lines 237-243 Link Here
237	}	237	}
238	}	238	}
239	}	239	}
240	if (nodepath.getLength() == 0) {	240	if ( nodepath.isEmpty() ) {
241	badNodePath();	241	badNodePath();
242	}	242	}
243	// For backwards compatibility, allow a nodepath that misses the leading	243	// For backwards compatibility, allow a nodepath that misses the leading
Lines 245-254 Link Here
245	if (nodepath[0] != '/') {	245	if (nodepath[0] != '/') {
246	nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;	246	nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;
247	}	247	}
248	if (locale.getLength() == 0) {	248	if ( locale.isEmpty() ) {
249	//TODO: should the Access use the dynamically changing locale_ instead?	249	//TODO: should the Access use the dynamically changing locale_ instead?
250	locale = locale_;	250	locale = locale_;
251	if (locale.getLength() == 0) {	251	if ( locale.isEmpty() ) {
252	locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));	252	locale = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
253	}	253	}
254	}	254	}
Lines 361-367 Link Here
361	css::lang::Locale loc;	361	css::lang::Locale loc;
362	if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {	362	if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {
363	loc.Language = locale_;	363	loc.Language = locale_;
364	} else if (locale_.getLength() != 0) {	364	} else if ( !locale_.isEmpty() ) {
365	try {	365	try {
366	comphelper::Locale l(locale_);	366	comphelper::Locale l(locale_);
367	loc.Language = l.getLanguage();	367	loc.Language = l.getLanguage();
Lines 481-488 Link Here
481	if (name.equalsIgnoreAsciiCaseAsciiL(	481	if (name.equalsIgnoreAsciiCaseAsciiL(
482	RTL_CONSTASCII_STRINGPARAM("locale")))	482	RTL_CONSTASCII_STRINGPARAM("locale")))
483	{	483	{
484	if (locale.getLength() != 0 \|\| !(value >>= locale) \|\|	484	if ( !locale.isEmpty() \|\| !(value >>= locale) \|\|
485	locale.getLength() == 0)	485	locale.isEmpty() )
486	{	486	{
487	throw css::uno::Exception(	487	throw css::uno::Exception(
488	rtl::OUString(	488	rtl::OUString(

Lines 398-404 Link Here

(-)configmgr/source/writemodfile.cxx (-3 / +3 lines)
398	case Node::KIND_LOCALIZED_VALUE:	398	case Node::KIND_LOCALIZED_VALUE:
399	{	399	{
400	writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));	400	writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));
401	if (name.getLength() != 0) {	401	if ( !name.isEmpty() ) {
402	writeData(handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));	402	writeData(handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
403	writeAttributeValue(handle, name);	403	writeAttributeValue(handle, name);
404	writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));	404	writeData(handle, RTL_CONSTASCII_STRINGPARAM("\""));
Lines 431-437 Link Here
431	case Node::KIND_SET:	431	case Node::KIND_SET:
432	writeData(handle, RTL_CONSTASCII_STRINGPARAM("<node oor:name=\""));	432	writeData(handle, RTL_CONSTASCII_STRINGPARAM("<node oor:name=\""));
433	writeAttributeValue(handle, name);	433	writeAttributeValue(handle, name);
434	if (node->getTemplateName().getLength() != 0) { // set member	434	if ( !node->getTemplateName().isEmpty() ) { // set member
435	writeData(	435	writeData(
436	handle, RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"replace"));	436	handle, RTL_CONSTASCII_STRINGPARAM("\" oor:op=\"replace"));
437	}	437	}
Lines 467-473 Link Here
467	switch (parent->kind()) {	467	switch (parent->kind()) {
468	case Node::KIND_LOCALIZED_PROPERTY:	468	case Node::KIND_LOCALIZED_PROPERTY:
469	writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));	469	writeData(handle, RTL_CONSTASCII_STRINGPARAM("<value"));
470	if (nodeName.getLength() != 0) {	470	if ( !nodeName.isEmpty() ) {
471	writeData(	471	writeData(
472	handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));	472	handle, RTL_CONSTASCII_STRINGPARAM(" xml:lang=\""));
473	writeAttributeValue(handle, nodeName);	473	writeAttributeValue(handle, nodeName);

Lines 645-651 Link Here

(-)configmgr/source/access.cxx (-8 / +8 lines)
645	case Node::KIND_GROUP:	645	case Node::KIND_GROUP:
646	case Node::KIND_SET:	646	case Node::KIND_SET:
647	if (i->second.children.empty()) {	647	if (i->second.children.empty()) {
648	if (child->getNode()->getTemplateName().getLength() != 0) {	648	if ( child->getNode()->getTemplateName().isEmpty() == false ) {
649	for (ContainerListeners::iterator j(	649	for (ContainerListeners::iterator j(
650	containerListeners_.begin());	650	containerListeners_.begin());
651	j != containerListeners_.end(); ++j)	651	j != containerListeners_.end(); ++j)
Lines 1239-1245 Link Here
1239	path.append(root->getAbsolutePathRepresentation());	1239	path.append(root->getAbsolutePathRepresentation());
1240	}	1240	}
1241	rtl::OUString rel(getRelativePathRepresentation());	1241	rtl::OUString rel(getRelativePathRepresentation());
1242	if (path.getLength() != 0 && rel.getLength() != 0) {	1242	if (path.getLength() != 0 && !rel.isEmpty()) {
1243	path.append(sal_Unicode('/'));	1243	path.append(sal_Unicode('/'));
1244	}	1244	}
1245	path.append(rel);	1245	path.append(rel);
Lines 1255-1261 Link Here
1255	OSL_ASSERT(thisIs(IS_ANY));	1255	OSL_ASSERT(thisIs(IS_ANY));
1256	osl::MutexGuard g(lock);	1256	osl::MutexGuard g(lock);
1257	checkLocalizedPropertyAccess();	1257	checkLocalizedPropertyAccess();
1258	if (aRelativeName.getLength() == 0 \|\| aRelativeName[0] == '/') {	1258	if (aRelativeName.isEmpty() \|\| aRelativeName[0] == '/') {
1259	throw css::lang::IllegalArgumentException(	1259	throw css::lang::IllegalArgumentException(
1260	rtl::OUString(	1260	rtl::OUString(
1261	RTL_CONSTASCII_USTRINGPARAM(	1261	RTL_CONSTASCII_USTRINGPARAM(
Lines 1295-1301 Link Here
1295	rtl::Reference< Access > parent(getParentAccess());	1295	rtl::Reference< Access > parent(getParentAccess());
1296	if (parent.is()) {	1296	if (parent.is()) {
1297	rtl::Reference< Node > node(getNode());	1297	rtl::Reference< Node > node(getNode());
1298	if (node->getTemplateName().getLength() != 0) {	1298	if ( !node->getTemplateName().isEmpty() ) {
1299	rtl::Reference< ChildAccess > other(	1299	rtl::Reference< ChildAccess > other(
1300	parent->getChild(aName));	1300	parent->getChild(aName));
1301	if (other.get() == this) {	1301	if (other.get() == this) {
Lines 1991-1997 Link Here
1991	rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {	1991	rtl::Reference< ChildAccess > Access::getSubChild(rtl::OUString const & path) {
1992	sal_Int32 i = 0;	1992	sal_Int32 i = 0;
1993	// For backwards compatibility, allow absolute paths where meaningful:	1993	// For backwards compatibility, allow absolute paths where meaningful:
1994	if (path.getLength() != 0 && path[0] == '/') {	1994	if (!path.isEmpty() && path[0] == '/') {
1995	++i;	1995	++i;
1996	if (!getRootAccess().is()) {	1996	if (!getRootAccess().is()) {
1997	return rtl::Reference< ChildAccess >();	1997	return rtl::Reference< ChildAccess >();
Lines 2038-2050 Link Here
2038	switch (p->kind()) {	2038	switch (p->kind()) {
2039	case Node::KIND_LOCALIZED_PROPERTY:	2039	case Node::KIND_LOCALIZED_PROPERTY:
2040	if (!Components::allLocales(getRootAccess()->getLocale()) \|\|	2040	if (!Components::allLocales(getRootAccess()->getLocale()) \|\|
2041	templateName.getLength() != 0)	2041	!templateName.isEmpty())
2042	{	2042	{
2043	return rtl::Reference< ChildAccess >();	2043	return rtl::Reference< ChildAccess >();
2044	}	2044	}
2045	break;	2045	break;
2046	case Node::KIND_SET:	2046	case Node::KIND_SET:
2047	if (templateName.getLength() != 0 &&	2047	if (!templateName.isEmpty() &&
2048	!dynamic_cast< SetNode * >(p.get())->isValidTemplate(	2048	!dynamic_cast< SetNode * >(p.get())->isValidTemplate(
2049	templateName))	2049	templateName))
2050	{	2050	{
Lines 2148-2154 Link Here
2148	}	2148	}
2149		2149
2150	void Access::checkKnownProperty(rtl::OUString const & descriptor) {	2150	void Access::checkKnownProperty(rtl::OUString const & descriptor) {
2151	if (descriptor.getLength() == 0) {	2151	if ( descriptor.isEmpty() ) {
2152	return;	2152	return;
2153	}	2153	}
2154	rtl::Reference< ChildAccess > child(getChild(descriptor));	2154	rtl::Reference< ChildAccess > child(getChild(descriptor));

Lines 93-99 Link Here

(-)configmgr/source/data.cxx (-6 / +6 lines)
93	rtl::OUString Data::createSegment(	93	rtl::OUString Data::createSegment(
94	rtl::OUString const & templateName, rtl::OUString const & name)	94	rtl::OUString const & templateName, rtl::OUString const & name)
95	{	95	{
96	if (templateName.getLength() == 0) {	96	if ( templateName.isEmpty() ) {
97	return name;	97	return name;
98	}	98	}
99	rtl::OUStringBuffer buf(templateName);	99	rtl::OUStringBuffer buf(templateName);
Lines 207-213 Link Here
207	rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)	207	rtl::OUString * canonicRepresentation, Path * path, int * finalizedLayer)
208	const	208	const
209	{	209	{
210	if (pathRepresentation.getLength() == 0 \|\| pathRepresentation[0] != '/') {	210	if ( pathRepresentation.isEmpty() \|\| pathRepresentation[0] != '/') {
211	throw css::uno::RuntimeException(	211	throw css::uno::RuntimeException(
212	(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +	212	(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
213	pathRepresentation),	213	pathRepresentation),
Lines 277-283 Link Here
277	if (setElement) {	277	if (setElement) {
278	switch (parent->kind()) {	278	switch (parent->kind()) {
279	case Node::KIND_LOCALIZED_PROPERTY:	279	case Node::KIND_LOCALIZED_PROPERTY:
280	if (templateName.getLength() != 0) {	280	if ( !templateName.isEmpty() ) {
281	throw css::uno::RuntimeException(	281	throw css::uno::RuntimeException(
282	(rtl::OUString(	282	(rtl::OUString(
283	RTL_CONSTASCII_USTRINGPARAM("bad path ")) +	283	RTL_CONSTASCII_USTRINGPARAM("bad path ")) +
Lines 286-292 Link Here
286	}	286	}
287	break;	287	break;
288	case Node::KIND_SET:	288	case Node::KIND_SET:
289	if (templateName.getLength() != 0 &&	289	if ( !templateName.isEmpty() &&
290	!dynamic_cast< SetNode * >(parent.get())->isValidTemplate(	290	!dynamic_cast< SetNode * >(parent.get())->isValidTemplate(
291	templateName))	291	templateName))
292	{	292	{
Lines 303-310 Link Here
303	pathRepresentation),	303	pathRepresentation),
304	css::uno::Reference< css::uno::XInterface >());	304	css::uno::Reference< css::uno::XInterface >());
305	}	305	}
306	if (templateName.getLength() != 0 && p != 0) {	306	if ( !templateName.isEmpty() && p != 0) {
307	OSL_ASSERT(p->getTemplateName().getLength() != 0);	307	OSL_ASSERT( !p->getTemplateName().isEmpty() );
308	if (!equalTemplateNames(templateName, p->getTemplateName())) {	308	if (!equalTemplateNames(templateName, p->getTemplateName())) {
309	throw css::uno::RuntimeException(	309	throw css::uno::RuntimeException(
310	(rtl::OUString(	310	(rtl::OUString(