summaryrefslogtreecommitdiff
path: root/framework/source/fwe
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-23 16:03:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-25 17:19:22 +0200
commitd116894b26f538793a0d5dc5847efd2fb53e7acb (patch)
tree5d99d51c14bccc6a08d646b32246814c8b1bd61d /framework/source/fwe
parent3361e28f944d9f752f0e0df91968559f1ae55f72 (diff)
loplugin:oncevar in formula..framework
Change-Id: I96d6af49c1994ebd7d6dcc41469127e3151b4350 Reviewed-on: https://gerrit.libreoffice.org/39186 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/fwe')
-rw-r--r--framework/source/fwe/helper/titlehelper.cxx3
-rw-r--r--framework/source/fwe/xml/statusbardocumenthandler.cxx12
-rw-r--r--framework/source/fwe/xml/toolboxdocumenthandler.cxx12
-rw-r--r--framework/source/fwe/xml/xmlnamespaces.cxx3
4 files changed, 10 insertions, 20 deletions
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index ddce708ab7fe..63fbd191299d 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -559,8 +559,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle)
OUString version(utl::ConfigManager::getProductVersion());
sTitle.append(' ');
sTitle.append(version);
- OUString sDefault("development");
- OUString sVersion = ::utl::Bootstrap::getBuildIdData(sDefault);
+ OUString sVersion = ::utl::Bootstrap::getBuildIdData("development");
sTitle.append(" [");
sTitle.append(sVersion);
if (OpenGLWrapper::isVCLOpenGLEnabled())
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 033103d25a80..d1edc94bb6d8 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -147,24 +147,20 @@ OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler(
const Reference< XIndexContainer >& rStatusBarItems ) :
m_aStatusBarItems( rStatusBarItems )
{
- OUString aNamespaceStatusBar( XMLNS_STATUSBAR );
- OUString aNamespaceXLink( XMLNS_XLINK );
- OUString aSeparator( XMLNS_FILTER_SEPARATOR );
-
// create hash map
for ( int i = 0; i < (int)SB_XML_ENTRY_COUNT; i++ )
{
if ( StatusBarEntries[i].nNamespace == SB_NS_STATUSBAR )
{
- OUString temp( aNamespaceStatusBar );
- temp += aSeparator;
+ OUString temp( XMLNS_STATUSBAR );
+ temp += XMLNS_FILTER_SEPARATOR;
temp += OUString::createFromAscii( StatusBarEntries[i].aEntryName );
m_aStatusBarMap.insert( StatusBarHashMap::value_type( temp, (StatusBar_XML_Entry)i ) );
}
else
{
- OUString temp( aNamespaceXLink );
- temp += aSeparator;
+ OUString temp( XMLNS_XLINK );
+ temp += XMLNS_FILTER_SEPARATOR;
temp += OUString::createFromAscii( StatusBarEntries[i].aEntryName );
m_aStatusBarMap.insert( StatusBarHashMap::value_type( temp, (StatusBar_XML_Entry)i ) );
}
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 4076a489d0a0..21f2d53ccc5d 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -127,24 +127,20 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde
m_aIsVisible( ITEM_DESCRIPTOR_VISIBLE ),
m_aCommandURL( ITEM_DESCRIPTOR_COMMANDURL )
{
- OUString aNamespaceToolBar( XMLNS_TOOLBAR );
- OUString aNamespaceXLink( XMLNS_XLINK );
- OUString aSeparator( XMLNS_FILTER_SEPARATOR );
-
// create hash map
for ( int i = 0; i < (int)TB_XML_ENTRY_COUNT; i++ )
{
if ( ToolBoxEntries[i].nNamespace == TB_NS_TOOLBAR )
{
- OUString temp( aNamespaceToolBar );
- temp += aSeparator;
+ OUString temp( XMLNS_TOOLBAR );
+ temp += XMLNS_FILTER_SEPARATOR;
temp += OUString::createFromAscii( ToolBoxEntries[i].aEntryName );
m_aToolBoxMap.insert( ToolBoxHashMap::value_type( temp, (ToolBox_XML_Entry)i ) );
}
else
{
- OUString temp( aNamespaceXLink );
- temp += aSeparator;
+ OUString temp( XMLNS_XLINK );
+ temp += XMLNS_FILTER_SEPARATOR;
temp += OUString::createFromAscii( ToolBoxEntries[i].aEntryName );
m_aToolBoxMap.insert( ToolBoxHashMap::value_type( temp, (ToolBox_XML_Entry)i ) );
}
diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx
index 0562d56c2191..a658cf12961e 100644
--- a/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -166,8 +166,7 @@ OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const
else
{
// namespace not defined => throw exception!
- OUString aErrorMessage( "XML namespace used but not defined!" );
- throw SAXException( aErrorMessage, Reference< XInterface >(), Any() );
+ throw SAXException( "XML namespace used but not defined!", Reference< XInterface >(), Any() );
}
}
}