[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/source
sc/inc/globstr.hrc |3 +--
sc/qa/extras/scautoformatobj.cxx |2 +-
sc/qa/extras/scautoformatsobj.cxx |2 +-
sc/qa/uitest/calc_tests6/tdf91726.py |4 ++--
sc/source/core/data/attarray.cxx |2 +-
sc/source/core/data/docpool.cxx|2 +-
sc/source/core/data/documen8.cxx |2 +-
sc/source/core/data/document.cxx |7 +--
sc/source/core/data/dpoutput.cxx |2 +-
sc/source/core/data/patattr.cxx|2 +-
sc/source/core/data/stlpool.cxx| 16 ++--
sc/source/core/data/stlsheet.cxx |4 +---
sc/source/core/data/table1.cxx |2 +-
sc/source/core/data/table5.cxx |2 +-
sc/source/core/tool/autoform.cxx |4 ++--
sc/source/core/tool/stylehelper.cxx|4 ++--
sc/source/filter/excel/impop.cxx |2 +-
sc/source/filter/excel/xestyle.cxx |4 ++--
sc/source/filter/excel/xistyle.cxx |6 +++---
sc/source/filter/excel/xltools.cxx |4 ++--
sc/source/filter/html/htmlexp.cxx |2 +-
sc/source/filter/oox/stylesbuffer.cxx |6 +++---
sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
sc/source/ui/docshell/docsh4.cxx |2 +-
sc/source/ui/unoobj/cellsuno.cxx |4 ++--
sc/source/ui/unoobj/styleuno.cxx |2 +-
26 files changed, 41 insertions(+), 53 deletions(-)
New commits:
commit 7002053174aed5c3a7b1fe5b1785011080aa6cbe
Author: Xisco Fauli
AuthorDate: Fri Nov 6 09:57:39 2020 +0100
Commit: Xisco Fauli
CommitDate: Tue Nov 10 12:07:21 2020 +0100
Revert "tdf#132137 Rename Default Style in Calc."
This reverts commit 4111ed76906bf6be05b704bf52fa91353dfef183.
the document would also hang if
define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD", "Default");
is replaced by
define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD", "DefaultTest");
meaning somewhere in the code 'Default' is harcoded
as git grep "\"Default\"" sc/source/ shows
Reverting for now so we can backport it to libreoffice-7-0
while a better solution is provided for tdf#132137
Some other problems of the reverted commit are mentioned
in comment 4 and comment 5 of tdf#134161
I'm adding a unittest in another commit so this one
can be easily reverted in the future
Change-Id: Ifabc133b8f72547fb506da0925df97f1b006291c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105390
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 063d51a3d2ec..d393739292e5 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -269,8 +269,7 @@
#define STR_EXPORT_DBF NC_("STR_EXPORT_DBF", "DBase
export")
#define STR_EXPORT_DIF NC_("STR_EXPORT_DIF", "Dif
Export")
#define STR_IMPORT_DIF NC_("STR_IMPORT_DIF", "Dif
Import")
-#define STR_STYLENAME_STANDARD_CELL NC_("STR_STYLENAME_STANDARD",
"Default Cell Style")
-#define STR_STYLENAME_STANDARD_PAGE NC_("STR_STYLENAME_STANDARD",
"Default Page Style")
+#define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD",
"Default")
#define STR_STYLENAME_RESULTNC_("STR_STYLENAME_RESULT",
"Result")
#define STR_STYLENAME_RESULT1 NC_("STR_STYLENAME_RESULT1",
"Result2")
#define STR_STYLENAME_HEADLINE NC_("STR_STYLENAME_HEADLINE",
"Heading")
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 23abaa956f1c..76db8c6a3592 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -88,7 +88,7 @@ ScAutoFormatObj::ScAutoFormatObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(16)
-, XNamed("Default Cell Style")
+, XNamed("Default")
, XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat")
{
}
diff --git a/sc/qa/extras/scautoformatsobj.cxx
b/sc/qa/extras/scautoformatsobj.cxx
index 769478608506..ed799c018ef4 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -89,7 +89,7 @@ ScAutoFormatsObj::ScAutoFormatsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(2)
-, XNameAccess("Default Cell Style")
+, XNameAccess("Default")
, XNameContainer("ScAutoFormatsObj")
, XNameReplace("ScAutoFormatsObj")
, XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj",
"com.sun.star.sheet.TableAutoFormats")
diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py
b/sc/qa/uitest/calc_tests6/tdf91726.py
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/source
sc/inc/clipparam.hxx |2 -
sc/inc/document.hxx |4 +-
sc/qa/unit/data/ods/validation-copypaste.ods |binary
sc/qa/unit/subsequent_export-test.cxx| 39 +++
sc/source/core/tool/compiler.cxx | 21 ++
5 files changed, 63 insertions(+), 3 deletions(-)
New commits:
commit 03f601d10c8fe8772dcb8542e1d44f2d2e87fbb4
Author: Serge Krot
AuthorDate: Fri Jul 10 11:09:35 2020 +0200
Commit: Thorsten Behrens
CommitDate: Wed Sep 9 09:16:47 2020 +0200
tdf#108673 XLSX: Don't export invalid sheet references in cell validation
Change-Id: Id9d88f5e34f3017516f693505df4c3ce82b1890f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98479
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit a3b4831208da615789bd1e2d5660dd130807f504)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102127
Reviewed-by: Thorsten Behrens
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index ee9422bc27db..575a04526763 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -27,7 +27,7 @@
* This struct stores general clipboard parameters associated with a
* ScDocument instance created in clipboard mode.
*/
-struct ScClipParam
+struct SC_DLLPUBLIC ScClipParam
{
enum Direction { Unspecified, Column, Row };
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0c5ccc248faf..971377559ce9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1560,7 +1560,7 @@ public:
SCTAB nTab, InsertDeleteFlags
nDelFlag);
void DeleteAreaTab(const ScRange& rRange,
InsertDeleteFlags nDelFlag);
-void CopyToClip( const ScClipParam& rClipParam,
ScDocument* pClipDoc,
+SC_DLLPUBLIC voidCopyToClip( const ScClipParam& rClipParam,
ScDocument* pClipDoc,
const ScMarkData* pMarks, bool
bKeepScenarioFlags,
bool bIncludeObjects );
@@ -1611,7 +1611,7 @@ public:
/** If pDestRanges is given it overrides rDestRange, rDestRange in this
case is the overall encompassing range. */
-voidCopyFromClip( const ScRange& rDestRange, const
ScMarkData& rMark,
+SC_DLLPUBLIC void CopyFromClip( const ScRange& rDestRange, const
ScMarkData& rMark,
InsertDeleteFlags nInsFlag,
ScDocument* pRefUndoDoc,
ScDocument* pClipDoc,
diff --git a/sc/qa/unit/data/ods/validation-copypaste.ods
b/sc/qa/unit/data/ods/validation-copypaste.ods
new file mode 100644
index ..55f8d823b88b
Binary files /dev/null and b/sc/qa/unit/data/ods/validation-copypaste.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 2f0a7c7fdd0e..9647d0964277 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
@@ -247,6 +248,7 @@ public:
void testTdf126177XLSX();
void testCommentTextVAlignment();
void testCommentTextHAlignment();
+void testValidationCopyPaste();
void testXltxExport();
void testRotatedImageODS();
@@ -398,6 +400,7 @@ public:
CPPUNIT_TEST(testTdf126177XLSX);
CPPUNIT_TEST(testCommentTextVAlignment);
CPPUNIT_TEST(testCommentTextHAlignment);
+CPPUNIT_TEST(testValidationCopyPaste);
CPPUNIT_TEST(testXltxExport);
CPPUNIT_TEST(testRotatedImageODS);
@@ -4797,6 +4800,42 @@ void ScExportTest::testTdf91634XLSX()
xDocSh->DoClose();
}
+void ScExportTest::testValidationCopyPaste()
+{
+ScDocShellRef xDocSh = loadDoc("validation-copypaste.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+ScDocument& rSrcDoc = xDocSh->GetDocument();
+
+// Copy B1 from src doc to clip
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+ScRange aSrcRange(1, 0, 1);
+ScClipParam aClipParam(aSrcRange, false);
+ScMarkData aMark(rSrcDoc.GetSheetLimits().mnMaxRow,
rSrcDoc.GetSheetLimits().mnMaxCol);
+aMark.SetMarkArea(aSrcRange);
+rSrcDoc.CopyToClip(aClipParam, , , false, false);
+
+// Create second document, paste B1 from clip
+ScDocShell* pShell2
+= new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS
+ | SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+pShell2->DoInitNew();
+ScDocument& rDestDoc = pShell2->GetDocument();
+ScRange aDstRange(1, 0, 0);
+ScMarkData aMark2(rDestDoc.GetSheetLimits().mnMaxRow,
rDestDoc.GetSheetLimits().mnMaxCol);
+aMark2.SetMarkArea(aDstRange);
+rDestDoc.CopyFromClip(aDstRange, aMark2, InsertDeleteFlags::ALL, nullptr,
);
+
+// save as XLSX
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/source
sc/inc/dbdata.hxx |4 sc/inc/document.hxx|4 sc/qa/unit/data/ods/tdf95640.ods |binary sc/qa/unit/data/ods/tdf95640_standard_list.ods |binary sc/qa/unit/data/xlsx/tdf95640.xlsx |binary sc/qa/unit/subsequent_export-test.cxx | 63 + sc/source/filter/excel/excrecds.cxx| 64 + sc/source/filter/inc/autofilterbuffer.hxx | 30 ++ sc/source/filter/inc/autofiltercontext.hxx | 39 sc/source/filter/inc/excrecds.hxx |3 sc/source/filter/oox/autofilterbuffer.cxx | 116 +++-- sc/source/filter/oox/autofiltercontext.cxx | 68 ++ sc/source/filter/oox/tablebuffer.cxx |2 13 files changed, 375 insertions(+), 18 deletions(-) New commits: commit e6bdfaaf572b592f7e8b510cb38f82a4aca41593 Author: Serge Krot AuthorDate: Mon Jun 29 13:23:34 2020 +0200 Commit: Samuel Mehrbrodt CommitDate: Wed Sep 9 08:49:19 2020 +0200 tdf#95640 XLSX: import/export of custom sort lists Conflicts: sc/source/filter/excel/excrecds.cxx sc/source/filter/oox/autofilterbuffer.cxx sc/source/filter/oox/tablebuffer.cxx Change-Id: If5ffef39770bf7abd6e75e8de998d4a2b4749a0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97399 Tested-by: Jenkins Tested-by: Serge Krot Reviewed-by: Serge Krot Reviewed-by: Thorsten Behrens Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102252 Reviewed-by: Samuel Mehrbrodt diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 488063cd0a2b..0e31a0f02152 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -172,8 +172,8 @@ public: OUString GetSourceString() const; OUString GetOperations() const; -voidGetSortParam(ScSortParam& rSortParam) const; -voidSetSortParam(const ScSortParam& rSortParam); +SC_DLLPUBLIC void GetSortParam(ScSortParam& rSortParam) const; +SC_DLLPUBLIC void SetSortParam(const ScSortParam& rSortParam); /** Remember some more settings of ScSortParam, only to be called at anonymous DB ranges as it at least overwrites bHasHeader. */ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 15a7145b7abc..0c5ccc248faf 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -812,8 +812,8 @@ public: bool bRemoveAutoFilter = false ); const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const; ScDBData*GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion); -const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; -ScDBData*GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); +SC_DLLPUBLIC const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; +SC_DLLPUBLIC ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); void RefreshDirtyTableColumnNames(); SC_DLLPUBLIC sc::ExternalDataMapper& GetExternalDataMapper(); diff --git a/sc/qa/unit/data/ods/tdf95640.ods b/sc/qa/unit/data/ods/tdf95640.ods new file mode 100644 index ..5d435c61cc85 Binary files /dev/null and b/sc/qa/unit/data/ods/tdf95640.ods differ diff --git a/sc/qa/unit/data/ods/tdf95640_standard_list.ods b/sc/qa/unit/data/ods/tdf95640_standard_list.ods new file mode 100644 index ..37bea8a0c93e Binary files /dev/null and b/sc/qa/unit/data/ods/tdf95640_standard_list.ods differ diff --git a/sc/qa/unit/data/xlsx/tdf95640.xlsx b/sc/qa/unit/data/xlsx/tdf95640.xlsx new file mode 100644 index ..78c2d32c2cf6 Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf95640.xlsx differ diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index d74d4d63d0ec..2f0a7c7fdd0e 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -205,6 +205,12 @@ public: void testTdf129985(); void testTdf73063(); +xmlDocUniquePtr testTdf95640(const OUString& rFileName, sal_Int32 nSourceFormat, + sal_Int32 nDestFormat); +void testTdf95640_ods_to_xlsx(); +void testTdf95640_ods_to_xlsx_with_standard_list(); +void testTdf95640_xlsx_to_xlsx(); + void testRefStringXLSX(); void testRefStringConfigXLSX(); void testRefStringUnspecified(); @@ -352,6 +358,9 @@ public: CPPUNIT_TEST(testTdf55417); CPPUNIT_TEST(testTdf129985); CPPUNIT_TEST(testTdf73063); +CPPUNIT_TEST(testTdf95640_ods_to_xlsx); +CPPUNIT_TEST(testTdf95640_ods_to_xlsx_with_standard_list); +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/source
sc/inc/recursionhelper.hxx | 10 -
sc/qa/unit/parallelism.cxx | 54
sc/source/core/data/column4.cxx |2 -
sc/source/core/data/formulacell.cxx | 15
sc/source/core/tool/recursionhelper.cxx | 18 ++
5 files changed, 95 insertions(+), 4 deletions(-)
New commits:
commit afb6dd43af5d1179c2e3cd8f00794cd4c3d75b2d
Author: Luboš Luňák
AuthorDate: Mon Jun 22 11:42:22 2020 +0200
Commit: Luboš Luňák
CommitDate: Mon Jun 22 19:18:56 2020 +0200
failed cell dependency check should not set invalid values (tdf#132451)
Calc's dependency check done before parallel formula cell group
calculation tries to ensure valid cell values for all the dependencies
of the group's cell, and if it detects a problem such as a cycle
it bails out. But since ScFormulaCell::Interpret() simply bailed out
without doing anything, other cells could use that cell's possibly
incorrect value for their calculation and get their dirty flag reset.
This fix adds a flag to mark that bailing out is in progress, which
ensures the bail-out is short-circuited and no cell values are set.
Change-Id: Ia93c70d456682e19ce533abd2cf65ce35ffed9ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96838
Reviewed-by: Dennis Francis
Tested-by: Jenkins
(cherry picked from commit 82803ef4736fbed89dd8ae0723f2c4f30e37ba8e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96801
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 2c7a6605042e..14abbcf0a052 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -64,6 +64,7 @@ class ScRecursionHelper
boolbInIterationReturn;
boolbConverging;
boolbGroupsIndependent;
+boolbAbortingDependencyComputation;
std::vector< ScFormulaCell* > aTemporaryGroupCells;
o3tl::sorted_vector< ScFormulaCellGroup* >* pFGSet;
@@ -77,8 +78,8 @@ public:
voidIncRecursionCount() { ++nRecursionCount; }
voidDecRecursionCount() { --nRecursionCount; }
sal_uInt16 GetDepComputeLevel() const { return
nDependencyComputationLevel; }
-voidIncDepComputeLevel(){ ++nDependencyComputationLevel; }
-voidDecDepComputeLevel(){ --nDependencyComputationLevel; }
+voidIncDepComputeLevel();
+voidDecDepComputeLevel();
/// A pure recursion return, no iteration.
boolIsInRecursionReturn() const { return bInRecursionReturn &&
!bInIterationReturn; }
@@ -116,6 +117,11 @@ public:
bool AnyCycleMemberInDependencyEvalMode(ScFormulaCell* pCell);
bool AnyParentFGInCycle();
void SetFormulaGroupDepEvalMode(bool bSet);
+// When dependency computation detects a cycle, it may not compute proper
cell values.
+// This sets a flag that ScFormulaCell will use to avoid setting those new
values
+// and resetting the dirty flag, until the dependency computation bails
out.
+void AbortDependencyComputation();
+bool IsAbortingDependencyComputation() const { return
bAbortingDependencyComputation; }
void AddTemporaryGroupCell(ScFormulaCell* cell);
void CleanTemporaryGroupCells();
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 9af1daaca9e0..7bd370db3a54 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -48,6 +48,7 @@ public:
void testFormulaGroupWithForwardSelfReference();
void testFormulaGroupsInCyclesAndWithSelfReference();
void testFormulaGroupsInCyclesAndWithSelfReference2();
+void testFormulaGroupsInCyclesAndWithSelfReference3();
CPPUNIT_TEST_SUITE(ScParallelismTest);
CPPUNIT_TEST(testSUMIFS);
@@ -66,6 +67,7 @@ public:
CPPUNIT_TEST(testFormulaGroupWithForwardSelfReference);
CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference);
CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference2);
+CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference3);
CPPUNIT_TEST_SUITE_END();
private:
@@ -979,6 +981,58 @@ void
ScParallelismTest::testFormulaGroupsInCyclesAndWithSelfReference2()
m_pDoc->DeleteTab(0);
}
+void ScParallelismTest::testFormulaGroupsInCyclesAndWithSelfReference3()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, false);
+m_pDoc->InsertTab(0, "1");
+
+m_pDoc->SetValue(1, 1, 0, 2.0); // B2 <== 2
+for (size_t nRow = 1; nRow < 105; ++nRow)
+{
+// Formula-group in B3:B104 with first cell "=D2+0.001"
+if( nRow != 1 )
+m_pDoc->SetFormula(ScAddress(1, nRow, 0), "=D" +
OUString::number(nRow) + "+0.001",
+formula::FormulaGrammar::GRAM_NATIVE_UI);
+// Formula-group in C2:C104 with first cell "=B2*1.01011"
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/inc sc/qa sc/source
sc/inc/globstr.hrc |3 ++-
sc/qa/extras/scautoformatobj.cxx |2 +-
sc/qa/extras/scautoformatsobj.cxx |2 +-
sc/qa/uitest/calc_tests6/tdf91726.py |4 ++--
sc/source/core/data/attarray.cxx |2 +-
sc/source/core/data/docpool.cxx|2 +-
sc/source/core/data/documen8.cxx |2 +-
sc/source/core/data/document.cxx |7 ++-
sc/source/core/data/dpoutput.cxx |2 +-
sc/source/core/data/patattr.cxx|2 +-
sc/source/core/data/stlpool.cxx| 16 ++--
sc/source/core/data/stlsheet.cxx |4 +++-
sc/source/core/data/table1.cxx |2 +-
sc/source/core/data/table5.cxx |2 +-
sc/source/core/tool/autoform.cxx |4 ++--
sc/source/core/tool/stylehelper.cxx|4 ++--
sc/source/filter/excel/impop.cxx |2 +-
sc/source/filter/excel/xestyle.cxx |4 ++--
sc/source/filter/excel/xistyle.cxx |6 +++---
sc/source/filter/excel/xltools.cxx |4 ++--
sc/source/filter/html/htmlexp.cxx |2 +-
sc/source/filter/oox/stylesbuffer.cxx |6 +++---
sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
sc/source/ui/docshell/docsh4.cxx |2 +-
sc/source/ui/unoobj/cellsuno.cxx |4 ++--
sc/source/ui/unoobj/styleuno.cxx |2 +-
26 files changed, 53 insertions(+), 41 deletions(-)
New commits:
commit 95f0a01a943961db415b6d036b6b4e1e54292716
Author: Srijan Bhatia
AuthorDate: Tue Jun 2 18:09:20 2020 +0530
Commit: Heiko Tietze
CommitDate: Mon Jun 15 11:21:40 2020 +0200
tdf#132137 Rename Default Style in Calc.
Change-Id: I0f7c5ffc64b2387fbb63bb5724594480d3135f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96215
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index d393739292e5..063d51a3d2ec 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -269,7 +269,8 @@
#define STR_EXPORT_DBF NC_("STR_EXPORT_DBF", "DBase
export")
#define STR_EXPORT_DIF NC_("STR_EXPORT_DIF", "Dif
Export")
#define STR_IMPORT_DIF NC_("STR_IMPORT_DIF", "Dif
Import")
-#define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD",
"Default")
+#define STR_STYLENAME_STANDARD_CELL NC_("STR_STYLENAME_STANDARD",
"Default Cell Style")
+#define STR_STYLENAME_STANDARD_PAGE NC_("STR_STYLENAME_STANDARD",
"Default Page Style")
#define STR_STYLENAME_RESULTNC_("STR_STYLENAME_RESULT",
"Result")
#define STR_STYLENAME_RESULT1 NC_("STR_STYLENAME_RESULT1",
"Result2")
#define STR_STYLENAME_HEADLINE NC_("STR_STYLENAME_HEADLINE",
"Heading")
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index 76db8c6a3592..23abaa956f1c 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -88,7 +88,7 @@ ScAutoFormatObj::ScAutoFormatObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(16)
-, XNamed("Default")
+, XNamed("Default Cell Style")
, XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat")
{
}
diff --git a/sc/qa/extras/scautoformatsobj.cxx
b/sc/qa/extras/scautoformatsobj.cxx
index ed799c018ef4..769478608506 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -89,7 +89,7 @@ ScAutoFormatsObj::ScAutoFormatsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(2)
-, XNameAccess("Default")
+, XNameAccess("Default Cell Style")
, XNameContainer("ScAutoFormatsObj")
, XNameReplace("ScAutoFormatsObj")
, XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj",
"com.sun.star.sheet.TableAutoFormats")
diff --git a/sc/qa/uitest/calc_tests6/tdf91726.py
b/sc/qa/uitest/calc_tests6/tdf91726.py
index 38703cb7e34a..4dccc7c697ec 100644
--- a/sc/qa/uitest/calc_tests6/tdf91726.py
+++ b/sc/qa/uitest/calc_tests6/tdf91726.py
@@ -28,7 +28,7 @@ class tdf91726(UITestCase):
xadd = xDialog.getChild("add")
def handle_name_dlg(dialog):
nameEntry = dialog.getChild("name_entry")
-nameEntry.executeAction("TYPE",
mkPropertyValues({"TEXT":"Default"}))
+nameEntry.executeAction("TYPE", mkPropertyValues({"TEXT":"Default
Cell Style"}))
xOKBtn = dialog.getChild("ok")
def handle_error_dlg(dialog2):
#Error message: You have entered an invalid name.
@@ -43,7 +43,7 @@ class tdf91726(UITestCase):
xDialog = self.xUITest.getTopFocusWindow()
