diff options
| -rw-r--r-- | svx/inc/svx/msocximex.hxx | 3 | ||||
| -rw-r--r-- | svx/source/msfilter/msocximex.cxx | 8 | ||||
| -rw-r--r-- | svx/uiconfig/layout/layout.mk | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/svx/inc/svx/msocximex.hxx b/svx/inc/svx/msocximex.hxx index 25cd116c8ad1..679845827867 100644 --- a/svx/inc/svx/msocximex.hxx +++ b/svx/inc/svx/msocximex.hxx @@ -288,6 +288,7 @@ public: sal_Int32 mnForeColor; sal_uInt16 mnTabPos; UniString sName; + UniString msToolTip; OCX_FontData aFontData; SfxObjectShell *pDocSh; protected: @@ -898,7 +899,7 @@ public: sal_uInt8 nKeepScrollBarsVisible; sal_uInt8 nCycle; sal_uInt16 nBorderStyle; - sal_uInt16 nSpecialEffect; + sal_uInt8 nSpecialEffect; sal_uInt16 nPicture; sal_uInt8 nPictureAlignment; sal_uInt8 nPictureSizeMode; diff --git a/svx/source/msfilter/msocximex.cxx b/svx/source/msfilter/msocximex.cxx index f4992e45e8c2..7308bbf221eb 100644 --- a/svx/source/msfilter/msocximex.cxx +++ b/svx/source/msfilter/msocximex.cxx @@ -689,8 +689,11 @@ class ContainerRecReader sal_uInt32 nTipBufSize = lclGetBufferSize( nTipLen ); if( nTipBufSize > 0 ) { + std::auto_ptr< sal_Char > pTipName; + pTipName.reset( new sal_Char[ nTipBufSize ] ); ReadAlign( pS, pS->Tell() - nStartPos, 4 ); - pS->SeekRel( nTipBufSize ); + pS->Read( pTipName.get(), nTipBufSize ); + rec.controlTip = lclCreateOUString( pTipName.get(), nTipLen ); } // control id sal_uInt32 nCntrlIdSize = lclGetBufferSize( nCntrlIdLen ); @@ -1200,6 +1203,8 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp); aTmp <<= sal_Int32((nHeight * 2) / 100); xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp); + if ( msToolTip.Len() > 0 ) + xPropSet->setPropertyValue(WW8_ASCII2STR("HelpText"), uno::Any(OUString(msToolTip))); if ( mnStep ) { @@ -3596,6 +3601,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream* } pControl->sName = rec.cName; + pControl->msToolTip = rec.controlTip; // Position of controls is relative to the container pControl->mnTop = rec.nTop + mnTop; pControl->mnLeft = rec.nLeft + mnLeft; diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk index 8daa1c5e8fab..f6bea876d898 100644 --- a/svx/uiconfig/layout/layout.mk +++ b/svx/uiconfig/layout/layout.mk @@ -1,7 +1,7 @@ # TODO: move to solenv/inc # copies: sw/uiconfig/layout svx/uiconfig/layout -TRALAY=$(AUGMENT_LIBRARY_PATH) tralay +TRALAY=tralay XML_DEST=$(DLLDEST) XML_LANGS=$(alllangiso) |