Skip to content

C
core
Kaydet (Commit) 0db33615 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt
Dosyalara gözat
Seçenekler

Fix indentation 

Change-Id: Ie0b842cd35ca05e4adfc0b8692423e0a91e1739c
üst bba3f7bf
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 30 deletions
framework/source/fwe/xml/toolboxdocumenthandler.cxx
Dosyayı görüntüle @ 0db33615
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment