[Libreoffice-commits] .: 2 commits - binfilter/bf_sfx2 binfilter/bf_so3

[Caolán McNamara]

 binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx |   14 +++-----------
 binfilter/bf_so3/source/inplace/outplace.cxx       |    3 ++-
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 4cbc8aab21dcda55edf79c57a7650181c1c0d8de
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 3 12:07:37 2011 +0000

    fix visibility warning

diff --git a/binfilter/bf_so3/source/inplace/outplace.cxx b/binfilter/bf_so3/source/inplace/outplace.cxx
index 09924cf..7c35515 100644
--- a/binfilter/bf_so3/source/inplace/outplace.cxx
+++ b/binfilter/bf_so3/source/inplace/outplace.cxx
@@ -720,7 +720,8 @@ SvInPlaceObjectRef SvOutPlaceObject::InsertObject
 
 
 //=========================================================================
-struct SvObjectServerListHolder {
+struct SO3_DLLPRIVATE SvObjectServerListHolder
+{
     ::binfilter::SvObjectServerList	mObjList;
     SvObjectServerListHolder() { mObjList.FillInsertObjects(); }
 };
commit d78b483c55b1eac295acba6dfd29d093b942eec5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 3 12:01:22 2011 +0000

    WaE: define hid that nErrCode was unused in exception thrown

diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index c3575ac..7acfec8 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -93,8 +93,6 @@ namespace binfilter {
 //________________________________________________________________________________________________________
 //	defines
 //________________________________________________________________________________________________________
-#define	SfxIOException_Impl( nErr )				::com::sun::star::io::IOException()
-
 #define	XFRAME									::com::sun::star::frame::XFrame
 #define	XINTERFACE								::com::sun::star::uno::XInterface
 #define	OMULTITYPEINTERFACECONTAINERHELPER		::cppu::OMultiTypeInterfaceContainerHelper
@@ -1174,14 +1172,11 @@ extern sal_Bool supportsMetaFileHandle_Impl();
 /*N*/ 			throw DOUBLEINITIALIZATIONEXCEPTION();
 /*N*/
 /*N*/ 		sal_Bool bRes = m_pData->m_pObjectShell->DoInitNew( NULL );
-/*N*/ 		sal_uInt32 nErrCode = ERRCODE_IO_CANTCREATE;
-/*N*/ 		if (m_pData->m_pObjectShell->GetError())
-/*N*/ 			nErrCode = m_pData->m_pObjectShell->GetError();
 /*N*/ 		m_pData->m_pObjectShell->ResetError();
 /*N*/
 /*N*/ 		if ( !bRes )
 /*N*/ 		{
-/*N*/ 			throw SfxIOException_Impl( nErrCode );
+/*N*/ 			throw ::com::sun::star::io::IOException();
 /*N*/ 		}
 /*N*/ 	}
 /*N*/ }
@@ -1247,7 +1242,7 @@ extern sal_Bool supportsMetaFileHandle_Impl();
                 delete pMedium;
             }
 
-            throw SfxIOException_Impl( nError ? nError : ERRCODE_IO_CANTREAD );
+            throw ::com::sun::star::io::IOException();
         }
     }
 }
@@ -1456,14 +1451,11 @@ extern sal_Bool supportsMetaFileHandle_Impl();
 /*N*/ 	sal_Bool aRet = pObjectShell->APISaveAs_Impl( sURL, aParams );
 /*N*/ 	DELETEZ( aParams );
 /*N*/
-/*N*/ 	sal_uInt32 nErrCode = ERRCODE_IO_CANTWRITE;
-/*N*/ 	if (pObjectShell->GetError())
-/*N*/ 	    nErrCode = pObjectShell->GetError();
 /*N*/ 	pObjectShell->ResetError();
 /*N*/
 /*N*/ 	if ( !aRet )
 /*N*/ 	{
-/*N*/ 		throw SfxIOException_Impl( nErrCode );
+/*N*/ 		throw ::com::sun::star::io::IOException();
 /*N*/ 	}
 /*N*/ }
 /*N*/