diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-01 14:37:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-02 07:12:46 +0000 |
| commit | a7369d98991eb41e0e6bb008ef0305c17859540e (patch) | |
| tree | 8bc87665d071392677446332725de3b6004d1530 /oox/source | |
| parent | 5d39c2013374727b1c8f147b8b99d54402a7ff02 (diff) | |
loplugin:oncevar in helpcompiler..reportdesign
Change-Id: I2dc57931fb230953c285aeb18f57c0a41fedafcb
Reviewed-on: https://gerrit.libreoffice.org/30463
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/texteffectscontext.cxx | 4 | ||||
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx index 7b7f32e69976..52abd9500456 100644 --- a/oox/source/drawingml/texteffectscontext.cxx +++ b/oox/source/drawingml/texteffectscontext.cxx @@ -98,8 +98,6 @@ OUString lclGetGrabBagName(sal_uInt32 aId) return aGrabBagNameMap[aId]; } -const char constAttributesSequenceName[] = "attributes"; - } using namespace oox::core; @@ -131,7 +129,7 @@ void TextEffectsContext::pushAttributeToGrabBag (sal_Int32 aAttributeId, const O void TextEffectsContext::processAttributes(const AttributeList& rAttribs) { - mpGrabBagStack->push(constAttributesSequenceName); + mpGrabBagStack->push("attributes"); switch(mnCurrentElement) { case OOX_TOKEN(w14, glow): diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 69ab00395709..b6ea8a2726e6 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2520,9 +2520,6 @@ HtmlSelectModel::HtmlSelectModel() bool HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) { - static const char sMultiple[] = "<SELECT MULTIPLE"; - static const char sSelected[] = "OPTION SELECTED"; - OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() ); OUString data = sStringContents; @@ -2540,7 +2537,7 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) OUString sLine( data.getToken( nToken, '\n' ) ); if ( !nToken ) // first line will tell us if multiselect is enabled { - if ( sLine == sMultiple ) + if ( sLine == "<SELECT MULTIPLE" ) mnMultiSelect = AX_SELECTION_MULTI; } // skip first and last lines, no data there @@ -2558,7 +2555,7 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) displayValue = displayValue.replaceAll( """, "\"" ); displayValue = displayValue.replaceAll( "&", "&" ); listValues.push_back( displayValue ); - if( sLine.indexOf( sSelected ) != -1 ) + if( sLine.indexOf( "OPTION SELECTED" ) != -1 ) selectedIndices.push_back( static_cast< sal_Int16 >( listValues.size() ) - 1 ); } } |