diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-12-15 09:29:20 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-12-16 12:10:07 +0100 |
| commit | 0db3361527f799be6cadf5bedb8a37976fb0a39d (patch) | |
| tree | b1a90f4371ae6a0c3fcc7702f3429c85bf3e9ad9 /framework | |
| parent | bba3f7bf8f831bf7f51de6441b3f15ed667e56fd (diff) | |
Fix indentation
Change-Id: Ie0b842cd35ca05e4adfc0b8692423e0a91e1739c
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/xml/toolboxdocumenthandler.cxx | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 912e2e1056ec..c00266227ad4 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -162,8 +162,8 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde m_nHashCode_Style_DropDown = OUString( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); m_nHashCode_Style_Repeat = OUString( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); m_nHashCode_Style_DropDownOnly = OUString( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode(); - m_nHashCode_Style_Text = OUString( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); - m_nHashCode_Style_Image = OUString( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); + m_nHashCode_Style_Text = OUString( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode(); + m_nHashCode_Style_Image = OUString( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode(); m_bToolBarStartFound = false; m_bToolBarEndFound = false; @@ -216,43 +216,42 @@ throw( SAXException, RuntimeException, std::exception ) aErrorMessage += "Element 'toolbar:toolbar' cannot be embedded into 'toolbar:toolbar'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - else - { - // Check if we have a UI name set in our XML file - OUString aUIName; - for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) - { + else + { + // Check if we have a UI name set in our XML file + OUString aUIName; + for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) + { pToolBoxEntry = m_aToolBoxMap.find( xAttribs->getNameByIndex( n ) ); if ( pToolBoxEntry != m_aToolBoxMap.end() ) { - switch ( pToolBoxEntry->second ) - { - case TB_ATTRIBUTE_UINAME: + switch ( pToolBoxEntry->second ) + { + case TB_ATTRIBUTE_UINAME: aUIName = xAttribs->getValueByIndex( n ); - break; - default: - break; - } - } + break; + default: + break; } - - if ( !aUIName.isEmpty() ) + } + } + if ( !aUIName.isEmpty() ) + { + // Try to set UI name as a container property + Reference< XPropertySet > xPropSet( m_rItemContainer, UNO_QUERY ); + if ( xPropSet.is() ) + { + try + { + xPropSet->setPropertyValue("UIName", makeAny( aUIName ) ); + } + catch ( const UnknownPropertyException& ) { - // Try to set UI name as a container property - Reference< XPropertySet > xPropSet( m_rItemContainer, UNO_QUERY ); - if ( xPropSet.is() ) - { - try - { - xPropSet->setPropertyValue("UIName", makeAny( aUIName ) ); - } - catch ( const UnknownPropertyException& ) - { - } - } } } + } + } m_bToolBarStartFound = true; } break; |