[Libreoffice-commits] .: 2 commits - filter/Executable_svg2odf.mk filter/Library_svgfilter.mk filter/source

[Caolán McNamara]

 filter/Executable_svg2odf.mk                 |    2 +-
 filter/Library_svgfilter.mk                  |    1 +
 filter/source/config/cache/basecontainer.cxx |    2 +-
 filter/source/config/cache/filterfactory.cxx |    6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 7fd546207223f3a5d86f4d9399df52da9fbb9c23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 27 11:35:28 2012 +0100

    WaE: fix various msvc2008 warnings
    
    Change-Id: Ic4db9792177754222da324bfce58eee06b74c3bf

diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk
index 329ca8e..aa4e44c 100644
--- a/filter/Executable_svg2odf.mk
+++ b/filter/Executable_svg2odf.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_use_libraries,svg2odf,\
 	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_cxxobjects,svg2odf,\
+$(eval $(call gb_Executable_add_exception_objects,svg2odf,\
     filter/source/svg/test/svg2odf \
     filter/source/svg/test/odfserializer \
 ))
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 642c726..f8f26a1 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -342,7 +342,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem)
         aItem = pCache->getItem(m_eType, sItem);
         pCache->addStatePropsToItem(m_eType, sItem, aItem); // add implicit props "Finalized"/"Mandatory"
     }
-    catch(const css::container::NoSuchElementException& exNotExist)
+    catch(const css::container::NoSuchElementException&)
     {
         throw;
     }
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 935ada0..fb24a65 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -414,7 +414,7 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
             // It match the query ...
             lResult.push_back(sName);
         }
-        catch(const css::uno::RuntimeException& exRun)
+        catch(const css::uno::RuntimeException&)
             { throw; }
         catch(const css::uno::Exception&)
             { continue; }
@@ -539,7 +539,7 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const
         OUStringList lModules(xModuleConfig->getElementNames());
         return lModules;
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
         {}
@@ -633,7 +633,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
             return lSortedFilters;
         }
     }
-    catch(const css::uno::RuntimeException& exRun)
+    catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
         {}
commit fd96b86c0a8cf1c40946e2aa2e4fc4f92839c5dc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 27 11:34:45 2012 +0100

    missing FILTER_DLLIMPLEMENTATION define
    
    possibly svg2odf didn't work under windows, etc.
    
    Change-Id: I5f30130b988105337706dee64cac900f4ef399ae

diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index c37938f..c03714f 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter
 
 $(eval $(call gb_Library_add_defs,svgfilter,\
 	-DUSE_MODERN_SPIRIT \
+	-DFILTER_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_set_include,svgfilter,\