[Libreoffice-commits] .: sfx2/inc sfx2/source

[Kohei Yoshida]

 sfx2/inc/sfx2/sfxbasemodel.hxx   |    3 +--
 sfx2/source/doc/sfxbasemodel.cxx |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit e05a284f0b3beb93ffcea43663ff165a0dd2001a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Jul 24 22:41:10 2012 -0400

    Useless macro define.
    
    Change-Id: I19e71dfd514b19e34c7d73642a8c6bc2d3464590

diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index bdb5d6a..844bc33 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -139,7 +139,6 @@
 #define NOSUPPORTEXCEPTION      ::com::sun::star::lang::NoSupportException
 #define RUNTIMEEXCEPTION        ::com::sun::star::uno::RuntimeException
 #define CLOSEVETOEXCEPTION      ::com::sun::star::util::CloseVetoException
-#define DOUBLEINITIALIZATIONEXCEPTION      ::com::sun::star::frame::DoubleInitializationException
 #define ILLEGALARGUMENTEXCEPTION ::com::sun::star::lang::IllegalArgumentException
 #define IOEXCEPTION             ::com::sun::star::io::IOException
 #define EXCEPTION               ::com::sun::star::uno::Exception
@@ -1042,7 +1041,7 @@ public:
     virtual void SAL_CALL loadFromStorage( const REFERENCE< XSTORAGE >& xStorage,
                                             const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& aMediaDescriptor )
         throw ( ILLEGALARGUMENTEXCEPTION,
-                DOUBLEINITIALIZATIONEXCEPTION,
+                com::sun::star::frame::DoubleInitializationException,
                 IOEXCEPTION,
                 EXCEPTION,
                 RUNTIMEEXCEPTION );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8309d28..1641a6f 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1834,7 +1834,7 @@ void SAL_CALL SfxBaseModel::initNew()
     if ( m_pData->m_pObjectShell.Is() )
     {
         if( m_pData->m_pObjectShell->GetMedium() )
-            throw DOUBLEINITIALIZATIONEXCEPTION();
+            throw frame::DoubleInitializationException();
 
         sal_Bool bRes = m_pData->m_pObjectShell->DoInitNew( NULL );
         sal_uInt32 nErrCode = m_pData->m_pObjectShell->GetError() ?
@@ -1867,7 +1867,7 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
     {
         if( m_pData->m_pObjectShell->GetMedium() )
             // if a Medium is present, the document is already initialized
-            throw DOUBLEINITIALIZATIONEXCEPTION();
+            throw frame::DoubleInitializationException();
 
         SfxMedium* pMedium = new SfxMedium( seqArguments );
         String aFilterName;
@@ -3515,7 +3515,7 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat
 void SAL_CALL SfxBaseModel::loadFromStorage( const uno::Reference< XSTORAGE >& xStorage,
                                              const uno::Sequence< beans::PropertyValue >& aMediaDescriptor )
     throw ( lang::IllegalArgumentException,
-            DOUBLEINITIALIZATIONEXCEPTION,
+            frame::DoubleInitializationException,
             IOEXCEPTION,
             EXCEPTION,
             uno::RuntimeException )