This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 226b2a7545 Cleanup
226b2a7545 is described below
commit 226b2a7545a5be49803cc3de88b41a770216bc96
Author: mseidel <[email protected]>
AuthorDate: Sat Mar 7 11:08:03 2026 +0100
Cleanup
(cherry picked from commit 0bd9e355e13b620bef19e582b9cfda5857deb292)
---
main/svx/source/form/fmexpl.cxx | 494 ++++++++++++++++++++--------------------
main/svx/source/inc/fmexpl.hrc | 2 -
main/svx/source/inc/fmexpl.hxx | 83 ++++---
3 files changed, 283 insertions(+), 296 deletions(-)
diff --git a/main/svx/source/form/fmexpl.cxx b/main/svx/source/form/fmexpl.cxx
index 01ac91f61a..e143116585 100644
--- a/main/svx/source/form/fmexpl.cxx
+++ b/main/svx/source/form/fmexpl.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
@@ -70,7 +68,6 @@
#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
#endif
-#include <vcl/sound.hxx>
#include <svx/fmshell.hxx>
#include "fmshimp.hxx"
#include <svx/fmpage.hxx>
@@ -104,20 +101,19 @@ TYPEINIT1( FmNavInsertedHint, SfxHint );
DBG_NAME(FmNavInsertedHint);
//------------------------------------------------------------------------
FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData,
sal_uInt32 nRelPos )
- :pEntryData( pInsertedEntryData )
- ,nPos( nRelPos )
+ :pEntryData( pInsertedEntryData )
+ ,nPos( nRelPos )
{
- DBG_CTOR(FmNavInsertedHint,NULL);
+ DBG_CTOR(FmNavInsertedHint,NULL);
}
//------------------------------------------------------------------------
FmNavInsertedHint::~FmNavInsertedHint()
{
- DBG_DTOR(FmNavInsertedHint,NULL);
+ DBG_DTOR(FmNavInsertedHint,NULL);
}
-
//========================================================================
// class FmNavInsertedHint
//========================================================================
@@ -125,15 +121,15 @@ TYPEINIT1( FmNavModelReplacedHint, SfxHint );
DBG_NAME(FmNavModelReplacedHint);
//------------------------------------------------------------------------
FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData*
pAffectedEntryData )
- :pEntryData( pAffectedEntryData )
+ :pEntryData( pAffectedEntryData )
{
- DBG_CTOR(FmNavModelReplacedHint,NULL);
+ DBG_CTOR(FmNavModelReplacedHint,NULL);
}
//------------------------------------------------------------------------
FmNavModelReplacedHint::~FmNavModelReplacedHint()
{
- DBG_DTOR(FmNavModelReplacedHint,NULL);
+ DBG_DTOR(FmNavModelReplacedHint,NULL);
}
//========================================================================
@@ -143,18 +139,17 @@ TYPEINIT1( FmNavRemovedHint, SfxHint );
DBG_NAME(FmNavRemovedHint);
//------------------------------------------------------------------------
FmNavRemovedHint::FmNavRemovedHint( FmEntryData* pRemovedEntryData )
- :pEntryData( pRemovedEntryData )
+ :pEntryData( pRemovedEntryData )
{
- DBG_CTOR(FmNavRemovedHint,NULL);
+ DBG_CTOR(FmNavRemovedHint,NULL);
}
//------------------------------------------------------------------------
FmNavRemovedHint::~FmNavRemovedHint()
{
- DBG_DTOR(FmNavRemovedHint,NULL);
+ DBG_DTOR(FmNavRemovedHint,NULL);
}
-
//========================================================================
// class FmNavNameChangedHint
//========================================================================
@@ -162,16 +157,16 @@ TYPEINIT1( FmNavNameChangedHint, SfxHint );
DBG_NAME(FmNavNameChangedHint);
//------------------------------------------------------------------------
FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const
::rtl::OUString& rNewName )
- :pEntryData( pData )
- ,aNewName( rNewName )
+ :pEntryData( pData )
+ ,aNewName( rNewName )
{
- DBG_CTOR(FmNavNameChangedHint,NULL);
+ DBG_CTOR(FmNavNameChangedHint,NULL);
}
//------------------------------------------------------------------------
FmNavNameChangedHint::~FmNavNameChangedHint()
{
- DBG_DTOR(FmNavNameChangedHint,NULL);
+ DBG_DTOR(FmNavNameChangedHint,NULL);
}
//========================================================================
@@ -182,13 +177,13 @@ DBG_NAME(FmNavClearedHint);
//------------------------------------------------------------------------
FmNavClearedHint::FmNavClearedHint()
{
- DBG_CTOR(FmNavClearedHint,NULL);
+ DBG_CTOR(FmNavClearedHint,NULL);
}
//------------------------------------------------------------------------
FmNavClearedHint::~FmNavClearedHint()
{
- DBG_DTOR(FmNavClearedHint,NULL);
+ DBG_DTOR(FmNavClearedHint,NULL);
}
//========================================================================
@@ -208,16 +203,15 @@ DBG_NAME(FmEntryDataList);
//------------------------------------------------------------------------
FmEntryDataList::FmEntryDataList()
{
- DBG_CTOR(FmEntryDataList,NULL);
+ DBG_CTOR(FmEntryDataList,NULL);
}
//------------------------------------------------------------------------
FmEntryDataList::~FmEntryDataList()
{
- DBG_DTOR(FmEntryDataList,NULL);
+ DBG_DTOR(FmEntryDataList,NULL);
}
-
//========================================================================
// class FmEntryData
//========================================================================
@@ -225,11 +219,11 @@ TYPEINIT0( FmEntryData );
DBG_NAME(FmEntryData);
//------------------------------------------------------------------------
FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference<
XInterface >& _rxIFace )
- :pParent( pParentData )
+ :pParent( pParentData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::FmEntryData" );
- DBG_CTOR(FmEntryData,NULL);
- pChildList = new FmEntryDataList();
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::FmEntryData" );
+ DBG_CTOR(FmEntryData,NULL);
+ pChildList = new FmEntryDataList();
newObject( _rxIFace );
}
@@ -237,15 +231,15 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const
Reference< XInterface
//------------------------------------------------------------------------
FmEntryData::~FmEntryData()
{
- Clear();
- delete pChildList;
- DBG_DTOR(FmEntryData,NULL);
+ Clear();
+ delete pChildList;
+ DBG_DTOR(FmEntryData,NULL);
}
//------------------------------------------------------------------------
void FmEntryData::newObject( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& _rxIFace )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::newObject" );
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::newObject" );
// do not just copy, normalize it
m_xNormalizedIFace = Reference< XInterface >( _rxIFace, UNO_QUERY );
m_xProperties = m_xProperties.query( m_xNormalizedIFace );
@@ -255,21 +249,21 @@ void FmEntryData::newObject( const
::com::sun::star::uno::Reference< ::com::sun:
//------------------------------------------------------------------------
FmEntryData::FmEntryData( const FmEntryData& rEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::FmEntryData" );
- pChildList = new FmEntryDataList();
- aText = rEntryData.GetText();
- m_aNormalImage = rEntryData.GetNormalImage();
- m_aHCImage = rEntryData.GetHCImage();
- pParent = rEntryData.GetParent();
-
- FmEntryData* pChildData;
- sal_uInt32 nEntryCount = rEntryData.GetChildList()->Count();
- for( sal_uInt32 i=0; i<nEntryCount; i++ )
- {
- pChildData = rEntryData.GetChildList()->GetObject(i);
- FmEntryData* pNewChildData = pChildData->Clone();
- pChildList->Insert( pNewChildData, LIST_APPEND );
- }
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::FmEntryData" );
+ pChildList = new FmEntryDataList();
+ aText = rEntryData.GetText();
+ m_aNormalImage = rEntryData.GetNormalImage();
+ m_aHCImage = rEntryData.GetHCImage();
+ pParent = rEntryData.GetParent();
+
+ FmEntryData* pChildData;
+ sal_uInt32 nEntryCount = rEntryData.GetChildList()->Count();
+ for( sal_uInt32 i=0; i<nEntryCount; i++ )
+ {
+ pChildData = rEntryData.GetChildList()->GetObject(i);
+ FmEntryData* pNewChildData = pChildData->Clone();
+ pChildList->Insert( pNewChildData, LIST_APPEND );
+ }
m_xNormalizedIFace = rEntryData.m_xNormalizedIFace;
m_xProperties = rEntryData.m_xProperties;
@@ -279,45 +273,44 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
//------------------------------------------------------------------------
void FmEntryData::Clear()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::Clear" );
- for (;;)
- {
- FmEntryData* pEntryData = GetChildList()->Remove(sal_uLong(0));
- if (pEntryData == NULL)
- break;
- delete pEntryData;
- }
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::Clear" );
+ for (;;)
+ {
+ FmEntryData* pEntryData = GetChildList()->Remove(sal_uLong(0));
+ if (pEntryData == NULL)
+ break;
+ delete pEntryData;
+ }
}
//------------------------------------------------------------------------
sal_Bool FmEntryData::IsEqualWithoutChilds( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::IsEqualWithoutChilds" );
- if(this == pEntryData)
- return sal_True;
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmEntryData::IsEqualWithoutChilds" );
+ if(this == pEntryData)
+ return sal_True;
- if( !pEntryData )
- return sal_False;
+ if( !pEntryData )
+ return sal_False;
- if( !aText.equals(pEntryData->GetText()))
- return sal_False;
+ if( !aText.equals(pEntryData->GetText()))
+ return sal_False;
- if( !pEntryData->GetParent() && pParent )
- return sal_False;
+ if( !pEntryData->GetParent() && pParent )
+ return sal_False;
- if( pEntryData->GetParent() && !pParent )
- return sal_False;
+ if( pEntryData->GetParent() && !pParent )
+ return sal_False;
- if( !pEntryData->GetParent() && !pParent )
- return sal_True;
+ if( !pEntryData->GetParent() && !pParent )
+ return sal_True;
- if( !pParent->IsEqualWithoutChilds(pEntryData->GetParent()) )
- return sal_False;
+ if( !pParent->IsEqualWithoutChilds(pEntryData->GetParent()) )
+ return sal_False;
- return sal_True;
+ return sal_True;
}
-
//========================================================================
// class FmFormData
//========================================================================
@@ -325,66 +318,65 @@ TYPEINIT1( FmFormData, FmEntryData );
DBG_NAME(FmFormData);
//------------------------------------------------------------------------
FmFormData::FmFormData( const Reference< XForm >& _rxForm, const ImageList&
_rNormalImages, const ImageList& _rHCImages, FmFormData* _pParent )
- :FmEntryData( _pParent, _rxForm )
- ,m_xForm( _rxForm )
+ :FmEntryData( _pParent, _rxForm )
+ ,m_xForm( _rxForm )
{
- DBG_CTOR(FmEntryData,NULL);
- //////////////////////////////////////////////////////////////////////
- // Images setzen
-
- m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM );
- m_aHCImage = _rHCImages.GetImage( RID_SVXIMG_FORM );
-
- //////////////////////////////////////////////////////////////////////
- // Titel setzen
- if (m_xForm.is())
- {
- Reference< XPropertySet > xSet(m_xForm, UNO_QUERY);
- if (xSet.is())
- {
- ::rtl::OUString
aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME )));
- SetText(aEntryName);
- }
- }
- else
- SetText( ::rtl::OUString() );
+ DBG_CTOR(FmEntryData,NULL);
+ //////////////////////////////////////////////////////////////////////
+ // Images setzen
+
+ m_aNormalImage = _rNormalImages.GetImage( RID_SVXIMG_FORM );
+ m_aHCImage = _rHCImages.GetImage( RID_SVXIMG_FORM );
+
+ //////////////////////////////////////////////////////////////////////
+ // Titel setzen
+ if (m_xForm.is())
+ {
+ Reference< XPropertySet > xSet(m_xForm, UNO_QUERY);
+ if (xSet.is())
+ {
+ ::rtl::OUString
aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME )));
+ SetText(aEntryName);
+ }
+ }
+ else
+ SetText( ::rtl::OUString() );
}
//------------------------------------------------------------------------
FmFormData::~FmFormData()
{
- DBG_DTOR(FmEntryData,NULL);
+ DBG_DTOR(FmEntryData,NULL);
}
//------------------------------------------------------------------------
FmFormData::FmFormData( const FmFormData& rFormData )
- :FmEntryData( rFormData )
+ :FmEntryData( rFormData )
{
- DBG_CTOR(FmEntryData,NULL);
- m_xForm = rFormData.GetFormIface();
+ DBG_CTOR(FmEntryData,NULL);
+ m_xForm = rFormData.GetFormIface();
}
//------------------------------------------------------------------------
FmEntryData* FmFormData::Clone()
{
- return new FmFormData( *this );
+ return new FmFormData( *this );
}
//------------------------------------------------------------------------
sal_Bool FmFormData::IsEqualWithoutChilds( FmEntryData* pEntryData )
{
- if(this == pEntryData)
- return sal_True;
- if( !pEntryData->ISA(FmFormData) )
- return sal_False;
- FmFormData* pFormData = (FmFormData*)pEntryData;
- if( (XForm*)m_xForm.get() != (XForm*)pFormData->GetFormIface().get() )
- return sal_False;
-
- return FmEntryData::IsEqualWithoutChilds( pFormData );
+ if(this == pEntryData)
+ return sal_True;
+ if( !pEntryData->ISA(FmFormData) )
+ return sal_False;
+ FmFormData* pFormData = (FmFormData*)pEntryData;
+ if( (XForm*)m_xForm.get() != (XForm*)pFormData->GetFormIface().get() )
+ return sal_False;
+
+ return FmEntryData::IsEqualWithoutChilds( pFormData );
}
-
//========================================================================
// class FmControlData
//========================================================================
@@ -392,183 +384,183 @@ TYPEINIT1( FmControlData, FmEntryData );
DBG_NAME(FmControlData);
//------------------------------------------------------------------------
FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent,
const ImageList& _rNormalImages, const ImageList& _rHCImages, FmFormData*
_pParent )
- :FmEntryData( _pParent, _rxComponent )
- ,m_xFormComponent( _rxComponent )
+ :FmEntryData( _pParent, _rxComponent )
+ ,m_xFormComponent( _rxComponent )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::FmControlData" );
- DBG_CTOR(FmControlData,NULL);
- //////////////////////////////////////////////////////////////////////
- // Images setzen
- m_aNormalImage = GetImage( _rNormalImages );
- m_aHCImage = GetImage( _rHCImages );
-
- //////////////////////////////////////////////////////////////////////
- // Titel setzen
- Reference< XPropertySet > xSet(m_xFormComponent, UNO_QUERY);
- if( xSet.is() )
- {
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::FmControlData" );
+ DBG_CTOR(FmControlData,NULL);
+ //////////////////////////////////////////////////////////////////////
+ // Images setzen
+ m_aNormalImage = GetImage( _rNormalImages );
+ m_aHCImage = GetImage( _rHCImages );
+
+ //////////////////////////////////////////////////////////////////////
+ // Titel setzen
+ Reference< XPropertySet > xSet(m_xFormComponent, UNO_QUERY);
+ if( xSet.is() )
+ {
#ifdef DBG_UTIL
- ::rtl::OUString aEntryName =
::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ));
+ ::rtl::OUString aEntryName =
::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ));
#endif
- SetText( ::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME
)));
- }
+ SetText( ::comphelper::getString(xSet->getPropertyValue(
FM_PROP_NAME )));
+ }
}
//------------------------------------------------------------------------
FmControlData::~FmControlData()
{
- DBG_DTOR(FmControlData,NULL);
+ DBG_DTOR(FmControlData,NULL);
}
//------------------------------------------------------------------------
FmControlData::FmControlData( const FmControlData& rControlData )
- :FmEntryData( rControlData )
+ :FmEntryData( rControlData )
{
- DBG_CTOR(FmControlData,NULL);
- m_xFormComponent = rControlData.GetFormComponent();
+ DBG_CTOR(FmControlData,NULL);
+ m_xFormComponent = rControlData.GetFormComponent();
}
//------------------------------------------------------------------------
FmEntryData* FmControlData::Clone()
{
- return new FmControlData( *this );
+ return new FmControlData( *this );
}
//------------------------------------------------------------------------
Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::FmControlData" );
- //////////////////////////////////////////////////////////////////////
- // Default-Image
- Image aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CONTROL );
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::FmControlData" );
+ //////////////////////////////////////////////////////////////////////
+ // Default-Image
+ Image aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CONTROL );
- Reference< XServiceInfo > xInfo( m_xFormComponent, UNO_QUERY );
- if (!m_xFormComponent.is())
+ Reference< XServiceInfo > xInfo( m_xFormComponent, UNO_QUERY );
+ if (!m_xFormComponent.is())
return aImage;
- //////////////////////////////////////////////////////////////////////
- // Spezielle Control-Images
- sal_Int16 nObjectType = getControlTypeByObject(xInfo);
- switch (nObjectType)
- {
- case OBJ_FM_BUTTON:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_BUTTON );
- break;
-
- case OBJ_FM_FIXEDTEXT:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_FIXEDTEXT );
- break;
-
- case OBJ_FM_EDIT:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_EDIT );
- break;
-
- case OBJ_FM_RADIOBUTTON:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_RADIOBUTTON );
- break;
-
- case OBJ_FM_CHECKBOX:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CHECKBOX );
- break;
-
- case OBJ_FM_LISTBOX:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_LISTBOX );
- break;
-
- case OBJ_FM_COMBOBOX:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_COMBOBOX );
- break;
-
- case OBJ_FM_NAVIGATIONBAR:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_NAVIGATIONBAR );
- break;
-
- case OBJ_FM_GROUPBOX:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_GROUPBOX );
- break;
-
- case OBJ_FM_IMAGEBUTTON:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_IMAGEBUTTON );
- break;
-
- case OBJ_FM_FILECONTROL:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_FILECONTROL );
- break;
-
- case OBJ_FM_HIDDEN:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_HIDDEN );
- break;
-
- case OBJ_FM_DATEFIELD:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_DATEFIELD );
- break;
-
- case OBJ_FM_TIMEFIELD:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_TIMEFIELD );
- break;
-
- case OBJ_FM_NUMERICFIELD:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_NUMERICFIELD );
- break;
-
- case OBJ_FM_CURRENCYFIELD:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CURRENCYFIELD );
- break;
-
- case OBJ_FM_PATTERNFIELD:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_PATTERNFIELD );
- break;
-
- case OBJ_FM_IMAGECONTROL:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_IMAGECONTROL );
- break;
-
- case OBJ_FM_FORMATTEDFIELD:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_FORMATTEDFIELD );
- break;
-
- case OBJ_FM_GRID:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_GRID );
- break;
-
- case OBJ_FM_SCROLLBAR:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_SCROLLBAR );
- break;
-
- case OBJ_FM_SPINBUTTON:
- aImage = ilNavigatorImages.GetImage( RID_SVXIMG_SPINBUTTON);
- break;
- }
-
- return aImage;
+ //////////////////////////////////////////////////////////////////////
+ // Spezielle Control-Images
+ sal_Int16 nObjectType = getControlTypeByObject(xInfo);
+ switch (nObjectType)
+ {
+ case OBJ_FM_BUTTON:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_BUTTON );
+ break;
+
+ case OBJ_FM_FIXEDTEXT:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_FIXEDTEXT );
+ break;
+
+ case OBJ_FM_EDIT:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_EDIT );
+ break;
+
+ case OBJ_FM_RADIOBUTTON:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_RADIOBUTTON );
+ break;
+
+ case OBJ_FM_CHECKBOX:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CHECKBOX );
+ break;
+
+ case OBJ_FM_LISTBOX:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_LISTBOX );
+ break;
+
+ case OBJ_FM_COMBOBOX:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_COMBOBOX );
+ break;
+
+ case OBJ_FM_NAVIGATIONBAR:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_NAVIGATIONBAR );
+ break;
+
+ case OBJ_FM_GROUPBOX:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_GROUPBOX );
+ break;
+
+ case OBJ_FM_IMAGEBUTTON:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_IMAGEBUTTON );
+ break;
+
+ case OBJ_FM_FILECONTROL:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_FILECONTROL );
+ break;
+
+ case OBJ_FM_HIDDEN:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_HIDDEN );
+ break;
+
+ case OBJ_FM_DATEFIELD:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_DATEFIELD );
+ break;
+
+ case OBJ_FM_TIMEFIELD:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_TIMEFIELD );
+ break;
+
+ case OBJ_FM_NUMERICFIELD:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_NUMERICFIELD );
+ break;
+
+ case OBJ_FM_CURRENCYFIELD:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_CURRENCYFIELD );
+ break;
+
+ case OBJ_FM_PATTERNFIELD:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_PATTERNFIELD );
+ break;
+
+ case OBJ_FM_IMAGECONTROL:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_IMAGECONTROL );
+ break;
+
+ case OBJ_FM_FORMATTEDFIELD:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_FORMATTEDFIELD
);
+ break;
+
+ case OBJ_FM_GRID:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_GRID );
+ break;
+
+ case OBJ_FM_SCROLLBAR:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_SCROLLBAR );
+ break;
+
+ case OBJ_FM_SPINBUTTON:
+ aImage = ilNavigatorImages.GetImage( RID_SVXIMG_SPINBUTTON);
+ break;
+ }
+
+ return aImage;
}
//------------------------------------------------------------------------
sal_Bool FmControlData::IsEqualWithoutChilds( FmEntryData* pEntryData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::IsEqualWithoutChilds" );
- if(this == pEntryData)
- return sal_True;
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::IsEqualWithoutChilds" );
+ if(this == pEntryData)
+ return sal_True;
- if( !pEntryData->ISA(FmControlData) )
- return sal_False;
- FmControlData* pControlData = (FmControlData*)pEntryData;
+ if( !pEntryData->ISA(FmControlData) )
+ return sal_False;
+ FmControlData* pControlData = (FmControlData*)pEntryData;
- if( (XFormComponent*)m_xFormComponent.get() !=
(XFormComponent*)pControlData->GetFormComponent().get() )
- return sal_False;
+ if( (XFormComponent*)m_xFormComponent.get() !=
(XFormComponent*)pControlData->GetFormComponent().get() )
+ return sal_False;
- return FmEntryData::IsEqualWithoutChilds( pControlData );
+ return FmEntryData::IsEqualWithoutChilds( pControlData );
}
//------------------------------------------------------------------------
void FmControlData::ModelReplaced( const Reference< XFormComponent >& _rxNew,
const ImageList& _rNormalImages, const ImageList& _rHCImages )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::ModelReplaced" );
- m_xFormComponent = _rxNew;
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "[email protected]",
"FmControlData::ModelReplaced" );
+ m_xFormComponent = _rxNew;
newObject( m_xFormComponent );
- // Images neu setzen
- m_aNormalImage = GetImage( _rNormalImages );
+ // Images neu setzen
+ m_aNormalImage = GetImage( _rNormalImages );
m_aHCImage = GetImage( _rHCImages );
}
@@ -650,10 +642,10 @@ namespace svxform
//-----------------------------------------------------------------------
Size NavigatorFrame::CalcDockingSize( SfxChildAlignment eAlign )
{
- if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) )
- return Size();
+ if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign ==
SFX_ALIGN_BOTTOM ) )
+ return Size();
- return SfxDockingWindow::CalcDockingSize( eAlign );
+ return SfxDockingWindow::CalcDockingSize( eAlign );
}
//-----------------------------------------------------------------------
@@ -661,7 +653,7 @@ namespace svxform
{
if ( ( _eAlign == SFX_ALIGN_LEFT ) || ( _eAlign ==
SFX_ALIGN_RIGHT ) || ( _eAlign == SFX_ALIGN_NOALIGNMENT ) )
return _eAlign;
- return _eActAlign;
+ return _eActAlign;
}
//------------------------------------------------------------------------
@@ -680,7 +672,6 @@ namespace svxform
m_pNavigatorTree->SetPosSizePixel( aExplPos, aExplSize );
}
-
//========================================================================
// class NavigatorFrameManager
//========================================================================
@@ -700,4 +691,5 @@ namespace svxform
//............................................................................
} // namespace svxform
-//............................................................................
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/source/inc/fmexpl.hrc b/main/svx/source/inc/fmexpl.hrc
index 7c5fb7cd17..d76e43b92d 100644
--- a/main/svx/source/inc/fmexpl.hrc
+++ b/main/svx/source/inc/fmexpl.hrc
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef _SVX_FMEXPL_HRC
#define _SVX_FMEXPL_HRC
diff --git a/main/svx/source/inc/fmexpl.hxx b/main/svx/source/inc/fmexpl.hxx
index c71cc4e719..2ee248e829 100644
--- a/main/svx/source/inc/fmexpl.hxx
+++ b/main/svx/source/inc/fmexpl.hxx
@@ -19,7 +19,6 @@
*
*************************************************************/
-
#ifndef _SVX_FMEXPL_HXX
#define _SVX_FMEXPL_HXX
@@ -82,7 +81,7 @@ public:
//========================================================================
class FmNavModelReplacedHint : public SfxHint
{
- FmEntryData* pEntryData; // die Daten des Eintrages, der ein
neues Model bekommen hat
+ FmEntryData* pEntryData; // die Daten des Eintrages, der ein neues
Model bekommen hat
public:
TYPEINFO();
@@ -155,8 +154,8 @@ protected:
Image m_aHCImage;
::rtl::OUString aText;
- FmEntryDataList* pChildList;
- FmEntryData* pParent;
+ FmEntryDataList* pChildList;
+ FmEntryData* pParent;
protected:
void newObject( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& _rxIFace );
@@ -168,9 +167,9 @@ public:
FmEntryData( const FmEntryData& rEntryData );
virtual ~FmEntryData();
- void Clear();
- void SetText( const ::rtl::OUString& rText ){ aText = rText; }
- void SetParent( FmEntryData* pParentData ){ pParent = pParentData; }
+ void Clear();
+ void SetText( const ::rtl::OUString& rText ){ aText = rText; }
+ void SetParent( FmEntryData* pParentData ){ pParent = pParentData; }
const Image& GetNormalImage() const { return m_aNormalImage; }
const Image& GetHCImage() const { return m_aHCImage; }
@@ -211,7 +210,7 @@ public:
};
//========================================================================
-// FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er
bestimmte Eintraege selektieren soll
+// FmNavRequestSelectHint - jemand teilt dem NavigatorTree mit, dass er
bestimmte Einträge selektieren soll
typedef FmEntryData* FmEntryDataPtr;
SV_DECL_PTRARR_SORT( FmEntryDataArray, FmEntryDataPtr, 16, 16 )
@@ -265,7 +264,6 @@ public:
virtual FmEntryData* Clone();
};
-
//========================================================================
class FmControlData : public FmEntryData
{
@@ -296,7 +294,6 @@ public:
);
};
-
//========================================================================
//............................................................................
namespace svxform
@@ -350,10 +347,10 @@ namespace svxform
friend class NavigatorTree;
friend class OFormComponentObserver;
- FmEntryDataList* m_pRootList;
- FmFormShell* m_pFormShell;
- FmFormPage* m_pFormPage;
- FmFormModel* m_pFormModel;
+ FmEntryDataList* m_pRootList;
+ FmFormShell* m_pFormShell;
+ FmFormPage* m_pFormPage;
+ FmFormModel* m_pFormModel;
OFormComponentObserver* m_pPropChangeList;
ImageList m_aNormalImages;
@@ -375,8 +372,8 @@ namespace svxform
void BroadcastMarkedObjects(const SdrMarkList& mlMarked);
// einen RequestSelectHint mit den aktuell markierten
Objekten broadcasten
sal_Bool InsertFormComponent(FmNavRequestSelectHint& rHint,
SdrObject* pObject);
- // ist ein Helper fuer vorherige, managet das Abteigen
in SdrObjGroups
- // Rueckgabe sal_True, wenn das Objekt eine
FormComponent ist (oder rekursiv nur aus solchen besteht)
+ // ist ein Helper für vorherige, managet das Absteigen
in SdrObjGroups
+ // Rückgabe sal_True, wenn das Objekt eine
FormComponent ist (oder rekursiv nur aus solchen besteht)
public:
NavigatorTreeModel( const ImageList& _rNormalImages, const
ImageList& _rHCImages );
@@ -418,10 +415,10 @@ namespace svxform
enum DROP_ACTION { DA_SCROLLUP, DA_SCROLLDOWN,
DA_EXPANDNODE };
enum SELDATA_ITEMS { SDI_DIRTY, SDI_ALL, SDI_NORMALIZED,
SDI_NORMALIZED_FORMARK };
- // beim Droppen will ich scrollen und Folder aufklappen
koennen, dafuer :
+ // beim Droppen will ich scrollen und Folder aufklappen können,
dafür :
AutoTimer m_aDropActionTimer;
Timer m_aSynchronizeTimer;
- // die Meta-Daten ueber meine aktuelle Selektion
+ // die Meta-Daten über meine aktuelle Selektion
SvLBoxEntrySortedArray m_arrCurrentSelection;
// the entries which, in the view, are currently marked as
"cut" (painted semi-transparent)
ListBoxEntrySet m_aCutEntries;
@@ -439,24 +436,23 @@ namespace svxform
sal_uLong nEditEvent;
SELDATA_ITEMS m_sdiState;
- Point m_aTimerTriggered; // die Position, an
der der DropTimer angeschaltet wurde
+ Point m_aTimerTriggered; // die Position, an der
der DropTimer angeschaltet wurde
DROP_ACTION m_aDropActionType;
sal_uInt16 m_nSelectLock;
sal_uInt16 m_nFormsSelected;
sal_uInt16 m_nControlsSelected;
- sal_uInt16 m_nHiddenControls; // (die Zahl geht
in m_nControlsSelected mit ein)
+ sal_uInt16 m_nHiddenControls; // (die Zahl geht in
m_nControlsSelected mit ein)
unsigned short m_aTimerCounter;
- sal_Bool m_bDragDataDirty : 1; // dito
+ sal_Bool m_bDragDataDirty : 1; // dito
sal_Bool m_bPrevSelectionMixed : 1;
- sal_Bool m_bMarkingObjects : 1; // wenn
das sal_True ist, brauche ich auf die RequestSelectHints nicht reagieren
+ sal_Bool m_bMarkingObjects : 1; // wenn
das sal_True ist, brauche ich auf die RequestSelectHints nicht reagieren
sal_Bool m_bRootSelected : 1;
- sal_Bool m_bInitialUpdate : 1; // bin
ich das erste Mal im UpdateContent ?
+ sal_Bool m_bInitialUpdate : 1; // bin ich
das erste Mal im UpdateContent ?
sal_Bool m_bKeyboardCut
: 1;
-
void UpdateContent();
sal_Bool IsDeleteAllowed();
FmControlData* NewControl( const ::rtl::OUString&
rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True );
@@ -464,33 +460,32 @@ namespace svxform
SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong
nRelPos=LIST_APPEND );
void Remove( FmEntryData* pEntryData );
-
void CollectSelectionData(SELDATA_ITEMS sdiHow);
- // sammelt in m_arrCurrentSelection die aktuell
selektierten Eintraege, normalisiert die Liste wenn verlangt
- // SDI_NORMALIZED bedeutet einfach, dass alle
Eintraege, die schon einen selektierten Vorfahren haben, nicht mit gesammelt
+ // sammelt in m_arrCurrentSelection die aktuell
selektierten Einträge, normalisiert die Liste wenn verlangt
+ // SDI_NORMALIZED bedeutet einfach, dass alle Einträge,
die schon einen selektierten Vorfahren haben, nicht mit gesammelt
// werden.
- // SDI_NORMALIZED_FORMARK bedeutet, dass wie bei
SDI_NORMALIZED verfahren wird, aber Eintraege, deren direktes Elter nicht
- // selektiert ist, aufgenommen werden (unabhaengig vom
Status weiterer Vorfahren), desgleichen Formulare, die selektiert sind,
- // unabhaengig vom Status irgendwelcher Vorfahren
- // Bei beiden Normalized-Modi enthalten die
m_nFormsSelected, ... die richtige Anzahl, auch wenn nicht alle dieser Eintraege
+ // SDI_NORMALIZED_FORMARK bedeutet, dass wie bei
SDI_NORMALIZED verfahren wird, aber Einträge, deren direktes Elter nicht
+ // selektiert ist, aufgenommen werden (unabhängig vom
Status weiterer Vorfahren), desgleichen Formulare, die selektiert sind,
+ // unabhängig vom Status irgendwelcher Vorfahren
+ // Bei beiden Normalized-Modi enthalten die
m_nFormsSelected, ... die richtige Anzahl, auch wenn nicht alle dieser Einträge
// in m_arrCurrentSelection landen.
- // SDI_DIRTY ist natuerlich nicht erlaubt als Parameter
+ // SDI_DIRTY ist natürlich nicht erlaubt als Parameter
- // ein einziges Interface fuer alle selektierten Eintraege
zusammensetzen
+ // ein einziges Interface für alle selektierten Einträge
zusammensetzen
void ShowSelectionProperties(sal_Bool bForce = sal_False);
- // alle selektierten Elemnte loeschen
+ // alle selektierten Elemente löschen
void DeleteSelection();
void SynchronizeSelection(FmEntryDataArray& arredToSelect);
- // nach dem Aufruf dieser Methode sind genau die
Eintraege selektiert, die in dem Array bezeichnet sind
+ // nach dem Aufruf dieser Methode sind genau die
Einträge selektiert, die in dem Array bezeichnet sind
void SynchronizeSelection();
// macht das selbe, nimmt die MarkList der
::com::sun::star::sdbcx::View
void SynchronizeMarkList();
// umgekehrte Richtung von SynchronizeMarkList :
markiert in der ::com::sun::star::sdbcx::View alle der aktuellen Selektion
entsprechenden Controls
- void CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set<
::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >&
_rObjects);
+ void CollectObjects(FmFormData* pFormData, sal_Bool bDeep,
::std::set< ::com::sun::star::uno::Reference<
::com::sun::star::form::XFormComponent > >& _rObjects);
- // im Select aktualisiere ich normalerweise die Marklist der
zugehoerigen ::com::sun::star::sdbcx::View, mit folgenden Funktionen
+ // im Select aktualisiere ich normalerweise die Marklist der
zugehörigen ::com::sun::star::sdbcx::View, mit folgenden Funktionen
// kann ich das Locking dieses Verhaltens steuern
void LockSelectionHandling() { ++m_nSelectLock; }
void UnlockSelectionHandling() { --m_nSelectLock; }
@@ -510,7 +505,7 @@ namespace svxform
virtual void Command( const CommandEvent& rEvt );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt
);
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent&
rEvt );
virtual void StartDrag( sal_Int8 nAction, const
Point& rPosPixel );
public:
@@ -539,10 +534,10 @@ namespace svxform
virtual void ModelHasRemoved( SvListEntry* _pEntry );
- using SvTreeListBox::Insert;
- using SvTreeListBox::ExecuteDrop;
- using SvTreeListBox::Select;
- using SvTreeListBox::Notify;
+ using SvTreeListBox::Insert;
+ using SvTreeListBox::ExecuteDrop;
+ using SvTreeListBox::Select;
+ using SvTreeListBox::Notify;
private:
sal_Int8 implAcceptDataTransfer( const
DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const Point& _rDropPos,
sal_Bool _bDnD );
@@ -579,7 +574,7 @@ namespace svxform
virtual Size CalcDockingSize( SfxChildAlignment );
virtual SfxChildAlignment CheckAlignment( SfxChildAlignment,
SfxChildAlignment );
- using SfxDockingWindow::StateChanged;
+ using SfxDockingWindow::StateChanged;
public:
NavigatorFrame( SfxBindings *pBindings, SfxChildWindow *pMgr,
@@ -605,3 +600,5 @@ namespace svxform
//............................................................................
#endif // _SVX_FMEXPL_HXX
+
+/* vim: set noet sw=4 ts=4: */
