diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-22 01:51:46 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-22 11:09:38 +0200 |
commit | 0dbe3d40579d20f4cbce3ce155996ff4b5c32c99 (patch) | |
tree | 7203a64b79e4a848c7ff4acd3922d1930679b117 | |
parent | e39bf3677109976cae13e1bdff044e2d5769c098 (diff) |
Fix wrong use of OUString::copy
Code like:
if( aCommandURL.copy(5) != ".uno:" )
is obviously wrong, as OUString::copy(sal_Int32) takes the _beginning_
index, so for this condition to be false the command URL must have
".uno:" in the _middle_ of the string. This created some weird things
like an empty label attribute added to any submenu item. Moreover, the
command URL can be easily shorter than 5 (like when a custom submenu
added by the user). Using copy(5) in such case officially considered as
"undefined behavior" and will trigger an assert in debug build (that's
how I discovered this code actually).
Most likely the original intent was to check whether the command URL
doesn't start with ".uno:", and so should be changed to use
OUString::startsWith. But doing that will create a regression, as it
won't be possible anymore to change labels of commands that start with
".uno:". Simply dropping this check seems to be better solution here.
Change-Id: I2f88807eceae1006066a14750f2003e235f49ad4
-rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 1d7122e2b68c..5f5925873a8a 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -80,8 +80,6 @@ static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; // special popup menus (filled during runtime) must be saved as an empty popup menu or menuitem!!! -static const sal_Int32 CMD_PROTOCOL_SIZE = 5; -static const char CMD_PROTOCOL[] = ".uno:"; static const char ADDDIRECT_CMD[] = ".uno:AddDirect"; static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu"; @@ -839,7 +837,7 @@ throw ( SAXException, RuntimeException ) m_aAttributeType, aCommandURL ); - if ( aCommandURL.copy( CMD_PROTOCOL_SIZE ) != CMD_PROTOCOL ) + if ( !aLabel.isEmpty() ) pListMenu->AddAttribute( ATTRIBUTE_NS_LABEL, m_aAttributeType, aLabel ); @@ -897,13 +895,13 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, cons aHelpURL ); } - if ( !aLabel.isEmpty() && aCommandURL.copy( CMD_PROTOCOL_SIZE ) != CMD_PROTOCOL ) + if ( !aLabel.isEmpty() ) { pList->AddAttribute( ATTRIBUTE_NS_LABEL, m_aAttributeType, aLabel ); } - if (( nStyle > 0 ) && aCommandURL.copy( CMD_PROTOCOL_SIZE ) != CMD_PROTOCOL ) + if ( nStyle > 0 ) { OUString aValue; MenuStyleItem* pStyle = MenuItemStyles; |