loplogin:singlevalfields in include/

Change-Id: I27842162fcf82120ecb811ee8e89e187430931fc
Reviewed-on: https://gerrit.libreoffice.org/28931
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 22 insertions, 42 deletions

diff --git a/svtools/source/svhtml/HtmlWriter.cxx b/svtools/source/svhtml/HtmlWriter.cxx
index ea5b93a00fa6..befadafbea3e 100644
--- a/svtools/source/svhtml/HtmlWriter.cxx
+++ b/svtools/source/svhtml/HtmlWriter.cxx
@@ -15,8 +15,7 @@ HtmlWriter::HtmlWriter(SvStream& rStream) :
     mrStream(rStream),
     mbElementOpen(false),
     mbContentWritten(false),
-    mbPrettyPrint(true),
-    maEncoding(RTL_TEXTENCODING_UTF8)
+    mbPrettyPrint(true)
 {}
 
 HtmlWriter::~HtmlWriter()
@@ -129,7 +128,7 @@ void HtmlWriter::attribute(const OString& aAttribute, const char* pValue)
 
 void HtmlWriter::attribute(const OString& aAttribute, const OUString& aValue)
 {
-    attribute(aAttribute, OUStringToOString(aValue, maEncoding));
+    attribute(aAttribute, OUStringToOString(aValue, RTL_TEXTENCODING_UTF8));
 }
 
 void HtmlWriter::attribute(const OString& aAttribute)
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 314934c943fb..bf6c771e39c7 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -41,7 +41,6 @@ FrameStatusListener::FrameStatusListener(
     const Reference< XComponentContext >& rxContext,
     const Reference< XFrame >& xFrame ) :
     OWeakObject()
-    ,   m_bInitialized( true )
     ,   m_bDisposed( false )
     ,   m_xFrame( xFrame )
     ,   m_xContext( rxContext )
@@ -170,44 +169,32 @@ void FrameStatusListener::addStatusListener( const OUString& aCommandURL )
         if ( pIter != m_aListenerMap.end() )
             return;
 
-        // Check if we are already initialized. Implementation starts adding itself as status listener when
-        // intialize is called.
-        if ( !m_bInitialized )
-        {
-            // Put into the unordered_map of status listener. Will be activated when initialized is called
-            m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, Reference< XDispatch >() ));
-            return;
-        }
-        else
+        Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
+        if ( m_xContext.is() && xDispatchProvider.is() )
         {
-            // Add status listener directly as intialize has already been called.
-            Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
-            if ( m_xContext.is() && xDispatchProvider.is() )
+            Reference< XURLTransformer > xURLTransformer( css::util::URLTransformer::create( m_xContext ) );
+            aTargetURL.Complete = aCommandURL;
+            xURLTransformer->parseStrict( aTargetURL );
+            xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+
+            xStatusListener.set( static_cast< OWeakObject* >( this ), UNO_QUERY );
+            URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL );
+            if ( aIter != m_aListenerMap.end() )
             {
-                Reference< XURLTransformer > xURLTransformer( css::util::URLTransformer::create( m_xContext ) );
-                aTargetURL.Complete = aCommandURL;
-                xURLTransformer->parseStrict( aTargetURL );
-                xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
+                Reference< XDispatch > xOldDispatch( aIter->second );
+                aIter->second = xDispatch;
 
-                xStatusListener.set( static_cast< OWeakObject* >( this ), UNO_QUERY );
-                URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL );
-                if ( aIter != m_aListenerMap.end() )
+                try
+                {
+                    if ( xOldDispatch.is() )
+                        xOldDispatch->removeStatusListener( xStatusListener, aTargetURL );
+                }
+                catch (const Exception&)
                 {
-                    Reference< XDispatch > xOldDispatch( aIter->second );
-                    aIter->second = xDispatch;
-
-                    try
-                    {
-                        if ( xOldDispatch.is() )
-                            xOldDispatch->removeStatusListener( xStatusListener, aTargetURL );
-                    }
-                    catch (const Exception&)
-                    {
-                    }
                 }
-                else
-                    m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, xDispatch ));
             }
+            else
+                m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, xDispatch ));
         }
     }
 
@@ -231,9 +218,6 @@ void FrameStatusListener::bindListener()
     {
         SolarMutexGuard aSolarMutexGuard;
 
-        if ( !m_bInitialized )
-            return;
-
         // Collect all registered command URL's and store them temporary
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         if ( m_xContext.is() && xDispatchProvider.is() )
@@ -299,9 +283,6 @@ void FrameStatusListener::unbindListener()
 {
     SolarMutexGuard aSolarMutexGuard;
 
-    if ( !m_bInitialized )
-        return;
-
     // Collect all registered command URL's and store them temporary
     Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
     if ( m_xContext.is() && xDispatchProvider.is() )