mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS oj14 (1.6.24); FILE MERGED

Browse Source 
2007/04/05 08:08:00 lla 1.6.24.4: #146843# remove confighelper.hxx
2006/11/07 08:43:42 oj 1.6.24.3: RESYNC: (1.7-1.10); FILE MERGED
2006/07/04 07:25:55 oj 1.6.24.2: RESYNC: (1.6-1.7); FILE MERGED
2006/03/20 08:42:53 oj 1.6.24.1: use mimeconfighelper
This commit is contained in:
Rüdiger Timm
2007-07-06 09:11:44 +00:00
parent b022274ce1
commit 06e5db9ab6
1 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
embeddedobj/source/msole/xdialogcreator.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: xdialogcreator.cxx,v $ * $RCSfile: xdialogcreator.cxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: obo $ $Date: 2006-10-13 11:31:52 $ * last change: $Author: rt $ $Date: 2007-07-06 10:11:44 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -65,10 +65,16 @@
#include <comphelper/classids.hxx> #include <comphelper/classids.hxx>
#include "platform.h" #include "platform.h"
#include <confighelper.hxx> #ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_
#include <comphelper/mimeconfighelper.hxx>
#endif
#include "xdialogcreator.hxx"
#include "oleembobj.hxx"
// LLA: tip from FS
// #include <confighelper.hxx>
#include <xdialogcreator.hxx> #include <xdialogcreator.hxx>
#include <oleembobj.hxx> #include <oleembobj.hxx>
#include <convert.hxx>
#ifdef WNT #ifdef WNT
@@ -98,39 +104,39 @@ typedef UINT STDAPICALLTYPE OleUIInsertObjectA_Type(LPOLEUIINSERTOBJECTA);
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::comphelper;
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_Int8 >& aClassID ) uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_Int8 >& aClassID )
{ {
// Writer // Writer
if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SW_OLE_EMBED_CLASSID_60 ) ) if ( MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SW_OLE_EMBED_CLASSID_60 ) )
|| ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SW_OLE_EMBED_CLASSID_8 ) ) ) || MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SW_OLE_EMBED_CLASSID_8 ) ) )
return GetSequenceClassID( SO3_SW_CLASSID_60 ); return MimeConfigurationHelper::GetSequenceClassID( SO3_SW_CLASSID_60 );
// Calc // Calc
if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SC_OLE_EMBED_CLASSID_60 ) ) if ( MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SC_OLE_EMBED_CLASSID_60 ) )
|| ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SC_OLE_EMBED_CLASSID_8 ) ) ) || MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SC_OLE_EMBED_CLASSID_8 ) ) )
return GetSequenceClassID( SO3_SC_CLASSID_60 ); return MimeConfigurationHelper::GetSequenceClassID( SO3_SC_CLASSID_60 );
// Impress // Impress
if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SIMPRESS_OLE_EMBED_CLASSID_60 ) ) if ( MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SIMPRESS_OLE_EMBED_CLASSID_60 ) )
|| ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SIMPRESS_OLE_EMBED_CLASSID_8 ) ) ) || MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SIMPRESS_OLE_EMBED_CLASSID_8 ) ) )
return GetSequenceClassID( SO3_SIMPRESS_CLASSID_60 ); return MimeConfigurationHelper::GetSequenceClassID( SO3_SIMPRESS_CLASSID_60 );
// Draw // Draw
if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SDRAW_OLE_EMBED_CLASSID_60 ) ) if ( MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SDRAW_OLE_EMBED_CLASSID_60 ) )
|| ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SDRAW_OLE_EMBED_CLASSID_8 ) ) ) || MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SDRAW_OLE_EMBED_CLASSID_8 ) ) )
return GetSequenceClassID( SO3_SDRAW_CLASSID_60 ); return MimeConfigurationHelper::GetSequenceClassID( SO3_SDRAW_CLASSID_60 );
// Chart // Chart
if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SCH_OLE_EMBED_CLASSID_60 ) ) if ( MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SCH_OLE_EMBED_CLASSID_60 ) )
|| ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SCH_OLE_EMBED_CLASSID_8 ) ) ) || MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SCH_OLE_EMBED_CLASSID_8 ) ) )
return GetSequenceClassID( SO3_SCH_CLASSID_60 ); return MimeConfigurationHelper::GetSequenceClassID( SO3_SCH_CLASSID_60 );
// Math // Math
if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SM_OLE_EMBED_CLASSID_60 ) ) if ( MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SM_OLE_EMBED_CLASSID_60 ) )
|| ClassIDsEqual( aClassID, GetSequenceClassID( SO3_SM_OLE_EMBED_CLASSID_8 ) ) ) || MimeConfigurationHelper::ClassIDsEqual( aClassID, MimeConfigurationHelper::GetSequenceClassID( SO3_SM_OLE_EMBED_CLASSID_8 ) ) )
return GetSequenceClassID( SO3_SM_CLASSID_60 ); return MimeConfigurationHelper::GetSequenceClassID( SO3_SM_CLASSID_60 );
return aClassID; return aClassID;
} }
@@ -222,7 +228,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
if ( !xEmbCreator.is() ) if ( !xEmbCreator.is() )
throw uno::RuntimeException(); throw uno::RuntimeException();
uno::Sequence< sal_Int8 > aClassID = GetSequenceClassID( io.clsid.Data1, uno::Sequence< sal_Int8 > aClassID = MimeConfigurationHelper::GetSequenceClassID( io.clsid.Data1,
io.clsid.Data2, io.clsid.Data2,
io.clsid.Data3, io.clsid.Data3,
io.clsid.Data4[0], io.clsid.Data4[0],
@@ -255,7 +261,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
// TODO: use config helper for type detection // TODO: use config helper for type detection
uno::Reference< embed::XEmbedObjectCreator > xEmbCreator; uno::Reference< embed::XEmbedObjectCreator > xEmbCreator;
ConfigurationHelper aHelper( m_xFactory ); ::comphelper::MimeConfigurationHelper aHelper( m_xFactory );
if ( aHelper.AddFilterNameCheckOwnFile( aMediaDescr ) ) if ( aHelper.AddFilterNameCheckOwnFile( aMediaDescr ) )
xEmbCreator = uno::Reference< embed::XEmbedObjectCreator >( xEmbCreator = uno::Reference< embed::XEmbedObjectCreator >(