[Libreoffice-commits] core.git: 8 commits - framework/inc framework/source include/svx
Eike Rathke
erack at redhat.com
Thu Apr 17 17:04:11 PDT 2014
framework/inc/helper/mischelper.hxx | 3 --
framework/source/fwi/helper/mischelper.cxx | 13 ++++------
framework/source/uielement/langselectionmenucontroller.cxx | 7 ++---
framework/source/uielement/langselectionstatusbarcontroller.cxx | 13 +++-------
include/svx/langbox.hxx | 1
5 files changed, 14 insertions(+), 23 deletions(-)
New commits:
commit 619b4c40da9e85febbb08a3f7cf8aa8d10963fc1
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 02:02:47 2014 +0200
and again ... geez..
Change-Id: Ib74e4690de547612bbc58ad7db650cf37931d7dd
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index df3f2bc..78733cf 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -194,7 +194,7 @@ throw (css::uno::RuntimeException)
}
xPopupMenu->insertItem( MID_LANG_SEL_NONE, FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE );
- if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == m_aCurLang )
+ if ( sNone == m_aCurLang )
xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True );
xPopupMenu->insertItem( MID_LANG_SEL_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET );
xPopupMenu->insertItem( MID_LANG_SEL_MORE, FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE );
commit 14f917058e214b4796856655fc3989366bd67139
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 02:01:20 2014 +0200
and again
Change-Id: I79fd5b90fd79f55bd80a4ab297192114aae5da42
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index b2f3d45..df3f2bc 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -204,7 +204,7 @@ throw (css::uno::RuntimeException)
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if( rStr != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) )&&
+ if( rStr != sNone &&
rStr != sAsterisk &&
rStr != sEmpty)
{
commit 131edeac010f61918bd9403f5e7e2cb2025dedd9
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 02:00:31 2014 +0200
why obtain the string in each iteration again
Change-Id: I3faf1d27bb11eeabbe91da32d35480c9381c50e2
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 7d3e9be..b2f3d45 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -170,12 +170,13 @@ throw (css::uno::RuntimeException)
sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
const OUString sAsterisk("*"); // multiple languages in current selection
const OUString sEmpty; // 'no language found' from language guessing
+ const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ));
std::map< sal_Int16, OUString > aLangMap;
std::set< OUString >::const_iterator it;
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if ( rStr != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) ) &&
+ if ( rStr != sNone &&
rStr != sAsterisk &&
rStr != sEmpty)
{
commit d4ccbef95dd026a489d920d8a0929a84984b6250
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 01:58:42 2014 +0200
why obtain the string in each iteration again
Change-Id: I78225a0b0b53178e6cb7d534d767f5984604e442
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 3c1cf94..8d1ced1 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -233,11 +233,12 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command
const OUString sAsterisk("*"); // multiple languages in current selection
const OUString sEmpty; // 'no language found' from language guessing
+ const OUString sNone( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ));
std::set< OUString >::const_iterator it;
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if (rStr != SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) &&
+ if (rStr != sNone &&
rStr != sAsterisk &&
rStr != sEmpty)
{
commit ca5361ce25f595ceabe4305466f6b45c3907e86c
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 01:47:33 2014 +0200
remove unused fwd-decl
Change-Id: I20d4fc89d349db85feecffbcd85d7b0300540c0a
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 0208142..d5ca097 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -24,7 +24,6 @@
#include <vcl/image.hxx>
#include <vcl/lstbox.hxx>
-class SvtLanguageTable;
#define LANG_LIST_EMPTY 0x0000
#define LANG_LIST_ALL 0x0001
commit bf1737cfe67588bb853112e2b044e43d704d8bf5
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 01:43:14 2014 +0200
and another SvtLanguageTable instance bites the dust
Change-Id: I1109d1b7a403d4feb2791e758e1c0540b25029ba
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 066c3ae..7d3e9be 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -73,8 +73,6 @@ using namespace css::i18n;
using namespace css::document;
using namespace framework;
-class SvtLanguageTable;
-
namespace {
class LangSelectionStatusbarController:
@@ -163,8 +161,6 @@ throw (css::uno::RuntimeException)
//sub menu that contains all items except the last two items: Separator + Set Language for Paragraph
Reference< awt::XPopupMenu > subPopupMenu( awt::PopupMenu::create( m_xContext ) );
- SvtLanguageTable aLanguageTable;
-
// get languages to be displayed in the menu
std::set< OUString > aLangItems;
FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper,
@@ -179,7 +175,7 @@ throw (css::uno::RuntimeException)
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if ( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) ) &&
+ if ( rStr != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) ) &&
rStr != sAsterisk &&
rStr != sEmpty)
{
@@ -197,7 +193,7 @@ throw (css::uno::RuntimeException)
}
xPopupMenu->insertItem( MID_LANG_SEL_NONE, FWK_RESSTR(STR_LANGSTATUS_NONE), 0, MID_LANG_SEL_NONE );
- if ( aLanguageTable.GetString( LANGUAGE_NONE ) == m_aCurLang )
+ if ( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) == m_aCurLang )
xPopupMenu->checkItem( MID_LANG_SEL_NONE, sal_True );
xPopupMenu->insertItem( MID_LANG_SEL_RESET, FWK_RESSTR(STR_RESET_TO_DEFAULT_LANGUAGE), 0, MID_LANG_SEL_RESET );
xPopupMenu->insertItem( MID_LANG_SEL_MORE, FWK_RESSTR(STR_LANGSTATUS_MORE), 0, MID_LANG_SEL_MORE );
@@ -207,7 +203,7 @@ throw (css::uno::RuntimeException)
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&&
+ if( rStr != OUString( SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) )&&
rStr != sAsterisk &&
rStr != sEmpty)
{
commit 3f814cd286889995c96a6ced3ee7f5793ea92fc6
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 01:41:04 2014 +0200
another SvtLanguageTable instance bites the dust
Change-Id: I9d5ab635081539c21c84901c72f8a762f58ed409
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index a1179cf..3c1cf94 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -221,8 +221,6 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
aCmd_Language += ".uno:LanguageStatus?Language:string=Default_";
}
- SvtLanguageTable aLanguageTable;
-
// get languages to be displayed in the menu
std::set< OUString > aLangItems;
FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper,
@@ -239,7 +237,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
const OUString & rStr( *it );
- if (rStr != aLanguageTable.GetString( LANGUAGE_NONE ) &&
+ if (rStr != SvtLanguageTable::GetLanguageString( LANGUAGE_NONE ) &&
rStr != sAsterisk &&
rStr != sEmpty)
{
commit d8cc554522742be4e690c39e06dc240a597db003
Author: Eike Rathke <erack at redhat.com>
Date: Fri Apr 18 01:36:23 2014 +0200
FillLangItems() doesn't need an SvtLanguageTable instance
Change-Id: I4c8b8b54c434343eb72fb75aae3c15038cff72af
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 40e72c1..406de7a 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -38,8 +38,6 @@
#include <set>
-class SvtLanguageTable;
-
// flags for script types in use within selection
#define LS_SCRIPT_LATIN 0x0001
#define LS_SCRIPT_ASIAN 0x0002
@@ -135,7 +133,6 @@ FWI_DLLPUBLIC OUString RetrieveLabelFromCommand( const OUString& aCmdURL
,const sal_Char* _pName);
FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
- const SvtLanguageTable &rLanguageTable,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > &rxFrame,
const LanguageGuessingHelper & rLangGuessHelper,
sal_Int16 nScriptType,
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index ab041d1..ed1bc75 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -131,7 +131,6 @@ OUString RetrieveLabelFromCommand(
}
void FillLangItems( std::set< OUString > &rLangItems,
- const SvtLanguageTable & rLanguageTable,
const uno::Reference< frame::XFrame > & rxFrame,
const LanguageGuessingHelper & rLangGuessHelper,
sal_Int16 nScriptType,
@@ -143,7 +142,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
//1--add current language
if( !rCurLang.isEmpty() &&
- LANGUAGE_DONTKNOW != rLanguageTable.GetType( rCurLang ))
+ LANGUAGE_DONTKNOW != SvtLanguageTable::GetLanguageType( rCurLang ))
rLangItems.insert( rCurLang );
//2--System
@@ -152,7 +151,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
if( rSystemLanguage != LANGUAGE_DONTKNOW )
{
if ( IsScriptTypeMatchingToLanguage( nScriptType, rSystemLanguage ))
- rLangItems.insert( OUString( rLanguageTable.GetString( rSystemLanguage )) );
+ rLangItems.insert( OUString( SvtLanguageTable::GetLanguageString( rSystemLanguage )) );
}
//3--UI
@@ -160,7 +159,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
if( rUILanguage != LANGUAGE_DONTKNOW )
{
if ( IsScriptTypeMatchingToLanguage( nScriptType, rUILanguage ))
- rLangItems.insert( OUString( rLanguageTable.GetString( rUILanguage )) );
+ rLangItems.insert( OUString( SvtLanguageTable::GetLanguageString( rUILanguage )) );
}
//4--guessed language
@@ -171,13 +170,13 @@ void FillLangItems( std::set< OUString > &rLangItems,
LanguageType nLang = LanguageTag( aLocale ).makeFallback().getLanguageType();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
&& IsScriptTypeMatchingToLanguage( nScriptType, nLang ))
- rLangItems.insert( rLanguageTable.GetString( nLang ));
+ rLangItems.insert( SvtLanguageTable::GetLanguageString( nLang ));
}
//5--keyboard language
if( !rKeyboardLang.isEmpty() )
{
- if ( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rKeyboardLang )))
+ if ( IsScriptTypeMatchingToLanguage( nScriptType, SvtLanguageTable::GetLanguageType( rKeyboardLang )))
rLangItems.insert( rKeyboardLang );
}
@@ -206,7 +205,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
if ( rLangItems.size() == static_cast< size_t >(nMaxCount) )
break;
const Locale& rLocale=rLocales[i];
- if( IsScriptTypeMatchingToLanguage( nScriptType, rLanguageTable.GetType( rLocale.Language )))
+ if( IsScriptTypeMatchingToLanguage( nScriptType, SvtLanguageTable::GetLanguageType( rLocale.Language )))
rLangItems.insert( OUString( rLocale.Language ) );
}
}
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 12e802d..a1179cf 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -225,7 +225,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
// get languages to be displayed in the menu
std::set< OUString > aLangItems;
- FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+ FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper,
m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
// now add menu entries
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index dcb1ee3..066c3ae 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -167,7 +167,7 @@ throw (css::uno::RuntimeException)
// get languages to be displayed in the menu
std::set< OUString > aLangItems;
- FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
+ FillLangItems( aLangItems, m_xFrame, m_aLangGuessHelper,
m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
// add first few entries to main menu
More information about the Libreoffice-commits
mailing list