diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-11-05 20:35:09 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-11-06 09:53:04 +0100 |
commit | a5b3211f072d982e1ee136e864f153836c76a5ca (patch) | |
tree | 5a84e41458aa7a1bf3c1e700b96c3b8e647af8ac /sc/source/filter/excel/impop.cxx | |
parent | 538a3463f424adae8b48db50ca11f27704fe0be2 (diff) |
tdf#134161: Revert "tdf#132137 Rename Default Style in Calc."
This reverts 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: Ib7c4a99ff4957eba7ec0b644e989c7a08b46f2a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105381
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc/source/filter/excel/impop.cxx')
-rw-r--r-- | sc/source/filter/excel/impop.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 5b2fa7cef930..abb1e8934758 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -1234,7 +1234,7 @@ void ImportExcel::PostDocLoad() /* Set automatic page numbering in Default page style (default is "page number = 1"). Otherwise hidden tables (i.e. for scenarios) which have Default page style will break automatic page numbering. */ - if( SfxStyleSheetBase* pStyleSheet = GetStyleSheetPool().Find( ScResId( STR_STYLENAME_STANDARD_PAGE ), SfxStyleFamily::Page ) ) + if( SfxStyleSheetBase* pStyleSheet = GetStyleSheetPool().Find( ScResId( STR_STYLENAME_STANDARD ), SfxStyleFamily::Page ) ) pStyleSheet->GetItemSet().Put( SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 0 ) ); // outlines for all sheets, sets hidden rows and columns (#i11776# after filtered ranges) |