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

INTEGRATION: CWS ab32 (1.22.44); FILE MERGED

Browse Source 
2007/01/11 15:54:39 ab 1.22.44.1: #i73075# Let property browser handle multi selection
This commit is contained in:
Rüdiger Timm
2007-01-29 15:52:31 +00:00
parent e56183e931
commit b8afc9aae7
1 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
basctl/source/dlged/propbrw.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: propbrw.cxx,v $ * $RCSfile: propbrw.cxx,v $
* *
* $Revision: 1.24 $ * $Revision: 1.25 $
* *
* last change: $Author: rt $ $Date: 2007-01-19 08:41:39 $ * last change: $Author: rt $ $Date: 2007-01-29 16:52:31 $
* *
* 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.
@@ -135,6 +135,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#endif #endif
#ifndef _COM_SUN_STAR_INSPECTION_XOBJECTINSPECTOR_HPP_
#include <com/sun/star/inspection/XObjectInspector.hpp>
#endif
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#endif #endif
@@ -355,14 +359,14 @@ sal_Bool PropBrw::Close()
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
Sequence< Reference< XInterface > >
::comphelper::OComposedPropertySet* PropBrw::CreateCompPropSet(const SdrMarkList& _rMarkList) PropBrw::CreateMultiSelectionSequence( const SdrMarkList& _rMarkList )
{ {
PropertySetArray aSets; Sequence< Reference< XInterface > > aSeq;
InterfaceArray aInterfaces;
sal_uInt32 nMarkCount = _rMarkList.GetMarkCount(); sal_uInt32 nMarkCount = _rMarkList.GetMarkCount();
for( sal_uInt32 i = 0 ; i < nMarkCount ; i++ )
for(sal_uInt32 i=0;i<nMarkCount;i++)
{ {
SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj(); SdrObject* pCurrent = _rMarkList.GetMark(i)->GetMarkedSdrObj();
@@ -378,9 +382,9 @@ sal_Bool PropBrw::Close()
DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pCurrent); DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pCurrent);
if (pDlgEdObj) if (pDlgEdObj)
{ {
Reference< XPropertySet > xControlModel(pDlgEdObj->GetUnoControlModel(), UNO_QUERY); Reference< XInterface > xControlInterface(pDlgEdObj->GetUnoControlModel(), UNO_QUERY);
if (xControlModel.is()) if (xControlInterface.is())
aSets.push_back(xControlModel); aInterfaces.push_back(xControlInterface);
} }
// next element // next element
@@ -389,8 +393,29 @@ sal_Bool PropBrw::Close()
if (pGroupIterator) if (pGroupIterator)
delete pGroupIterator; delete pGroupIterator;
} }
Reference< XPropertySet > *pSets = aSets.empty() ? 0 : &aSets[0];
return new ::comphelper::OComposedPropertySet(Sequence< Reference< XPropertySet > >(pSets, aSets.size())); sal_Int32 nCount = aInterfaces.size();
aSeq.realloc( nCount );
Reference< XInterface >* pInterfaces = aSeq.getArray();
for( sal_Int32 i = 0 ; i < nCount ; i++ )
pInterfaces[i] = aInterfaces[i];
return aSeq;
}
//----------------------------------------------------------------------------
void PropBrw::implSetNewObjectSequence
( const Sequence< Reference< XInterface > >& _rObjectSeq )
{
Reference< inspection::XObjectInspector > xObjectInspector(m_xBrowserController, UNO_QUERY);
if ( xObjectInspector.is() )
{
xObjectInspector->inspect( _rObjectSeq );
::rtl::OUString aText = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
aText += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
SetText( aText );
}
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@@ -515,11 +540,12 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
{ {
aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES))); aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES)));
} }
else // multiselection // #i73075 Handled in implSetNewObjectSequence
{ //else // multiselection
aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES))); //{
aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT))); // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
} // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
//}
return aName; return aName;
} }
@@ -585,7 +611,7 @@ void PropBrw::Update( SdrView* pNewView )
{ {
if ( pDlgEdObj->IsGroupObject() ) // group object if ( pDlgEdObj->IsGroupObject() ) // group object
{ {
implSetNewObject( Reference< XPropertySet>( CreateCompPropSet( rMarkList ) ) ); implSetNewObjectSequence( CreateMultiSelectionSequence( rMarkList ) );
} }
else // single selection else // single selection
{ {
@@ -599,7 +625,7 @@ void PropBrw::Update( SdrView* pNewView )
} }
else if ( nMarkCount > 1 ) // multiple selection else if ( nMarkCount > 1 ) // multiple selection
{ {
implSetNewObject( Reference< XPropertySet>( CreateCompPropSet( rMarkList ) ) ); implSetNewObjectSequence( CreateMultiSelectionSequence( rMarkList ) );
} }
else else
{ {