incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1179195 - in /incubator/ooo/trunk/main/vcl/source: app/svdata.cxx gdi/print3.cxx glyphs/graphite_layout.cxx window/dndlcon.cxx window/window.cxx
Date Wed, 05 Oct 2011 12:29:14 GMT
Author: hdu
Date: Wed Oct  5 12:29:13 2011
New Revision: 1179195

URL: http://svn.apache.org/viewvc?rev=1179195&view=rev
Log:
avoid some C++ exception slicing warnings

Modified:
    incubator/ooo/trunk/main/vcl/source/app/svdata.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/print3.cxx
    incubator/ooo/trunk/main/vcl/source/glyphs/graphite_layout.cxx
    incubator/ooo/trunk/main/vcl/source/window/dndlcon.cxx
    incubator/ooo/trunk/main/vcl/source/window/window.cxx

Modified: incubator/ooo/trunk/main/vcl/source/app/svdata.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/app/svdata.cxx?rev=1179195&r1=1179194&r2=1179195&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/app/svdata.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/app/svdata.cxx Wed Oct  5 12:29:13 2011
@@ -412,7 +412,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
         return bSuccess;
     }
 
-    catch(::com::sun::star::java::JavaNotConfiguredException e)
+    catch(::com::sun::star::java::JavaNotConfiguredException&)
     {
         ResMgr *pResMgr = ImplGetResMgr();
         if( bErrorMessage && bAllowCancel && pResMgr )
@@ -437,7 +437,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
         return false;
     }
 
-    catch(::com::sun::star::java::JavaVMCreationFailureException e)
+    catch(::com::sun::star::java::JavaVMCreationFailureException&)
     {
         ResMgr *pResMgr = ImplGetResMgr();
         if( bErrorMessage && bAllowCancel && pResMgr )
@@ -462,7 +462,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
         return false;
     }
 
-    catch(::com::sun::star::java::MissingJavaRuntimeException e)
+    catch(::com::sun::star::java::MissingJavaRuntimeException&)
     {
         ResMgr *pResMgr = ImplGetResMgr();
         if( bErrorMessage && bAllowCancel && pResMgr )
@@ -487,7 +487,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
         return false;
     }
 
-    catch(::com::sun::star::java::JavaDisabledException e)
+    catch(::com::sun::star::java::JavaDisabledException&)
     {
         ResMgr *pResMgr = ImplGetResMgr();
         if( bErrorMessage && bAllowCancel && pResMgr )
@@ -513,7 +513,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
     }
 
 
-    catch(::com::sun::star::uno::RuntimeException e)
+    catch(::com::sun::star::uno::RuntimeException& e)
     {
         ResMgr *pResMgr = ImplGetResMgr();
         if( bErrorMessage && pResMgr )

Modified: incubator/ooo/trunk/main/vcl/source/gdi/print3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/gdi/print3.cxx?rev=1179195&r1=1179194&r2=1179195&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/gdi/print3.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/gdi/print3.cxx Wed Oct  5 12:29:13 2011
@@ -254,7 +254,7 @@ static rtl::OUString queryFile( Printer*
                 // add arbitrary files
                 xFilterMgr->appendFilter( String( VclResId( SV_STDTEXT_ALLFILETYPES )
), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
             }
-            catch( lang::IllegalArgumentException rExc )
+            catch( lang::IllegalArgumentException&)
             {
                 DBG_ERRORFILE( "caught IllegalArgumentException when registering filter\n"
);
             }

Modified: incubator/ooo/trunk/main/vcl/source/glyphs/graphite_layout.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/glyphs/graphite_layout.cxx?rev=1179195&r1=1179194&r2=1179195&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/glyphs/graphite_layout.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/glyphs/graphite_layout.cxx Wed Oct  5 12:29:13 2011
@@ -886,7 +886,7 @@ bool GraphiteLayout::LayoutGlyphs(ImplLa
 #endif
 #endif
         }
-        catch (std::exception e)
+        catch (std::exception& e)
         {
 #ifdef GRLAYOUT_DEBUG
             fprintf(grLog(),"LayoutGlyphs failed %s\n", e.what());

Modified: incubator/ooo/trunk/main/vcl/source/window/dndlcon.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/window/dndlcon.cxx?rev=1179195&r1=1179194&r2=1179195&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/window/dndlcon.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/window/dndlcon.cxx Wed Oct  5 12:29:13 2011
@@ -193,7 +193,7 @@ sal_uInt32 DNDListenerContainer::fireDro
                 }
 			}
 
-			catch( RuntimeException exc )
+			catch( RuntimeException&)
 			{
 				pContainer->removeInterface( xElement );
 			}
@@ -209,7 +209,7 @@ sal_uInt32 DNDListenerContainer::fireDro
                 context->rejectDrop();
             }
 
-            catch( RuntimeException exc )
+            catch( RuntimeException&)
             {
             }
         }
@@ -253,7 +253,7 @@ sal_uInt32 DNDListenerContainer::fireDra
 				}
 			}
 
-			catch( RuntimeException exc )
+			catch( RuntimeException&)
 			{
 				pContainer->removeInterface( xElement );
 			}
@@ -305,7 +305,7 @@ sal_uInt32 DNDListenerContainer::fireDra
 				}
 			}
 
-			catch( RuntimeException exc )
+			catch( RuntimeException&)
 			{
 				pContainer->removeInterface( xElement );
 			}
@@ -321,7 +321,7 @@ sal_uInt32 DNDListenerContainer::fireDra
                 context->rejectDrag();
             }
 
-    		catch( RuntimeException exc )
+    		catch( RuntimeException&)
             {
             }
         }
@@ -373,7 +373,7 @@ sal_uInt32 DNDListenerContainer::fireDra
 				}
 			}
 
-			catch( RuntimeException exc )
+			catch( RuntimeException&)
 			{
 				pContainer->removeInterface( xElement );
 			}
@@ -389,7 +389,7 @@ sal_uInt32 DNDListenerContainer::fireDra
                 context->rejectDrag();
             }
 
-    		catch( RuntimeException exc )
+    		catch( RuntimeException&)
             {
             }
         }
@@ -440,7 +440,7 @@ sal_uInt32 DNDListenerContainer::fireDro
 				}
 			}
 
-			catch( RuntimeException exc )
+			catch( RuntimeException&)
 			{
 				pContainer->removeInterface( xElement );
 			}
@@ -456,7 +456,7 @@ sal_uInt32 DNDListenerContainer::fireDro
                 context->rejectDrag();
             }
 
-    		catch( RuntimeException exc )
+    		catch( RuntimeException&)
             {
             }
         }
@@ -502,7 +502,7 @@ sal_uInt32 DNDListenerContainer::fireDra
 				}
 			}
 
-			catch( RuntimeException exc )
+			catch( RuntimeException&)
 			{
 				pContainer->removeInterface( xElement );
 			}

Modified: incubator/ooo/trunk/main/vcl/source/window/window.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/window/window.cxx?rev=1179195&r1=1179194&r2=1179195&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/window/window.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/window/window.cxx Wed Oct  5 12:29:13 2011
@@ -4443,7 +4443,7 @@ Window::~Window()
                 xComponent->dispose();
         }
 
-        catch ( Exception exc )
+        catch ( Exception&)
         {
             // can be safely ignored here.
         }
@@ -8521,7 +8521,7 @@ uno::Reference< XDropTarget > Window::Ge
 
                     }
 
-                    catch( RuntimeException exc )
+                    catch( RuntimeException&)
                     {
                         // release all instances
                         mpWindowImpl->mpFrameData->mxDropTarget.clear();
@@ -8594,7 +8594,7 @@ uno::Reference< XDragSource > Window::Ge
             }
 
             // createInstance can throw any exception
-            catch( Exception exc )
+            catch( Exception&)
             {
                 // release all instances
                 mpWindowImpl->mpFrameData->mxDropTarget.clear();
@@ -8674,7 +8674,7 @@ uno::Reference< XClipboard > Window::Get
             }
 
             // createInstance can throw any exception
-            catch( Exception exc )
+            catch( Exception&)
             {
                 // release all instances
                 mpWindowImpl->mpFrameData->mxClipboard.clear();
@@ -8726,7 +8726,7 @@ uno::Reference< XClipboard > Window::Get
             }
 
             // createInstance can throw any exception
-            catch( Exception exc )
+            catch( Exception&)
             {
                 // release all instances
                 mpWindowImpl->mpFrameData->mxSelection.clear();



Mime
View raw message