[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_svtools

[Norbert Thiebaud]

 binfilter/bf_sc/source/core/tool/sc_userlist.cxx     |    4 ++--
 binfilter/bf_sc/source/ui/docshell/sc_impex.cxx      |    2 +-
 binfilter/bf_svtools/source/numbers/svt_zforfind.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0612182d6669ae7eefcd043db19e2b7cd19a1841
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Nov 19 11:27:42 2011 -0600

    fix XCalendar/2 issue following genetive-month patch series

diff --git a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
index 672983d..b61f1db 100644
--- a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
@@ -119,9 +119,9 @@ namespace binfilter {
 /*N*/     using namespace ::com::sun::star;
 /*N*/
 /*N*/   sal_Unicode cDelimiter = ScGlobal::cListDelimiter;
-/*N*/   uno::Sequence< i18n::CalendarItem > xCal;
+/*N*/   uno::Sequence< i18n::CalendarItem2 > xCal;
 /*N*/
-/*N*/     uno::Sequence< i18n::Calendar > xCalendars(
+/*N*/     uno::Sequence< i18n::Calendar2 > xCalendars(
 /*N*/             ScGlobal::pLocaleData->getAllCalendars() );
 /*N*/
 /*N*/     for ( sal_Int32 j = 0; j < xCalendars.getLength(); ++j )
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
index 2009c07..16b9957 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
@@ -329,7 +329,7 @@ enum DoubledQuoteMode
 /*M*/           {
 /*M*/                 static const String aSeptCorrect( RTL_CONSTASCII_USTRINGPARAM( "SEPT" ) );
 /*M*/                 static const String aSepShortened( RTL_CONSTASCII_USTRINGPARAM( "SEP" ) );
-/*M*/               uno::Sequence< i18n::CalendarItem > xMonths;
+/*M*/               uno::Sequence< i18n::CalendarItem2 > xMonths;
 /*M*/               sal_Int32 i, nLclLen;
 /*M*/               //  first test all month names from local international
 /*M*/               xMonths = rCalendar.getMonths();
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
index c834ff6..880886c 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
@@ -2367,7 +2367,7 @@ void ImpSvNumberInputScan::InitText()
     const CalendarWrapper* pCal = pFormatter->GetCalendar();
     delete [] pUpperMonthText;
     delete [] pUpperAbbrevMonthText;
-    ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem > xElems
+    ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > xElems
         = pCal->getMonths();
     nElems = xElems.getLength();
     pUpperMonthText = new String[nElems];