diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-19 11:27:42 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-19 11:28:24 -0600 |
| commit | 0612182d6669ae7eefcd043db19e2b7cd19a1841 (patch) | |
| tree | 73b6bb628d6fa902fcba4565c68d23758e617571 | |
| parent | binfilter: move dynary.hxx from tools here (diff) | |
| download | binfilter-0612182d6669ae7eefcd043db19e2b7cd19a1841.tar.gz binfilter-0612182d6669ae7eefcd043db19e2b7cd19a1841.zip | |
fix XCalendar/2 issue following genetive-month patch series
| -rw-r--r-- | binfilter/bf_sc/source/core/tool/sc_userlist.cxx | 4 | ||||
| -rw-r--r-- | binfilter/bf_sc/source/ui/docshell/sc_impex.cxx | 2 | ||||
| -rw-r--r-- | binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx index 672983d45..b61f1db69 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 2009c07f0..16b9957e9 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 c834ff6fd..880886cf9 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]; |