[Libreoffice-commits] .: 3 commits - framework/source sfx2/source

[Caolán McNamara]

 framework/source/uiconfiguration/windowstateconfiguration.cxx |    9 ++++++++-
 sfx2/source/appl/appuno.cxx                                   |    1 -
 sfx2/source/doc/doctempl.cxx                                  |    2 --
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit bc2bb7b46606ccf2cfdc74d8cad87f9480053b50
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 29 15:56:11 2010 +0000

    survice missing elements

diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 643c2e7..b2429d5 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -1374,7 +1374,14 @@ WindowStateConfiguration::WindowStateConfiguration( const Reference< XMultiServi
                                                     UNO_QUERY );
     Reference< XNameAccess > xEmptyNameAccess;
     Reference< XNameAccess > xNameAccess( m_xModuleManager, UNO_QUERY_THROW );
-    Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames();
+    Sequence< rtl::OUString > aElementNames;
+    try
+    {
+        aElementNames = xNameAccess->getElementNames();
+    }
+    catch (::com::sun::star::uno::RuntimeException &)
+    {
+    }
     Sequence< PropertyValue > aSeq;
     ::rtl::OUString                  aModuleIdentifier;
 
commit ddbb6322a2f6d898fec72b65f125c7e7af1997ef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 29 15:09:18 2010 +0000

    remove unused define

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 81b7693..63dd814 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -136,7 +136,6 @@ using namespace ::com::sun::star::io;
 #include "SfxDocumentMetaData.hxx"
 
 
-#define FRAMELOADER_SERVICENAME         "com.sun.star.frame.FrameLoader"
 #define PROTOCOLHANDLER_SERVICENAME     "com.sun.star.frame.ProtocolHandler"
 
 static char const sTemplateRegionName[] = "TemplateRegionName";
commit feeae488669789fe4fed4babaaa508888ef95a81
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 29 15:00:07 2010 +0000

    remove dead comments

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 34a0d37..e1f4c6a 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -121,8 +121,6 @@ using namespace ::ucbhelper;
 
 #define SERVICENAME_TYPEDETECTION       "com.sun.star.document.TypeDetection"
 #define TYPEDETECTION_PARAMETER         "FileName"
-//#define SERVICENAME_OLD_TYPEDETECTION   "com.sun.star.frame.FrameLoaderFactory"
-//#define PARAMETER_OLD_TYPEDETECTION     "DeepDetection"
 #define SERVICENAME_DOCINFO             "com.sun.star.document.DocumentProperties"
 #define SERVICENAME_DOCTEMPLATES        "com.sun.star.frame.DocumentTemplates"
 #define SERVICENAME_DESKTOP             "com.sun.star.frame.Desktop"