configure.in | 2 +- sw/source/core/doc/docsort.cxx | 2 +- sw/source/ui/app/appopt.cxx | 2 +- sw/source/ui/app/docshini.cxx | 2 +- sw/source/ui/dbui/dbmgr.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit cddea419b645c11819b9314acb95d8ea8df4fc98 Author: Tomas Chvatal <tchva...@suse.cz> Date: Sat Sep 24 18:08:24 2011 +0200 Avoid ambiguous Locale type by specifying full path to sun::star... ; the other definition is from ICU. diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 6a65b32..d76dcec 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0; SwDoc* SwSortElement::pDoc = 0; const FlatFndBox* SwSortElement::pBox = 0; CollatorWrapper* SwSortElement::pSortCollator = 0; -Locale* SwSortElement::pLocale = 0; +com::sun::star::lang::Locale* SwSortElement::pLocale = 0; String* SwSortElement::pLastAlgorithm = 0; LocaleDataWrapper* SwSortElement::pLclData = 0; diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 6ab953e..689e875 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) else { SvtLinguConfig aLinguCfg; - Locale aLocale; + com::sun::star::lang::Locale aLocale; LanguageType nLang; using namespace ::com::sun::star::i18n::ScriptType; diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index f2663d3..5c43206 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales(); if(aLocales.getLength()) { - const Locale* pLocales = aLocales.getConstArray(); + const com::sun::star::lang::Locale* pLocales = aLocales.getConstArray(); for(sal_Int32 i = 0; i < aLocales.getLength(); i++) { ForbiddenCharacters aForbidden; diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 5ee9fca..2bdd83c 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference< XDataSource> xSource, uno::Reference< XNumberFormats > xDocNumberFormats = xDocNumFmtsSupplier->getNumberFormats(); uno::Reference< XNumberFormatTypes > xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY); - Locale aLocale( MsLangId::convertLanguageToLocale( (LanguageType)nLanguage )); + com::sun::star::lang::Locale aLocale( MsLangId::convertLanguageToLocale( (LanguageType)nLanguage )); //get the number formatter of the data source uno::Reference<XPropertySet> xSourceProps(xSource, UNO_QUERY); commit 3a8c8537d1c8e03f3587a6823b2f6749b3115c46 Author: Tomas Chvatal <tchva...@suse.cz> Date: Thu Sep 22 12:52:40 2011 +0200 For wiki-ext check also java and ext support. diff --git a/configure.in b/configure.in index 2359334..11f4681 100755 --- a/configure.in +++ b/configure.in @@ -7046,7 +7046,7 @@ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$E fi AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) -AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [ +AS_IF([test "x$enable_ext_wiki_publisher" = "xyes" -a -o "x$enable_extension_integration" != "xno" -a "$with_java" != "no"], [ AC_MSG_RESULT([yes]) AC_MSG_CHECKING([for swext module]) ENABLE_MEDIAWIKI=YES _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits