[Libreoffice-commits] core.git: Branch 'aoo/trunk' - qadevOOo/tests sd/source xmloff/source

Matthias Seidel mseidel at apache.org
Thu Jun 28 12:10:24 UTC 2018


 qadevOOo/tests/java/ifc/container/_XIndexAccess.java |    2 
 sd/source/core/CustomAnimationEffect.cxx             |   58 +++++++++----------
 sd/source/core/TransitionPreset.cxx                  |    2 
 sd/source/filter/eppt/pptexanimations.cxx            |    2 
 sd/source/ui/animations/CustomAnimationPane.cxx      |    4 -
 xmloff/source/draw/animationexport.cxx               |    2 
 xmloff/source/draw/sdxmlexp.cxx                      |    2 
 xmloff/source/draw/ximppage.cxx                      |    4 -
 xmloff/source/table/XMLTableExport.cxx               |    2 
 9 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit 6e3f2607a58910c060588193c46e0f27905838ee
Author: Matthias Seidel <mseidel at apache.org>
Date:   Thu Jun 28 11:58:01 2018 +0000

    Fixed typo (cought -> caught)

diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
index cbcd5119e462..f131b7a88c00 100644
--- a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
@@ -111,7 +111,7 @@ public class _XIndexAccess extends MultiMethodTest {
                 log.println("no exception thrown - FAILED");
                 result = false;
             } catch (IndexOutOfBoundsException e) {
-                    log.println("Expected exception cought! " + e + " OK");
+                    log.println("Expected exception caught! " + e + " OK");
             } catch (WrappedTargetException e) {
                     log.println("Wrong exception! " + e + " FAILED");
                     result = false;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index d463ae0dc43b..4219f01c6fd5 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -378,7 +378,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
     {
         (void)e;
         nSubItems = 0;
-        DBG_ERROR( "sd::CustomAnimationEffect::getNumberOfSubitems(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::getNumberOfSubitems(), exception caught!" );
     }
 
     return nSubItems;
@@ -706,7 +706,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setTarget(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setTarget(), exception caught!" );
     }
 }
 
@@ -743,7 +743,7 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setTargetSubItem(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setTargetSubItem(), exception caught!" );
     }
 }
 
@@ -793,7 +793,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setDuration(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setDuration(), exception caught!" );
     }
 }
 
@@ -808,7 +808,7 @@ void CustomAnimationEffect::setBegin( double fBegin )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setBegin(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setBegin(), exception caught!" );
     }
 }
 
@@ -823,7 +823,7 @@ void CustomAnimationEffect::setAcceleration( double fAcceleration )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setAcceleration(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setAcceleration(), exception caught!" );
     }
 }
 // --------------------------------------------------------------------
@@ -837,7 +837,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setDecelerate(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setDecelerate(), exception caught!" );
     }
 }
 
@@ -852,7 +852,7 @@ void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::CustomAnimationEffect::setAutoReverse(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setAutoReverse(), exception caught!" );
     }
 }
 
@@ -1114,7 +1114,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType )
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::CustomAnimationEffect::setIterateType(), Exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationEffect::setIterateType(), Exception caught!" );
     }
 }
 
@@ -1160,7 +1160,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval )
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::getPath(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::getPath(), exception caught!" );
     }
 
     return aPath;
@@ -1189,7 +1189,7 @@ void CustomAnimationEffect::setPath( const ::rtl::OUString& rPath )
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::setPath(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::setPath(), exception caught!" );
     }
 }
 
@@ -1239,7 +1239,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::getProperty(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::getProperty(), exception caught!" );
     }
 
     return aProperty;
@@ -1317,7 +1317,7 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::setProperty(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::setProperty(), exception caught!" );
     }
 
     return bChanged;
@@ -1376,7 +1376,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex )
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::getColor(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::getColor(), exception caught!" );
     }
 
     return aColor;
@@ -1432,7 +1432,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::setColor(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::setColor(), exception caught!" );
     }
 }
 
@@ -1479,7 +1479,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType,
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::getTransformationProperty(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::getTransformationProperty(), exception caught!" );
     }
 
     return aProperty;
@@ -1553,7 +1553,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::setTransformationProperty(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::setTransformationProperty(), exception caught!" );
     }
 
     return bChanged;
@@ -1576,7 +1576,7 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::CustomAnimationEffect::createAudio(), exception cought!" );
+        DBG_ERROR("sd::CustomAnimationEffect::createAudio(), exception caught!" );
     }
 }
 
@@ -1936,7 +1936,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::EffectSequenceHelper::append(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::append(), exception caught!" );
     }
 
     return pEffect;
@@ -1961,7 +1961,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::EffectSequenceHelper::replace(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::replace(), exception caught!" );
     }
 }
 
@@ -2118,7 +2118,7 @@ void EffectSequenceHelper::implRebuild()
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::EffectSequenceHelper::rebuild(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::rebuild(), exception caught!" );
     }
 }
 
@@ -2288,7 +2288,7 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "ppt::stl_process_after_effect_node_func::operator(), exception cought!" );
+        DBG_ERROR( "ppt::stl_process_after_effect_node_func::operator(), exception caught!" );
     }
 }
 
@@ -2740,7 +2740,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR("sd::EffectSequenceHelper::createTextGroup(), exception cought!" );
+        DBG_ERROR("sd::EffectSequenceHelper::createTextGroup(), exception caught!" );
     }
 }
 
@@ -3065,7 +3065,7 @@ void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::EffectSequenceHelper::create(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::create(), exception caught!" );
     }
 }
 
@@ -3088,7 +3088,7 @@ void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode
     }
     catch( Exception& )
     {
-        DBG_ERROR( "sd::EffectSequenceHelper::createEffectsequence(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::createEffectsequence(), exception caught!" );
     }
 }
 
@@ -3135,7 +3135,7 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::EffectSequenceHelper::createEffects(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::createEffects(), exception caught!" );
     }
 }
 
@@ -3197,7 +3197,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::EffectSequenceHelper::processAfterEffect(), exception cought!" );
+        DBG_ERROR( "sd::EffectSequenceHelper::processAfterEffect(), exception caught!" );
     }
 }
 
@@ -3398,7 +3398,7 @@ void MainSequence::createMainSequence()
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::MainSequence::create(), exception cought!" );
+        DBG_ERROR( "sd::MainSequence::create(), exception caught!" );
         return;
     }
 
@@ -3800,7 +3800,7 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::InteractiveSequence::InteractiveSequence(), exception cought!" );
+        DBG_ERROR( "sd::InteractiveSequence::InteractiveSequence(), exception caught!" );
         return;
     }
 }
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 54053af7c920..ace8636ad89e 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -217,7 +217,7 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::TransitionPreset::importResources(), Exception cought!" );
+        DBG_ERROR( "sd::TransitionPreset::importResources(), Exception caught!" );
     }
 
     return bRet;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 75ed76087393..d4a6ddc50221 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -426,7 +426,7 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "(@CL)AnimationExporter::processAfterEffectNodes(), exception cought!" );
+        DBG_ERROR( "(@CL)AnimationExporter::processAfterEffectNodes(), exception caught!" );
     }
 }
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 198621265871..448e1ff86457 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -236,7 +236,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::CustomAnimationPane::CustomAnimationPane(), Exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationPane::CustomAnimationPane(), Exception caught!" );
     }
 
     // get current page and update custom animation list
@@ -1942,7 +1942,7 @@ bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "sd::CustomAnimationPane::getTextSelection(), exception cought!" );
+        DBG_ERROR( "sd::CustomAnimationPane::getTextSelection(), exception caught!" );
     }
 
     return false;
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index a5e2bdd7eb5b..36b272f85bc3 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1342,7 +1342,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "xmloff::AnimationsExporterImpl::exportAnimate(), Exception cought!" );
+        DBG_ERROR( "xmloff::AnimationsExporterImpl::exportAnimate(), Exception caught!" );
     }
 }
 
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index b754a46feaa6..dfdc82d41977 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1657,7 +1657,7 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
     catch( Exception& e )
     {
         (void)e;
-        DBG_ERROR( "SdXMLExport::ImpPrepDrawPageHeaderFooterDecls(), unexpected exception cought!" );
+        DBG_ERROR( "SdXMLExport::ImpPrepDrawPageHeaderFooterDecls(), unexpected exception caught!" );
     }
 
     return aSettings;
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 5e8bb21e2478..d1402a2d1f86 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -356,7 +356,7 @@ void SdXMLGenericPageContext::EndElement()
         catch( uno::Exception& e )
         {
             (void)e;
-            DBG_ERROR("xmloff::SdXMLGenericPageContext::EndElement(), unexpected exception cought!");
+            DBG_ERROR("xmloff::SdXMLGenericPageContext::EndElement(), unexpected exception caught!");
         }
     }
 
@@ -638,6 +638,6 @@ void SdXMLGenericPageContext::SetNavigationOrder()
     }
     catch( uno::Exception& )
     {
-        DBG_ERROR("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), unexpected exception cought while importing shape navigation order!");
+        DBG_ERROR("xmloff::SdXMLGenericPageContext::SetNavigationOrder(), unexpected exception caught while importing shape navigation order!");
     }
 }
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 056939f9fcf4..8b6e4662b411 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -382,7 +382,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
      }
      catch( Exception )
     {
-         DBG_ERROR( "XMLTableExport::exportTable(), exception cought!" );
+         DBG_ERROR( "XMLTableExport::exportTable(), exception caught!" );
      }
  }
 


More information about the Libreoffice-commits mailing list