[Libreoffice-commits] .: 2 commits - framework/Library_fwk.mk framework/source

[Caolán McNamara]

 framework/Library_fwk.mk                              |    1 
 framework/source/uiconfiguration/imagemanagerimpl.cxx |   32 +++++++++---------
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 376c753bff659298116bd9fae4abe8e30b7be2cd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 2 10:10:59 2011 +0100

    catch by const reference

diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 103498c..3fc2457 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -207,7 +207,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
                 if ( xCmdDesc.is() )
                     xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
             }
-            catch ( NoSuchElementException& )
+            catch ( const NoSuchElementException& )
             {
                 // Module unknown we will work with an empty command image list!
                 return;
@@ -220,10 +220,10 @@ void CmdImageList::impl_fillCommandToImageNameMap()
             {
                 xCmdDesc->getByName( aCommandImageList ) >>= aCmdImageSeq;
             }
-            catch ( NoSuchElementException& )
+            catch ( const NoSuchElementException& )
             {
             }
-            catch ( WrappedTargetException& )
+            catch ( const WrappedTargetException& )
             {
             }
         }
@@ -468,19 +468,19 @@ void ImageManagerImpl::implts_initialize()
                                                                                  nModes );
             }
         }
-        catch ( com::sun::star::container::NoSuchElementException& )
+        catch ( const ::com::sun::star::container::NoSuchElementException& )
         {
         }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        catch ( const ::com::sun::star::embed::InvalidStorageException& )
         {
         }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        catch ( const ::com::sun::star::lang::IllegalArgumentException& )
         {
         }
-        catch ( ::com::sun::star::io::IOException& )
+        catch ( const ::com::sun::star::io::IOException& )
         {
         }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
         {
         }
     }
@@ -542,19 +542,19 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
                 }
             }
         }
-        catch ( com::sun::star::container::NoSuchElementException& )
+        catch ( const ::com::sun::star::container::NoSuchElementException& )
         {
         }
-        catch ( ::com::sun::star::embed::InvalidStorageException& )
+        catch ( const ::com::sun::star::embed::InvalidStorageException& )
         {
         }
-        catch ( ::com::sun::star::lang::IllegalArgumentException& )
+        catch ( const ::com::sun::star::lang::IllegalArgumentException& )
         {
         }
-        catch ( ::com::sun::star::io::IOException& )
+        catch ( const ::com::sun::star::io::IOException& )
         {
         }
-        catch ( ::com::sun::star::embed::StorageWrappedTargetException& )
+        catch ( const ::com::sun::star::embed::StorageWrappedTargetException& )
         {
         }
     }
@@ -641,7 +641,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
             {
                 xUserImageStorage->removeElement( rtl::OUString::createFromAscii( IMAGELIST_XML_FILE[nImageType] ));
             }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
+            catch ( const ::com::sun::star::container::NoSuchElementException& )
             {
             }
 
@@ -649,7 +649,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
             {
                 xUserBitmapsStorage->removeElement( rtl::OUString::createFromAscii( BITMAP_FILE_NAMES[nImageType] ));
             }
-            catch ( ::com::sun::star::container::NoSuchElementException& )
+            catch ( const ::com::sun::star::container::NoSuchElementException& )
             {
             }
 
@@ -1436,7 +1436,7 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent&
                         break;
                 }
             }
-            catch( css::uno::RuntimeException& )
+            catch( const css::uno::RuntimeException& )
             {
                 pIterator.remove();
             }
commit d9b87017a1f04803139cecccce83a0b57c0d1718
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 1 23:53:51 2011 +0100

    remove uriabbrev registered as fwl from fwk

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index fc6fb1f..f999b75 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -127,7 +127,6 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
     framework/source/services/substitutepathvars \
     framework/source/services/tabwindowservice \
     framework/source/services/taskcreatorsrv \
-    framework/source/services/uriabbreviation \
     framework/source/services/urltransformer \
     framework/source/uiconfiguration/globalsettings \
     framework/source/uiconfiguration/graphicnameaccess \