[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - jvmfwk/plugins jvmfwk/source
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 16 +---
jvmfwk/source/framework.cxx |8 ++--
jvmfwk/source/fwkbase.cxx |6 --
3 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit f60e081efd4d5902bbbd5545513bd41fb3ea4e90
Author: Stephan Bergmann
AuthorDate: Mon Feb 21 11:55:21 2022 +0100
Commit: Andras Timar
CommitDate: Sat Mar 25 07:49:27 2023 +0100
Avoid unnecessary empty -Djava.class.path=
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130242
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 5e8f64e50f97d39e83a3358697be14db03566878)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130265
Reviewed-by: Caolán McNamara
(cherry picked from commit 04bb6f736f92b93497bed28b7420fac97753f95e)
Change-Id: Idcfe7321077b60381c0273910b1faeb444ef1fd8
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 4760ab629313..ea133ea6c78c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -687,17 +687,22 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// all versions below 1.5.1
options.emplace_back("abort", reinterpret_cast(abort_handler));
bool hasStackSize = false;
+#ifdef UNX
+// Until java 1.5 we need to put a plugin.jar or javaplugin.jar (<1.4.2)
+// in the class path in order to have applet support:
+OString sAddPath = getPluginJarPath(pInfo->sVendor,
pInfo->sLocation,pInfo->sVersion);
+#endif
for (int i = 0; i < cOptions; i++)
{
OString opt(arOptions[i].optionString);
#ifdef UNX
-// Until java 1.5 we need to put a plugin.jar or javaplugin.jar
(<1.4.2)
-// in the class path in order to have applet support:
if (opt.startsWith("-Djava.class.path="))
{
-OString sAddPath = getPluginJarPath(pInfo->sVendor,
pInfo->sLocation,pInfo->sVersion);
if (!sAddPath.isEmpty())
+{
opt += OStringChar(SAL_PATHSEPARATOR) + sAddPath;
+sAddPath.clear();
+}
}
#endif
if (opt == "-Xint") {
@@ -742,6 +747,11 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
}
#endif
}
+#ifdef UNX
+if (!sAddPath.isEmpty()) {
+options.emplace_back("-Djava.class.path=" + sAddPath, nullptr);
+}
+#endif
std::unique_ptr sarOptions(new
JavaVMOption[options.size()]);
for (std::vector::size_type i = 0; i != options.size(); ++i) {
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 32120308f932..f532ebd53fd3 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -210,8 +210,12 @@ javaFrameworkError jfw_startVM(
//In direct mode the options are specified by bootstrap
variables
//of the form UNO_JAVA_JFW_PARAMETER_1 ..
UNO_JAVA_JFW_PARAMETER_n
vmParams = jfw::BootParams::getVMParameters();
-sUserClassPath =
-"-Djava.class.path=" + jfw::BootParams::getClasspath();
+auto const cp = jfw::BootParams::getClasspath();
+if (!cp.isEmpty())
+{
+sUserClassPath =
+"-Djava.class.path=" + cp;
+}
}
else
OSL_ASSERT(false);
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index ece4dd2bd717..1a7425e2 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -458,8 +458,10 @@ OString makeClassPathOption(OUString const &
sUserClassPath)
sBufCP.append(sAppCP);
}
-sPaths = OUStringToOString(
-sBufCP.makeStringAndClear(), osl_getThreadTextEncoding());
+sPaths = OUStringToOString(sBufCP.makeStringAndClear(),
osl_getThreadTextEncoding());
+if (sPaths.isEmpty()) {
+return "";
+}
OString sOptionClassPath = "-Djava.class.path=" + sPaths;
return sOptionClassPath;
[Libreoffice-commits] core.git: dbaccess/source desktop/source
dbaccess/source/filter/hsqldb/fbalterparser.cxx |6 --
dbaccess/source/filter/hsqldb/fbcreateparser.cxx |6 --
dbaccess/source/filter/hsqldb/hsqlimport.cxx |8 ---
dbaccess/source/ui/misc/DExport.cxx |3 -
dbaccess/source/ui/misc/WCopyTable.cxx|3 -
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx |3 -
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx|3 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx| 24 --
desktop/source/app/officeipcthread.cxx|8 +--
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |4 -
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 14 +
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |5 --
desktop/source/deployment/manager/dp_manager.cxx | 11 ++--
desktop/source/deployment/misc/dp_misc.cxx|3 -
desktop/source/deployment/registry/component/dp_component.cxx | 14 +
desktop/source/deployment/registry/dp_registry.cxx|8 +--
desktop/source/lib/init.cxx |7 +-
desktop/source/migration/migration.cxx|7 +-
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx|7 --
desktop/source/pkgchk/unopkg/unopkg_misc.cxx |7 --
20 files changed, 54 insertions(+), 97 deletions(-)
New commits:
commit d638a512ac19fa68f7760ff110469337f061f481
Author: Noel Grandin
AuthorDate: Fri Mar 24 19:08:40 2023 +0200
Commit: Noel Grandin
CommitDate: Sat Mar 25 06:21:25 2023 +
loplugin:stringadd in d*
after my patch to merge the bufferadd loplugin into stringadd
Change-Id: I625a0adf89f54ea25f0377a266c37acf9a37d723
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149550
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/filter/hsqldb/fbalterparser.cxx
b/dbaccess/source/filter/hsqldb/fbalterparser.cxx
index 024598c0b319..a8948069e4e6 100644
--- a/dbaccess/source/filter/hsqldb/fbalterparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbalterparser.cxx
@@ -32,15 +32,13 @@ OUString FbAlterStmtParser::compose() const
}
else if (getActionType() == AlterAction::ADD_FOREIGN)
return getStatement(); // do nothing with that
-OUStringBuffer sSql("ALTER TABLE ");
-sSql.append(getTableName());
+OUStringBuffer sSql("ALTER TABLE " + getTableName());
if (getActionType() == AlterAction::IDENTITY_RESTART)
{
sSql.append(" ALTER COLUMN ");
}
-sSql.append(getColumnName());
-sSql.append(" RESTART WITH ");
+sSql.append(getColumnName() + " RESTART WITH ");
// Firebird: restart with 0 means the first number is 1, not 0.
sSql.append(getIdentityParam() - 1);
diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index f3399474c272..1740998c62d2 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -135,8 +135,7 @@ OUString FbCreateStmtParser::compose() const
{
ensureProperTableLengths();
OUStringBuffer sSql(128);
-sSql.append("CREATE TABLE ");
-sSql.append(getTableName());
+sSql.append("CREATE TABLE " + getTableName());
lcl_appendWithSpace(sSql, u"("); // column declaration
auto& rColumns = getColumnDef();
@@ -183,8 +182,7 @@ OUString FbCreateStmtParser::compose() const
// start with 0:
// HSQLDB: first value will be 0.
// Firebird: first value will be 1.
-sSql.append(columnIter->getStartValue() - 1);
-sSql.append(")");
+sSql.append(OUString::number(columnIter->getStartValue() - 1) +
")");
}
else if (!columnIter->isNullable())
lcl_appendWithSpace(sSql, u"NOT NULL");
diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index 045a32f93ce3..af9b637cb862 100644
--- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
@@ -180,9 +180,7 @@ OUString lcl_createInsertStatement(std::u16string_view
sTableName,
const
std::vector& rColTypes)
{
assert(rColTypes.size() > 0);
-OUStringBuffer sql("INSERT INTO ");
-sql.append(sTableName);
-sql.append(" (");
+OUStringBuffer sql(OUString::Concat("INSERT INTO ") + sTableName + " (");
// column names
for (size_t i = 0; i < rColTypes.size(); ++i)
@@ -191,9 +189,7 @@ OUString lcl_createInsertStatement(std::u16string_view
sTableName,
if (i < rColTypes.size() - 1)
sql.append(", ");
}
-sql.append(")");
-
-sql.append(" VALUES (");
+sql.append(") VALUES (");
for (size_t i = 0; i < r
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/tabfrm.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 4ca4282517d02592966576fc642048b3d5ae5532
Author: Justin Luth
AuthorDate: Thu Mar 23 14:09:05 2023 -0400
Commit: Justin Luth
CommitDate: Fri Mar 24 21:16:59 2023 +
related tdf#76022 sw CalcFlyOffset: no ConsiderFly if THROUGH wrap
A fly that has text wrap through it does not need to be considered
for table offsets.
Change-Id: I1b1e58bca3f59d8789581f978f15355c2d4d7ee0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149465
Reviewed-by: Justin Luth
Tested-by: Jenkins
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 900f3ba71fe1..ef169a209212 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2912,18 +2912,22 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
bConsiderFly = false;
}
+text::WrapTextMode nSurround = text::WrapTextMode_NONE;
if ( bConsiderFly )
{
-text::WrapTextMode nSurround =
pFly->GetFormat()->GetSurround().GetSurround();
+nSurround = pFly->GetFormat()->GetSurround().GetSurround();
// If the frame format is a TextBox of a draw shape,
// then use the surround of the original shape.
bool bWrapThrough = nSurround ==
text::WrapTextMode_THROUGH;
SwTextBoxHelper::getShapeWrapThrough(pFly->GetFormat(),
bWrapThrough);
-if (bWrapThrough && nSurround !=
text::WrapTextMode_THROUGH)
-nSurround = text::WrapTextMode_THROUGH;
+if (bWrapThrough)
+bConsiderFly = false;
else if (!bWrapThrough && nSurround ==
text::WrapTextMode_THROUGH)
nSurround = text::WrapTextMode_PARALLEL;
+}
+if (bConsiderFly)
+{
const SwFormatHoriOrient &rHori=
pFly->GetFormat()->GetHoriOrient();
bool bShiftDown = css::text::WrapTextMode_NONE ==
nSurround;
if (!bShiftDown && bAddVerticalFlyOffsets)
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/fontmanager/fontmanager.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 45da2754222d1fd6ffb02636b8568b4ac6472979
Author: Caolán McNamara
AuthorDate: Fri Mar 24 12:32:13 2023 +
Commit: Caolán McNamara
CommitDate: Fri Mar 24 20:42:07 2023 +
tdf#151722 restore use of localized font name
basically disabled back with:
commit cc93f06f93eeaaee5811588d90929ebc72bf9724
Date: Fri Apr 23 12:28:26 2010 +0200
#i08# do not prefer fontconfig familyname because of i79878
to avoid stuff like "DejaVu Condensed" getting reported as "DejaVu" with
a "Condensed" style.
Rather than reopen that problem, just tweak analyzeSfntFamilyName to
use the UI lang instead of the system lang as the preferred lang.
Change-Id: I41f128d1a21397ff7880f34985c1553b890b4747
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149542
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index dc8feaa6d0b3..b8f99d122e1f 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
#include
@@ -453,8 +454,8 @@ void PrintFontManager::analyzeSfntFamilyName( void const *
pTTFont, ::std::vecto
GetTTNameRecords( static_cast(pTTFont), aNameRecords
);
if( !aNameRecords.empty() )
{
-LanguageTag aSystem("");
-LanguageType eLang = aSystem.getLanguageType();
+LanguageTag aUILang(SvtSysLocaleOptions().GetRealUILanguageTag());
+LanguageType eLang = aUILang.getLanguageType();
int nLastMatch = -1;
for( size_t i = 0; i < aNameRecords.size(); i++ )
{
@@ -480,7 +481,7 @@ void PrintFontManager::analyzeSfntFamilyName( void const *
pTTFont, ::std::vecto
{
AppleLanguageId aAppleId =
static_cast(static_cast(aNameRecords[i].languageID));
LanguageTag
aApple(makeLanguageTagFromAppleLanguageId(aAppleId));
-if (aApple == aSystem)
+if (aApple == aUILang)
nMatch = 8000;
else if (aAppleId == AppleLanguageId::ENGLISH)
nMatch = 2000;
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2f8b40487cb02287f02ec93acb42f1442c9b4590
Author: Caolán McNamara
AuthorDate: Fri Mar 24 16:15:33 2023 +
Commit: Caolán McNamara
CommitDate: Fri Mar 24 20:41:52 2023 +
ofz#57376 Fuzzing build failure
Change-Id: I03624956bebc7c6ce435482bc7cc5fc8b3fc31cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149547
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index b8fa3634ab23..6dc5def61b1a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -307,7 +307,7 @@ core_constructor_list = [
("lingucomponent_MacSpellChecker_get_implementation", "#ifdef IOS"),
# lingucomponent/source/spellcheck/languagetool/LanguageTool.component
("lingucomponent_LanguageToolGrammarChecker_get_implementation", "#if
!ENABLE_FUZZERS"),
-"lingucomponent_NumberText_get_implementation",
+("lingucomponent_NumberText_get_implementation", "#if !ENABLE_FUZZERS"),
# lingucomponent/source/thesaurus/libnth/lnth.component
"lingucomponent_Thesaurus_get_implementation",
"lingucomponent_SpellChecker_get_implementation",
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/metaact.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eba27d85c2c47ba8880ff257cddfe148ca987828
Author: Caolán McNamara
AuthorDate: Thu Mar 23 16:37:02 2023 +
Commit: Caolán McNamara
CommitDate: Fri Mar 24 20:41:34 2023 +
ofz#57232 Integer-overflow
Change-Id: I352d66bf6926a1d839de538dd02d1f2f7c355da8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149461
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 89c60fbe7baa..ad50fa4b2e18 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -591,7 +591,7 @@ static bool AllowPoint(const Point& rPoint)
static bool AllowRect(const tools::Rectangle& rRect)
{
-return AllowDim(rRect.Top()) && AllowDim(rRect.Bottom());
+return AllowPoint(rRect.TopLeft()) && AllowPoint(rRect.BottomRight());
}
void MetaTextAction::Execute( OutputDevice* pOut )
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/itrcrsr.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 48d5d19716b941a67492989ea30fb76f65696841
Author: Michael Stahl
AuthorDate: Fri Mar 24 11:08:33 2023 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 24 19:27:54 2023 +
sw: fix crashtesting assert on ooo55147-1.doc
frmpaint.cxx:801: SwTextFrame::PaintSwFrame: Assertion
`!isPDFTaggingEnabled || oTaggedParagraph ||
rRect.GetIntersection(getFrameArea()) != getFrameArea()' failed.
This happens because the SwNumberPortion is outside of the
SwTextFrame 16's area so it is not painted at all (table cell clipping).
The first-line indent is incorrect 1233 instead of 2084
because in SwTextMargin::CtorInitTextMargin() the mnLeft is incorrect
2084 instead of 2935 because it erroneously took the branch to set
mnLeft = m_pFrame->getFramePrintArea().Left() +
m_pFrame->getFrameArea().Left()
because the nLMWithNum check wasn't adapted to the change of including
the text-left-margin in it.
(regression from commit 92280ad0c65a3d1b5aa8ac77c87ec6a964389a01)
Change-Id: Ic7cd2b272a79e70cb5e0313bb6bcf1e909c3a68a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149538
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 7963b0aa177c..ba6641e7cdab 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -225,7 +225,8 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrame
*pNewFrame, SwTextSizeInfo *p
// paras inside cells inside new documents:
(
pNode->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING)
||
!m_pFrame->IsInTab() ||
- ( !nLMWithNum && (!bLabelAlignmentActive ||
bListLevelIndentsApplicable) ) ) )
+ (bListLevelIndentsApplicable && nLMWithNum ==
rTextLeftMargin.GetTextLeft())
+ || (!bLabelAlignmentActive && nLMWithNum == 0)))
{
mnLeft = m_pFrame->getFramePrintArea().Left() +
m_pFrame->getFrameArea().Left();
if( mnLeft >= mnRight ) // e.g. with large paragraph indentations in
slim table columns
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/indexentry.ui | 194 +++ 1 file changed, 130 insertions(+), 64 deletions(-) New commits: commit 4ec75d22eb916e3809e9e92f77fd25e33f6b21ee Author: Seth Chaiklin AuthorDate: Sat Mar 11 11:09:25 2023 + Commit: Seth Chaiklin CommitDate: Fri Mar 24 18:57:58 2023 + tdf#153499 Add "For Selected Entry" label add frame to checkboxes under "For Selected Entry" add grid for navigation buttons add typographical quotes to extended tips add missing colons to three "Phonetic reading" labels Change-Id: Id630febb01165e4a0faf1a228e436457867748da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148695 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui index 826f053d2fc0..aabc8cf463ab 100644 --- a/sw/uiconfig/swriter/ui/indexentry.ui +++ b/sw/uiconfig/swriter/ui/indexentry.ui @@ -142,8 +142,8 @@ - - + + True False 12 @@ -246,7 +246,7 @@ True 12 6 -Phonetic reading +Phonetic reading: True phonetic0ed 0 @@ -279,7 +279,7 @@ True 12 6 -Phonetic reading +Phonetic reading: True phonetic1ed 0 @@ -312,7 +312,7 @@ True 12 6 -Phonetic reading +Phonetic reading: True phonetic2ed 0 @@ -367,8 +367,8 @@ True True - -Makes the current selection a subentry of the word that you enter here. For example, if you select "cold", and enter "weather" as the 1st key, the index entry is "weather, cold". + +Makes the current selection a subentry of the word that you enter here. For example, if you select “cold”, and enter “weather” as the 1st key, the index entry will be “weather, cold”. @@ -408,8 +408,8 @@ True True - -Makes the current selection a sub-subentry of the 1st key. For example, if you select "cold", and enter "weather" as the 1st key and "winter" as the 2nd key, the index entry is "weather, winter, cold". + +Makes the current selection a sub-subentry of the 1st key. For example, if you select “cold”, and enter “weather” as the 1st key and “winter” as the 2nd key, the index entry will be “weather, winter, cold”. @@ -479,56 +479,128 @@ - -Apply to all other occurrences -True - Add an index entry to any other occurrences of the selected text specified in “Entry”. -False -True -start -True -True - - -0 -6 -3 - + - -Match case -True -False -True -start -12 -True -True - - -0 -7 -3 - + - -Whole words only -True -False -True -start -12 -True -True + + + + + + + + + + + + + +False +True +0 + + + + +True +False +0 +none + + +True +False +12 + + + +True +False +12 +6 +6 +6 + + +Apply to all other occurrences +True +False +
[Libreoffice-commits] core.git: include/com sw/qa
include/com/sun/star/uno/Any.h|9 +
include/com/sun/star/uno/Reference.hxx| 12
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |3 +--
3 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 2a145d8667196838bd5e1bf635234fce564faea6
Author: Mike Kaganski
AuthorDate: Fri Mar 24 19:56:23 2023 +0300
Commit: Mike Kaganski
CommitDate: Fri Mar 24 18:38:26 2023 +
Introduce query() and queryThrow() to css::uno::Any
Similar to commit f3ffdc1a5fe965016550f20ada405ef638bf5f75
(Introduce non-static query() and queryThrow() to css::uno::Reference,
2023-03-23), this adds a syntactic sugar for css::uno::Reference ctors:
css::uno::Reference
xSomeInterface(anAny, css::uno::UNO_QUERY);
would become
auto xSomeInterface(anAny.query());
and
css::uno::Reference
xSomeInterface(anAny, css::uno::UNO_QUERY_THROW);
would become
auto
xSomeInterface(anAny.queryThrow());
Change-Id: I06f8d97fe200a7dd03ecc965a431eb54b10a3c91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149549
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index b453f5fa5b0c..181b58ae4b4a 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -44,6 +44,7 @@ namespace uno
{
class Type;
+template class Reference;
/** C++ class representing an IDL any.
This class is used to transport any type defined in IDL. The class
inherits from the
@@ -287,6 +288,14 @@ public:
*/
inline bool SAL_CALL operator != ( const Any & rAny ) const;
+#if defined LIBO_INTERNAL_ONLY
+// Similar to Reference::query/queryThrow, these allow to simplify calling
constructors of
+// Reference taking Any. queryThrow is functionally similar to get(), but
doesn't require
+// to specify the full Reference type explicitly, only the interface type.
+template inline Reference query()
const;
+template inline Reference
queryThrow() const;
+#endif
+
private:
#if !defined LIBO_INTERNAL_ONLY
/// @cond INTERNAL
diff --git a/include/com/sun/star/uno/Reference.hxx
b/include/com/sun/star/uno/Reference.hxx
index 40297cc086d7..76b01b6c57cf 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -397,6 +397,18 @@ inline Reference< other_type > Reference< interface_type
>::queryThrow() const
{
return Reference< other_type >(*this, UNO_QUERY_THROW);
}
+
+template< class interface_type >
+inline Reference< interface_type > Any::query() const
+{
+return Reference< interface_type >(*this, UNO_QUERY);
+}
+
+template< class interface_type >
+inline Reference< interface_type > Any::queryThrow() const
+{
+return Reference< interface_type >(*this, UNO_QUERY_THROW);
+}
#endif
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index c12c5deeac1c..6436d68ec89e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -1043,8 +1043,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf154319)
auto
xSupplier(mxComponent.queryThrow());
auto xIndexes = xSupplier->getDocumentIndexes();
-css::uno::Reference
xTOCIndex(xIndexes->getByIndex(0),
-
css::uno::UNO_QUERY_THROW);
+auto
xTOCIndex(xIndexes->getByIndex(0).queryThrow());
css::uno::Reference xLevelFormats;
CPPUNIT_ASSERT(xTOCIndex->getPropertyValue("LevelFormat") >>=
xLevelFormats);
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), xLevelFormats->getCount());
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter3.cxx | 75
sw/qa/extras/uiwriter/uiwriter4.cxx | 75
2 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit cfcf76b67935bb91d7417e8be60ec2a6285652de
Author: Xisco Fauli
AuthorDate: Fri Mar 24 14:36:17 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 18:33:48 2023 +
CppunitTest_sw_uiwriter3: move failing test to another file
In order to see wether this test keeps failing in the new file
or it's affected by another test
Change-Id: I73ef0287a81d0ea8c2b26f466cd0d623a62933c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149543
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 40f02901de09..a282ae7bcbb4 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -2005,81 +2005,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf108124)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
}
-CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf107975)
-{
-// This test also covers tdf#117185 tdf#110442
-
-createSwDoc("tdf107975.odt");
-SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
-
-uno::Reference
xTextGraphicObjectsSupplier(mxComponent,
-
uno::UNO_QUERY);
-uno::Reference xIndexAccess(
-xTextGraphicObjectsSupplier->getGraphicObjects(), uno::UNO_QUERY);
-
-uno::Reference xShape(xIndexAccess->getByIndex(0),
uno::UNO_QUERY);
-
-CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
- getProperty(xShape,
"AnchorType"));
-
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-
-dispatchCommand(mxComponent, ".uno:SelectAll", {});
-
-dispatchCommand(mxComponent, ".uno:Copy", {});
-
-//Position the mouse cursor (caret) after "ABC" below the blue image
-dispatchCommand(mxComponent, ".uno:GoRight", {});
-dispatchCommand(mxComponent, ".uno:Paste", {});
-
-// without the fix, it crashes
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-CPPUNIT_ASSERT_EQUAL(OUString("ABC"), getParagraph(1)->getString());
-dispatchCommand(mxComponent, ".uno:Undo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Redo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Undo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Redo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Undo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-
-//try again with anchor at start of doc which is another special case
-xShape.set(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
-uno::Reference xShapeContent(xShape, uno::UNO_QUERY);
-uno::Reference const xStart =
pTextDoc->getText()->getStart();
-xShapeContent->attach(xStart);
-
-CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
- getProperty(xShape,
"AnchorType"));
-
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-
-dispatchCommand(mxComponent, ".uno:SelectAll", {});
-
-dispatchCommand(mxComponent, ".uno:Copy", {});
-
-//Position the mouse cursor (caret) after "ABC" below the blue image
-dispatchCommand(mxComponent, ".uno:GoRight", {});
-dispatchCommand(mxComponent, ".uno:Paste", {});
-
-// without the fix, it crashes
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-CPPUNIT_ASSERT_EQUAL(OUString("ABC"), getParagraph(1)->getString());
-dispatchCommand(mxComponent, ".uno:Undo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Redo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Undo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Redo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
-dispatchCommand(mxComponent, ".uno:Undo", {});
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
-}
-
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134021)
{
createSwDoc("tdf134021.docx");
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index 327d493c8c35..b692becbfcf3 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2343,6 +2343,81 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4,
testTdf113877_blank_bold_on)
CPPUNIT_ASSERT_EQUAL(listId1, listId3);
}
+CPP
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optviewpage.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit be5b1b42c8b66c6614b6cc307112e02ac0f082d1 Author: Seth Chaiklin AuthorDate: Thu Mar 23 20:05:19 2023 + Commit: Seth Chaiklin CommitDate: Fri Mar 24 18:29:05 2023 + add 6px to Skia children options Change-Id: Ic7d3a63516aae263aaffec9fba9d9673469bede4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149445 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index 3865fe17b0c1..a063a4f6d36d 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -481,7 +481,7 @@ True False Requires restart. Enabling this will prevent the use of graphics drivers. -12 +18 True True @@ -493,7 +493,7 @@ False -12 +18 Skia is currently enabled. 0 @@ -508,7 +508,7 @@ False -12 +18 Skia is currently disabled. 0
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 13 +
sw/source/core/layout/tabfrm.cxx | 23 +++--
3 files changed, 29 insertions(+), 7 deletions(-)
New commits:
commit afbe948d4c47391092c8fcf4130bd7501c3d5062
Author: Justin Luth
AuthorDate: Thu Mar 23 12:17:28 2023 -0400
Commit: Justin Luth
CommitDate: Fri Mar 24 18:25:37 2023 +
tdf#115625 tdf#76022 sw table: CalcFlyOffset: get correct surround for
textbox
The function thought it was dealing with a wrap-through shape,
but actually it is wrap parallel.
Attempts to syncProperty of RES_SURROUND meet with instant disaster,
and likely this emulation works better if the doubled-up shape
only has one wrap anyway.
There is a helper function for this after all,
so that highly suggests workarounds are necessary
instead of just syncing the wrap property.
There were two existing unit tests identified:
-tdf123163-1.docx (doesn't even open in MS Word 2010/2003)
-testCustomShapePresetExport.odt (on round-trip)
-no differences noticed.
Change-Id: I7b0828ce6406fa9cfb1debb68040ea02e8d6fe45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149463
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt
b/sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt
new file mode 100644
index ..b08fe002f32b
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf76022_textboxWrap.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index b784724fce6f..3f0a92bf95c7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -367,6 +367,19 @@
DECLARE_OOXMLEXPORT_TEST(testTdf153964_firstIndentAfterBreak14, "tdf153964_first
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xPara,
"ParaFirstLineIndent"));
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf76022_textboxWrap)
+{
+// Granted, this is an ODT with a bit of an anomoly - tables ignore fly
wrapping.
+createSwDoc("tdf76022_textboxWrap.odt");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Did you make wrapping sane/interoperable?",
1, getPages());
+
+// When saving to DOCX, the table should obey the fly wrapping
+reload("Office Open XML Text", "");
+
+// The fly takes up the whole page, so the table needs to shift down to
the next page.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf149551_mongolianVert)
{
// Given a docx document with a shape with vert="mongolianVert".
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 71d736499d8e..900f3ba71fe1 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2914,12 +2914,21 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
if ( bConsiderFly )
{
-const SwFormatSurround &rSur =
pFly->GetFormat()->GetSurround();
+text::WrapTextMode nSurround =
pFly->GetFormat()->GetSurround().GetSurround();
+// If the frame format is a TextBox of a draw shape,
+// then use the surround of the original shape.
+bool bWrapThrough = nSurround ==
text::WrapTextMode_THROUGH;
+SwTextBoxHelper::getShapeWrapThrough(pFly->GetFormat(),
bWrapThrough);
+if (bWrapThrough && nSurround !=
text::WrapTextMode_THROUGH)
+nSurround = text::WrapTextMode_THROUGH;
+else if (!bWrapThrough && nSurround ==
text::WrapTextMode_THROUGH)
+nSurround = text::WrapTextMode_PARALLEL;
+
const SwFormatHoriOrient &rHori=
pFly->GetFormat()->GetHoriOrient();
-bool bShiftDown = css::text::WrapTextMode_NONE ==
rSur.GetSurround();
+bool bShiftDown = css::text::WrapTextMode_NONE ==
nSurround;
if (!bShiftDown && bAddVerticalFlyOffsets)
{
-if (rSur.GetSurround() == text::WrapTextMode_PARALLEL
+if (nSurround == text::WrapTextMode_PARALLEL
&& rHori.GetHoriOrient() ==
text::HoriOrientation::NONE)
{
// We know that wrapping was requested and the
table frame overlaps with
@@ -2979,8 +2988,8 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
bInvalidatePrtArea = true;
}
}
-if ( (css::text::WrapTextMode_RIGHT==
rSur.GetSurround() ||
- css::text::WrapTextMode_PARALLEL ==
rSur.GetSurround())&&
+if ((css::
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ae4e5e38b5ec99123ef478143501a9b0a3650171 Author: Andrea Gelmini AuthorDate: Fri Mar 24 11:37:25 2023 +0100 Commit: Julien Nabet CommitDate: Fri Mar 24 17:56:51 2023 + Fix typo Change-Id: I8106dc197585b823b52d675698533e8a5167819b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149537 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index d6a259157886..0f77b4eada3a 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1008,7 +1008,7 @@ void VclPixelProcessor2D::processFillGradientPrimitive2D( // color gradients). // To handle a primitive that needs paint, either use decompose, or - when you // do not want that for any reason, e.g. extra primitives created - implement -// a direct handling in your primitive rendererer. This is always possible +// a direct handling in your primitive renderer. This is always possible // since primitives by definition are self-contained what means they have all // needed data locally available to do so. // The question is the complexity to invest - the implemented decompose
[Libreoffice-commits] core.git: sw/CppunitTest_sw_rtfexport7.mk sw/Module_sw.mk sw/qa
sw/CppunitTest_sw_rtfexport7.mk | 14
sw/Module_sw.mk |1
sw/qa/extras/rtfexport/rtfexport.cxx | 653
sw/qa/extras/rtfexport/rtfexport7.cxx | 688 ++
4 files changed, 703 insertions(+), 653 deletions(-)
New commits:
commit 8bc0c3013089b291bd6c4cb65f944db64373dcb5
Author: Xisco Fauli
AuthorDate: Fri Mar 24 16:20:49 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 17:09:48 2023 +
CppunitTest_sw_rtfexport: split in two
it already has 109 tests
Change-Id: I1e7adf3fa9c1cdb22fb1402306c2f9478d94038c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149546
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/CppunitTest_sw_rtfexport7.mk b/sw/CppunitTest_sw_rtfexport7.mk
new file mode 100644
index ..9da7428bfb4b
--- /dev/null
+++ b/sw/CppunitTest_sw_rtfexport7.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call sw_rtfexport_test,7))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index eaa8c142f0fd..cd1c3dbc31b4 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_rtfexport4 \
CppunitTest_sw_rtfexport5 \
CppunitTest_sw_rtfexport6 \
+CppunitTest_sw_rtfexport7 \
CppunitTest_sw_docbookexport \
CppunitTest_sw_fodfexport \
CppunitTest_sw_htmlexport \
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index a29cf8ac7451..0a5ef84d9a5d 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -14,30 +14,21 @@
#include
#include
#include
-#include
-#include
#include
-#include
#include
-#include
#include
-#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
#include
#include
#include
-#include
#include
-#include
#include
using namespace css;
@@ -808,650 +799,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo32613)
getProperty(getShape(1),
"AnchorType"));
}
-DECLARE_RTFEXPORT_TEST(testPictureWrapPolygon, "picture-wrap-polygon.rtf")
-{
-// The problem was that the wrap polygon was ignored during import.
-drawing::PointSequenceSequence aSeqSeq
-= getProperty(getShape(1),
"ContourPolyPolygon");
-// This was 0: the polygon list was empty.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aSeqSeq.getLength());
-
-drawing::PointSequence aSeq = aSeqSeq[0];
-CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aSeq.getLength());
-
-// The shape also didn't have negative top / left coordinates.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(-1177)),
- getProperty(getShape(1),
"HoriOrientPosition"));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(-67)),
- getProperty(getShape(1),
"VertOrientPosition"));
-}
-
-DECLARE_RTFEXPORT_TEST(testTdf113408, "tdf113408.rtf")
-{
-// This was 0, left margin was not inherited from style properly.
-CPPUNIT_ASSERT_EQUAL(static_cast(1270),
- getProperty(getParagraph(1),
"ParaLeftMargin"));
-}
-
-CPPUNIT_TEST_FIXTURE(Test, testAbi10039)
-{
-loadAndReload("abi10039.odt");
-CPPUNIT_ASSERT_EQUAL(1, getShapes());
-CPPUNIT_ASSERT_EQUAL(1, getPages());
-// Make sure we don't just crash on export, and additionally the shape
should not be inline (as it's at-page anchored originally).
-CPPUNIT_ASSERT(text::TextContentAnchorType_AS_CHARACTER
- != getProperty(getShape(1),
"AnchorType"));
-}
-
-CPPUNIT_TEST_FIXTURE(Test, testAbi10076)
-{
-loadAndReload("abi10076.odt");
-CPPUNIT_ASSERT_EQUAL(2, getPages());
-// Just make sure that we don't crash after exporting a fully calculated
layout.
-}
-
-DECLARE_RTFEXPORT_TEST(testEm, "em.rtf")
-{
-// Test all possible \acc* control words.
-CPPUNIT_ASSERT_EQUAL(text::FontEmphasis::NONE,
- getProperty(getRun(getParagraph(1), 1),
"CharEmphasis"));
-CPPUNIT_ASSERT_EQUAL(text::FontEmphasis::DOT_ABOVE,
- getProperty(getRun(getParagraph(1), 2),
"CharEmphasis"));
-CPPUNIT_ASSERT_EQUAL(text::FontEmphasis::ACCENT_ABOVE,
- getProperty(getRun(getParagraph(1), 3),
"CharEmphasis"));
-// This was missing.
-CPPUNIT_ASSERT_EQUAL(text::FontEmphasis::CIRCLE_ABOVE,
-
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.5.2.2'
Tag 'libreoffice-7.5.2.2' created by Christian Lohmaier at 2023-03-24 16:53 + Tag libreoffice-7.5.2.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd1ZwACgkQ9DSh76/u rqN2iQ//dLc3ScrXWtlApkrlP5SJdKpTu8Ov5mTXGnK+Fca53NFVijtbNLc1jzjj qw/s5QJDg0zVodGb0fTKtAuxiOGDy/4EmxhuBYAEO0kcf3R7m71nJ64UZ//3ZXc0 P2v8/ZLtzf3SRAsCa8iTtMShUvVspCIVUluPBarMNHcjscqY9h9WEc4lrQdAYQff 0qyTuIhX8CwnU8YCr4aTYxBKeB4A1BN2YgZzNSVVQ9LVaBTje8jrMeY7jR1JKLgc 9Typ573dqa7UuqLzX/n7Ca1XN4Hdlc3L2+pTupjqvR7WnGq06BbCnK1e969agWYo FvoV+g3aPsTfeAZG+G6KdAXTOf5sQroK5YsvrCtvi3gLFKELu259niyiAoxprwpT is7QEMHOiVeYjSOz3y3ca3c2yjKQ2gso/IA4pyqtwZMz9pqIltZc79IbCXh4yddl yuY2IWDAfcfkXdLPeyBxBr+D4beKq1Pwo5sgnz1xeKpxUJMgiMCKPddQax0U8nwR xKgKjmc6R3DIJ6ZyXRCFsjJUez95UtTysHnsnP5jejEr2jWPS6zM2jwULtYj8hF/ RNdRjJ1q8l6dBkdyjNOWy6Ea0p/SEvimDn+DbZMBwliQJpdXlHljVOWr61J3Cq6u hucNWSriVBoliYSKtdT0w02gaWMpbQElq1NuXloZeLQ+eGAIEAI= =/gy5 -END PGP SIGNATURE- Changes since co-23.05-branch-point-313: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.5.2.2'
Tag 'libreoffice-7.5.2.2' created by Christian Lohmaier at 2023-03-24 16:53 + Tag libreoffice-7.5.2.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd1ZwACgkQ9DSh76/u rqNuhBAAlJX1pZw0+at2T1ymJuMLOeHi+Wi6hcTxQ38RBdzEnj2Pb7b+8GVNQCeC OhWFffUcQF3Xz/gLY50eh8TY9t+vWiqEbRKVJBdXi934zN6EqH9H9MhprvCeC18S E/otNYKa5RyvUqMsz01e2zOGCNr4gDdcLhz/mn36wNoGkZrLoK9Ja2AonSd8vOmT VciRlrIhlhv9xIkpoEW3sG09qlapkc8WvUbe63C9ys3dLUHt4+Nb8KEFXk2M4SAu +O/nvQZ3AHY/vly9MnEwC2FVk2y7a43Fk2wWVepiwvc3/91L2CWWLBVRxVzGz94c Ln+xYcupeft+R3vUqyiP29ED2r9DekRB6Ao1PzeibUVFYBujOIbHiUEU2OZrbgka oZZvIxzYGAyBX9K41sq6EezebrD0WfkiRqeszqg/qf9R4FzsB4U2UvYQcmS6IE14 ohrvBWIvFhmY/5PMuqlw5B/HVNEanGl1fEiq4TzD/a0Bxf0MH1L3j6+XDtotaBmW o58XjDheZRu94Ml10Zm8W1f6uNI8eu6R/PoP9fKh8OnFucQLD+j7uZY6RxcoZ/o3 r5g3QqYFAE2/XT04ylAKSmEpQiPvponThleynLXjBO/eVC3RFqmsPSleJCkJ1oV9 GS6lb0kuYOMPtL42VHgyjc4qfbnReSQPjwlKLydagwXro/xxfv8= =D8g6 -END PGP SIGNATURE- Changes since co-23.05-branch-point-9: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.5.2.2'
Tag 'libreoffice-7.5.2.2' created by Christian Lohmaier at 2023-03-24 16:53 + Tag libreoffice-7.5.2.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd1ZwACgkQ9DSh76/u rqO4Vg//QhiSVORFY0kUnRkt30lL9cNN+LSrkHMlGiHhgqyPXEMBrXePq7hzW+10 zN84heikwQWPzQCrG9yyfjUzLZ806v2cXbT8O6fBs1/lRq0GgWWAjw2caw+dWwDP aAEQsu0LliX8tAfLgVSDfjhLSbrekHR43TlPezYRW0ck4jmXqsQdvNF0GYQREZk9 cpDJrO5AOOpFOSaFU69rdh6OfHyOy8jzy6SvJNpUMUJATp2n7RFUw2S1VwVmbrcD GfSkBvCq6LqU8fTd0kPdJrRoflPwf1Y/xqIVkIYA6Dvxhwq9OMMtSnVTt9gA2LT7 et/6cVSMRlI5jJJNF3x/34kQbJkUQ+CBRmH7WkCIWGIjskKDJWS5GjLd2o/LjYuy QcYvNQ/ni+LR9BQx/IhR7ErpQ2c2D31OxqWAo0OyMK4655aHsyXvfO9CItS/lfvT +Pgd5Sew5MrEB7HEt5NQ2edbI/QZeiY3pOK4Jm6dBP97KansgVLrIYHN+qR28aDm bVMsQuc23rTahM29iBqsQk6MDkeYfACRJNatXKKCO3ClR8wG7W/fvn7xSk3aZE5H OvLPfDQ6TlplPBQt6MUPDikvOEOsaY4Zd7v7QQ12KkY5xlnm7Nn2uLv7BWmz9czh 14jh/TmcY6bIlmCwoLvBZFqm/p1C/gutWrDyniU2iio/3DoeGcg= =x5yp -END PGP SIGNATURE- Changes since co-23.05-branch-point-4: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.5.2.2'
Tag 'libreoffice-7.5.2.2' created by Christian Lohmaier at 2023-03-24 16:53 + Tag libreoffice-7.5.2.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd1ZkACgkQ9DSh76/u rqPapA/+OLjH5Z5HD+tSPflYv5jdAlWPVcoNlHg8qCuc19tDzZjSZH6RB3gTKe3T U08OUyWKTap8zNKujkB/9PKiLschOv/litbG3xDY7yl6lDdrQL/1ogeTYyL4ZP0C hHTm+QfnoQyC8r3L5DQxZ2MMA1EOrqQr70SzKwpstIUdPGe+24qgOKFO4QaInY3M c+f0zeB2iMOJnPd5167+pgE1X7iWQlKX98K80LUvVBASez9e9wwJhCuNXxi4pSvM 6/mwK7yRoeQp7CUpdJHquA9vd74deguAVvhwSpUY9cimn15NMHpV0t6ZfWB58Qjy sT8U5aKqAICl4XUCeP6W/2Vnwm+UfGi2a84WFWuRCt4lakTRJSAK1HxUoJ9K5WJR A7NSI3+YQncgmy+eWvLsRWL22uHPxI5dG5GDzzCwiL5SgvA/cysjmWNfEIVqnFfO M5bLRq1RhoOnCDJExBrLHB/QZeQZRlZnREz0tZNLubcJidv3Z65MBAMDGhWujcyq 4M99WKKFgfFBUxdV9Myt05kwARtRobkYpg9pc5VvGuJbympOU+TdT77gkX9f4dXF jLmoZGdKYMqMyuEYW9BcIMjhR9V3kpKGDEcRn8YUslI4qgeDk9XeiNNMUkT4VOce o9wnQaK3yQkjrKEvt2RaKGpyZ79xmmhBiUPcneCtMjHCyP9+1XA= =qOIC -END PGP SIGNATURE- Changes since co-23.05-branch-point-1: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 15184e6e4dff6bfa2b4e44f3f7d2c076f63e5029 Author: Christian Lohmaier AuthorDate: Fri Mar 24 17:54:07 2023 +0100 Commit: Christian Lohmaier CommitDate: Fri Mar 24 17:54:07 2023 +0100 bump product version to 7.5.2.2.0+ Change-Id: I384321ec7a50e4f5723c4e6cf31b09b049636415 diff --git a/configure.ac b/configure.ac index 9e703f3425cf..19b331739508 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.5.2.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.5.2.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 31 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 75 ++
2 files changed, 68 insertions(+), 38 deletions(-)
New commits:
commit 7eedd76d93ef04d11ae2e1bfb1e7d264aab88f40
Author: Mike Kaganski
AuthorDate: Fri Mar 24 11:01:56 2023 +0300
Commit: Mike Kaganski
CommitDate: Fri Mar 24 16:38:51 2023 +
tdf#154360: use TOC(N) styles in DOCX as the source of ToC tab stop position
Change-Id: Iab8001f8be8a8af437e8898079d55ff57dd6fa3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149494
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index ba97147876e7..c12c5deeac1c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -1050,39 +1050,46 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf154319)
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), xLevelFormats->getCount());
const auto checkPropVal = [](const auto& expected, const
css::beans::PropertyValues& entry,
- const OUString& name) {
+ const OUString& name, sal_Int32 level) {
auto it
= std::find_if(entry.begin(), entry.end(),
[&name](const css::beans::PropertyValue& p) {
return p.Name == name; });
-OString msg = "Property: " + name.toUtf8();
+OString msg = "Property: " + name.toUtf8() + ", level: " +
OString::number(level);
CPPUNIT_ASSERT_MESSAGE(msg.getStr(), it != entry.end());
CPPUNIT_ASSERT_EQUAL_MESSAGE(msg.getStr(), css::uno::Any(expected),
it->Value);
};
+// tdf#154360: check tab stops between the number and the entry text
+constexpr sal_Int32 levelTabStops[]
+= { 776, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270, 1270 };
+
//start with level 1, 0 is the header level
for (sal_Int32 nLevel = 1; nLevel < xLevelFormats->getCount(); ++nLevel)
{
css::uno::Sequence aLevel;
xLevelFormats->getByIndex(nLevel) >>= aLevel;
-CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aLevel.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aLevel.getLength());
+
+checkPropVal(OUString("TokenHyperlinkStart"), aLevel[0], "TokenType",
nLevel);
-checkPropVal(OUString("TokenHyperlinkStart"), aLevel[0], "TokenType");
+checkPropVal(OUString("TokenEntryNumber"), aLevel[1], "TokenType",
nLevel);
-checkPropVal(OUString("TokenEntryNumber"), aLevel[1], "TokenType");
+checkPropVal(OUString("TokenTabStop"), aLevel[2], "TokenType", nLevel);
+checkPropVal(levelTabStops[nLevel - 1], aLevel[2], "TabStopPosition",
nLevel);
-checkPropVal(OUString("TokenEntryText"), aLevel[2], "TokenType");
+checkPropVal(OUString("TokenEntryText"), aLevel[3], "TokenType",
nLevel);
-checkPropVal(OUString("TokenTabStop"), aLevel[3], "TokenType");
+checkPropVal(OUString("TokenTabStop"), aLevel[4], "TokenType", nLevel);
-checkPropVal(OUString("TokenChapterInfo"), aLevel[4], "TokenType");
+checkPropVal(OUString("TokenChapterInfo"), aLevel[5], "TokenType",
nLevel);
-checkPropVal(OUString("TokenText"), aLevel[5], "TokenType");
-checkPropVal(OUString("\""), aLevel[5], "Text");
+checkPropVal(OUString("TokenText"), aLevel[6], "TokenType", nLevel);
+checkPropVal(OUString("\""), aLevel[6], "Text", nLevel);
-checkPropVal(OUString("TokenPageNumber"), aLevel[6], "TokenType");
+checkPropVal(OUString("TokenPageNumber"), aLevel[7], "TokenType",
nLevel);
-checkPropVal(OUString("TokenHyperlinkEnd"), aLevel[7], "TokenType");
+checkPropVal(OUString("TokenHyperlinkEnd"), aLevel[8], "TokenType",
nLevel);
}
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 01e244bd5e87..3f402c50b3ee 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6073,35 +6073,34 @@ void DomainMapper_Impl::handleAuthor
}
static uno::Sequence< beans::PropertyValues > lcl_createTOXLevelHyperlinks(
bool bHyperlinks, const OUString& sChapterNoSeparator,
- const uno::Sequence< beans::PropertyValues
>& aLevel )
+ const uno::Sequence< beans::PropertyValues
>& aLevel, const uno::Sequence& tabs)
{
//create a copy of the level and add new entries
std::vector aNewLevel;
-aNewLevel.reserve(aLevel.getLength() + 4); // at most 4 added items
+aNewLevel.reserve(aLevel.getLength() + 5); // at most 5 added items
static constexpr OUStringLiteral tokType(u"TokenType");
static constexpr OUStringLiteral tokHStart(u"TokenHyperlinkStart");
static constexpr OUStringLiteral tok
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - framework/source
framework/source/accelerators/acceleratorconfiguration.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 6ea328bc2d3700059d77b110c7825f995ef6c5b3
Author: Caolán McNamara
AuthorDate: Wed Mar 22 16:59:23 2023 +
Commit: Christian Lohmaier
CommitDate: Fri Mar 24 16:24:58 2023 +
fix crash seen when experimenting with tdf#129547
Change-Id: I0b26a7f683f91d3307856f86c5a437fde1155451
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149331
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 936f2e6924e405433770b98f32a615508fd0670d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149434
Reviewed-by: Xisco Fauli
(cherry picked from commit 252b27e3ce340526c6e5dc2e9bd38f1398e6f2f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149514
Reviewed-by: Miklos Vajna
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3507314a9a6e..ad08f375a177 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -64,7 +64,10 @@ namespace framework
static OUString lcl_getKeyString(const css::awt::KeyEvent& aKeyEvent)
{
const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of an
identifier...
-OUStringBuffer
sKeyBuffer((KeyMapping::get().mapCodeToIdentifier(aKeyEvent.KeyCode)).subView(nBeginIndex));
+OUString
sKey(KeyMapping::get().mapCodeToIdentifier(aKeyEvent.KeyCode));
+if (sKey.getLength() < nBeginIndex) // dead key
+return OUString();
+OUStringBuffer sKeyBuffer(sKey.subView(nBeginIndex));
if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) ==
css::awt::KeyModifier::SHIFT )
sKeyBuffer.append("_SHIFT");
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - sc/qa sc/source
sc/qa/unit/uicalc/data/simpleTable.xlsx |binary
sc/qa/unit/uicalc/uicalc.cxx| 15 +++
sc/source/core/tool/dbdata.cxx |7 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 41ffe9b42bad5085072c94c18fc9b6d17528a7ef
Author: Paris Oplopoios
AuthorDate: Wed Mar 8 23:04:49 2023 +0200
Commit: Christian Lohmaier
CommitDate: Fri Mar 24 16:24:27 2023 +
tdf#154061 Make sure table column attributes size is correct
Resize maTableColumnAttributes to match the amount of columns, fixes
crash upon undoing a column insertion on a table
Change-Id: Iad4b8ac5c38d5d1065d6ef1267ce3f5d3b28afa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148492
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 2135706397d36aa7ea24650b65859be0b6860a65)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148972
Reviewed-by: Xisco Fauli
(cherry picked from commit 3abe8c150d72eaef8dd2998ee13cdd2226ac2360)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149020
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/sc/qa/unit/uicalc/data/simpleTable.xlsx
b/sc/qa/unit/uicalc/data/simpleTable.xlsx
new file mode 100644
index ..fd4e394732ba
Binary files /dev/null and b/sc/qa/unit/uicalc/data/simpleTable.xlsx differ
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 4976c19c17f0..25b4d0790383 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -2082,6 +2082,21 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf142010)
CPPUNIT_ASSERT_EQUAL(5.0, pDoc->GetValue(ScAddress(5, 71, 0)));
}
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf154061)
+{
+createScDoc("simpleTable.xlsx");
+ScDocument* pDoc = getScDoc();
+CPPUNIT_ASSERT_EQUAL(OUString("Column2"), pDoc->GetString(ScAddress(1, 0,
0)));
+
+goToCell("B1");
+
+// Without the fix in place, it would crash here due to an out of bounds
array access
+dispatchCommand(mxComponent, ".uno:InsertColumnsBefore", {});
+CPPUNIT_ASSERT_EQUAL(OUString("Column2"), pDoc->GetString(ScAddress(2, 0,
0)));
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(OUString("Column2"), pDoc->GetString(ScAddress(1, 0,
0)));
+}
+
CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf132431)
{
createScDoc("tdf132431.ods");
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index dc10d6a0503e..293bb20a4976 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -116,6 +116,7 @@ ScDBData::ScDBData( const ScDBData& rData ) :
bAutoFilter (rData.bAutoFilter),
bModified (rData.bModified),
maTableColumnNames (rData.maTableColumnNames),
+maTableColumnAttributes(rData.maTableColumnAttributes),
mbTableColumnNamesDirty(rData.mbTableColumnNamesDirty),
nFilteredRowCount (rData.nFilteredRowCount)
{
@@ -150,6 +151,7 @@ ScDBData::ScDBData( const OUString& rName, const ScDBData&
rData ) :
bAutoFilter (rData.bAutoFilter),
bModified (rData.bModified),
maTableColumnNames (rData.maTableColumnNames),
+maTableColumnAttributes(rData.maTableColumnAttributes),
mbTableColumnNamesDirty (rData.mbTableColumnNamesDirty),
nFilteredRowCount (rData.nFilteredRowCount)
{
@@ -199,6 +201,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData)
else
{
maTableColumnNames = rData.maTableColumnNames;
+maTableColumnAttributes = rData.maTableColumnAttributes;
mbTableColumnNamesDirty = rData.mbTableColumnNamesDirty;
}
@@ -577,6 +580,7 @@ void ScDBData::UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos)
aRange.aEnd.Row());
// Do not use SetTableColumnNames() because that resets
mbTableColumnNamesDirty.
maTableColumnNames = aNames;
+maTableColumnAttributes.resize(aNames.size());
mbTableColumnNamesDirty = bTableColumnNamesDirty;
}
@@ -620,6 +624,7 @@ bool ScDBData::UpdateReference(const ScDocument* pDoc,
UpdateRefMode eUpdateRefM
MoveTo( theTab1, theCol1, theRow1, theCol2, theRow2 );
// Do not use SetTableColumnNames() because that resets
mbTableColumnNamesDirty.
maTableColumnNames = aNames;
+maTableColumnAttributes.resize(aNames.size());
mbTableColumnNamesDirty = bTableColumnNamesDirty;
}
@@ -721,7 +726,6 @@ void ScDBData::AdjustTableColumnAttributes( UpdateRefMode
eUpdateRefMode, SCCOL
n += nDx;
aNewNames.resize(n);
aNewAttributes.resize(n);
-maTableColumnAttributes.resize(n);
// Copy head.
for (size_t i = 0; i < nHead; ++i)
{
@@ -876,6 +880,7 @@ void ScDBData::RefreshTableColumnNames( ScDocument* pDoc )
}
aNewNames.swap( maTab
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - sw/source
sw/source/uibase/app/docsh2.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit ace3079172ed55d7408193a2f37bc9b16d1b3c39
Author: Xisco Fauli
AuthorDate: Thu Mar 16 16:26:17 2023 +0100
Commit: Christian Lohmaier
CommitDate: Fri Mar 24 16:23:36 2023 +
sw: fix null dereference
See
https://crashreport.libreoffice.org/stats/signature/SfxDispatcher::ExecuteList(unsigned%20short,SfxCallMode,std::initializer_list%3CSfxPoolItem%20const%20*%3E,std::initializer_list%3CSfxPoolItem%20const%20*%3E)
Change-Id: I7f5471f003798f260d9d015782bd2a798baa22d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148999
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit 11ce7e810ef5ba540afe676d58575fabf4ab386d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149018
Reviewed-by: Michael Stahl
(cherry picked from commit b524e2fcb52a28bd24854c23a8f5eedf10d9552e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149099
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index bc9647d77dd7..d8195b7e200d 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1197,11 +1197,12 @@ void SwDocShell::Execute(SfxRequest& rReq)
// Ok. I did my best.
break;
-SfxStringItem aApp(SID_DOC_SERVICE,
"com.sun.star.text.TextDocument");
-SfxStringItem aTarget(SID_TARGETNAME, "_blank");
-pViewShell->GetDispatcher()->ExecuteList(SID_OPENDOC,
-SfxCallMode::API|SfxCallMode::SYNCHRON,
-{ &aApp, &aTarget });
+if (SfxDispatcher* pDispatch = pViewShell->GetDispatcher())
+{
+SfxStringItem aApp(SID_DOC_SERVICE,
"com.sun.star.text.TextDocument");
+SfxStringItem aTarget(SID_TARGETNAME, "_blank");
+pDispatch->ExecuteList(SID_OPENDOC,
SfxCallMode::API|SfxCallMode::SYNCHRON, { &aApp, &aTarget });
+}
}
break;
case SID_CLASSIFICATION_APPLY:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3564 ++-- 1 file changed, 1812 insertions(+), 1752 deletions(-) New commits: commit 07c77bc32e1e34f882ced16ba6bfac83def8689a Author: Christian Lohmaier AuthorDate: Fri Mar 24 17:16:05 2023 +0100 Commit: Christian Lohmaier CommitDate: Fri Mar 24 17:18:12 2023 +0100 update credits Change-Id: Iea1190aa7e0b9d81a8cf73ebbafd318e73fca757 (cherry picked from commit 9469044db420f280bf60765e0d94bc7d94e6641e) (cherry picked from commit 952608294edfad6f91d93a976c1b004acf94ad33) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index becbef53c0d3..bbc492531228 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,13 +1,13 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.0.3$Linux_X86_64 LibreOffice_project/c21113d003cd3efa8c53188764377a8272d9d6de2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.1.2$Linux_X86_64 LibreOffice_project/fcbaee479e84c6cd81291587d2ee68cba099e1292012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2078 + 2140 501 - 33948 - 28180 + 32413 + 28233 true true @@ -16,9 +16,9 @@ 3649 3434 501 - 2078 - 34447 - 30256 + 2140 + 32912 + 30371 0 0 false @@ -27,6 +27,7 @@ false false false + false @@ -82,7 +83,7 @@ false - 11862265 + 11967653 true false false @@ -94,6 +95,7 @@ false false false + true true true true @@ -172,7 +174,7 @@ - + @@ -364,7 +366,7 @@ - + @@ -428,24 +430,24 @@ - + - + - + - + - + - + @@ -1135,7 +1137,7 @@ Credits -1845 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-03 17:31:56. +1860 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-24 15:28:25. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1147,7 +1149,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 34245Joined: 2000-10-10 + Caolán M
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3564 ++-- 1 file changed, 1812 insertions(+), 1752 deletions(-) New commits: commit 952608294edfad6f91d93a976c1b004acf94ad33 Author: Christian Lohmaier AuthorDate: Fri Mar 24 17:16:05 2023 +0100 Commit: Christian Lohmaier CommitDate: Fri Mar 24 17:17:29 2023 +0100 update credits Change-Id: Iea1190aa7e0b9d81a8cf73ebbafd318e73fca757 (cherry picked from commit 9469044db420f280bf60765e0d94bc7d94e6641e) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index becbef53c0d3..bbc492531228 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,13 +1,13 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.0.3$Linux_X86_64 LibreOffice_project/c21113d003cd3efa8c53188764377a8272d9d6de2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.1.2$Linux_X86_64 LibreOffice_project/fcbaee479e84c6cd81291587d2ee68cba099e1292012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2078 + 2140 501 - 33948 - 28180 + 32413 + 28233 true true @@ -16,9 +16,9 @@ 3649 3434 501 - 2078 - 34447 - 30256 + 2140 + 32912 + 30371 0 0 false @@ -27,6 +27,7 @@ false false false + false @@ -82,7 +83,7 @@ false - 11862265 + 11967653 true false false @@ -94,6 +95,7 @@ false false false + true true true true @@ -172,7 +174,7 @@ - + @@ -364,7 +366,7 @@ - + @@ -428,24 +430,24 @@ - + - + - + - + - + - + @@ -1135,7 +1137,7 @@ Credits -1845 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-03 17:31:56. +1860 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-24 15:28:25. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1147,7 +1149,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 34245Joined: 2000-10-10 + Caolán McNamaraCommits: 34308Joined: 2000-10-10 Kurt Ze
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3564 ++-- 1 file changed, 1812 insertions(+), 1752 deletions(-) New commits: commit d4319f43ee5280c692a6c190651a6a7109e4f35c Author: Christian Lohmaier AuthorDate: Fri Mar 24 17:16:05 2023 +0100 Commit: Christian Lohmaier CommitDate: Fri Mar 24 17:16:49 2023 +0100 update credits Change-Id: Iea1190aa7e0b9d81a8cf73ebbafd318e73fca757 (cherry picked from commit 9469044db420f280bf60765e0d94bc7d94e6641e) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index becbef53c0d3..bbc492531228 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,13 +1,13 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.0.3$Linux_X86_64 LibreOffice_project/c21113d003cd3efa8c53188764377a8272d9d6de2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.1.2$Linux_X86_64 LibreOffice_project/fcbaee479e84c6cd81291587d2ee68cba099e1292012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2078 + 2140 501 - 33948 - 28180 + 32413 + 28233 true true @@ -16,9 +16,9 @@ 3649 3434 501 - 2078 - 34447 - 30256 + 2140 + 32912 + 30371 0 0 false @@ -27,6 +27,7 @@ false false false + false @@ -82,7 +83,7 @@ false - 11862265 + 11967653 true false false @@ -94,6 +95,7 @@ false false false + true true true true @@ -172,7 +174,7 @@ - + @@ -364,7 +366,7 @@ - + @@ -428,24 +430,24 @@ - + - + - + - + - + - + @@ -1135,7 +1137,7 @@ Credits -1845 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-03 17:31:56. +1860 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-24 15:28:25. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1147,7 +1149,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 34245Joined: 2000-10-10 + Caolán McNamaraCommits: 34308Joined: 2000-10-10 Kurt Ze
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3564 ++-- 1 file changed, 1812 insertions(+), 1752 deletions(-) New commits: commit 9469044db420f280bf60765e0d94bc7d94e6641e Author: Christian Lohmaier AuthorDate: Fri Mar 24 17:16:05 2023 +0100 Commit: Christian Lohmaier CommitDate: Fri Mar 24 17:16:05 2023 +0100 update credits Change-Id: Iea1190aa7e0b9d81a8cf73ebbafd318e73fca757 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index becbef53c0d3..bbc492531228 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,13 +1,13 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns: meta:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.0.3$Linux_X86_64 LibreOffice_project/c21113d003cd3efa8c53188764377a8272d9d6de2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.5.1.2$Linux_X86_64 LibreOffice_project/fcbaee479e84c6cd81291587d2ee68cba099e1292012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 2078 + 2140 501 - 33948 - 28180 + 32413 + 28233 true true @@ -16,9 +16,9 @@ 3649 3434 501 - 2078 - 34447 - 30256 + 2140 + 32912 + 30371 0 0 false @@ -27,6 +27,7 @@ false false false + false @@ -82,7 +83,7 @@ false - 11862265 + 11967653 true false false @@ -94,6 +95,7 @@ false false false + true true true true @@ -172,7 +174,7 @@ - + @@ -364,7 +366,7 @@ - + @@ -428,24 +430,24 @@ - + - + - + - + - + - + @@ -1135,7 +1137,7 @@ Credits -1845 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-03 17:31:56. +1860 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2023-03-24 15:28:25. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1147,7 +1149,7 @@ Ruediger TimmCommits: 82464Joined: 2000-10-10 - Caolán McNamaraCommits: 34245Joined: 2000-10-10 + Caolán McNamaraCommits: 34308Joined: 2000-10-10 Kurt ZenkerCommits: 31752Joined: 2000-09-25 @@ -1164,10 +1166,10 @@ Vla
[Libreoffice-commits] core.git: chart2/source codemaker/source comphelper/source configmgr/source connectivity/source cppuhelper/source cppu/source cui/source
chart2/source/tools/ObjectIdentifier.cxx | 13 +--
chart2/source/tools/StatisticsHelper.cxx |3
codemaker/source/codemaker/global.cxx |3
comphelper/source/misc/AccessibleImplementationHelper.cxx |3
comphelper/source/misc/diagnose_ex.cxx|6 -
comphelper/source/property/property.cxx | 20 +++---
configmgr/source/data.cxx |5 -
connectivity/source/commontools/DateConversion.cxx| 18 ++---
connectivity/source/commontools/TIndexes.cxx | 12 +--
connectivity/source/commontools/TKeys.cxx | 26
+++
connectivity/source/commontools/dbtools.cxx |5 -
connectivity/source/commontools/dbtools2.cxx | 29
+++-
connectivity/source/commontools/parameters.cxx|8 --
connectivity/source/drivers/firebird/Connection.cxx | 24
+++
connectivity/source/drivers/firebird/Tables.cxx | 19 ++---
connectivity/source/drivers/firebird/Util.cxx |4 -
connectivity/source/drivers/hsqldb/HConnection.cxx|3
connectivity/source/drivers/hsqldb/HDriver.cxx|3
connectivity/source/drivers/hsqldb/HView.cxx |4 -
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx| 12 ---
connectivity/source/drivers/odbc/OStatement.cxx |4 -
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx|3
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |7 --
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |3
connectivity/source/drivers/postgresql/pq_statement.cxx | 14 +---
connectivity/source/drivers/postgresql/pq_tools.cxx | 14 +---
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |8 +-
connectivity/source/drivers/postgresql/pq_xcolumns.cxx|3
cppu/source/uno/lbenv.cxx | 30
+++--
cppu/source/uno/lbmap.cxx | 33
--
cppuhelper/source/servicemanager.cxx |6 -
cui/source/dialogs/FontFeaturesDialog.cxx |5 -
32 files changed, 147 insertions(+), 203 deletions(-)
New commits:
commit 637cceeefba0b0e2e09ac734bb0327364e8ddd25
Author: Noel Grandin
AuthorDate: Fri Mar 24 10:09:16 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 24 15:29:18 2023 +
loplugin:stringadd in c*
after my patch to merge the bufferadd loplugin into stringadd
Change-Id: I66f4ce2fd87c1e12eefb14406e0e17212f68ceff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149497
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 587aace2f3d8..883c115126cb 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -90,15 +90,13 @@ OUString lcl_createClassificationStringForType( ObjectType
eObjectType
{
if( !aRet.isEmpty() )
aRet.append(":");
-aRet.append( m_aDragMethodEquals );
-aRet.append( rDragMethodServiceName );
+aRet.append( OUString::Concat(m_aDragMethodEquals) +
rDragMethodServiceName );
if( !rDragParameterString.empty() )
{
if( !aRet.isEmpty() )
aRet.append(":");
-aRet.append( m_aDragParameterEquals );
-aRet.append( rDragParameterString );
+aRet.append( OUString::Concat(m_aDragParameterEquals) +
rDragParameterString );
}
}
return aRet.makeStringAndClear();
@@ -584,9 +582,7 @@ OUString
ObjectIdentifier::createClassifiedIdentifierWithParent(
if(!rParentPartical.empty())
aRet.append(":");
-aRet.append(getStringForType( eObjectType ));
-aRet.append("=");
-aRet.append(rParticleID);
+aRet.append(getStringForType( eObjectType ) + "=" + rParticleID);
return aRet.makeStringAndClear();
}
@@ -1014,8 +1010,7 @@ OUString ObjectIdentifier::createChildParticleWithIndex(
ObjectType eObjectType,
OUStringBuffer aRet( getStringForType( eObjectType ) );
if( !aRet.isEmpty() )
{
-aRet.append("=");
-aRet.append(nIndex);
+aRet.append("=" + OUString::number(nIndex));
}
return aRet.makeStringAndClear();
}
diff --git a/chart2/source/tools/StatisticsHelper.cxx
b/chart2/source/tools/StatisticsHelper.cxx
index e97475915705..1336f471432c 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -82,8 +82,7 @@ uno::Reference< chart2::data::XLabe
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cee2ac1946ddbf7dc6a6be863260bde0fa559d4 Author: Christian Lohmaier AuthorDate: Fri Mar 24 16:20:22 2023 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 24 15:20:22 2023 + Update git submodules * Update translations from branch 'libreoffice-7-5-2' to 7943dccb54146ab9a78d86fc5901633c7c13 - update translations for 7.5.2 rc2 and force-fix errors using pocheck Change-Id: Idde67f8e180cbca1aa4521f70add10b46834c7a7 (cherry picked from commit 2d7b06eb9700bd2f6c0b2aa7be432d4d83a3d922) diff --git a/translations b/translations index 7d2e72f647d7..7943dccb5414 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7d2e72f647d7a7d7ee643f80eda81ee4da3d3ef4 +Subproject commit 7943dccb54146ab9a78d86fc5901633c7c13
[Libreoffice-commits] translations.git: Branch 'libreoffice-7-5-2' - source/af source/an source/ast source/bg source/ca source/de source/dsb source/el source/es source/fi source/gl source/gug source/h
source/af/extensions/messages.po| 8 source/an/basctl/messages.po| 8 source/an/chart2/messages.po| 6 source/an/cui/messages.po | 44 source/an/dbaccess/messages.po | 10 source/an/desktop/messages.po | 8 source/an/extensions/messages.po| 18 source/an/filter/messages.po| 23 source/an/officecfg/registry/data/org/openoffice/Office/UI.po | 101 source/an/reportdesign/messages.po | 19 source/an/sc/messages.po| 37 source/an/sd/messages.po| 5 source/an/sfx2/messages.po | 12 source/an/svtools/messages.po | 8 source/an/svx/messages.po | 24 source/an/sw/messages.po| 105 source/an/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po | 8 source/an/vcl/messages.po | 8 source/an/wizards/messages.po | 9 source/an/wizards/source/resources.po | 11 source/an/writerperfect/messages.po | 8 source/an/xmlsecurity/messages.po | 8 source/ast/basctl/messages.po | 6 source/ast/cui/messages.po | 36 source/ast/dbaccess/messages.po | 14 source/ast/extensions/messages.po | 8 source/ast/framework/messages.po| 8 source/ast/helpcontent2/source/text/sbasic/guide.po | 10 source/ast/helpcontent2/source/text/sbasic/shared.po| 6 source/ast/helpcontent2/source/text/sbasic/shared/02.po | 12 source/ast/helpcontent2/source/text/scalc.po| 4 source/ast/helpcontent2/source/text/scalc/01.po | 18 source/ast/helpcontent2/source/text/scalc/02.po | 8 source/ast/helpcontent2/source/text/scalc/guide.po | 16 source/ast/helpcontent2/source/text/sdraw.po| 8 source/ast/helpcontent2/source/text/shared.po | 8 source/ast/helpcontent2/source/text/shared/00.po| 6 source/ast/helpcontent2/source/text/shared/01.po| 6 source/ast/helpcontent2/source/text/shared/02.po| 16 source/ast/helpcontent2/source/text/shared/guide.po | 14 source/ast/helpcontent2/source/text/shared/optionen.po | 24 source/ast/helpcontent2/source/text/simpress/00.po | 6 source/ast/helpcontent2/source/text/simpress/02.po | 10 source/ast/helpcontent2/source/text/smath/guide.po | 6 source/ast/helpcontent2/source/text/swriter.po | 12 source/ast/helpcontent2/source/text/swriter/01.po | 6 source/ast/helpcontent2/source/text/swriter/guide.po| 14 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 18 source/ast/sc/messages.po | 64 source/ast/scaddins/messages.po | 10 source/ast/scp2/source/draw.po | 12 source/ast/sd/messages.po | 27 source/ast/sfx2/messages.po | 8 source/ast/starmath/messages.po | 4 source/ast/svtools/messages.po | 8 source/ast/svx/messages.po | 17 source/ast/sw/messages.po | 90 source/ast/wizards/source/resources.po | 16 source/bg/
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 10283a7b88c7508bd4cda2fa1e296139000e5757 Author: Christian Lohmaier AuthorDate: Fri Mar 24 16:19:03 2023 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 24 15:19:03 2023 + Update git submodules * Update translations from branch 'libreoffice-7-5' to 2d7b06eb9700bd2f6c0b2aa7be432d4d83a3d922 - update translations for 7.5.2 rc2 and force-fix errors using pocheck Change-Id: Idde67f8e180cbca1aa4521f70add10b46834c7a7 diff --git a/translations b/translations index 03fbb6a606df..2d7b06eb9700 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 03fbb6a606dff8622b1f97537ed0b556ca3def59 +Subproject commit 2d7b06eb9700bd2f6c0b2aa7be432d4d83a3d922
[Libreoffice-commits] translations.git: Branch 'libreoffice-7-5' - source/af source/an source/ast source/bg source/ca source/de source/dsb source/el source/es source/fi source/gl source/gug source/he
source/af/extensions/messages.po| 8 source/an/basctl/messages.po| 8 source/an/chart2/messages.po| 6 source/an/cui/messages.po | 44 source/an/dbaccess/messages.po | 10 source/an/desktop/messages.po | 8 source/an/extensions/messages.po| 18 source/an/filter/messages.po| 23 source/an/officecfg/registry/data/org/openoffice/Office/UI.po | 101 source/an/reportdesign/messages.po | 19 source/an/sc/messages.po| 37 source/an/sd/messages.po| 5 source/an/sfx2/messages.po | 12 source/an/svtools/messages.po | 8 source/an/svx/messages.po | 24 source/an/sw/messages.po| 105 source/an/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po | 8 source/an/vcl/messages.po | 8 source/an/wizards/messages.po | 9 source/an/wizards/source/resources.po | 11 source/an/writerperfect/messages.po | 8 source/an/xmlsecurity/messages.po | 8 source/ast/basctl/messages.po | 6 source/ast/cui/messages.po | 36 source/ast/dbaccess/messages.po | 14 source/ast/extensions/messages.po | 8 source/ast/framework/messages.po| 8 source/ast/helpcontent2/source/text/sbasic/guide.po | 10 source/ast/helpcontent2/source/text/sbasic/shared.po| 6 source/ast/helpcontent2/source/text/sbasic/shared/02.po | 12 source/ast/helpcontent2/source/text/scalc.po| 4 source/ast/helpcontent2/source/text/scalc/01.po | 18 source/ast/helpcontent2/source/text/scalc/02.po | 8 source/ast/helpcontent2/source/text/scalc/guide.po | 16 source/ast/helpcontent2/source/text/sdraw.po| 8 source/ast/helpcontent2/source/text/shared.po | 8 source/ast/helpcontent2/source/text/shared/00.po| 6 source/ast/helpcontent2/source/text/shared/01.po| 6 source/ast/helpcontent2/source/text/shared/02.po| 16 source/ast/helpcontent2/source/text/shared/guide.po | 14 source/ast/helpcontent2/source/text/shared/optionen.po | 24 source/ast/helpcontent2/source/text/simpress/00.po | 6 source/ast/helpcontent2/source/text/simpress/02.po | 10 source/ast/helpcontent2/source/text/smath/guide.po | 6 source/ast/helpcontent2/source/text/swriter.po | 12 source/ast/helpcontent2/source/text/swriter/01.po | 6 source/ast/helpcontent2/source/text/swriter/guide.po| 14 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 18 source/ast/sc/messages.po | 64 source/ast/scaddins/messages.po | 10 source/ast/scp2/source/draw.po | 12 source/ast/sd/messages.po | 27 source/ast/sfx2/messages.po | 8 source/ast/starmath/messages.po | 4 source/ast/svtools/messages.po | 8 source/ast/svx/messages.po | 17 source/ast/sw/messages.po | 90 source/ast/wizards/source/resources.po | 16 source/bg/
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/qa desktop/qa sc/qa sd/qa sw/qa unotest/Library_unotest.mk unotest/source
chart2/qa/extras/uichart.cxx |6
desktop/qa/desktop_lib/test_desktop_lib.cxx |2
sc/qa/unit/jumbosheets-test.cxx |4
sc/qa/unit/tiledrendering/tiledrendering.cxx | 37 +
sc/qa/unit/uicalc/uicalc.cxx | 81
sd/qa/unit/tiledrendering/LOKitSearchTest.cxx|2
sd/qa/unit/tiledrendering/tiledrendering.cxx | 33 +
sd/qa/unit/uiimpress.cxx | 45 ++
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx |2
sw/qa/extras/layout/layout.cxx |2
sw/qa/extras/tiledrendering/tiledrendering.cxx |4
sw/qa/extras/uiwriter/uiwriter.cxx |2
sw/qa/extras/uiwriter/uiwriter2.cxx | 16 ++
sw/qa/extras/uiwriter/uiwriter3.cxx | 97 +++
sw/qa/extras/uiwriter/uiwriter4.cxx | 10 +
sw/qa/extras/uiwriter/uiwriter5.cxx | 14 ++
sw/qa/extras/uiwriter/uiwriter6.cxx | 16 ++
sw/qa/extras/uiwriter/uiwriter7.cxx |3
sw/qa/extras/uiwriter/uiwriter8.cxx | 79
unotest/Library_unotest.mk |1
unotest/source/cpp/macros_test.cxx |6
21 files changed, 456 insertions(+), 6 deletions(-)
New commits:
commit 4df2a951b05197448e310cb003449658e52b45fb
Author: Xisco Fauli
AuthorDate: Fri Mar 24 12:43:12 2023 +
Commit: Xisco Fauli
CommitDate: Fri Mar 24 15:09:41 2023 +
Revert "qa: call ProcessEventsToIdle inside dispatchCommand"
This reverts commit 1029afe2fa49a3a326ca529a68e99e2a7239a395.
number of failures in CppunitTest_sc_uicalc has increased since
this patch was backported. reverting it to find out for sure whether
this introduced it or not
Change-Id: I670412d9445aee5ca2d65f647a82b993682d088f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149518
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx
index 4b5db209a742..ec250f80bb27 100644
--- a/chart2/qa/extras/uichart.cxx
+++ b/chart2/qa/extras/uichart.cxx
@@ -47,13 +47,16 @@ void
Chart2UiChartTest::testCopyPasteToNewSheet(uno::Reference xChartDoc2 =
getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc2.is());
@@ -137,13 +140,16 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf151091)
comphelper::makePropertyValue("ToObject", OUString("Object 1")),
};
dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Copy", {});
+Scheduler::ProcessEventsToIdle();
// create a new writer document
load("private:factory/swriter");
dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
aSeriesList = getWriterChartColumnDescriptions(mxComponent);
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index d7108977aae2..5af044e67523 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -606,6 +606,7 @@ void DesktopLOKTest::testSearchCalc()
{"SearchItem.Command",
uno::Any(static_cast(SvxSearchCmd::FIND_ALL))},
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
std::vector aSelections;
sal_Int32 nIndex = 0;
@@ -636,6 +637,7 @@ void DesktopLOKTest::testSearchAllNotificationsCalc()
{"SearchItem.Command",
uno::Any(static_cast(SvxSearchCmd::FIND_ALL))},
}));
dispatchCommand(mxComponent, ".uno:ExecuteSearch", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
// This was 1, make sure that we get no notifications about selection
changes during search.
CPPUNIT_ASSERT_EQUAL(0, m_nSelectionBeforeSearchResult);
diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx
index 0dec10967751..05b2c2248650 100644
--- a/sc/qa/unit/jumbosheets-test.cxx
+++ b/sc/qa/unit/jumbosheets-test.cxx
@@ -272,10 +272,12 @@ void ScJumboSheetsTest::testTdf134553()
pViewShell->SelectObject(u"Diagram 1");
dispatchCommand(mxComponent, ".uno:Cut", {});
+Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast(0), pPage->GetObjCount());
dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
pOleObj = pPage->GetObj(0);
CPPUNIT_ASSERT(pOleObj);
@@ -315,8 +317,10 @@ void ScJumboSheetsTest::testTdf147509()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ScDocShell::GetViewData()->GetCurY());
dispatchCommand(mxComponent, ".uno:SelectColumn", {});
+Scheduler::Pro
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d90e2696dd4358b3d02bbbae90160c92d36263f Author: Olivier Hallot AuthorDate: Fri Mar 24 11:28:25 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Mar 24 14:28:25 2023 + Update git submodules * Update helpcontent2 from branch 'master' to ed90b5c51e0cda59e30995bbfb26d9ea69123fe8 - tdf#154364 (part) refactor "related topics" for swriter/guide/ Change-Id: I16d60d69f8ab0e5c79079ad54ad58752673082c7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149544 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1cb08818a1cc..ed90b5c51e0c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1cb08818a1cc6b2ea566316b7904dc77749028e1 +Subproject commit ed90b5c51e0cda59e30995bbfb26d9ea69123fe8
[Libreoffice-commits] help.git: source/text
source/text/swriter/guide/auto_spellcheck.xhp |4 +- source/text/swriter/guide/autocorr_except.xhp | 16 source/text/swriter/guide/calculate.xhp | 16 source/text/swriter/guide/calculate_clipboard.xhp | 16 source/text/swriter/guide/calculate_intable.xhp | 10 +++-- source/text/swriter/guide/calculate_intext.xhp | 18 + source/text/swriter/guide/calculate_intext2.xhp | 12 +++--- source/text/swriter/guide/calculate_multitable.xhp | 12 +++--- source/text/swriter/guide/captions.xhp | 20 +- source/text/swriter/guide/conditional_text2.xhp | 12 +++--- source/text/swriter/guide/delete_from_dict.xhp |8 ++-- source/text/swriter/guide/field_convert.xhp | 12 +++--- source/text/swriter/guide/fields.xhp|4 +- source/text/swriter/guide/fields_date.xhp | 12 +++--- source/text/swriter/guide/fields_enter.xhp |6 ++- source/text/swriter/guide/footer_pagenumber.xhp | 12 +++--- source/text/swriter/guide/footnote_with_line.xhp| 10 +++-- source/text/swriter/guide/form_letters_main.xhp |4 +- source/text/swriter/guide/header_pagestyles.xhp |6 ++- source/text/swriter/guide/header_with_line.xhp |6 ++- source/text/swriter/guide/hyperlinks.xhp|6 ++- source/text/swriter/guide/indices_edit.xhp | 12 +++--- source/text/swriter/guide/indices_index.xhp |6 ++- source/text/swriter/guide/indices_multidoc.xhp |6 ++- source/text/swriter/guide/insert_graphic_fromchart.xhp | 12 +++--- source/text/swriter/guide/insert_graphic_fromdraw.xhp |5 ++ source/text/swriter/guide/insert_graphic_gallery.xhp|6 ++- source/text/swriter/guide/insert_graphic_scan.xhp | 14 --- source/text/swriter/guide/jump2statusbar.xhp| 16 source/text/swriter/guide/keyboard.xhp | 16 source/text/swriter/guide/navigator.xhp | 14 --- source/text/swriter/guide/number_sequence.xhp |6 ++- source/text/swriter/guide/pagebackground.xhp|4 +- source/text/swriter/guide/pageorientation.xhp | 12 +++--- source/text/swriter/guide/printer_tray.xhp |8 ++-- source/text/swriter/guide/printing_order.xhp| 14 --- source/text/swriter/guide/protection.xhp|6 ++- source/text/swriter/guide/references.xhp|4 +- source/text/swriter/guide/references_modify.xhp |4 +- source/text/swriter/guide/reset_format.xhp |8 ++-- source/text/swriter/guide/resize_navigator.xhp |6 ++- source/text/swriter/guide/section_edit.xhp | 11 +++-- source/text/swriter/guide/section_insert.xhp|6 ++- source/text/swriter/guide/shortcut_writing.xhp | 24 ++-- source/text/swriter/guide/subscript.xhp | 10 +++-- source/text/swriter/guide/table_cellmerge.xhp |7 +-- source/text/swriter/guide/table_insert.xhp | 14 --- source/text/swriter/guide/table_repeat_multiple_headers.xhp |4 +- source/text/swriter/guide/tablemode.xhp | 10 +++-- source/text/swriter/guide/text_capital.xhp |8 ++-- source/text/swriter/guide/text_centervert.xhp |8 ++-- source/text/swriter/guide/text_emphasize.xhp| 10 +++-- source/text/swriter/guide/textdoc_inframe.xhp |5 +- source/text/swriter/guide/using_hyphen.xhp |4 +- source/text/swriter/guide/using_thesaurus.xhp | 10 +++-- source/text/swriter/guide/words_count.xhp |6 ++- 56 files changed, 323 insertions(+), 215 deletions(-) New commits: commit ed90b5c51e0cda59e30995bbfb26d9ea69123fe8 Author: Olivier Hallot AuthorDate: Fri Mar 24 11:11:59 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Mar 24 14:28:25 2023 + tdf#154364 (part) refactor "related topics" for swriter/guide/ Change-Id: I16d60d69f8ab0e5c79079ad54ad58752673082c7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149544 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/guide/auto_spellcheck.xhp b/source/text/swriter/guide/auto_spellcheck.xhp index 4960fb5e44..3ed8f19517 100644 --- a/source/text/swriter/guide/auto_spellcheck.xhp +++ b/source/text/swriter/guide/auto_spellcheck.xhp @@ -59,9 +59,11 @@ Choose "None (Do not check spelling)". - + + C
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/func_sumifs.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1cb08818a1cc6b2ea566316b7904dc77749028e1 Author: Olivier Hallot AuthorDate: Thu Mar 23 18:47:50 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Mar 24 14:27:37 2023 + Fix bad link for SUMIF Change-Id: I8f7bfe2a4427c5465d8bd428fd58510cf90cca57 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149473 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/func_sumifs.xhp b/source/text/scalc/01/func_sumifs.xhp index c71cd408d3..ef177035ff 100644 --- a/source/text/scalc/01/func_sumifs.xhp +++ b/source/text/scalc/01/func_sumifs.xhp @@ -58,7 +58,7 @@ https://wiki.documentfoundation.org/Documentation/Calc_Functions/SUMIFS";>SUMIFS wiki page. -, +,
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 764f99dcac7a3e739762465bb2703b8f39252865 Author: Olivier Hallot AuthorDate: Fri Mar 24 11:27:37 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Mar 24 14:27:37 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 1cb08818a1cc6b2ea566316b7904dc77749028e1 - Fix bad link for SUMIF Change-Id: I8f7bfe2a4427c5465d8bd428fd58510cf90cca57 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149473 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3b91921b0522..1cb08818a1cc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3b91921b052201ce082d96fa3d9c8d85170808c5 +Subproject commit 1cb08818a1cc6b2ea566316b7904dc77749028e1 commit b6d0be98f5bef19d20f1ce65ef86e82285f55c9a Author: Olivier Hallot AuthorDate: Fri Mar 24 11:27:22 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Mar 24 14:27:22 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 3b91921b052201ce082d96fa3d9c8d85170808c5 - Fix menu path for color bar in Impress + PLus refactoring Change-Id: I4c6fe7d906fb63fa1a2b293ed7f7a161e9548634 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149471 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 47a4762f1c5c..3b91921b0522 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 47a4762f1c5c7f208beaada82f71995ea084d923 +Subproject commit 3b91921b052201ce082d96fa3d9c8d85170808c5
[Libreoffice-commits] help.git: source/text
source/text/simpress/02/1003.xhp | 86 +-- 1 file changed, 43 insertions(+), 43 deletions(-) New commits: commit 3b91921b052201ce082d96fa3d9c8d85170808c5 Author: Olivier Hallot AuthorDate: Thu Mar 23 18:06:01 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Mar 24 14:27:22 2023 + Fix menu path for color bar in Impress + PLus refactoring Change-Id: I4c6fe7d906fb63fa1a2b293ed7f7a161e9548634 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149471 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/simpress/02/1003.xhp b/source/text/simpress/02/1003.xhp index 130190ed16..648b288a37 100644 --- a/source/text/simpress/02/1003.xhp +++ b/source/text/simpress/02/1003.xhp @@ -21,7 +21,7 @@ -Transformations +Transformations /text/simpress/02/1003.xhp @@ -29,7 +29,7 @@ - + flipping around a flip line mirroring objects 3D rotation objects; converting to @@ -43,23 +43,23 @@ gradients; defining colors circles; of objects mw made "slanting;..." a one level entry - + Transformations -Modifies the shape, orientation or fill of the selected object(s). +Modifies the shape, orientation or fill of the selected object(s). -Choose View - Toolbars - Transformations. +Choose View - Toolbars - Transformations. Click the arrow next to the Transformations icon on the Standard bar. -Icon Transformations +Icon Transformations -Transformations +Transformations @@ -68,115 +68,115 @@ Rotate -Rotates or skews the selected 2D object(s) around a pivot point. Drag a corner handle of the object in the direction you want to rotate it. To skew an object, drag a center handle in the direction you want to skew it. -Each slide has only one pivot point. Double-click an object to move the pivot point to the center of the object. You can also drag the pivot point to a new location on the screen, and then rotate the object. +Rotates or skews the selected 2D object(s) around a pivot point. Drag a corner handle of the object in the direction you want to rotate it. To skew an object, drag a center handle in the direction you want to skew it. +Each slide has only one pivot point. Double-click an object to move the pivot point to the center of the object. You can also drag the pivot point to a new location on the screen, and then rotate the object. If you select a group that includes a 3D object, only the 3D object is rotated. You cannot skew a 3D object, instead, you can rotate it about the X and Y axes by dragging the center handles. - Icon Rotate + Icon Rotate - Rotate + Rotate - + Flip -Flips the selected object(s) around a flip line, that you can drag to anywhere on the slide. Drag a handle of the object(s) across the flip line to flip the object(s). To change the orientation of the flip line, drag one of its end points to new location. +Flips the selected object(s) around a flip line, that you can drag to anywhere on the slide. Drag a handle of the object(s) across the flip line to flip the object(s). To change the orientation of the flip line, drag one of its end points to new location. -Icon Flip +Icon Flip -Flip +Flip - + In 3D Rotation Object -Converts the selected 2D object(s) to a 3D object, by rotating the object(s) around a symmetry line. -Drag the symmetry line to a new location to change the shape of the converted object. To change the orientation of the symmetry line, drag one of its end points. Click the object to convert it to 3D. +Converts the selected 2D object(s) to a 3D object, by rotating the object(s) around a symmetry line. +Drag the symmetry line to a new location to change the shape of the converted object. To change the orientation of the symmetry line, drag one of its end points. Click the object to convert it to 3D. -Icon In 3D rotation object +Icon In 3D rotation object -In 3D Rotation Object +In 3D Rotation Object - + Set in circle (perspective) -Distorts the selected object by wrapping it around imaginary circles, and then adding perspective. Drag a handle of the selected object to distort it. If the selected object is not a polygon or Bézier curve, you are prompted to change the object to a curve before you can distort it. +Distorts the selected object by wrapping it around imaginary circles, and then adding perspective. Drag a handle of the selected object to distort it. If the selected object is n
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 722d30c1d84eee5ab0a452b1f38d342f1d0b9011 Author: Stéphane Guillou AuthorDate: Fri Mar 24 14:26:57 2023 + Commit: Gerrit Code Review CommitDate: Fri Mar 24 14:26:57 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 47a4762f1c5c7f208beaada82f71995ea084d923 - fix dead link to Modify or Insert Layer Change-Id: Ib708c5314136143dc6c3b43e1e906b4d7c6d66ed Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149516 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 742aa91199f4..47a4762f1c5c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 742aa91199f41ef96f1b47bbc163b7c3bb6e2a9d +Subproject commit 47a4762f1c5c7f208beaada82f71995ea084d923
[Libreoffice-commits] help.git: source/text
source/text/sdraw/main_format.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47a4762f1c5c7f208beaada82f71995ea084d923 Author: Stéphane Guillou AuthorDate: Fri Mar 24 10:32:05 2023 + Commit: Olivier Hallot CommitDate: Fri Mar 24 14:26:57 2023 + fix dead link to Modify or Insert Layer Change-Id: Ib708c5314136143dc6c3b43e1e906b4d7c6d66ed Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149516 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdraw/main_format.xhp b/source/text/sdraw/main_format.xhp index 054a3081bf..8d6211bcfc 100644 --- a/source/text/sdraw/main_format.xhp +++ b/source/text/sdraw/main_format.xhp @@ -48,7 +48,7 @@ Text Attributes -Layer +Layer
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 153055f27ba1ca1aca8bebba2b6836e52ac801a6 Author: Olivier Hallot AuthorDate: Fri Mar 24 11:25:58 2023 -0300 Commit: Gerrit Code Review CommitDate: Fri Mar 24 14:25:58 2023 + Update git submodules * Update helpcontent2 from branch 'master' to 742aa91199f41ef96f1b47bbc163b7c3bb6e2a9d - tdf#154335 Deprecate layer_new.xhp in favour of insert_layer.xhp + refactoring for XML simplification + #2 replace layer_new by insert_layer Change-Id: I12e7bac9da6652d5b3d98e8a4cee0eb40aa9c627 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149474 Tested-by: Jenkins Reviewed-by: Stéphane Guillou Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 35dca7d7e802..742aa91199f4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 35dca7d7e802b33da0f8c903f554f591eb239f03 +Subproject commit 742aa91199f41ef96f1b47bbc163b7c3bb6e2a9d
[Libreoffice-commits] help.git: AllLangHelp_sdraw.mk source/auxiliary source/text
AllLangHelp_sdraw.mk|1 source/auxiliary/sdraw.tree |4 +- source/text/sdraw/01/insert_layer.xhp |8 ++-- source/text/sdraw/guide/layer_move.xhp | 24 +--- source/text/sdraw/guide/layer_new.xhp | 64 source/text/sdraw/guide/layer_tipps.xhp | 41 ++-- source/text/sdraw/guide/layers.xhp | 30 +++ source/text/sdraw/guide/main.xhp| 13 ++ 8 files changed, 58 insertions(+), 127 deletions(-) New commits: commit 742aa91199f41ef96f1b47bbc163b7c3bb6e2a9d Author: Olivier Hallot AuthorDate: Thu Mar 23 19:36:05 2023 -0300 Commit: Olivier Hallot CommitDate: Fri Mar 24 14:25:58 2023 + tdf#154335 Deprecate layer_new.xhp in favour of insert_layer.xhp + refactoring for XML simplification + #2 replace layer_new by insert_layer Change-Id: I12e7bac9da6652d5b3d98e8a4cee0eb40aa9c627 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/149474 Tested-by: Jenkins Reviewed-by: Stéphane Guillou Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk index 8639173b2a..8202f70b00 100644 --- a/AllLangHelp_sdraw.mk +++ b/AllLangHelp_sdraw.mk @@ -45,7 +45,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\ helpcontent2/source/text/sdraw/guide/keyboard \ helpcontent2/source/text/sdraw/guide/layers \ helpcontent2/source/text/sdraw/guide/layer_move \ -helpcontent2/source/text/sdraw/guide/layer_new \ helpcontent2/source/text/sdraw/guide/layer_tipps \ helpcontent2/source/text/sdraw/guide/main \ helpcontent2/source/text/sdraw/guide/rotate_object \ diff --git a/source/auxiliary/sdraw.tree b/source/auxiliary/sdraw.tree index 853b26f25b..eb2883327a 100644 --- a/source/auxiliary/sdraw.tree +++ b/source/auxiliary/sdraw.tree @@ -40,7 +40,7 @@ Form Navigation Bar Options Bar Standard Bar -Table Bar +Table Bar @@ -89,7 +89,7 @@ Grouping Objects About Layers - Inserting Layers + Insert or Modify Layer Working With Layers Moving Objects to a Different Layer diff --git a/source/text/sdraw/01/insert_layer.xhp b/source/text/sdraw/01/insert_layer.xhp index ad3c24c2ee..dbd3139065 100644 --- a/source/text/sdraw/01/insert_layer.xhp +++ b/source/text/sdraw/01/insert_layer.xhp @@ -29,14 +29,14 @@ - renaming layers +renaming layers layers; renaming layers; insert layers; modify modify layer insert layer -Insert or Modify Layer +Insert or Modify Layer Inserts a new layer or modify a layer in the document. Layers are only available in Draw, not in Impress. @@ -72,8 +72,8 @@ Locked Prevent elements on the layer from being edited. - - + + diff --git a/source/text/sdraw/guide/layer_move.xhp b/source/text/sdraw/guide/layer_move.xhp index b276c1f9af..ebd2ef7c85 100644 --- a/source/text/sdraw/guide/layer_move.xhp +++ b/source/text/sdraw/guide/layer_move.xhp @@ -1,6 +1,4 @@ - - - -Moving Objects to a Different Layer +Moving Objects to a Different Layer /text/sdraw/guide/layer_move.xhp @@ -30,27 +27,28 @@ -objects; moving in layers +objects; moving in layers layers; moving objects moving; between layers -Moving Objects to a Different Layer - -Drawings in %PRODUCTNAME Draw support layers. +Moving Objects to a Different Layer + +Drawings in %PRODUCTNAME Draw support layers. -Click and hold the object until its edges flash. +Click and hold the object until its edges flash. -Drag the object to the name tab of the layer you want to move it to. +Drag the object to the name tab of the layer you want to move it to. -Release the object. +Release the object. - + - + + diff --git a/source/text/sdraw/guide/layer_new.xhp b/source/text/sdraw/guide/layer_new.xhp deleted file mode 100644 index 7ed64aeeff..00 --- a/source/text/sdraw/guide/layer_new.xhp +++ /dev/null @@ -1,64 +0,0 @@ - - - - - -Inserting Layers -/text/sdraw/guide/layer_new.xhp - - -Sun Microsystems, Inc. - - - -layers; inserting and editing -inserting; layers -changing;layer properties -MW changed "modifying;..." to "changing;..." -Inserting Layers - -Drawings in %PRODUCTNAME Draw support layers. - - - -Right-click the layer tab area at the bottom. - - -Choose Insert Layer. - - -Type a name for the layer in the Name box. - - - -In the Properties area, set the options for the layer. - - -Click OK. The new layer automatically becomes the active layer. - - -To change the properties of a layer, click the name tab of the layer, and then choose Format - Layer. -You cannot change the name of or delete a predefined %PRODUCTNAME Draw layer. - - - - - - - diff --git a/source/text/sdraw/guide/layer_tipps.xhp b/source/text/sdraw/guide/layer_tipps.xhp index c82a77b6c7..adca672ae8 100644 --- a/source/text/sdraw/guide/layer_tip
[Libreoffice-commits] core.git: officecfg/registry sw/source
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8
sw/source/uibase/config/usrpref.cxx|5 --
sw/source/uibase/uiview/view.cxx | 22 -
3 files changed, 2 insertions(+), 33 deletions(-)
New commits:
commit b09df066497fecc66b51af9094914e46e7a87176
Author: Xisco Fauli
AuthorDate: Fri Mar 24 11:46:22 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 14:11:15 2023 +
tdf#149485: Revert "tdf#142450 add code to store showing whitespace"
This reverts commit 5b07acbf3345918f450fccf7ee243ad5bcb3fd67.
The reverted commit claims that
"This option is stored at the document level like the other
layout options."
which is not true. The option is saved in the user profile,
which makes other documents to look wrong.
Reverting for now until it's implemented at document level
as the commit suggests
Change-Id: I2ae0daeb410090949f1b6cfc8245b711fe518216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149541
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 07fcc54d10d4..1177b5472dcd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1610,14 +1610,6 @@
false
-
-
-
-Specifies whether to hide whitespace.
-View Layout Hide Whitespace
-
- false
-
diff --git a/sw/source/uibase/config/usrpref.cxx
b/sw/source/uibase/config/usrpref.cxx
index 45590d5e0b8a..e2599f4092b3 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -271,9 +271,8 @@ Sequence SwLayoutViewConfig::GetPropertyNames()
const
"Other/IsSquaredPageMode", //17
"Other/ApplyCharUnit", //18
"Window/ShowScrollBarTips", //19
-"ViewLayout/HideWhitespace",//20
};
-const int nCount = m_bWeb ? 13 : 21;
+const int nCount = m_bWeb ? 13 : 20;
Sequence aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -335,7 +334,6 @@ void SwLayoutViewConfig::ImplCommit()
case 17: rVal <<= m_rParent.IsSquaredPageMode(); break;
// "Other/IsSquaredPageMode",
case 18: rVal <<= m_rParent.IsApplyCharUnit(); break;
// "Other/ApplyCharUnit",
case 19: rVal <<= m_rParent.IsShowScrollBarTips(); break;
// "Window/ShowScrollBarTips",
-case 20: rVal <<= m_rParent.IsHideWhitespaceMode(); break;
// "ViewLayout/HideWhitespace"
}
}
PutProperties(aNames, aValues);
@@ -391,7 +389,6 @@ void SwLayoutViewConfig::Load()
case 17: m_rParent.SetDefaultPageMode(bSet,true); break;//
"Other/IsSquaredPageMode",
case 18: m_rParent.SetApplyCharUnit(bSet, true); break;//
"Other/ApplyUserChar"
case 29: m_rParent.SetShowScrollBarTips(bSet); break;//
"Window/ShowScrollBarTips",
-case 20: m_rParent.SetHideWhitespaceMode(bSet); break;//
"ViewLayout/HideWhitespace"
}
}
}
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index a878e5591a9d..219958ec8517 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1347,7 +1347,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence <
beans::PropertyValue >
sal_Int16 nZoomFactor = static_cast < sal_Int16 > (pVOpt->GetZoom());
bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
-bool bHideWhitespace = pVOpt->IsHideWhitespaceMode();
bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() !=
FrameTypeFlags::NONE ),
bGotVisibleLeft = false,
@@ -1355,7 +1354,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence <
beans::PropertyValue >
bGotZoomType = false,
bGotZoomFactor = false, bGotIsSelectedFrame = false,
bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false,
- bGotHideWhitespace = false,
bBrowseMode = false, bGotBrowseMode = false;
bool bKeepRatio = pVOpt->IsKeepRatio();
bool bGotKeepRatio = false;
@@ -1419,11 +1417,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence
< beans::PropertyValue >
rValue.Value >>= bKeepRatio;
bGotKeepRatio = true;
}
-else if (rValue.Name == "HideWhitespace")
-{
-rValue.Value >>= bHideWhitespace;
-bGotHideWhitespace = true;
-}
// Fallback to common S
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - 2 commits - cppuhelper/source desktop/source
cppuhelper/source/paths.cxx |6 --
desktop/source/app/app.cxx |4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 4107bb21a3e9734f4c12832d1fd465075bec16cb
Author: Stephan Bergmann
AuthorDate: Wed Mar 22 17:19:49 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 13:49:39 2023 +
rhbz#2171265 Filter out all non *.rdb files
In that rhbz issue ("Libreoffice cannot start"), it looks like some junk
file
named /usr/lib64/libreoffice/program/services/services.rdb;63ddcd86 caused
soffice.bin to crash early, without any information (cf.
a1faf14f74a62ea76141115538d7d30d90c9eeb6 "rhbz#2171265 Report fatal
InitApplicationServiceManager failures more reliably"). So, following up on
b8c7548527f5fc14fe8fcbe74a749c7e3c10d385 "ignore backup files in services/
directory to avoid debugging grief", extend the set of ignored files to
anything
starting with "." or not ending in ".rdb" (in any case).
Change-Id: I154750465d2128b3ff6493f4ab606072dda61503
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149328
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit feb8b04a0ee86b0146a17393da220ae188babda8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149436
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149499
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index ece7650ded4c..dd8fe56df2bf 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -99,9 +99,11 @@ bool cppu::nextDirectoryItem(osl::Directory & directory,
OUString * url) {
"Cannot stat in directory");
}
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO:
symlinks
-// Ignore backup files:
+// Ignore backup and spurious junk files:
OUString name(stat.getFileName());
-if (!(name.match(".") || name.endsWith("~"))) {
+if (name.match(".") || !name.endsWithIgnoreAsciiCase(u".rdb")) {
+SAL_WARN("cppuhelper", "ignoring <" << stat.getFileURL() <<
">");
+} else {
*url = stat.getFileURL();
return true;
}
commit 35a46563b9cfe87a76ad5e637d77c37e4286bb62
Author: Stephan Bergmann
AuthorDate: Wed Mar 22 14:40:04 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 13:49:34 2023 +
rhbz#2171265 Report fatal InitApplicationServiceManager failures more
reliably
For example, when initialization of the UNO type manager failed, any code
run
between this SetBootstrapError and the HandleBootstrapErrors in
Desktop::Main
which would need the type manager (e.g., to set a css::uno::Any) would have
caused a crash, so would have failed to print to std::cerr the sought-after
css::uno::Exception message. The mis-initialized process would most
definitely
crash sooner or later anyway, so there's no harm in a controlled
std::abort()
here (if that is even reached, and the process doesn't already crash in
HandleBootstrapErrors, after it has printed the relevant information to
std::cerr).
Change-Id: Ic5889aedec0908fa4b1e2966eb188508d0f92d26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149323
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit a1faf14f74a62ea76141115538d7d30d90c9eeb6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149440
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149498
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a45ce9f82a51..b205d5b189e1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -28,6 +28,7 @@
#include
+#include
#include
#include
@@ -455,7 +456,8 @@ void Desktop::Init()
}
catch (css::uno::Exception & e)
{
-SetBootstrapError( BE_UNO_SERVICEMANAGER, e.Message );
+HandleBootstrapErrors( BE_UNO_SERVICEMANAGER, e.Message );
+std::abort();
}
// Check whether safe mode is enabled
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fba19e93cca9a7cdfa1e4ac92291cd0b7f06d715
Author: Andrea Gelmini
AuthorDate: Fri Mar 24 11:34:36 2023 +0100
Commit: Julien Nabet
CommitDate: Fri Mar 24 12:06:05 2023 +
Fix typo
Change-Id: I4cc8dbd5a315844f858bf60e3b5b949c4adb1f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149535
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 06fb46b9e3c1..bc0463e8983e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -355,7 +355,7 @@ IMPL_LINK_NOARG(ImpPDFTabDialog, OkHdl, weld::Button&, void)
else if (ret == RET_NO)
{
m_xDialog->response(RET_CANCEL);
-// Show accessiblity check Sidebar deck
+// Show accessibility check Sidebar deck
SfxDispatcher* pDispatcher = pShell->GetDispatcher();
if (pDispatcher)
{
Re: Extended color
Regina Henschel schrieb am 24.03.2023 um 11:01: [..]> Sorry, not in "attlist" but in "elements". But have no time left today to elaborate it. Kind regards, Regina
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porlay.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d367afff67d166d292f461fccc6075cbf0997419
Author: Michael Stahl
AuthorDate: Thu Mar 23 18:54:36 2023 +0100
Commit: Michael Stahl
CommitDate: Fri Mar 24 10:36:28 2023 +
sw: fix crashtesting assert on ooo90040-2.doc
itrpaint.cxx:421: void SwTextPainter::DrawTextLine: Assertion
`!roTaggedParagraph' failed
because the first portion is a SwKernPortion due to some text grid.
(regression from commit 9b38beadf9eaf027b201cdf0ecb2bce5611014dd)
Change-Id: I95b87871b7db3c7ced223b477b9f7522c1622d69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149469
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 271c76efed02..7111709aa6bc 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -2690,7 +2690,7 @@ bool SwParaPortion::HasNumberingPortion(FootnoteOrNot
const eFootnote) const
for (SwLineLayout const* pLine = this; pLine && !pPortion; pLine =
pLine->GetNext())
{
pPortion = pLine->GetFirstPortion();
-while (pPortion && (pPortion->InGlueGrp() || pPortion->IsFlyPortion()))
+while (pPortion && (pPortion->InGlueGrp() || pPortion->IsKernPortion()
|| pPortion->IsFlyPortion()))
{ // skip margins and fly spacers - numbering should be first then
pPortion = pPortion->GetNextPortion();
}
@@ -2705,7 +2705,7 @@ bool SwParaPortion::HasContentPortions() const
for (SwLineLayout const* pLine = this; pLine && !pPortion; pLine =
pLine->GetNext())
{
pPortion = pLine->GetFirstPortion();
-while (pPortion && (pPortion->InGlueGrp() || pPortion->IsFlyPortion()))
+while (pPortion && (pPortion->InGlueGrp() || pPortion->IsKernPortion()
|| pPortion->IsFlyPortion()))
{ // skip margins and fly spacers
pPortion = pPortion->GetNextPortion();
}
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) New commits: commit 1249706aeaaf60ccafa3675ca203de09f26aebc8 Author: Michael Stahl AuthorDate: Thu Mar 23 18:29:14 2023 +0100 Commit: Michael Stahl CommitDate: Fri Mar 24 10:36:11 2023 + drawinglayer: remove obsolete comment The code is now in vcl/source/gdi/formpdfexport.cxx Change-Id: I07ca1d87eedadc9778e08a491a77adc88f393586 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149468 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index da99da610883..d82465ceb313 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -722,17 +722,7 @@ VclMetafileProcessor2D::~VclMetafileProcessor2D() - UnoControlPDFExportContact is only created when PDFExtOutDevData is used at the target and uno control data is created in UnoControlPDFExportContact::do_PaintObject. - This may be added in primitive MetaFile renderer. - Adding support... - OOps, the necessary helper stuff is in svx/source/form/formpdxexport.cxx in namespace - svxform. Have to talk to FS if this has to be like that. Especially since - vcl::PDFWriter::AnyWidget is filled out, which is already part of vcl. - Wrote an eMail to FS, he is on vacation currently. I see no reason why not to move - that stuff to somewhere else, maybe tools or svtools ?!? We will see... - Moved to toolkit, so I have to link against it. I tried VCL first, but it did - not work since VCLUnoHelper::CreateFont is unresolved in VCL (!). Other than the name - may imply, it is defined in toolkit (!). Since toolkit is linked against VCL itself, - the lowest movement plane is toolkit. + This was added in primitive MetaFile renderer. Checked form control export, it works well. Done. - In goodies, in GraphicObject::Draw, when the used Graphic is linked, infos are
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf153255.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 35 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 ++--
3 files changed, 46 insertions(+), 3 deletions(-)
New commits:
commit 0a74936870937b64ef841d5ae78ac3bea876f16d
Author: László Németh
AuthorDate: Mon Mar 20 17:27:32 2023 +0100
Commit: Caolán McNamara
CommitDate: Fri Mar 24 10:19:20 2023 +
tdf#153255 DOCX import: fix footnote order
Simple unit test for tdf#152203 allowed to create
bad ordering algorithm by accident without noticing
the problem, which caused problem for most of the DOCX
files, where serialization in footnotes.xml doesn't follow
the order of the footnotes.
Regression from commit 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357
"tdf#76260 DOCX import: fix slow footnote import".
Follow-up to commit 09ae3c01940bbc25ffde51963683b04e3cb4bb6a
"tdf#152203 DOCX import: fix mixed footnotes/endnotes".
Change-Id: I0628d96e3b8ad4df38d26e9288b47d39b958c441
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149176
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 93a20c1d9c2f379906970bbe8a15905fc1a328bc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149299
Reviewed-by: Xisco Fauli
Reviewed-by: Michael Stahl
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153255.docx
b/sw/qa/extras/ooxmlexport/data/tdf153255.docx
new file mode 100644
index ..e9f2892d5670
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf153255.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 3916866b9ff4..c6949b14e6bc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -1307,6 +1307,41 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152206)
CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg5"),
xLastButOne->getString().trim() );
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf153255)
+{
+loadAndSave("tdf153255.docx");
+xmlDocUniquePtr pXml = parseExport("word/footnotes.xml");
+CPPUNIT_ASSERT(pXml);
+
+uno::Reference xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference xFootnotes =
xFootnotesSupplier->getFootnotes();
+uno::Reference xLastFootnote(xFootnotes->getByIndex(5),
uno::UNO_QUERY);
+// This was "Footnote for pg2" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg 6"),
xLastFootnote->getString().trim() );
+
+uno::Reference xLastButOne(xFootnotes->getByIndex(4),
uno::UNO_QUERY);
+// This was "Footnote for pg 6" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg5"),
xLastButOne->getString().trim() );
+
+// check all the remaining footnotes
+
+uno::Reference xFootnote1(xFootnotes->getByIndex(0),
uno::UNO_QUERY);
+// This was "Footnote for pg3" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg1"),
xFootnote1->getString().trim() );
+
+uno::Reference xFootnote2(xFootnotes->getByIndex(1),
uno::UNO_QUERY);
+// This was "Footnote for pg5" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg2"),
xFootnote2->getString().trim() );
+
+uno::Reference xFootnote3(xFootnotes->getByIndex(2),
uno::UNO_QUERY);
+// This was "Footnote for pg4." (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg3"),
xFootnote3->getString().trim() );
+
+uno::Reference xFootnote4(xFootnotes->getByIndex(3),
uno::UNO_QUERY);
+// This was "Footnote for pg1" (replaced footnotes)
+CPPUNIT_ASSERT_EQUAL( OUString("Footnote for pg4."),
xFootnote4->getString().trim() );
+}
+
// skip test for macOS (missing fonts?)
#if !defined(MACOSX)
DECLARE_OOXMLEXPORT_TEST(testTdf146346, "tdf146346.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e9fda3f50101..449c75e9b8ce 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3716,15 +3716,23 @@ void DomainMapper_Impl::RemoveTemporaryFootOrEndnotes()
static void lcl_convertToNoteIndices(std::deque& rNoteIds,
sal_Int32& rFirstNoteIndex)
{
-// convert arbitrary footnote identifiers to 0, 1, 2...
-// indices, keeping their possible random order
+// rNoteIds contains XML footnote identifiers in the loaded order of the
footnotes
+// (the same order as in footnotes.xml), i.e. it maps temporary footnote
positions to the
+// identifiers. For example: Ids[0] = 100; Ids[1] = -1, Ids[2] = 5.
+// To copy the footnotes in their final place, create an array, which map
the (normalized)
+// footnote identifiers to the temporary footnote positions. Using the
previous example,
+//
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-2' - vcl/source
vcl/source/animate/Animation.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69ca62c2fa66263f0239709446ea0b43fd9daa3d
Author: Caolán McNamara
AuthorDate: Thu Mar 23 15:35:49 2023 +
Commit: Caolán McNamara
CommitDate: Fri Mar 24 10:18:31 2023 +
crashreporting: BitmapEx::operator=(BitmapEx const &) crashes
e.g.
https://crashreport.libreoffice.org/stats/crash_details/b68d5267-16b1-4ee9-bd42-bdcecdb7043c
this went wrong with:
commit 91bc1e6a8c92a7c895f0ba9dcad9ac4d35f3f791
Date: Sat Jun 25 10:21:17 2022 +1000
vcl: extract function Animation::RenderNextFrameInAllRenderers()
Change-Id: Iaccf12b251ffe06e24813c48ba3a169d0eaaa61c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/76416
which substituted mnAnimCount with nAnimCount which is a subtle one char
difference, but mnAnimCount is a different thing entirely than the (then
local variable) nAnimCount. mnAnimCount is the count of animations
active, not the number of animation frames in a specific animation.
orig code was const size_t nAnimCount = maFrames.size();
so replace mnAnimCount here with maFrames.size() to get back to the
original logic
Change-Id: I11d1797eb0b9ef61addb3769d12d8364872071df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149443
Reviewed-by: Xisco Fauli
Reviewed-by: Noel Grandin
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index 5d4a208a6b30..9c188e417951 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -328,7 +328,7 @@ void Animation::RenderNextFrameInAllRenderers()
{
Stop();
mbLoopTerminated = true;
-mnFrameIndex = mnAnimCount - 1;
+mnFrameIndex = maFrames.size() - 1;
maBitmapEx = maFrames[mnFrameIndex]->maBitmapEx;
return;
}
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/metaact.cxx | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit f2033b6623e13ad70f6648545571594a8cd848c7
Author: Caolán McNamara
AuthorDate: Thu Mar 23 16:31:04 2023 +
Commit: Caolán McNamara
CommitDate: Fri Mar 24 10:02:42 2023 +
ofz#57146 Integer-overflow
Change-Id: Ic5a86254b5d969c8242c124fa0515e4f1537114f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149460
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 71dbe5daa4e4..89c60fbe7baa 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -570,28 +570,33 @@ MetaTextAction::MetaTextAction( const Point& rPt,
OUString aStr,
mnLen ( nLen )
{}
-static bool AllowY(tools::Long nY)
+static bool AllowDim(tools::Long nDim)
{
static bool bFuzzing = utl::ConfigManager::IsFuzzing();
if (bFuzzing)
{
-if (nY > 0x2000 || nY < -0x2000)
+if (nDim > 0x2000 || nDim < -0x2000)
{
-SAL_WARN("vcl", "skipping huge y: " << nY);
+SAL_WARN("vcl", "skipping huge dimension: " << nDim);
return false;
}
}
return true;
}
+static bool AllowPoint(const Point& rPoint)
+{
+return AllowDim(rPoint.X()) && AllowDim(rPoint.Y());
+}
+
static bool AllowRect(const tools::Rectangle& rRect)
{
-return AllowY(rRect.Top()) && AllowY(rRect.Bottom());
+return AllowDim(rRect.Top()) && AllowDim(rRect.Bottom());
}
void MetaTextAction::Execute( OutputDevice* pOut )
{
-if (!AllowY(pOut->LogicToPixel(maPt).Y()))
+if (!AllowDim(pOut->LogicToPixel(maPt).Y()))
return;
pOut->DrawText( maPt, maStr, mnIndex, mnLen );
@@ -724,7 +729,7 @@ MetaStretchTextAction::MetaStretchTextAction( const Point&
rPt, sal_uInt32 nWidt
void MetaStretchTextAction::Execute( OutputDevice* pOut )
{
-if (!AllowY(pOut->LogicToPixel(maPt).Y()))
+if (!AllowDim(pOut->LogicToPixel(maPt).Y()))
return;
pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen );
@@ -1483,7 +1488,7 @@ MetaMoveClipRegionAction::MetaMoveClipRegionAction(
tools::Long nHorzMove, tools
void MetaMoveClipRegionAction::Execute( OutputDevice* pOut )
{
-if (!AllowY(pOut->LogicToPixel(Point(mnHorzMove, mnVertMove)).Y()))
+if (!AllowPoint(pOut->LogicToPixel(Point(mnHorzMove, mnVertMove
return;
pOut->MoveClipRegion( mnHorzMove, mnVertMove );
}
Extended color
Hi all,
There is ongoing development on theme colors and on multi-color
gradients. These require additions to the API and additions to ODF. The
current solutions are not sufficient (I think) or do not exist.
Therefore I suggest a concept of "extended color". Such "extended color"
has information about the type of the color, a color value and
transformations of the color.
Currently in API, the gradient2 misses theme colors and XThemeColor
misses color transformations. rng additions for theme color misses that
color transformations in OOXML can be combined with any kind of color
type, not only with theme colors, and thus ODF should be extended
accordingly.
More concrete descriptions of my idea are below.
Kind regards,
Regina
For the API in css::awt or in css::util or mixed, here written for awt
struct ExtColor
css::awt::ColorType Type
string Value
sequence Transform
enum ColorType {RGBHex, Theme, RGBZeroToOne}
The ColorType determines how the string in Value has to be interpreted.
Examples:
Type="RGBHex" Value="#ffcc00". Value is a color in #rrggbb notation.
Type="Theme" Value="7". Value is an index into ThemeUnoRepresentation[2]
(="ColorScheme") or css::util::XScheme::ColorSet, respectively.
Type="RGBZeroToOne" Value="1.0 0.8 0"
struct ColorTransform
css::awt::ColorTransformType Type
shortValue
enum ColorTransformType {LumMod, LumOff, Alpha}
The ColorTransformType determines how the number in Value has to be
interpreted.
Examples: Type="LumMod" Value="6000" means to modify the luminance of
the color with 60% as specified in OOXML.
struct ColorStop
double StopOffset
css::awt::ExtColor StopColor
These can be straightforward transported to ODF.
Examples:
RGBHex
Theme
RGBZeroToOne
LumMod
LumOff
Alpha
...
...
...
...
If we want to be more flexible in ODF for color-type or
color-transform-type, we could use a namespaced string as datatype and
make it implementation-dependent (to allow all of enum class
TransformationType, for example).
[Libreoffice-commits] core.git: basctl/source basegfx/source basic/source bridges/source
basctl/source/basicide/uiobject.cxx |3 -
basegfx/source/polygon/b2dsvgpolypolygon.cxx |6 +--
basic/source/basmgr/basmgr.cxx |6 +--
basic/source/classes/sbunoobj.cxx| 51 +--
basic/source/sbx/sbxscan.cxx |3 -
bridges/source/jni_uno/jni_info.cxx |9 +---
bridges/source/jni_uno/jni_uno2java.cxx |3 -
7 files changed, 29 insertions(+), 52 deletions(-)
New commits:
commit c76fb95d45f0240ee00f831a88e8a52bf3faacbc
Author: Noel Grandin
AuthorDate: Fri Mar 24 09:29:24 2023 +0200
Commit: Noel Grandin
CommitDate: Fri Mar 24 09:50:49 2023 +
loplugin:stringadd in b*
after my patch to merge the bufferadd loplugin into stringadd
Change-Id: Ieb9b4f5154173738e26b429b55c7a3ea38733553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149478
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/uiobject.cxx
b/basctl/source/basicide/uiobject.cxx
index 80807d3a40a6..b875b1eceda7 100644
--- a/basctl/source/basicide/uiobject.cxx
+++ b/basctl/source/basicide/uiobject.cxx
@@ -28,8 +28,7 @@ StringMap EditorWindowUIObject::get_state()
OUStringBuffer aRes;
for (i = 0, nParas = pEditEngine->GetParagraphCount(); i < nParas; ++i)
{
-aRes.append(pEditEngine->GetText(i));
-aRes.append("\n");
+aRes.append(pEditEngine->GetText(i) + "\n");
}
aMap["Text"] = aRes.makeStringAndClear();
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index aa0fedb2ddf2..6bb34614c6ae 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -704,9 +704,9 @@ namespace basegfx::utils
aResult.append(' ');
}
-aResult.append(aPoint.getX());
-aResult.append(',');
-aResult.append(aPoint.getY());
+aResult.append(OUString::number(aPoint.getX())
++ ","
++ OUString::number(aPoint.getY()));
}
return aResult.makeStringAndClear();
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 72776dd08153..c00221f27a12 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1540,9 +1540,9 @@ ErrCode BasicManager::ExecuteMacro( OUString const&
i_fullyQualifiedName, std::u
sal_Int32 nPos {0};
for (;;)
{
-aBuff.append( "\"" );
-aBuff.append( o3tl::getToken(sArgs2, 0, ',', nPos) );
-aBuff.append( "\"" );
+aBuff.append( OUString::Concat("\"")
++ o3tl::getToken(sArgs2, 0, ',', nPos)
++ "\"" );
if (nPos<0)
break;
aBuff.append( "," );
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 71ef915e942a..36feb923a6de 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1605,9 +1605,7 @@ static OUString getDbgObjectName(SbUnoObject& rUnoObj)
{
aRet.append( "\n" );
}
-aRet.append( "\"" );
-aRet.append( aName );
-aRet.append( "\":" );
+aRet.append( "\"" + aName + "\":" );
return aRet.makeStringAndClear();
}
@@ -1739,16 +1737,16 @@ static OUString
Impl_GetSupportedInterfaces(SbUnoObject& rUnoObj)
auto x = o3tl::tryAccess>(aToInspectObj);
if( !x )
{
-aRet.append( ID_DBG_SUPPORTEDINTERFACES );
-aRet.append( " not available.\n(TypeClass is not
TypeClass_INTERFACE)\n" );
+aRet.append( ID_DBG_SUPPORTEDINTERFACES
++ " not available.\n(TypeClass is not TypeClass_INTERFACE)\n" );
}
else
{
Reference< XTypeProvider > xTypeProvider( *x, UNO_QUERY );
-aRet.append( "Supported interfaces by object " );
-aRet.append(getDbgObjectName(rUnoObj));
-aRet.append( "\n" );
+aRet.append( "Supported interfaces by object "
++ getDbgObjectName(rUnoObj)
++ "\n" );
if( xTypeProvider.is() )
{
// get the interfaces of the implementation
@@ -1769,9 +1767,9 @@ static OUString Impl_GetSupportedInterfaces(SbUnoObject&
rUnoObj)
typelib_TypeDescription * pTD = nullptr;
rType.getDescription( &pTD );
-aRet.append( "*** ERROR: No IdlClass for type \"" );
-aRet.append( pTD->pTypeName );
-aRet.append( "\"\n*** Please check type library\n" );
+aRet.append( OUString::Concat("*** ERROR: No IdlClass for
type \"")
++ OUString::unacquired(&pTD->pTypeName)
++ "\"\n*** Please check type library\n" );
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/qa sw/source
sw/qa/core/layout/data/header-textbox.docx |binary
sw/qa/core/layout/layout.cxx | 15 +++
sw/source/core/draw/dcontact.cxx |9 -
sw/source/core/layout/anchoreddrawobject.cxx |8
4 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 5bab8fc3b9dd27c0e37cf9a62b1b27c2bf243788
Author: Jaume Pujantell
AuthorDate: Tue Mar 21 16:03:54 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 09:09:03 2023 +
Fix wrong layout of textbox in header
In some cases the text box wasn't properly moved afeter it's position
had been calculated. Also now when the shape and text element are
brought together in the Z ordering, the one with higher Z moves down.
Change-Id: I0512db4b6466532b5af4e3c091fd65bd0a416381
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149221
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit 826b20b049449c9c335ce00c781cdb52e4ee0512)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149438
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/core/layout/data/header-textbox.docx
b/sw/qa/core/layout/data/header-textbox.docx
new file mode 100644
index ..4df72cccd3e7
Binary files /dev/null and b/sw/qa/core/layout/data/header-textbox.docx differ
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 8a5c90a972b8..758640d6d765 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -258,6 +258,21 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest,
testTextboxModification)
CPPUNIT_ASSERT(!pDocShell->IsModified());
}
+CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTextBoxInHeaderIsPositioned)
+{
+// Load a document with a floating text box in the header
+createSwDoc("header-textbox.docx");
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Without the fix in place, this test would have failed with
+// - Expected: 8051
+// - Actual : 1418
+// Comparison with 7000 chosen due to variability between devices
+CPPUNIT_ASSERT_GREATEREQUAL(
+double(7000), getXPath(pXmlDoc, "//anchored/fly/infos/bounds",
"left").toDouble());
+}
+
CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testBtlrNestedCell)
{
// Load a document with a nested table, the inner A1 cell has a btlr text
direction.
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 156f73adc58a..3cebc41c06ba 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1975,7 +1975,14 @@ void SwDrawContact::ConnectToLayout( const
SwFormatAnchor* pAnch )
if (pDrawPage)
{
sal_uInt32 nOrdNum =
pAnchoredObj->GetDrawObj()->GetOrdNum();
-
pDrawPage->SetObjectOrdNum(maAnchoredDrawObj.GetDrawObj()->GetOrdNumDirect(),
nOrdNum);
+if
(maAnchoredDrawObj.GetDrawObj()->GetOrdNum() >= nOrdNum)
+{
+
pDrawPage->SetObjectOrdNum(maAnchoredDrawObj.GetDrawObj()->GetOrdNumDirect(),
nOrdNum);
+}
+else
+{
+
pDrawPage->SetObjectOrdNum(nOrdNum,
maAnchoredDrawObj.GetDrawObj()->GetOrdNumDirect() + 1);
+}
break;
}
}
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index 491e860014f2..6dc6cac5d1b2 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -516,6 +517,13 @@ void SwAnchoredDrawObject::SetDrawObjAnchor()
DrawObj()->SetAnchorPos( aNewAnchorPos );
// correct object position, caused by setting new anchor position
DrawObj()->Move( aMove );
+// Sync textbox if it wasn't done at move
+if ( SwTextBoxHelper::isTextBox(&GetFrameFormat(), RES_DRAWFRMFMT) &&
GetFrameFormat().GetDoc() &&
+
GetFrameFormat().GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() &&
+
GetFrameFormat().GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell()->IsInConstructor())
+{
+SwTextBoxHelper::changeAnchor(&GetFrameFormat(),
GetFrameFormat().FindRealSdrObject());
+}
// --> #i70122# - missing invalidation
InvalidateObjRectWithSpac
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - cppuhelper/source desktop/source
cppuhelper/source/paths.cxx |6 --
desktop/source/app/app.cxx |4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 40d7fc59dec451ca1c5d61c2c6c81d45af971f5c
Author: Stephan Bergmann
AuthorDate: Wed Mar 22 17:19:49 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 09:08:38 2023 +
rhbz#2171265 Filter out all non *.rdb files
In that rhbz issue ("Libreoffice cannot start"), it looks like some junk
file
named /usr/lib64/libreoffice/program/services/services.rdb;63ddcd86 caused
soffice.bin to crash early, without any information (cf.
a1faf14f74a62ea76141115538d7d30d90c9eeb6 "rhbz#2171265 Report fatal
InitApplicationServiceManager failures more reliably"). So, following up on
b8c7548527f5fc14fe8fcbe74a749c7e3c10d385 "ignore backup files in services/
directory to avoid debugging grief", extend the set of ignored files to
anything
starting with "." or not ending in ".rdb" (in any case).
Change-Id: I154750465d2128b3ff6493f4ab606072dda61503
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149328
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit feb8b04a0ee86b0146a17393da220ae188babda8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149436
Reviewed-by: Xisco Fauli
diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index ece7650ded4c..dd8fe56df2bf 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -99,9 +99,11 @@ bool cppu::nextDirectoryItem(osl::Directory & directory,
OUString * url) {
"Cannot stat in directory");
}
if (stat.getFileType() != osl::FileStatus::Directory) { //TODO:
symlinks
-// Ignore backup files:
+// Ignore backup and spurious junk files:
OUString name(stat.getFileName());
-if (!(name.match(".") || name.endsWith("~"))) {
+if (name.match(".") || !name.endsWithIgnoreAsciiCase(u".rdb")) {
+SAL_WARN("cppuhelper", "ignoring <" << stat.getFileURL() <<
">");
+} else {
*url = stat.getFileURL();
return true;
}
commit af0db7d281b496280bdd0f1bc4eabab42fc37b1a
Author: Stephan Bergmann
AuthorDate: Wed Mar 22 14:40:04 2023 +0100
Commit: Xisco Fauli
CommitDate: Fri Mar 24 09:08:27 2023 +
rhbz#2171265 Report fatal InitApplicationServiceManager failures more
reliably
For example, when initialization of the UNO type manager failed, any code
run
between this SetBootstrapError and the HandleBootstrapErrors in
Desktop::Main
which would need the type manager (e.g., to set a css::uno::Any) would have
caused a crash, so would have failed to print to std::cerr the sought-after
css::uno::Exception message. The mis-initialized process would most
definitely
crash sooner or later anyway, so there's no harm in a controlled
std::abort()
here (if that is even reached, and the process doesn't already crash in
HandleBootstrapErrors, after it has printed the relevant information to
std::cerr).
Change-Id: Ic5889aedec0908fa4b1e2966eb188508d0f92d26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149323
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit a1faf14f74a62ea76141115538d7d30d90c9eeb6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149440
Reviewed-by: Xisco Fauli
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 135a5b5fdb1f..26c1711abd20 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -28,6 +28,7 @@
#include
+#include
#include
#include
@@ -455,7 +456,8 @@ void Desktop::Init()
}
catch (css::uno::Exception & e)
{
-SetBootstrapError( BE_UNO_SERVICEMANAGER, e.Message );
+HandleBootstrapErrors( BE_UNO_SERVICEMANAGER, e.Message );
+std::abort();
}
// Check whether safe mode is enabled
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - cui/source include/com sw/qa writerfilter/source
cui/source/tabpages/numpages.cxx | 43 +-
include/com/sun/star/uno/Any.h|4
include/com/sun/star/uno/Any.hxx |8
sw/qa/extras/ooxmlimport/data/tdf154319-ToC_with_s_and_d.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 50 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 150 ++
6 files changed, 187 insertions(+), 68 deletions(-)
New commits:
commit 128671288204136ceba258a5fe809c354728a175
Author: Mike Kaganski
AuthorDate: Tue Mar 21 21:35:58 2023 +0300
Commit: Xisco Fauli
CommitDate: Fri Mar 24 09:02:52 2023 +
tdf#154319: fix TOC field codes parsing
Change-Id: I734697f52df14ca5b316481df8a58fef72ab9571
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149254
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 76777c82fa4bb5080c135e2241c3f7122dcbb298)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149437
Reviewed-by: Xisco Fauli
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index f232ccd90fe9..b453f5fa5b0c 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -451,6 +451,10 @@ template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & value
);
template<>
inline bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString &
value );
+#if defined LIBO_INTERNAL_ONLY
+template
+inline bool SAL_CALL operator == (const Any& rAny, const
rtl::OUStringLiteral& value);
+#endif
// type
template<>
inline bool SAL_CALL operator >>= ( const Any & rAny, Type & value );
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index d73b2a586d61..6267d41e733c 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -600,6 +600,14 @@ inline bool SAL_CALL operator == ( const Any & rAny, const
::rtl::OUString & val
return (typelib_TypeClass_STRING == rAny.pType->eTypeClass &&
value == * static_cast< const ::rtl::OUString * >( rAny.pData ) );
}
+
+#if defined LIBO_INTERNAL_ONLY
+template
+inline bool SAL_CALL operator == (const Any& rAny, const
rtl::OUStringLiteral& value)
+{
+return operator ==(rAny, rtl::OUString(value));
+}
+#endif
// type
template<>
diff --git a/sw/qa/extras/ooxmlimport/data/tdf154319-ToC_with_s_and_d.docx
b/sw/qa/extras/ooxmlimport/data/tdf154319-ToC_with_s_and_d.docx
new file mode 100644
index ..dc5a67824c9d
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/tdf154319-ToC_with_s_and_d.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 26ad31df3a78..406812ab7fa5 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -1021,6 +1021,56 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf153791)
CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty(xRun, "CharColor"));
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf154319)
+{
+createSwDoc("tdf154319-ToC_with_s_and_d.docx");
+
+css::uno::Reference
xSupplier(mxComponent,
+
css::uno::UNO_QUERY_THROW);
+auto xIndexes = xSupplier->getDocumentIndexes();
+css::uno::Reference
xTOCIndex(xIndexes->getByIndex(0),
+
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xLevelFormats;
+CPPUNIT_ASSERT(xTOCIndex->getPropertyValue("LevelFormat") >>=
xLevelFormats);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(11), xLevelFormats->getCount());
+
+const auto checkPropVal = [](const auto& expected, const
css::beans::PropertyValues& entry,
+ const OUString& name) {
+auto it
+= std::find_if(entry.begin(), entry.end(),
+ [&name](const css::beans::PropertyValue& p) {
return p.Name == name; });
+OString msg = "Property: " + name.toUtf8();
+CPPUNIT_ASSERT_MESSAGE(msg.getStr(), it != entry.end());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(msg.getStr(), css::uno::Any(expected),
it->Value);
+};
+
+//start with level 1, 0 is the header level
+for (sal_Int32 nLevel = 1; nLevel < xLevelFormats->getCount(); ++nLevel)
+{
+css::uno::Sequence aLevel;
+xLevelFormats->getByIndex(nLevel) >>= aLevel;
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aLevel.getLength());
+
+checkPropVal(OUString("TokenHyperlinkStart"), aLevel[0], "TokenType");
+
+checkPropVal(OUString("TokenEntryNumber"), aLevel[1], "TokenType");
+
+checkPropVal(OUString("TokenEntryText"), aLevel[2], "TokenType");
+
+checkPropVal(OUString("TokenTabStop"), aLevel[3], "TokenType");
+
+checkPropVal(OUString("TokenChapterInfo"), aLevel[4], "TokenType");
+
+checkPropVal(OUString("TokenText"),
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - framework/source
framework/source/accelerators/acceleratorconfiguration.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 98465ee3f987c43bdb0a615ca81ffbbac6bf479f
Author: Caolán McNamara
AuthorDate: Wed Mar 22 16:59:23 2023 +
Commit: Xisco Fauli
CommitDate: Fri Mar 24 08:58:15 2023 +
fix crash seen when experimenting with tdf#129547
Change-Id: I0b26a7f683f91d3307856f86c5a437fde1155451
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149331
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 936f2e6924e405433770b98f32a615508fd0670d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149434
Reviewed-by: Xisco Fauli
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3507314a9a6e..ad08f375a177 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -64,7 +64,10 @@ namespace framework
static OUString lcl_getKeyString(const css::awt::KeyEvent& aKeyEvent)
{
const sal_Int32 nBeginIndex = 4; // "KEY_" is the prefix of an
identifier...
-OUStringBuffer
sKeyBuffer((KeyMapping::get().mapCodeToIdentifier(aKeyEvent.KeyCode)).subView(nBeginIndex));
+OUString
sKey(KeyMapping::get().mapCodeToIdentifier(aKeyEvent.KeyCode));
+if (sKey.getLength() < nBeginIndex) // dead key
+return OUString();
+OUStringBuffer sKeyBuffer(sKey.subView(nBeginIndex));
if ( (aKeyEvent.Modifiers & css::awt::KeyModifier::SHIFT) ==
css::awt::KeyModifier::SHIFT )
sKeyBuffer.append("_SHIFT");
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/layout/flycnt.cxx | 55 ++
sw/source/core/layout/findfrm.cxx | 15 +-
2 files changed, 69 insertions(+), 1 deletion(-)
New commits:
commit 3c3a47e911a7ee4d199fe96bd3003c7d9afa9deb
Author: Miklos Vajna
AuthorDate: Fri Mar 24 08:15:59 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 24 08:34:20 2023 +
sw floattable: fix up/down cursor travel at fly boundary
Pressing the "down" key in the middle of the last line of the A1 cell on
page 1 went to the end of the paragraph instead of going to the A2 cell
on page 2.
The problem was that fly frames don't have a "next" pointer to the
follow fly frame, so the cursor travel code thought there is no follow
frame to jump to.
Fix the problem similar to how explicitly chained frames do this in
lcl_FindLayoutFrame().
While at it, also fix the the "up" direction.
Change-Id: I8dd0c2d011300520b126abf3ca8d17722ab5ff92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149476
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/core/layout/flycnt.cxx b/sw/qa/core/layout/flycnt.cxx
index b9ab0ac116cb..daa9764325f5 100644
--- a/sw/qa/core/layout/flycnt.cxx
+++ b/sw/qa/core/layout/flycnt.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
namespace
{
@@ -543,6 +544,60 @@ CPPUNIT_TEST_FIXTURE(Test,
testSplitFlyFollowHorizontalPosition)
// master fly.
CPPUNIT_ASSERT_EQUAL(nPage1FlyLeft, nPage2FlyLeft);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testCursorTraversal)
+{
+// Given a document with a multi-page floating table:
+createSwDoc();
+SwDoc* pDoc = getSwDoc();
+SwPageDesc aStandard(pDoc->GetPageDesc(0));
+SwFormatFrameSize aPageSize(aStandard.GetMaster().GetFrameSize());
+// 5cm for the page height, 2cm are the top and bottom margins, so 1cm
remains for the body
+// frame:
+aPageSize.SetHeight(2834);
+aStandard.GetMaster().SetFormatAttr(aPageSize);
+pDoc->ChgPageDesc(0, aStandard);
+// Insert a table:
+SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+SwInsertTableOptions aTableOptions(SwInsertTableFlags::DefaultBorder, 0);
+pWrtShell->InsertTable(aTableOptions, /*nRows=*/2, /*nCols=*/1);
+pWrtShell->MoveTable(GotoPrevTable, fnTableStart);
+pWrtShell->GoPrevCell();
+pWrtShell->Insert("A1");
+pWrtShell->GoNextCell();
+pWrtShell->Insert("A2");
+// Select cell:
+pWrtShell->SelAll();
+// Select table:
+pWrtShell->SelAll();
+// Wrap the table in a text frame:
+SwFlyFrameAttrMgr aMgr(true, pWrtShell, Frmmgr_Type::TEXT, nullptr);
+pWrtShell->StartAllAction();
+aMgr.InsertFlyFrame(RndStdIds::FLY_AT_PARA, aMgr.GetPos(), aMgr.GetSize());
+pWrtShell->EndAllAction();
+// Allow the text frame to split:
+pWrtShell->StartAllAction();
+SwFrameFormats& rFlys = *pDoc->GetSpzFrameFormats();
+SwFrameFormat* pFly = rFlys[0];
+SwAttrSet aSet(pFly->GetAttrSet());
+aSet.Put(SwFormatFlySplit(true));
+pDoc->SetAttr(aSet, *pFly);
+pWrtShell->EndAllAction();
+
+// When going from A1 to A2:
+pWrtShell->GotoTable("Table1");
+SwTextNode* pTextNode =
pWrtShell->GetCursor()->GetPointNode().GetTextNode();
+CPPUNIT_ASSERT_EQUAL(OUString("A1"), pTextNode->GetText());
+pWrtShell->Down(/*bSelect=*/false);
+
+// Then make sure we get to A2 and don't stay in A1:
+pTextNode = pWrtShell->GetCursor()->GetPointNode().GetTextNode();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: A2
+// - Actual : A1
+// i.e. the cursor didn't get from A1 to A2.
+CPPUNIT_ASSERT_EQUAL(OUString("A2"), pTextNode->GetText());
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/findfrm.cxx
b/sw/source/core/layout/findfrm.cxx
index 0e425e0a1eb5..3e2c26a8bbf9 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
/// Searches the first ContentFrame in BodyText below the page.
@@ -308,7 +309,19 @@ static const SwFrame* lcl_FindLayoutFrame( const SwFrame*
pFrame, bool bNext )
{
const SwFrame* pRet = nullptr;
if ( pFrame->IsFlyFrame() )
-pRet = bNext ? static_cast(pFrame)->GetNextLink() :
static_cast(pFrame)->GetPrevLink();
+{
+auto pFlyFrame = static_cast(pFrame);
+if (pFlyFrame->IsFlySplitAllowed())
+{
+// This is a flow frame, look up the follow/precede.
+auto pFlyAtContent = static_cast(pFlyFrame);
+pRet = bNext ? pFlyAtContent->GetFollow() :
pFlyAtContent->GetPrecede();
+}
+else
+{
+pRet = bNext ? pFlyFrame->GetNextLink() : pFlyFrame->GetPrevLink();
+}
+}
else
pRet = bNext ? pFrame->GetNext() : pFrame->GetPrev();
[Libreoffice-commits] core.git: schema/libreoffice xmloff/inc xmloff/qa xmloff/source
schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng |6 +
xmloff/inc/xmlprop.hxx |1
xmloff/qa/unit/data/paragraph-tab-stop-distance.fodp| 19 +
xmloff/qa/unit/text.cxx | 41
xmloff/source/text/txtprmap.cxx |2
5 files changed, 69 insertions(+)
New commits:
commit fa5c01e67775c01b302fc08033a0eb78d3b87489
Author: Sarper Akdemir
AuthorDate: Fri Mar 3 18:04:46 2023 +0300
Commit: Miklos Vajna
CommitDate: Fri Mar 24 07:18:54 2023 +
related tdf#102261: xmloff: ODF import/export for ParaTabStopDefaultDistance
Introduces ODF import/export for ParaTabStopDefaultDistance
(loext:tab-stop-distance).
Also adds a unit test that covers import & export of the
property.
Change-Id: I8a69a9e2b73e8f1172f92dc35fada901f4b887f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148540
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index f0f84bd3fd40..fa38694f9cff 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2615,6 +2615,12 @@
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
+
+
+
+
+
+
diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx
index ab7c53de01cf..3b2cd86816bc 100644
--- a/xmloff/inc/xmlprop.hxx
+++ b/xmloff/inc/xmlprop.hxx
@@ -513,6 +513,7 @@ inline constexpr OUStringLiteral
PROP_ParaRightMarginRelative = u"ParaRightMargi
inline constexpr OUStringLiteral PROP_ParaShadowFormat = u"ParaShadowFormat";
inline constexpr OUStringLiteral PROP_ParaSplit = u"ParaSplit";
inline constexpr OUStringLiteral PROP_ParaTabStops = u"ParaTabStops";
+inline constexpr OUStringLiteral PROP_ParaTabStopDefaultDistance =
u"ParaTabStopDefaultDistance";
inline constexpr OUStringLiteral PROP_ParaTopMargin = u"ParaTopMargin";
inline constexpr OUStringLiteral PROP_ParaTopMarginRelative =
u"ParaTopMarginRelative";
inline constexpr OUStringLiteral PROP_ParaUserDefinedAttributes =
u"ParaUserDefinedAttributes";
diff --git a/xmloff/qa/unit/data/paragraph-tab-stop-distance.fodp
b/xmloff/qa/unit/data/paragraph-tab-stop-distance.fodp
new file mode 100644
index ..f51e75b79699
--- /dev/null
+++ b/xmloff/qa/unit/data/paragraph-tab-stop-distance.fodp
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ starttab1tab2tab4
+
+
+
+
+
+
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 7fe762580ac1..5d3a9cf4ac99 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1047,6 +1048,46 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest,
testFloatingTableImport)
CPPUNIT_ASSERT(bIsSplitAllowed);
}
+CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testParagraphScopedTabDistance)
+{
+// Given a document with paragraph scoped default tab stop distance
(loext:tab-stop-distance="0.5cm")
+loadFromURL(u"paragraph-tab-stop-distance.fodp");
+
+uno::Reference xDoc(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xPage(xDoc->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY_THROW);
+
+uno::Reference xShape(xPage->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xText
+= uno::Reference(xShape,
uno::UNO_QUERY_THROW)->getText();
+
+uno::Reference paraEnumAccess(xText,
uno::UNO_QUERY);
+uno::Reference
paraEnum(paraEnumAccess->createEnumeration());
+uno::Reference xParagraph(paraEnum->nextElement(),
uno::UNO_QUERY_THROW);
+
+uno::Reference runEnumAccess(xParagraph,
uno::UNO_QUERY);
+uno::Reference runEnum =
runEnumAccess->createEnumeration();
+uno::Reference xRun(runEnum->nextElement(),
uno::UNO_QUERY);
+uno::Reference xPropSet(xRun, uno::UNO_QUERY_THROW);
+
+// Make sure the tab stop default distance is imported correctly
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual : 0
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+
xPropSet->getPropertyValue("ParaTabStopDefaultDistance").get());
+
+// Save the imported file to test the export too
+save("impress8");
+
+// Then make sure we write the tab-stop-distance
+xmlDocUniquePtr pXmlDoc = parseExport("content.xml");
+assertXPath(pXmlDoc,
"//style:style[@style:name='P1']/style:paragraph-properties",
+"tab-stop-distance", "10cm");
+
+assertXPath(pXmlDoc, "//text:p[@text:style-name='P1']");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sw/qa writerfilter/source
dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx| 17 ++-
sw/qa/extras/uiwriter/uiwriter2.cxx | 17 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |7 +++---
4 files changed, 20 insertions(+), 21 deletions(-)
New commits:
commit df412d63d436ed4d84a40cdbbf02b7840c78c7c1
Author: Miklos Vajna
AuthorDate: Wed Mar 22 09:37:28 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 24 07:04:54 2023 +
sw floattable: limit the unfloat button to non-DOCX files
CppunitTest_sw_uiwriter2's testUnfloatButton and testUnfloating failed
in the SW_FORCE_FLY_SPLIT=1 case.
The trouble was that it assumed that floating tables from DOCX are
imported as tables in non-split flys, which is no longer the case.
Fix the problem by limiting the test to ODT and DOC files.
Once the DOC filter is there for SwFormatFlySplit, this can be
restricted further to ODT files only (or perhaps it should be removed
completely).
(cherry picked from commit 2b7b272e28bf95c4ed85cb118eacf065fb6dca3c)
Change-Id: Ie1db9a66c862c196aa3bf5326dfb20c67b9b493a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149375
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/uiwriter/data/unfloatable_floating_table.docx
b/sw/qa/extras/uiwriter/data/unfloatable_floating_table.docx
deleted file mode 100644
index cef1f7bf685d..
Binary files a/sw/qa/extras/uiwriter/data/unfloatable_floating_table.docx and
/dev/null differ
diff --git a/sw/qa/extras/uiwriter/data/unfloatable_small_floating_table.docx
b/sw/qa/extras/uiwriter/data/unfloatable_small_floating_table.docx
deleted file mode 100644
index d51056af1177..
Binary files a/sw/qa/extras/uiwriter/data/unfloatable_small_floating_table.docx
and /dev/null differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 622512119faf..0e9fa8ebdedc 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2472,12 +2472,11 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testUnfloatButtonSmallTable)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloatButton)
{
+SwModelTestBase::FlySplitGuard aGuard;
// Different use cases where unfloat button should be visible
const std::vector aTestFiles = {
"unfloatable_floating_table.odt", // Typical use case of multipage
floating table
-"unfloatable_floating_table.docx", // Need to test the DOCX import
whether we detect the floating table correctly
"unfloatable_floating_table.doc", // Also the DOC import
-"unfloatable_small_floating_table.docx" // Atypical use case, when the
table is small, but because of it's position is it broken to two pages
};
for (const OUString& aTestFile : aTestFiles)
@@ -2491,15 +2490,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloatButton)
CPPUNIT_ASSERT_MESSAGE(sFailureMessage.getStr(), pWrtShell);
const SwSortedObjs* pAnchored;
-if (sTestFileName == "unfloatable_small_floating_table.docx")
-pAnchored = pWrtShell->GetLayout()
-->GetLower()
-->GetLower()
-->GetLower()
-->GetNext()
-->GetDrawObjs();
-else
-pAnchored =
pWrtShell->GetLayout()->GetLower()->GetLower()->GetLower()->GetDrawObjs();
+pAnchored =
pWrtShell->GetLayout()->GetLower()->GetLower()->GetLower()->GetDrawObjs();
CPPUNIT_ASSERT_MESSAGE(sFailureMessage.getStr(), pAnchored);
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailureMessage.getStr(),
static_cast(1),
pAnchored->size());
@@ -2545,10 +2536,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testUnfloatButtonReadOnlyMode)
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloating)
{
+SwModelTestBase::FlySplitGuard aGuard;
// Test unfloating with tables imported from different file formats
const std::vector aTestFiles = {
"unfloatable_floating_table.odt",
-"unfloatable_floating_table.docx",
"unfloatable_floating_table.doc",
};
@@ -2558,7 +2549,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloating)
OString sFailureMessage = OString::Concat("Failure in the test file:
") + sTestFileName;
// Test what happens when pushing the unfloat button
-createSwDoc("unfloatable_floating_table.docx");
+createSwDoc(sTestFileName.getStr());
SwDoc* pDoc = getSwDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
CPPUNIT_ASSERT_MESSAGE(sFailureMessage.getStr(), pWrtShell);
commit 38d07cfa9ef66c15ca1919b356614e628203de77
Author: Miklos Vajna
AuthorDate: Wed Mar 22 0
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 18 +++---
sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 19 +--
2 files changed, 32 insertions(+), 5 deletions(-)
New commits:
commit 13957c49b939d29c0005c578e6c5e8dd76bd5722
Author: Miklos Vajna
AuthorDate: Tue Mar 21 13:30:49 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 24 07:04:34 2023 +
sw floattable, CppunitTest_sw_ooxmlimport2: assert the layout in
testTdf114217
The point is that the table is multi-page, which is preserved. The
detail that it's not in a fly is no longer true.
(cherry picked from commit 28b16870553f436b8dd0f74894896136057402a3)
Change-Id: I8fa61391eb26b434cd7e8b8adb5012c4909e5553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149287
Tested-by: Miklos Vajna
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 26ad31df3a78..1dfa519fd5fd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -37,6 +37,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
class Test : public SwModelTestBase
{
@@ -666,9 +670,20 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121804)
CPPUNIT_TEST_FIXTURE(Test, testTdf114217)
{
+SwModelTestBase::FlySplitGuard aGuard;
+// The floating table was not split between page 1 and page 2.
createSwDoc("tdf114217.docx");
-// This was 1, multi-page table was imported as a floating one.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
+auto pPage1Fly = dynamic_cast(rPage1Objs[0]);
+CPPUNIT_ASSERT(pPage1Fly);
+auto pTab1 = dynamic_cast(pPage1Fly->GetLower());
+CPPUNIT_ASSERT(pTab1);
+CPPUNIT_ASSERT(pTab1->HasFollow());
}
CPPUNIT_TEST_FIXTURE(Test, testTdf119200)
commit 692db60d346ea93270a066cba44bb8bb0ac8f7cb
Author: Miklos Vajna
AuthorDate: Tue Mar 21 09:20:14 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 24 07:04:20 2023 +
sw floattable, CppunitTest_sw_ooxmlexport9: assert can-split in
testTdf109063
It should not be a problem if the table is in a frame, what matters is
that the frame is marked to split.
(cherry picked from commit 3911b23c89da02eca92a0069bf1035155b7fddae)
Change-Id: Ib289691dcdf78de494518a9afeac3ede9045ec1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149286
Tested-by: Miklos Vajna
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index f4e7d4581f49..b0b7d81a602a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -123,10 +123,22 @@ DECLARE_SW_ROUNDTRIP_TEST(testBadDocm, "bad.docm",
nullptr, DocmTest)
CPPUNIT_ASSERT_EQUAL(OUString("MS Word 2007 XML VBA"),
pTextDoc->GetDocShell()->GetMedium()->GetFilter()->GetName());
}
-DECLARE_OOXMLEXPORT_TEST(testTdf109063, "tdf109063.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf109063)
{
-// This was 1, near-page-width table was imported as a TextFrame.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
+SwModelTestBase::FlySplitGuard aGuard;
+auto verify = [this]() {
+// A near-page-width table should be allowed to split:
+uno::Reference xDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFrame(xDocument->getTextFrames()->getByName("Frame1"),
+ uno::UNO_QUERY);
+bool bIsSplitAllowed{};
+xFrame->getPropertyValue("IsSplitAllowed") >>= bIsSplitAllowed;
+CPPUNIT_ASSERT(bIsSplitAllowed);
+};
+createSwDoc("tdf109063.docx");
+verify();
+reload(mpFilter, "tdf109063.docx");
+verify();
}
CPPUNIT_TEST_FIXTURE(DocmTest, testTdf108269)
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit e1c334008552fc667715f81c9d82ecfb499c8098
Author: Miklos Vajna
AuthorDate: Tue Mar 21 08:17:46 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 24 07:04:05 2023 +
sw floattable, CppunitTest_sw_ooxmlexport9: assert the layout in
testTdf107889
The point is that the table is multi-page, which is preserved. The
detail that it's not in a fly is no longer true.
(cherry picked from commit 8bc607225e6bc9ba343e2292f9185b6491108e44)
Change-Id: I63ee8182638a2f0118584f5e985abaf1c3d7e337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149285
Tested-by: Miklos Vajna
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a066f88ba13b..f4e7d4581f49 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1156,10 +1156,18 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107033,
"tdf107033.docx")
}
#if HAVE_MORE_FONTS
-DECLARE_OOXMLEXPORT_TEST(testTdf107889, "tdf107889.docx")
-{
-// This was 1, multi-page table was imported as a floating one.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_TEST_FIXTURE(Test, testTdf107889)
+{
+SwModelTestBase::FlySplitGuard aGuard;
+auto verify = [this]() {
+// This was 1, multi-page table was imported as a non-split fly.
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//tab", 2);
+};
+createSwDoc("tdf107889.docx");
+verify();
+reload(mpFilter, "tdf107889.docx");
+verify();
}
#endif
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/hffrm.hxx|2 ++
sw/source/core/layout/hffrm.cxx | 13 +
sw/source/core/text/xmldump.cxx |3 ---
3 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit c586d7f1f8370c9e6334c6f38b5ed883212945c7
Author: Miklos Vajna
AuthorDate: Thu Mar 23 22:07:25 2023 +0100
Commit: Miklos Vajna
CommitDate: Fri Mar 24 07:03:05 2023 +
sw layout xml dump: extract SwFooterFrame::dumpAsXml() from SwFrame
Ideally SwFrame should not really know anything about footers.
Change-Id: I5fe349b0a9bf11f84649d6f274c2620b7563174d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149472
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index d8f9f0556265..32af4dab9e30 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -53,6 +53,8 @@ class SwFooterFrame final : public SwHeadFootFrame
{
public:
SwFooterFrame( SwFrameFormat* pFrame, SwFrame* pSib ) :
SwHeadFootFrame(pFrame, pSib, SwFrameType::Footer) {};
+
+void dumpAsXml(xmlTextWriterPtr writer = nullptr) const override;
};
#endif
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 10c69f9a9bc1..e15b308176df 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -778,4 +778,17 @@ void SwHeaderFrame::dumpAsXml(xmlTextWriterPtr writer)
const
(void)xmlTextWriterEndElement(writer);
}
+void SwFooterFrame::dumpAsXml(xmlTextWriterPtr writer) const
+{
+(void)xmlTextWriterStartElement(writer, reinterpret_cast("footer"));
+dumpAsXmlAttributes(writer);
+
+(void)xmlTextWriterStartElement(writer, BAD_CAST("infos"));
+dumpInfosAsXml(writer);
+(void)xmlTextWriterEndElement(writer);
+dumpChildrenAsXml(writer);
+
+(void)xmlTextWriterEndElement(writer);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index a7db17625cf9..5544943f3dd0 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -174,9 +174,6 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const
switch ( GetType( ) )
{
-case SwFrameType::Footer:
-name = "footer";
-break;
case SwFrameType::FtnCont:
name = "ftncont";
break;
