strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#96447# gracefully handle illegal parent style attributes

Browse source
This commit is contained in:
Daniel Vogelheim 2002-01-11 18:08:18 +00:00
parent c901886768
commit 62ad4ffdd5
2 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xmloff/inc/xmlerror.hxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: xmlerror.hxx,v $ * $RCSfile: xmlerror.hxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: hr $ $Date: 2001-10-10 16:06:14 $ * last change: $Author: dvo $ $Date: 2002-01-11 19:08:18 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -102,6 +102,7 @@
#define XMLERROR_SAX ( XMLERROR_CLASS_FORMAT | 0x00000001 ) #define XMLERROR_SAX ( XMLERROR_CLASS_FORMAT | 0x00000001 )
#define XMLERROR_STYLE_ATTR_VALUE ( XMLERROR_CLASS_FORMAT | 0x00000002 ) #define XMLERROR_STYLE_ATTR_VALUE ( XMLERROR_CLASS_FORMAT | 0x00000002 )
#define XMLERROR_NO_INDEX_ALLOWED_HERE ( XMLERROR_CLASS_FORMAT | 0x00000003 ) #define XMLERROR_NO_INDEX_ALLOWED_HERE ( XMLERROR_CLASS_FORMAT | 0x00000003 )
#define XMLERROR_PARENT_STYLE_NOT_ALLOWED ( XMLERROR_CLASS_FORMAT | 0x00000004 )
// API errors: // API errors:
#define XMLERROR_STYLE_PROP_VALUE ( XMLERROR_CLASS_API | 0x00000001 ) #define XMLERROR_STYLE_PROP_VALUE ( XMLERROR_CLASS_API | 0x00000001 )

35
xmloff/source/style/prstylei.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: prstylei.cxx,v $ * $RCSfile: prstylei.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: mib $ $Date: 2001-09-05 08:30:32 $ * last change: $Author: dvo $ $Date: 2002-01-11 19:08:18 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -103,6 +103,9 @@
#ifndef _XMLOFF_ATTRLIST_HXX #ifndef _XMLOFF_ATTRLIST_HXX
#include "attrlist.hxx" #include "attrlist.hxx"
#endif #endif
#ifndef _XMLOFF_XMLERROR_HXX
#include "xmlerror.hxx"
#endif
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star; using namespace ::com::sun::star;
@ -328,7 +331,35 @@ void XMLPropStyleContext::Finish( sal_Bool bOverwrite )
sParent = OUString(); sParent = OUString();
if( sParent != xStyle->getParentStyle() ) if( sParent != xStyle->getParentStyle() )
{
// this may except if setting the parent style forms a
// circle in the style depencies; especially if the parent
// style is the same as the current style
try
{
xStyle->setParentStyle( sParent ); xStyle->setParentStyle( sParent );
}
catch( uno::Exception e )
{
// according to the API definition, I would expect a
// container::NoSuchElementException. But it throws an
// uno::RuntimeException instead. I catch
// uno::Exception in order to process both of them.
// We can't set the parent style. For a proper
// Error-Message, we should pass in the name of the
// style, as well as the desired parent style.
Sequence<OUString> aSequence(2);
// getName() throws no non-Runtime exception:
aSequence[0] = xStyle->getName();
aSequence[1] = sParent;
GetImport().SetError(
XMLERROR_FLAG_ERROR | XMLERROR_PARENT_STYLE_NOT_ALLOWED,
aSequence, e.Message, NULL );
}
}
// connect follow // connect follow
OUString sFollow( GetFollow() ); OUString sFollow( GetFollow() );