strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dba23a (1.18.44); FILE MERGED

Browse source 
2007/03/01 14:12:41 fs 1.18.44.3: #i74061# read-only-ness also for non-standard controls
2007/03/01 12:02:12 fs 1.18.44.2: #i74061# support for read-only object inspector
2007/02/13 12:00:25 fs 1.18.44.1: #i73761# warning: operation on 'xxx' may be undefined
This commit is contained in:
Kurt Zenker 2007-05-10 09:46:38 +00:00
parent 1d4c1d8c10
commit 1bc5ab7ff1
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
extensions/source/propctrlr/browserlistbox.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: browserlistbox.cxx,v $ * $RCSfile: browserlistbox.cxx,v $
* *
* $Revision: 1.18 $ * $Revision: 1.19 $
* *
* last change: $Author: kz $ $Date: 2006-12-13 11:55:35 $ * last change: $Author: kz $ $Date: 2007-05-10 10:46:38 $
* *
* 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.
@ -62,6 +62,9 @@
#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_INSPECTION_PROPERTYCONTROLTYPE_HPP_
#include <com/sun/star/inspection/PropertyControlType.hpp>
#endif
/** === end UNO includes === **/ /** === end UNO includes === **/
#ifndef _TOOLS_DEBUG_HXX #ifndef _TOOLS_DEBUG_HXX
@ -105,6 +108,7 @@ namespace pcr
using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::graphic::XGraphic; using ::com::sun::star::graphic::XGraphic;
/** === end UNO using === **/ /** === end UNO using === **/
namespace PropertyControlType = ::com::sun::star::inspection::PropertyControlType;
//================================================================== //==================================================================
//= ControlEvent //= ControlEvent
@ -871,7 +875,7 @@ namespace pcr
sal_Int32 nDelta = _nNewThumbPos - m_aVScroll.GetThumbPos(); sal_Int32 nDelta = _nNewThumbPos - m_aVScroll.GetThumbPos();
// adjust the scrollbar // adjust the scrollbar
m_aVScroll.SetThumbPos(_nNewThumbPos); m_aVScroll.SetThumbPos(_nNewThumbPos);
sal_Int32 nThumbPos = nThumbPos = _nNewThumbPos; sal_Int32 nThumbPos = _nNewThumbPos;
m_nYOffset = -m_aVScroll.GetThumbPos() * m_nRowHeight; m_nYOffset = -m_aVScroll.GetThumbPos() * m_nRowHeight;
@ -1198,7 +1202,7 @@ namespace pcr
// the old control and some data about it // the old control and some data about it
Reference< XPropertyControl > xControl = rLine.pLine->getControl(); Reference< XPropertyControl > xControl = rLine.pLine->getControl();
const Window* pControlWindow = rLine.pLine->getControlWindow(); Window* pControlWindow = rLine.pLine->getControlWindow();
Point aControlPos; Point aControlPos;
if ( pControlWindow ) if ( pControlWindow )
aControlPos = pControlWindow->GetPosPixel(); aControlPos = pControlWindow->GetPosPixel();
@ -1258,6 +1262,25 @@ namespace pcr
_rPropertyData.PrimaryButtonId, _rPropertyData.PrimaryButtonId,
_rPropertyData.SecondaryButtonId _rPropertyData.SecondaryButtonId
); );
if ( _rPropertyData.bReadOnly )
{
rLine.pLine->SetReadOnly( true );
// user controls (i.e. the ones not provided by the usual
// XPropertyControlFactory) have no chance to know that they should be read-only,
// since XPropertyHandler::describePropertyLine does not transport this
// information.
// So, we manually switch this to read-only.
if ( xControl.is() && ( xControl->getControlType() == PropertyControlType::Unknown ) )
{
Edit* pControlWindowAsEdit = dynamic_cast< Edit* >( rLine.pLine->getControlWindow() );
if ( pControlWindowAsEdit )
pControlWindowAsEdit->SetReadOnly( TRUE );
else
pControlWindowAsEdit->Enable( FALSE );
}
}
} }
} }