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

CWS-TOOLING: integrate CWS calc55

Browse Source
This commit is contained in:
obo
2010-06-23 13:54:50 +02:00
parent 63939649ce 6ff15843c9
commit ba01979286
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
svx/inc/svx/unoshprp.hxx
View File

@@ -160,7 +160,7 @@
#define OWN_ATTR_PAGE_NUMBER (OWN_ATTR_VALUE_START+65) #define OWN_ATTR_PAGE_NUMBER (OWN_ATTR_VALUE_START+65)
#define OWN_ATTR_THUMBNAIL (OWN_ATTR_VALUE_START+66) #define OWN_ATTR_THUMBNAIL (OWN_ATTR_VALUE_START+66)
#define OWN_ATTR_PERSISTNAME (OWN_ATTR_VALUE_START+67) #define OWN_ATTR_PERSISTNAME (OWN_ATTR_VALUE_START+67)
//#define OWN_ATTR_HASLEVELS (OWN_ATTR_VALUE_START+68) #define OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT (OWN_ATTR_VALUE_START+68)
#define OWN_ATTR_MEDIA_URL (OWN_ATTR_VALUE_START+69) #define OWN_ATTR_MEDIA_URL (OWN_ATTR_VALUE_START+69)
#define OWN_ATTR_MEDIA_PREFERREDSIZE (OWN_ATTR_VALUE_START+70) #define OWN_ATTR_MEDIA_PREFERREDSIZE (OWN_ATTR_VALUE_START+70)
#define OWN_ATTR_MEDIA_LOOP (OWN_ATTR_VALUE_START+71) #define OWN_ATTR_MEDIA_LOOP (OWN_ATTR_VALUE_START+71)

1
svx/source/unodraw/unoprov.cxx
View File

@@ -478,6 +478,7 @@ SfxItemPropertyMapEntry* ImplGetSvxOle2PropertyMap()
{ MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, { MAP_CHAR_LEN("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 },
{ MAP_CHAR_LEN("Model"), OWN_ATTR_OLEMODEL , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("Model"), OWN_ATTR_OLEMODEL , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ MAP_CHAR_LEN("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT , &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ MAP_CHAR_LEN("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ MAP_CHAR_LEN("OriginalSize"), OWN_ATTR_OLESIZE , &::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("OriginalSize"), OWN_ATTR_OLESIZE , &::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ MAP_CHAR_LEN("CLSID"), OWN_ATTR_CLSID , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 }, { MAP_CHAR_LEN("CLSID"), OWN_ATTR_CLSID , &::getCppuType(( const ::rtl::OUString*)0), 0, 0 },
{ MAP_CHAR_LEN("IsInternal"), OWN_ATTR_INTERNAL_OLE , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN("IsInternal"), OWN_ATTR_INTERNAL_OLE , &::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0},

12
svx/source/unodraw/unoshap4.cxx
View File

@@ -355,22 +355,26 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
case OWN_ATTR_OLEMODEL: case OWN_ATTR_OLEMODEL:
case OWN_ATTR_OLE_EMBEDDED_OBJECT: case OWN_ATTR_OLE_EMBEDDED_OBJECT:
case OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT:
{ {
SdrOle2Obj* pObj = dynamic_cast<SdrOle2Obj*>( mpObj.get() ); SdrOle2Obj* pObj = dynamic_cast<SdrOle2Obj*>( mpObj.get() );
if( pObj ) if( pObj )
{ {
uno::Reference < embed::XEmbeddedObject > xObj( pObj->GetObjRef() ); uno::Reference < embed::XEmbeddedObject > xObj( pObj->GetObjRef() );
if ( xObj.is() if ( xObj.is()
&& ( pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT || svt::EmbeddedObjectRef::TryRunningState( xObj ) ) ) && ( pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT || pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT || svt::EmbeddedObjectRef::TryRunningState( xObj ) ) )
{ {
// Discussed with CL fue to the before GetPaintingPageView // Discussed with CL fue to the before GetPaintingPageView
// usage. Removed it, former fallback is used now // usage. Removed it, former fallback is used now
if ( pProperty->nWID == OWN_ATTR_OLEMODEL || pProperty->nWID == OWN_ATTR_OLE_EMBEDDED_OBJECT )
{
#ifdef DBG_UTIL #ifdef DBG_UTIL
const sal_Bool bSuccess(pObj->AddOwnLightClient()); const sal_Bool bSuccess(pObj->AddOwnLightClient());
OSL_ENSURE( bSuccess, "An object without client is provided!" ); OSL_ENSURE( bSuccess, "An object without client is provided!" );
#else #else
pObj->AddOwnLightClient(); pObj->AddOwnLightClient();
#endif #endif
}
if ( pProperty->nWID == OWN_ATTR_OLEMODEL ) if ( pProperty->nWID == OWN_ATTR_OLEMODEL )
rValue <<= pObj->GetObjRef()->getComponent(); rValue <<= pObj->GetObjRef()->getComponent();

15
xmloff/source/chart/SchXMLPlotAreaContext.cxx
View File

@@ -1237,18 +1237,23 @@ void SchXMLAxisContext::CreateAxis()
case SCH_XML_AXIS_Z: case SCH_XML_AXIS_Z:
{ {
bool bSettingZAxisSuccedded = false;
try try
{ {
xDiaProp->setPropertyValue( rtl::OUString sHasZAxis( rtl::OUString::createFromAscii( "HasZAxis" ) );
rtl::OUString::createFromAscii( "HasZAxis" ), aTrueBool ); xDiaProp->setPropertyValue( sHasZAxis, aTrueBool );
xDiaProp->getPropertyValue( sHasZAxis ) >>= bSettingZAxisSuccedded;
} }
catch( beans::UnknownPropertyException & ) catch( beans::UnknownPropertyException & )
{ {
DBG_ERROR( "Couldn't turn on z axis" ); DBG_ERROR( "Couldn't turn on z axis" );
} }
uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY ); if( bSettingZAxisSuccedded )
if( xSuppl.is()) {
xProp = xSuppl->getZAxis(); uno::Reference< chart::XAxisZSupplier > xSuppl( mxDiagram, uno::UNO_QUERY );
if( xSuppl.is())
xProp = xSuppl->getZAxis();
}
} }
break; break;
case SCH_XML_AXIS_UNDEF: case SCH_XML_AXIS_UNDEF: