i18npool/source/characterclassification/cclass_unicode.cxx | 56
++++++----
i18npool/source/localedata/data/es_CR.xml | 42 +++++--
icon-themes/sifr/cmd/lc_autopilotmenu.png |binary
icon-themes/sifr/cmd/lc_conditionalformatdialog.png |binary
icon-themes/sifr/cmd/lc_conditionalformatmenu.png |binary
icon-themes/sifr/cmd/sc_autopilotmenu.png |binary
icon-themes/sifr/cmd/sc_conditionalformatdialog.png |binary
icon-themes/sifr/cmd/sc_conditionalformatmenu.png |binary
icon-themes/sifr/links.txt | 5
include/vcl/window.hxx | 3
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 2
sc/inc/refupdatecontext.hxx | 9 +
sc/source/core/data/documen2.cxx | 4
sc/source/core/data/document.cxx | 8 -
sc/source/core/data/refupdatecontext.cxx | 12 +-
sc/source/core/data/table3.cxx | 9 -
sc/source/core/tool/token.cxx | 32 ++++-
sc/source/ui/docshell/dbdocfun.cxx | 13 +-
svx/uiconfig/ui/sidebararea.ui | 31 +----
19 files changed, 140 insertions(+), 86 deletions(-)
New commits:
commit f5b5d92a28cc9c62a3c4752be5bd7b5fcc31a5a8
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu May 7 10:23:13 2015 +0100
Resolves: tdf#91057 transliterateChar2Char throws
MultipleCharsOutputException
for Ã, but toTitle only allows RuntimeException, which is our usual
awesomeness
Change-Id: Ib5618a55a369fa5cd1d323f657f0798776828386
(cherry picked from commit d0a0da717682a0e57f733d75d9d0700cfb198823)
Reviewed-on: https://gerrit.libreoffice.org/15659
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx
b/i18npool/source/characterclassification/cclass_unicode.cxx
index e58598e..637d75c 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -21,8 +21,10 @@
#include <com/sun/star/i18n/UnicodeScript.hpp>
#include <com/sun/star/i18n/UnicodeType.hpp>
#include <com/sun/star/i18n/KCharacterType.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <unicode/uchar.h>
#include <comphelper/string.hxx>
+#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <breakiteratorImpl.hxx>
@@ -79,27 +81,41 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32
nPos, sal_Int32 nCount,
OUString SAL_CALL
cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32
nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) {
- sal_Int32 len = Text.getLength();
- if (nPos >= len)
- return OUString();
- if (nCount + nPos > len)
- nCount = len - nPos;
-
- trans->setMappingType(MappingTypeToTitle, rLocale);
- rtl_uString* pStr = rtl_uString_alloc(nCount);
- sal_Unicode* out = pStr->buffer;
- BreakIteratorImpl brk(m_xContext);
- Boundary bdy = brk.getWordBoundary(Text, nPos, rLocale,
- WordType::ANYWORD_IGNOREWHITESPACES, sal_True);
- for (sal_Int32 i = nPos; i < nCount + nPos; i++, out++) {
- if (i >= bdy.endPos)
- bdy = brk.nextWord(Text, bdy.endPos, rLocale,
- WordType::ANYWORD_IGNOREWHITESPACES);
- *out = (i == bdy.startPos) ?
- trans->transliterateChar2Char(Text[i]) : Text[i];
+ try
+ {
+ sal_Int32 len = Text.getLength();
+ if (nPos >= len)
+ return OUString();
+ if (nCount + nPos > len)
+ nCount = len - nPos;
+
+ trans->setMappingType(MappingTypeToTitle, rLocale);
+ rtl_uString* pStr = rtl_uString_alloc(nCount);
+ sal_Unicode* out = pStr->buffer;
+ BreakIteratorImpl brk(m_xContext);
+ Boundary bdy = brk.getWordBoundary(Text, nPos, rLocale,
+ WordType::ANYWORD_IGNOREWHITESPACES, sal_True);
+ for (sal_Int32 i = nPos; i < nCount + nPos; i++, out++) {
+ if (i >= bdy.endPos)
+ bdy = brk.nextWord(Text, bdy.endPos, rLocale,
+ WordType::ANYWORD_IGNOREWHITESPACES);
+ *out = (i == bdy.startPos) ?
+ trans->transliterateChar2Char(Text[i]) : Text[i];
+ }
+ *out = 0;
+ return OUString( pStr, SAL_NO_ACQUIRE );
+ }
+ catch (const RuntimeException&)
+ {
+ throw;
+ }
+ catch (const Exception& e)
+ {
+ uno::Any a(cppu::getCaughtException());
+ throw lang::WrappedTargetRuntimeException(
+ "wrapped Exception " + e.Message,
+ uno::Reference<uno::XInterface>(), a);
}
- *out = 0;
- return OUString( pStr, SAL_NO_ACQUIRE );
}
sal_Int16 SAL_CALL
commit f88025d6fd26c8fb2eaf50937b2dc6e25f389d0f
Author: Eike Rathke <er...@redhat.com>
Date: Mon May 4 20:45:45 2015 +0200
Resolves tdf#90757 ensure start row / end row order makes sense
... in case the header is the only row.
Change-Id: I5e6046007a8d668f9834e108aaf8af0072629fc8
(cherry picked from commit 46fa99f61aff88f1697959a9d3c41a5c3c3c05e9)
Reviewed-on: https://gerrit.libreoffice.org/15631
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index f02a4b6..46d38c8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1702,11 +1702,10 @@ void ScTable::Sort(
SCROW nLastRow = 0;
for (SCCOL nCol = rSortParam.nCol1; nCol <= rSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
- rSortParam.nRow2 = nLastRow = std::min(nLastRow, rSortParam.nRow2);
- SCROW nRow1 = (rSortParam.bHasHeader ?
- rSortParam.nRow1 + 1 : rSortParam.nRow1);
+ rSortParam.nRow2 = nLastRow = std::max( std::min(nLastRow,
rSortParam.nRow2), rSortParam.nRow1);
+ SCROW nRow1 = (rSortParam.bHasHeader ? rSortParam.nRow1 + 1 :
rSortParam.nRow1);
aSortParam = rSortParam; // must be assigned before calling
IsSorted()
- if (!IsSorted(nRow1, nLastRow))
+ if (nRow1 < nLastRow && !IsSorted(nRow1, nLastRow))
{
if(pProgress)
pProgress->SetState( 0, nLastRow-nRow1 );
@@ -1735,7 +1734,7 @@ void ScTable::Sort(
SCCOL nCol1 = (rSortParam.bHasHeader ?
rSortParam.nCol1 + 1 : rSortParam.nCol1);
aSortParam = rSortParam; // must be assigned before calling
IsSorted()
- if (!IsSorted(nCol1, nLastCol))
+ if (nCol1 < nLastCol && !IsSorted(nCol1, nLastCol))
{
if(pProgress)
pProgress->SetState( 0, nLastCol-nCol1 );
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index bb97463..b2ab010 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -569,10 +569,13 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam&
rSortParam,
pDBData->SetSortParam(rSortParam);
- ScRange aDirtyRange(
- aLocalParam.nCol1, nStartRow, nTab,
- aLocalParam.nCol2, aLocalParam.nRow2, nTab);
- rDoc.SetDirty( aDirtyRange, true );
+ if (nStartRow <= aLocalParam.nRow2)
+ {
+ ScRange aDirtyRange(
+ aLocalParam.nCol1, nStartRow, nTab,
+ aLocalParam.nCol2, aLocalParam.nRow2, nTab);
+ rDoc.SetDirty( aDirtyRange, true );
+ }
if (bPaint)
{
@@ -590,7 +593,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam&
rSortParam,
rDocShell.PostPaint(ScRange(nStartX, nStartY, nTab, nEndX, nEndY,
nTab), nPaint);
}
- if (!bUniformRowHeight)
+ if (!bUniformRowHeight && nStartRow <= aLocalParam.nRow2)
rDocShell.AdjustRowHeight(nStartRow, aLocalParam.nRow2, nTab);
aModificator.SetDocumentModified();
commit 7937ee7d2d2e445a809e3284af5a0d539ad8ae94
Author: Eike Rathke <er...@redhat.com>
Date: Wed May 6 17:15:12 2015 +0200
Resolves: tdf#91078 check also DBData modified, not only named expressions
This adds ScDocument& to all RefUpdate...Context; another approach could
had been to add an UpdatedDBData similar to UpdatedRangeNames and gather
those in the ScDBData::Update...() methods, but as long as
ScDBData::IsModified() works that isn't necessary.
(cherry picked from commit 848dc76e76c1c4a9040be4a0088c4d4527af6f40)
Conflicts:
sc/source/core/tool/token.cxx
assume modified if an index has no corresponding ScDBData (anymore)
(cherry picked from commit 4a53021f0662e08b56fd076f78ac182634fcec4c)
16cbc7d772f39c8778b8ba21a629ced6b0dbedeb
Change-Id: Iae3ec6c8b8356cbd8acb2445489e91e7d6922fb3
Reviewed-on: https://gerrit.libreoffice.org/15654
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 393a855..3b4db92 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -103,29 +103,32 @@ struct RefUpdateResult
struct RefUpdateInsertTabContext
{
+ ScDocument& mrDoc;
SCTAB mnInsertPos;
SCTAB mnSheets;
UpdatedRangeNames maUpdatedNames;
- RefUpdateInsertTabContext(SCTAB nInsertPos, SCTAB nSheets);
+ RefUpdateInsertTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB
nSheets);
};
struct RefUpdateDeleteTabContext
{
+ ScDocument& mrDoc;
SCTAB mnDeletePos;
SCTAB mnSheets;
UpdatedRangeNames maUpdatedNames;
- RefUpdateDeleteTabContext(SCTAB nInsertPos, SCTAB nSheets);
+ RefUpdateDeleteTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB
nSheets);
};
struct RefUpdateMoveTabContext
{
+ ScDocument& mrDoc;
SCTAB mnOldPos;
SCTAB mnNewPos;
UpdatedRangeNames maUpdatedNames;
- RefUpdateMoveTabContext(SCTAB nOldPos, SCTAB nNewPos);
+ RefUpdateMoveTabContext(ScDocument& rDoc, SCTAB nOldPos, SCTAB nNewPos);
SCTAB getNewTab(SCTAB nOldTab) const;
};
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 02e1992..0c5f212 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -731,7 +731,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos,
ScProgress* pProgress )
// Update Reference
// TODO: combine with UpdateReference!
- sc::RefUpdateMoveTabContext aCxt(nOldPos, nNewPos);
+ sc::RefUpdateMoveTabContext aCxt( *this, nOldPos, nNewPos);
SCsTAB nDz = ((SCsTAB)nNewPos) - (SCsTAB)nOldPos;
ScRange aSourceRange( 0,0,nOldPos, MAXCOL,MAXROW,nOldPos );
@@ -804,7 +804,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos,
const ScMarkData* pOnlyM
bValid = !GetTable( aName, nDummy );
sc::AutoCalcSwitch aACSwitch(*this, false);
- sc::RefUpdateInsertTabContext aCxt(nNewPos, 1);
+ sc::RefUpdateInsertTabContext aCxt( *this, nNewPos, 1);
sc::StartListeningContext aSLCxt(*this);
if (bValid)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5a21587..5889916 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -491,7 +491,7 @@ bool ScDocument::InsertTab(
{
if (ValidTab(nPos) && (nPos < nTabCount))
{
- sc::RefUpdateInsertTabContext aCxt(nPos, 1);
+ sc::RefUpdateInsertTabContext aCxt( *this, nPos, 1);
ScRange aRange( 0,0,nPos, MAXCOL,MAXROW,MAXTAB );
xColNameRanges->UpdateReference( URM_INSDEL, this, aRange,
0,0,1 );
@@ -582,7 +582,7 @@ bool ScDocument::InsertTabs( SCTAB nPos, const
std::vector<OUString>& rNames,
{
if (ValidTab(nPos) && (nPos < nTabCount))
{
- sc::RefUpdateInsertTabContext aCxt(nPos, nNewSheets);
+ sc::RefUpdateInsertTabContext aCxt( *this, nPos, nNewSheets);
ScRange aRange( 0,0,nPos, MAXCOL,MAXROW,MAXTAB );
xColNameRanges->UpdateReference( URM_INSDEL, this, aRange,
0,0,nNewSheets );
xRowNameRanges->UpdateReference( URM_INSDEL, this, aRange,
0,0,nNewSheets );
@@ -657,7 +657,7 @@ bool ScDocument::DeleteTab( SCTAB nTab )
if (nTabCount > 1)
{
sc::AutoCalcSwitch aACSwitch(*this, false);
- sc::RefUpdateDeleteTabContext aCxt(nTab, 1);
+ sc::RefUpdateDeleteTabContext aCxt( *this, nTab, 1);
ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
DelBroadcastAreasInRange( aRange );
@@ -739,7 +739,7 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets )
if (nTabCount > nSheets)
{
sc::AutoCalcSwitch aACSwitch(*this, false);
- sc::RefUpdateDeleteTabContext aCxt(nTab, nSheets);
+ sc::RefUpdateDeleteTabContext aCxt( *this, nTab, nSheets);
for (SCTAB aTab = 0; aTab < nSheets; ++aTab)
{
diff --git a/sc/source/core/data/refupdatecontext.cxx
b/sc/source/core/data/refupdatecontext.cxx
index d63c745..b5f5391 100644
--- a/sc/source/core/data/refupdatecontext.cxx
+++ b/sc/source/core/data/refupdatecontext.cxx
@@ -61,14 +61,14 @@ RefUpdateResult::RefUpdateResult(const RefUpdateResult& r) :
mbReferenceModified(r.mbReferenceModified),
mbNameModified(r.mbNameModified) {}
-RefUpdateInsertTabContext::RefUpdateInsertTabContext(SCTAB nInsertPos, SCTAB
nSheets) :
- mnInsertPos(nInsertPos), mnSheets(nSheets) {}
+RefUpdateInsertTabContext::RefUpdateInsertTabContext(ScDocument& rDoc, SCTAB
nInsertPos, SCTAB nSheets) :
+ mrDoc(rDoc), mnInsertPos(nInsertPos), mnSheets(nSheets) {}
-RefUpdateDeleteTabContext::RefUpdateDeleteTabContext(SCTAB nDeletePos, SCTAB
nSheets) :
- mnDeletePos(nDeletePos), mnSheets(nSheets) {}
+RefUpdateDeleteTabContext::RefUpdateDeleteTabContext(ScDocument& rDoc, SCTAB
nDeletePos, SCTAB nSheets) :
+ mrDoc(rDoc), mnDeletePos(nDeletePos), mnSheets(nSheets) {}
-RefUpdateMoveTabContext::RefUpdateMoveTabContext(SCTAB nOldPos, SCTAB nNewPos)
:
- mnOldPos(nOldPos), mnNewPos(nNewPos) {}
+RefUpdateMoveTabContext::RefUpdateMoveTabContext(ScDocument& rDoc, SCTAB
nOldPos, SCTAB nNewPos) :
+ mrDoc(rDoc), mnOldPos(nOldPos), mnNewPos(nNewPos) {}
SCTAB RefUpdateMoveTabContext::getNewTab(SCTAB nOldTab) const
{
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1d2a0a6..9500a28 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -43,6 +43,7 @@
#include "types.hxx"
#include "globstr.hrc"
#include "addincol.hxx"
+#include "dbdata.hxx"
#include <svl/sharedstring.hxx>
using ::std::vector;
@@ -2588,9 +2589,6 @@ bool expandRangeByEdge( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, co
bool isNameModified( const sc::UpdatedRangeNames& rUpdatedNames, SCTAB
nOldTab, const formula::FormulaToken& rToken )
{
- if (rToken.GetOpCode() != ocName)
- return false;
-
SCTAB nTab = -1;
if (!rToken.IsGlobal())
nTab = nOldTab;
@@ -2599,6 +2597,16 @@ bool isNameModified( const sc::UpdatedRangeNames&
rUpdatedNames, SCTAB nOldTab,
return rUpdatedNames.isNameUpdated(nTab, rToken.GetIndex());
}
+bool isDBDataModified( const ScDocument& rDoc, const formula::FormulaToken&
rToken )
+{
+ // Check if this DBData has been modified.
+ const ScDBData* pDBData =
rDoc.GetDBCollection()->getNamedDBs().findByIndex( rToken.GetIndex());
+ if (!pDBData)
+ return true;
+
+ return pDBData->IsModified();
+}
+
}
sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift( const
sc::RefUpdateContext& rCxt, const ScAddress& rOldPos )
@@ -2737,7 +2745,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnShift(
const sc::RefUpdateCon
break;
case svIndex:
{
- if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ if (((*p)->GetOpCode() == ocName &&
isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) ||
+ ((*p)->GetOpCode() == ocDBArea &&
isDBDataModified(rCxt.mrDoc, **p)))
aRes.mbNameModified = true;
}
break;
@@ -2805,7 +2814,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
break;
case svIndex:
{
- if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ if (((*p)->GetOpCode() == ocName &&
isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) ||
+ ((*p)->GetOpCode() == ocDBArea &&
isDBDataModified(rCxt.mrDoc, **p)))
aRes.mbNameModified = true;
}
break;
@@ -2860,7 +2870,8 @@ sc::RefUpdateResult ScTokenArray::MoveReference( const
ScAddress& rPos, const sc
break;
case svIndex:
{
- if (isNameModified(rCxt.maUpdatedNames,
aOldRange.aStart.Tab(), **p))
+ if (((*p)->GetOpCode() == ocName &&
isNameModified(rCxt.maUpdatedNames, aOldRange.aStart.Tab(), **p)) ||
+ ((*p)->GetOpCode() == ocDBArea &&
isDBDataModified(rCxt.mrDoc, **p)))
aRes.mbNameModified = true;
}
break;
@@ -3344,7 +3355,8 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnDeletedTab( sc::RefUpdateDele
break;
case svIndex:
{
- if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ if (((*p)->GetOpCode() == ocName &&
isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) ||
+ ((*p)->GetOpCode() == ocDBArea &&
isDBDataModified(rCxt.mrDoc, **p)))
aRes.mbNameModified = true;
}
break;
@@ -3388,7 +3400,8 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnInsertedTab( sc::RefUpdateIns
break;
case svIndex:
{
- if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ if (((*p)->GetOpCode() == ocName &&
isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) ||
+ ((*p)->GetOpCode() == ocDBArea &&
isDBDataModified(rCxt.mrDoc, **p)))
aRes.mbNameModified = true;
}
break;
@@ -3453,7 +3466,8 @@ sc::RefUpdateResult
ScTokenArray::AdjustReferenceOnMovedTab( sc::RefUpdateMoveTa
break;
case svIndex:
{
- if (isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p))
+ if (((*p)->GetOpCode() == ocName &&
isNameModified(rCxt.maUpdatedNames, rOldPos.Tab(), **p)) ||
+ ((*p)->GetOpCode() == ocDBArea &&
isDBDataModified(rCxt.mrDoc, **p)))
aRes.mbNameModified = true;
}
break;
commit 63eb17da31b913d323c26041eee978bbb9c58c4b
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat May 2 10:30:19 2015 +0200
tdf#91009: Correct thousands separator character for locale es_CR
Thanks to Severo Raz for having indicated this link:
http://es.wikipedia.org/wiki/Wikipedia_discusi%C3%B3n:Manual_de_estilo/N%C3%BAmeros#Costa_Rica
(cherry picked from commit 78ef368b8ca6fb53b67330c305f8c2c581cbf68e)
Related tdf#91009: Correct thousands separator character for locale es_CR
Reviewed-on: https://gerrit.libreoffice.org/15630
Tested-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit aa06ce15fdd68983001ef33d1931fbaf6b515282)
cf080bb9f21ef75487d43d8a582625be512968c4
Change-Id: Ib8eef774921922dda0db653d8d8365b5e055e646
Reviewed-on: https://gerrit.libreoffice.org/15593
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/i18npool/source/localedata/data/es_CR.xml
b/i18npool/source/localedata/data/es_CR.xml
index ff0d73a..c048257 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -28,7 +28,29 @@
<DefaultName>Costa Rica</DefaultName>
</Country>
</LC_INFO>
- <LC_CTYPE ref="es_ES"/>
+ <LC_CTYPE>
+ <Separators>
+ <DateSeparator>/</DateSeparator>
+ <ThousandSeparator>Â </ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
+ <TimeSeparator>:</TimeSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
+ <ListSeparator>;</ListSeparator>
+ <LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+ <LongDateDaySeparator> de </LongDateDaySeparator>
+ <LongDateMonthSeparator> de </LongDateMonthSeparator>
+ <LongDateYearSeparator> </LongDateYearSeparator>
+ </Separators>
+ <Markers>
+ <QuotationStart>â</QuotationStart>
+ <QuotationEnd>â</QuotationEnd>
+ <DoubleQuotationStart>â</DoubleQuotationStart>
+ <DoubleQuotationEnd>â</DoubleQuotationEnd>
+ </Markers>
+ <TimeAM>AM</TimeAM>
+ <TimePM>PM</TimePM>
+ <MeasurementSystem>metric</MeasurementSystem>
+ </LC_CTYPE>
<LC_FORMAT>
<DateAcceptancePattern>D/M</DateAcceptancePattern>
<FormatElement msgid="DateFormatskey1" default="true" type="short"
usage="DATE" formatindex="18">
@@ -134,31 +156,31 @@
<FormatCode>0,00</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey4" default="false" type="short"
usage="FIXED_NUMBER" formatindex="3">
- <FormatCode>#.##0</FormatCode>
+ <FormatCode>#Â ##0</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey5" default="false" type="medium"
usage="FIXED_NUMBER" formatindex="4">
- <FormatCode>#.##0,00</FormatCode>
+ <FormatCode>#Â ##0,00</FormatCode>
</FormatElement>
<FormatElement msgid="FixedFormatskey6" default="false" type="medium"
usage="FIXED_NUMBER" formatindex="5">
- <FormatCode>#.###,00</FormatCode>
+ <FormatCode>#Â ###,00</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey1" default="true" type="short"
usage="CURRENCY" formatindex="12">
- <FormatCode>[$â¡-140A] #.##0;-[$â¡-140A] #.##0</FormatCode>
+ <FormatCode>[$â¡-140A] #Â ##0;-[$â¡-140A] #Â ##0</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium"
usage="CURRENCY" formatindex="13">
- <FormatCode>[$â¡-140A] #.##0,00;-[$â¡-140A] #.##0,00</FormatCode>
+ <FormatCode>[$â¡-140A] #Â ##0,00;-[$â¡-140A] #Â ##0,00</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium"
usage="CURRENCY" formatindex="14">
- <FormatCode>[$â¡-140A] #.##0;[RED]-[$â¡-140A] #.##0</FormatCode>
+ <FormatCode>[$â¡-140A] #Â ##0;[RED]-[$â¡-140A] #Â ##0</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium"
usage="CURRENCY" formatindex="15">
- <FormatCode>[$â¡-140A] #.##0,00;[RED]-[$â¡-140A] #.##0,00</FormatCode>
+ <FormatCode>[$â¡-140A] #Â ##0,00;[RED]-[$â¡-140A] #Â
##0,00</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium"
usage="CURRENCY" formatindex="16">
- <FormatCode>#.##0,00 CCC</FormatCode>
+ <FormatCode>#Â ##0,00 CCC</FormatCode>
</FormatElement>
<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium"
usage="CURRENCY" formatindex="17">
- <FormatCode>[$â¡-140A] #.##0,--;[RED]-[$â¡-140A] #.##0,--</FormatCode>
+ <FormatCode>[$â¡-140A] #Â ##0,--;[RED]-[$â¡-140A] #Â
##0,--</FormatCode>
</FormatElement>
<FormatElement msgid="PercentFormatskey1" default="true" type="short"
usage="PERCENT_NUMBER" formatindex="8">
<FormatCode>0%</FormatCode>
commit 65e7836d1ab83546f6c19c2ad5a981afbf646eed
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 5 13:31:29 2015 +0100
use a sizegroup to stop area panel 'jumping'
toolbox and lists are a little different in height naturally causing a
little
jump in layout on toggling between color and anything else
Change-Id: I0b2ab92ab2fb5bec7d7fecc7aeaf15f47781a67b
(cherry picked from commit 7fb784ff2c58f7ad89b0f961fee76e3a363841ff)
Reviewed-on: https://gerrit.libreoffice.org/15637
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index cbea7cb..adad038 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="AreaPropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,8 +37,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -53,8 +52,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -64,7 +61,6 @@
<property name="hexpand">True</property>
<child>
<object class="sfxlo-SidebarToolBox" id="selectcolor">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuToolButton" id="color">
@@ -91,7 +87,6 @@
</child>
<child>
<object class="svxlo-SvxFillAttrBox" id="fillattr">
- <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select
the effect to apply.</property>
@@ -107,8 +102,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -126,8 +119,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -137,8 +128,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the
type of transparency to apply.</property>
<property name="tooltip_text" translatable="yes">Select the
type of transparency to apply.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">None</item>
<item translatable="yes">Solid</item>
@@ -153,8 +142,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -198,7 +185,6 @@
<property name="hexpand">True</property>
<property name="max_length">100</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
<property
name="secondary_icon_activatable">False</property>
<property name="climb_rate">5</property>
<property name="numeric">True</property>
@@ -213,8 +199,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -234,9 +218,14 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="mode">both</property>
+ <widgets>
+ <widget name="selectcolor"/>
+ <widget name="fillattr"/>
+ </widgets>
+ </object>
</interface>
commit 9a5c49fc511282965974c734722723786251b684
Author: Richard PALO <rich...@netbsd.org>
Date: Fri Apr 17 08:34:40 2015 +0200
Avoid redefine of TRANSPARENT on solaris after including stream.h
Change-Id: I90611a4855320148f1d4b6e61a420ada47308c28
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit e4f10cb0e12e7965df5e469cc22e6893044cabc3)
Signed-off-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ce43cd4..bc75618 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -228,6 +228,9 @@ namespace svt { class PopupWindowControllerImpl; }
#define AUTOSCROLL_VERT ((sal_uInt16)0x0001)
#define AUTOSCROLL_HORZ ((sal_uInt16)0x0002)
+#ifdef TRANSPARENT
+#undef TRANSPARENT
+#endif
// Flags for StateChanged()
enum class StateChangedType : sal_uInt16
{
commit a981eeec6be6485deeca32c6866f8aa781680419
Author: Matthias Freund <matti...@secure.mailbox.org>
Date: Sun May 3 00:50:48 2015 +0200
tdf#75256 Improve sifr - autopilot and conditionalformatdialog
The last icon of calc which are not sifr in the toolbar panel
Change-Id: I91d2d6fd6c5f24b5a21932b262e2e8dc5a142893
Reviewed-on: https://gerrit.libreoffice.org/15601
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
(cherry picked from commit d2ab54bb0d07d285c91a8ac17f53559e438d042a)
Reviewed-on: https://gerrit.libreoffice.org/15604
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/icon-themes/sifr/cmd/lc_autopilotmenu.png
b/icon-themes/sifr/cmd/lc_autopilotmenu.png
new file mode 100644
index 0000000..aedbd9b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_autopilotmenu.png differ
diff --git a/icon-themes/sifr/cmd/lc_conditionalformatdialog.png
b/icon-themes/sifr/cmd/lc_conditionalformatdialog.png
new file mode 100644
index 0000000..57799d1
Binary files /dev/null and
b/icon-themes/sifr/cmd/lc_conditionalformatdialog.png differ
diff --git a/icon-themes/sifr/cmd/lc_conditionalformatmenu.png
b/icon-themes/sifr/cmd/lc_conditionalformatmenu.png
new file mode 100644
index 0000000..57799d1
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_conditionalformatmenu.png
differ
diff --git a/icon-themes/sifr/cmd/sc_autopilotmenu.png
b/icon-themes/sifr/cmd/sc_autopilotmenu.png
new file mode 100644
index 0000000..aedbd9b
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_autopilotmenu.png differ
diff --git a/icon-themes/sifr/cmd/sc_conditionalformatdialog.png
b/icon-themes/sifr/cmd/sc_conditionalformatdialog.png
new file mode 100644
index 0000000..93cc1cf
Binary files /dev/null and
b/icon-themes/sifr/cmd/sc_conditionalformatdialog.png differ
diff --git a/icon-themes/sifr/cmd/sc_conditionalformatmenu.png
b/icon-themes/sifr/cmd/sc_conditionalformatmenu.png
new file mode 100644
index 0000000..93cc1cf
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_conditionalformatmenu.png
differ
commit 9fdb34aab603989840ad325cb733762cd7e99094
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sun May 3 20:24:46 2015 +0400
SIFR: add duplicate record in links.txt for calc's autofilter
Change-Id: I4be0e13932697fd69c6d18a019080b051e9b405a
Reviewed-on: https://gerrit.libreoffice.org/15608
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index a843cd8..28457b1 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -64,3 +64,8 @@ cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
# Writer - Table toolbar
cmd/lc_tablesort.png cmd/lc_datasort.png
cmd/sc_tablesort.png cmd/sc_datasort.png
+
+# calc autofilter
+cmd/lc_datafilterautofilter.png cmd/lc_autofilter.png
+cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png
+
commit d7b410760f05922a29054073e44ccb9220619e1c
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat May 2 15:30:37 2015 +0200
tdf#89510: Enable "Check uppercase words" by default
Change-Id: Ib045d875e230228279918dd591c93e9504cbd9ac
Cherry-picked: 8e2e525cba6e6e1b1682934265a807ad7f94d79c
Reviewed-on: https://gerrit.libreoffice.org/15596
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 9f56a2f..27c2db1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -332,7 +332,7 @@
process.</desc>
<label>Spell uppercase words</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="IsSpellWithDigits" oor:type="xs:boolean"
oor:nillable="false">
<!-- OldPath: MiscOptions / SpellOptions -->
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
