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

INTEGRATION: CWS fwk80_SRC680 (1.31.102); FILE MERGED

Browse Source 
2008/01/14 06:23:48 mav 1.31.102.3: RESYNC: (1.31-1.31.110.1); FILE MERGED
2007/12/10 10:50:08 cd 1.31.102.2: #i84351# Small code refactoring to prevent duplicate entries in user interface element list
2007/12/07 17:49:25 cd 1.31.102.1: #i84351# Don't insert a ui element more than once into the element vector
This commit is contained in:
Rüdiger Timm
2008-01-29 14:22:53 +00:00
parent a88e2c4801
commit 38f563199d
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
framework/inc/services/layoutmanager.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: layoutmanager.hxx,v $ * $RCSfile: layoutmanager.hxx,v $
* *
* $Revision: 1.32 $ * $Revision: 1.33 $
* *
* last change: $Author: obo $ $Date: 2008-01-04 16:20:58 $ * last change: $Author: rt $ $Date: 2008-01-29 15:22:53 $
* *
* 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.
@@ -411,22 +411,23 @@ namespace framework
m_nStyle( BUTTON_SYMBOL ) {} m_nStyle( BUTTON_SYMBOL ) {}
bool operator< ( const UIElement& aUIElement ) const; bool operator< ( const UIElement& aUIElement ) const;
UIElement& operator=( const UIElement& rUIElement );
rtl::OUString m_aType; rtl::OUString m_aType;
rtl::OUString m_aName; rtl::OUString m_aName;
rtl::OUString m_aUIName; rtl::OUString m_aUIName;
com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xUIElement; com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > m_xUIElement;
sal_Bool m_bFloating : 1, sal_Bool m_bFloating,
m_bVisible : 1, m_bVisible,
m_bUserActive : 1, m_bUserActive,
m_bCreateNewRowCol0 : 1, m_bCreateNewRowCol0,
m_bDeactiveHide : 1, m_bDeactiveHide,
m_bMasterHide : 1, m_bMasterHide,
m_bContextSensitive : 1, m_bContextSensitive,
m_bContextActive : 1; m_bContextActive;
sal_Bool m_bNoClose : 1, sal_Bool m_bNoClose,
m_bSoftClose : 1, m_bSoftClose,
m_bStateRead : 1; m_bStateRead;
sal_Int16 m_nStyle; sal_Int16 m_nStyle;
DockedData m_aDockedData; DockedData m_aDockedData;
FloatingData m_aFloatingData; FloatingData m_aFloatingData;
@@ -454,6 +455,7 @@ namespace framework
sal_Bool implts_findElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xUIElement, UIElement& aElementData ); sal_Bool implts_findElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xUIElement, UIElement& aElementData );
sal_Bool implts_findElement( const rtl::OUString& aName, UIElement& aElementData ); sal_Bool implts_findElement( const rtl::OUString& aName, UIElement& aElementData );
UIElement& impl_findElement( const rtl::OUString& aName ); UIElement& impl_findElement( const rtl::OUString& aName );
sal_Bool implts_insertUIElement( const UIElement& rUIElement );
void implts_refreshContextToolbarsVisibility(); void implts_refreshContextToolbarsVisibility();
void implts_writeNewStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow ); void implts_writeNewStateData( const rtl::OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
@@ -543,6 +545,8 @@ namespace framework
void implts_notifyListeners( short nEvent, ::com::sun::star::uno::Any aInfoParam ); void implts_notifyListeners( short nEvent, ::com::sun::star::uno::Any aInfoParam );
void implts_checkElementContainer();
DECL_LINK( OptionsChanged, void* ); DECL_LINK( OptionsChanged, void* );
DECL_LINK( SettingsChanged, void* ); DECL_LINK( SettingsChanged, void* );