l10ntools/source/xmlparse.cxx | 2 -
xmloff/source/draw/animationexport.cxx | 36 ++++++++++++++++-----------------
xmloff/source/draw/animationimport.cxx | 14 ++++++------
xmloff/source/draw/animexp.cxx | 8 +++----
xmloff/source/draw/animimp.cxx | 4 +--
xmloff/source/draw/ximppage.cxx | 4 +--
xmloff/source/style/xmlnumi.cxx | 4 +--
xmloff/source/text/txtparai.cxx | 4 +--
8 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit f7b2d16b013fce20455a558dc37eb3eb79c5bc0d
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 13 13:58:05 2012 +0000
WaE: keep msvc happy
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index f44b6f4..51e38e6 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1139,7 +1139,7 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString
&rFullFileName , const rt
sal_uInt64 s;
oslFileError e = osl_getFileSize(h, &s);
- void * p;
+ void * p = NULL;
if (e == osl_File_E_None) {
e = osl_mapFile(h, &p, s, 0, 0);
}
commit 541631684027242eeb397ac6805936e8ba411055
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Feb 13 13:26:31 2012 +0000
catched -> caught
diff --git a/xmloff/source/draw/animationexport.cxx
b/xmloff/source/draw/animationexport.cxx
index 8d893d0..9c8594b 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -554,9 +554,9 @@ AnimationsExporterImpl::AnimationsExporterImpl(
SvXMLExport& rExport, const Refe
{
mxExport = static_cast< ::com::sun::star::document::XFilter
*>(&rExport);
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsExporterImpl::AnimationsExporterImpl(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsExporterImpl::AnimationsExporterImpl(),
RuntimeException caught!" );
}
mpSdPropHdlFactory = new XMLSdPropHdlFactory( mrExport.GetModel(),
mrExport );
@@ -688,7 +688,7 @@ void AnimationsExporterImpl::prepareTransitionNode()
mrExport.getInterfaceToIdentifierMapper().registerReference( xInt
);
}
}
- catch( Exception& )
+ catch (const Exception&)
{
OSL_FAIL( "xmloff::AnimationsExporterImpl::prepareNode(), Exception
caught!" );
}
@@ -769,9 +769,9 @@ void AnimationsExporterImpl::prepareNode( const Reference<
XAnimationNode >& xNo
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
- OSL_FAIL( "xmloff::AnimationsExporterImpl::prepareNode(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsExporterImpl::prepareNode(),
RuntimeException caught!" );
}
}
@@ -1016,9 +1016,9 @@ void AnimationsExporterImpl::exportNode( const Reference<
XAnimationNode >& xNod
OSL_FAIL( "xmloff::AnimationsExporterImpl::exportNode(), invalid
AnimationNodeType!" );
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsExporterImpl::exportNode(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsExporterImpl::exportNode(),
RuntimeException caught!" );
}
// if something goes wrong, its always a good idea to clear the attribute
list
@@ -1100,9 +1100,9 @@ void AnimationsExporterImpl::exportContainer( const
Reference< XTimeContainer >&
exportNode( xChildNode );
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(),
RuntimeException caught!" );
}
}
@@ -1364,7 +1364,7 @@ void AnimationsExporterImpl::exportAnimate( const
Reference< XAnimate >& xAnimat
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION,
eElementToken, sal_True, sal_True );
}
- catch( const Exception& )
+ catch (const Exception&)
{
OSL_FAIL( "xmloff::AnimationsExporterImpl::exportAnimate(), Exception
cought!" );
}
@@ -1396,7 +1396,7 @@ void AnimationsExporterImpl::exportAudio( const
Reference< XAudio >& xAudio )
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION,
XML_AUDIO, sal_True, sal_True );
}
- catch( const Exception& )
+ catch (const Exception&)
{
OSL_FAIL( "xmloff::AnimationsExporterImpl::exportAudio(), exception
caught!" );
}
@@ -1423,7 +1423,7 @@ void AnimationsExporterImpl::exportCommand( const
Reference< XCommand >& xComman
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION,
XML_COMMAND, sal_True, sal_True );
}
- catch( const Exception& )
+ catch (const Exception&)
{
OSL_FAIL( "xmloff::AnimationsExporterImpl::exportCommand(), exception
caught!" );
}
@@ -1445,9 +1445,9 @@ Reference< XInterface >
AnimationsExporterImpl::getParagraphTarget( const Paragr
return xRef;
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsExporterImpl::getParagraphTarget(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsExporterImpl::getParagraphTarget(),
RuntimeException caught!" );
}
Reference< XInterface > xRef;
@@ -1710,9 +1710,9 @@ void AnimationsExporter::prepare( Reference<
XAnimationNode > xRootNode )
mpImpl->prepareNode( xRootNode );
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsExporter::prepare(), exception catched" );
+ OSL_FAIL( "xmloff::AnimationsExporter::prepare(), exception caught" );
}
}
@@ -1746,9 +1746,9 @@ void AnimationsExporter::exportAnimations( Reference<
XAnimationNode > xRootNode
mpImpl->exportNode( xRootNode );
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsExporter::exportAnimations(), exception
catched" );
+ OSL_FAIL( "xmloff::AnimationsExporter::exportAnimations(), exception
caught" );
}
}
diff --git a/xmloff/source/draw/animationimport.cxx
b/xmloff/source/draw/animationimport.cxx
index 929d8ad..408b4a8 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -394,9 +394,9 @@ Any AnimationsImportHelperImpl::convertTarget( const
OUString& rValue )
}
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsImportImpl::convertTarget(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsImportImpl::convertTarget(),
RuntimeException caught!" );
}
Any aAny;
@@ -738,9 +738,9 @@ AnimationNodeContext::AnimationNodeContext(
}
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationsImportImpl::AnimationsImportImpl(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationsImportImpl::AnimationsImportImpl(),
RuntimeException caught!" );
}
}
@@ -1257,9 +1257,9 @@ void AnimationNodeContext::init_node( const
::com::sun::star::uno::Reference< :
xAnimate->setValues( mpHelper->convertValueSequence(
meAttributeName, aValues ) );
}
}
- catch( RuntimeException& )
+ catch (const RuntimeException&)
{
- OSL_FAIL( "xmloff::AnimationNodeContext::StartElement(),
RuntimeException catched!" );
+ OSL_FAIL( "xmloff::AnimationNodeContext::StartElement(),
RuntimeException caught!" );
}
}
@@ -1444,7 +1444,7 @@ void AnimationNodeContext::postProcessRootNode(
SvXMLImport& /*rImport*/, const
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
OSL_FAIL("xmloff::AnimationsImport::postProcessRootNode(), exception
caught!");
}
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 86ae42c..977f2f9 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -302,9 +302,9 @@ void XMLAnimationsExporter::prepare( Reference< XShape >
xShape, SvXMLExport& )
}
}
}
- catch(const Exception&)
+ catch (const Exception&)
{
- OSL_FAIL("exception catched while collection animation information!");
+ OSL_FAIL("exception caught while collection animation information!");
}
}
@@ -432,9 +432,9 @@ void XMLAnimationsExporter::collect( Reference< XShape >
xShape, SvXMLExport& rE
}
}
}
- catch(const Exception&)
+ catch (const Exception&)
{
- OSL_FAIL("exception catched while collection animation information!");
+ OSL_FAIL("exception caught while collection animation information!");
}
}
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 1411017..32b44c3 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -664,9 +664,9 @@ void XMLAnimationsEffectContext::EndElement()
}
}
}
- catch(const Exception&)
+ catch (const Exception&)
{
- OSL_FAIL( "exception catched while importing animation information!" );
+ OSL_FAIL( "exception caught while importing animation information!" );
}
}
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index f0b1797..79d0acc 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -429,9 +429,9 @@ void SdXMLGenericPageContext::SetStyle( rtl::OUString&
rStyleName )
}
}
}
- catch(const uno::Exception&)
+ catch (const uno::Exception&)
{
- OSL_FAIL( "SdXMLGenericPageContext::SetStyle(): uno::Exception
catched!" );
+ OSL_FAIL( "SdXMLGenericPageContext::SetStyle(): uno::Exception
caught!" );
}
}
}
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 5903277..7f13c15 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1210,9 +1210,9 @@ void SvxXMLListStyleContext::FillUnoNumRule(
xPropSet->setPropertyValue( sIsContinuousNumbering, aAny );
}
}
- catch( Exception& )
+ catch (const Exception&)
{
- OSL_FAIL( "SvxXMLListStyleContext::FillUnoNumRule - Exception catched"
);
+ OSL_FAIL( "SvxXMLListStyleContext::FillUnoNumRule - Exception caught"
);
}
}
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 70848c4..129edf6 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2036,7 +2036,7 @@ XMLParaContext::~XMLParaContext()
xAttrCursor = xTxtImport->GetText()->createTextCursorByRange( xStart );
if( !xAttrCursor.is() )
return; // Robust (defect file)
- } catch (uno::Exception &) {
+ } catch (const uno::Exception &) {
// createTextCursorByRange() likes to throw runtime exception, even
// though it just means 'we were unable to create the cursor'
return;
@@ -2064,7 +2064,7 @@ XMLParaContext::~XMLParaContext()
}
OSL_ENSURE(!xEnum->hasMoreElements(), "xml:id: > 1
paragraph?");
}
- } catch (uno::Exception &) {
+ } catch (const uno::Exception &) {
OSL_TRACE("XMLParaContext::~XMLParaContext: exception");
}
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
