sc/source/ui/unoobj/viewuno.cxx | 2 ++ sd/source/ui/unoidl/DrawController.cxx | 2 +- toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx | 3 +-- toolkit/source/awt/vclxtabpagecontainer.cxx | 1 + toolkit/source/controls/controlmodelcontainerbase.cxx | 2 +- toolkit/source/controls/tabpagemodel.cxx | 4 ---- 6 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit 5dfcb178f89532a92b4565739d3445a56abfd095 Author: Jürgen Schmidt <[email protected]> Date: Fri Dec 20 13:56:32 2013 +0000 #91439# apply patch to copy key modifiers as well Patch By: hanya Review By: jsc diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index d3f1a7b..c8ede08 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1285,6 +1285,7 @@ sal_Bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) aMouseEvent.ClickCount = e.ClickCount; aMouseEvent.PopupTrigger = e.PopupTrigger; aMouseEvent.Target = xTarget; + aMouseEvent.Modifiers = e.Modifiers; for ( sal_uInt16 n=0; n<aMouseClickHandlers.Count(); n++ ) { @@ -1379,6 +1380,7 @@ sal_Bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) aMouseEvent.ClickCount = e.ClickCount; aMouseEvent.PopupTrigger = e.PopupTrigger; aMouseEvent.Target = xTarget; + aMouseEvent.Modifiers = e.Modifiers; for ( sal_uInt16 n=0; n<aMouseClickHandlers.Count(); n++ ) { commit 1831b6c95e6137432f64729a270e53fc39e46217 Author: Jürgen Schmidt <[email protected]> Date: Fri Dec 20 13:36:19 2013 +0000 #123783# apply patch to correct type of ActiveLayer property Patch By: hanya Review By: jsc diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 4c5fda2..a9656a9 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -762,7 +762,7 @@ void DrawController::FillPropertyTable ( rProperties.push_back( beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ActiveLayer") ), PROPERTY_ACTIVE_LAYER, - ::getCppuBooleanType(), + ::getCppuType((const Reference< drawing::XLayer > *)0), beans::PropertyAttribute::BOUND )); rProperties.push_back( beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("ZoomValue") ), commit aa098b9e612b30a916cd4ce002133d499d7f711a Author: Jürgen Schmidt <[email protected]> Date: Fri Dec 20 12:40:17 2013 +0000 #120358# apply patch to support properties from tab model Patch By: hanya Review By: jsc diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx index 6f46416..e25b48a 100644 --- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx @@ -85,8 +85,7 @@ protected: AllGroups maGroups; sal_Bool mbGroupsUpToDate; - bool m_bEnabled; - ::rtl::OUString m_sTitle; + sal_Bool m_bEnabled; ::rtl::OUString m_sImageURL; ::rtl::OUString m_sTooltip; sal_Int16 m_nTabPageId; diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index c8ee1df..e179316 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -208,6 +208,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con pTabCtrl->SetHelpText(nPageID,xP->getToolTip()); pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL())); pTabCtrl->SelectTabPage(nPageID); + pTabCtrl->EnablePage(nPageID,xP->getEnabled()); m_aTabPages.push_back(xTabPage); } } diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 496a707..7ed16d5 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -221,6 +221,7 @@ ControlModelContainerBase::ControlModelContainerBase( const Reference< XMultiSer ,maContainerListeners( *this ) ,maChangeListeners ( GetMutex() ) ,mbGroupsUpToDate( sal_False ) + ,m_bEnabled( sal_True ) { } @@ -765,7 +766,6 @@ void SAL_CALL ControlModelContainerBase::setEnabled( ::sal_Bool _enabled ) throw ::rtl::OUString sTitle; xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle; return sTitle; - //return m_sTitle; } void SAL_CALL ControlModelContainerBase::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException) { diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 5ac6c8a..4d4d572 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -80,8 +80,6 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XMultiServiceFactory ImplRegisterProperty( BASEPROPERTY_TITLE ); ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); - ImplRegisterProperty( BASEPROPERTY_IMAGEURL ); - ImplRegisterProperty( BASEPROPERTY_ENABLED ); } ::rtl::OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException) @@ -166,9 +164,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument Reference<XPropertySet> xThis(*this,UNO_QUERY); xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver)); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE))); - xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL))); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT))); - xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED))); xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL))); } }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
