[Libreoffice-commits] core.git: cui/source

[Stephan Bergmann]

 cui/source/options/optgdlg.cxx |    6 ++----
 cui/source/options/treeopt.cxx |    3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 3700700982f49d5e1dc599791517abc31c38dbf8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 11 11:39:54 2013 +0200

    -Werror,-Wunused-variable
    
    Change-Id: Ie599ddddca533db3a626ab63a9d47e10d76a4a94

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 55d76b5..6c7f60e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1079,8 +1079,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
     {
         // we'll just leave the box in it's default setting and won't
         // even give it event handler...
-        OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-        OSL_FAIL(aMsg.getStr());
+        SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
     }
 
     m_pWesternLanguageLB->SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, sal_True,  sal_False, sal_True );
@@ -1239,8 +1238,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
     {
         // we'll just leave the box in it's default setting and won't
         // even give it event handler...
-        OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
-        OSL_FAIL(aMsg.getStr());
+        SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\"");
     }
 
     OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0ece675..062d9c9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1607,8 +1607,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
 
 
     OUString aFactory = getCurrentFactory_Impl( _xFrame );
-    OUString sTemp = GetModuleIdentifier( _xFrame );
-    DBG_ASSERT( sTemp == aFactory, "S H I T!!!" );
+    DBG_ASSERT( GetModuleIdentifier( _xFrame ) == aFactory, "S H I T!!!" );
 
     // Writer and Writer/Web options
     SvtModuleOptions aModuleOpt;