[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - i18npool/inc i18npool/source
i18npool/inc/cclass_unicode.hxx|6 +++-
i18npool/inc/transliteration_body.hxx | 11 ++-
i18npool/source/characterclassification/cclass_unicode.cxx | 19 -
i18npool/source/transliteration/transliteration_body.cxx |8 -
4 files changed, 27 insertions(+), 17 deletions(-)
New commits:
commit 2eed1c83d0026d0af3e7363da9a90b5e99e69b88
Author: Noel Grandin
AuthorDate: Sat Mar 12 14:50:28 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 14 08:24:10 2022 +0100
tdf#147905 calc PROPER function doesn't like mulithreading
regression from
commit dac29c278531d5474289eb54aa03987c4958ac83
Author: Noel Grandin
Date: Thu Sep 16 11:03:04 2021 +0200
if you hit Transliteration_casemapping hard enough, like
in this test case, the state changes become a problem, so
remove that by having multiple copies.
Change-Id: I1d795af4370d6f79468387997202ba11c6a9d7b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131441
Tested-by: Jenkins
Reviewed-by: Noel Grandin
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131508
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 4ae4f5fd362e..4f63b8ea889b 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -94,7 +94,11 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
private:
-rtl::Reference trans;
+// These are performance sensitive, so we don't want to use locking and
switch their state, so just
+// have multiple copies.
+rtl::Reference transToUpper;
+rtl::Reference transToLower;
+rtl::Reference transToTitle;
// --- parser specific (implemented in cclass_unicode_parser.cxx) ---
diff --git a/i18npool/inc/transliteration_body.hxx
b/i18npool/inc/transliteration_body.hxx
index a53aa77d15d2..6c3418fd7994 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -70,7 +70,16 @@ class Transliteration_casemapping final : public
Transliteration_body
{
public:
Transliteration_casemapping();
-void setMappingType(const MappingType rMappingType, const
css::lang::Locale& rLocale );
+void setMappingType( const MappingType rMappingType )
+{
+if (nMappingType != rMappingType)
+nMappingType = rMappingType;
+}
+void setLocale( const css::lang::Locale& rLocale )
+{
+if (aLocale != rLocale)
+aLocale = rLocale;
+}
};
class Transliteration_togglecase final : public Transliteration_body
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx
b/i18npool/source/characterclassification/cclass_unicode.cxx
index 2eb3fdf5f27d..13ea1f687b56 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -39,7 +39,9 @@ namespace i18npool {
// ;
cclass_Unicode::cclass_Unicode( const uno::Reference < XComponentContext >&
rxContext ) :
-trans( new Transliteration_casemapping() ),
+transToUpper( new Transliteration_casemapping() ),
+transToLower( new Transliteration_casemapping() ),
+transToTitle( new Transliteration_casemapping() ),
m_xContext( rxContext ),
nStartTypes( 0 ),
nContTypes( 0 ),
@@ -48,6 +50,9 @@ cclass_Unicode::cclass_Unicode( const uno::Reference <
XComponentContext >& rxCo
cDecimalSep( '.' ),
cDecimalSepAlt( 0 )
{
+transToUpper->setMappingType(MappingType::ToUpper);
+transToLower->setMappingType(MappingType::ToLower);
+transToTitle->setMappingType(MappingType::ToTitle);
}
cclass_Unicode::~cclass_Unicode() {
@@ -63,8 +68,8 @@ cclass_Unicode::toUpper( const OUString& Text, sal_Int32
nPos, sal_Int32 nCount,
if (nCount + nPos > len)
nCount = len - nPos;
-trans->setMappingType(MappingType::ToUpper, rLocale);
-return trans->transliterateString2String(Text, nPos, nCount);
+transToUpper->setLocale(rLocale);
+return transToUpper->transliterateString2String(Text, nPos, nCount);
}
OUString SAL_CALL
@@ -75,8 +80,8 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32
nPos, sal_Int32 nCount,
if (nCount + nPos > len)
nCount = len - nPos;
-trans->setMappingType(MappingType::ToLower, rLocale);
-return trans->transliterateString2String(Text, nPos, nCount);
+transToLower->setLocale(rLocale);
+return transToLower->transliterateString2String(Text, nPos, nCount);
}
OUString SAL_CALL
@@ -89,7 +94,7 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32
nPos, sal_Int32 nCount,
if (nCount + nPos > len)
nCount = len - nPos;
-trans->setMappingType(MappingType::ToTitle, rLocale);
+
[Libreoffice-commits] core.git: basic/inc compilerplugins/clang forms/source include/comphelper include/editeng include/filter include/formula include/oox include/svx starmath/inc sw/inc sw/source vcl
basic/inc/sbxfac.hxx |1
compilerplugins/clang/trivialconstructor.cxx | 146 +++
forms/source/xforms/namedcollection.hxx |1
include/comphelper/SelectionMultiplex.hxx|1
include/editeng/editview.hxx |1
include/editeng/svxacorr.hxx |1
include/filter/msfilter/escherex.hxx |2
include/formula/IFunctionDescription.hxx |4
include/oox/drawingml/chart/modelbase.hxx|4
include/svx/gridctrl.hxx |1
starmath/inc/parsebase.hxx |1
sw/inc/IDocumentExternalData.hxx |1
sw/source/core/inc/SwPortionHandler.hxx |2
vcl/inc/salmenu.hxx |2
vcl/inc/salsys.hxx |1
15 files changed, 146 insertions(+), 23 deletions(-)
New commits:
commit ef82ccdda93186b4cab55aeac3844295194120a4
Author: Noel Grandin
AuthorDate: Fri Mar 11 10:48:06 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 14 07:36:13 2022 +0100
new loplugin:trivialconstructor
Change-Id: Iaaf63c49ce94987ab9c4ebc68e963cc3054a3c34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131342
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/inc/sbxfac.hxx b/basic/inc/sbxfac.hxx
index bbdbcb018f0b..5493a6687e00 100644
--- a/basic/inc/sbxfac.hxx
+++ b/basic/inc/sbxfac.hxx
@@ -26,7 +26,6 @@ class SbxFactory
{
public:
virtual ~SbxFactory();
-SbxFactory() {}
virtual SbxBaseRef Create(sal_uInt16 nSbxId, sal_uInt32);
virtual SbxObjectRef CreateObject(const OUString&);
};
diff --git a/compilerplugins/clang/trivialconstructor.cxx
b/compilerplugins/clang/trivialconstructor.cxx
new file mode 100644
index ..6f5bb640b760
--- /dev/null
+++ b/compilerplugins/clang/trivialconstructor.cxx
@@ -0,0 +1,146 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include "plugin.hxx"
+#include "check.hxx"
+#include "config_clang.h"
+#include "clang/AST/CXXInheritance.h"
+#include "clang/AST/StmtVisitor.h"
+
+// Look for declared constructors that can be trivial (and therefore don't
need to be declared)
+
+namespace
+{
+class TrivialConstructor : public loplugin::FilteringPlugin
+{
+public:
+explicit TrivialConstructor(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
+}
+
+virtual void run() override {
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitCXXConstructorDecl(CXXConstructorDecl const*);
+
+private:
+bool HasTrivialConstructorBody(const CXXRecordDecl* BaseClassDecl,
+ const CXXRecordDecl* MostDerivedClassDecl);
+bool FieldHasTrivialConstructorBody(const FieldDecl* Field);
+};
+
+bool TrivialConstructor::VisitCXXConstructorDecl(CXXConstructorDecl const*
constructorDecl)
+{
+if (ignoreLocation(constructorDecl))
+return true;
+if (!constructorDecl->hasTrivialBody())
+return true;
+if (constructorDecl->isExplicit())
+return true;
+if (!constructorDecl->isDefaultConstructor())
+return true;
+if (!constructorDecl->inits().empty())
+return true;
+if (constructorDecl->getExceptionSpecType() != EST_None)
+return true;
+if (constructorDecl->getAccess() != AS_public)
+return true;
+if (!constructorDecl->isThisDeclarationADefinition())
+return true;
+if (isInUnoIncludeFile(
+
compiler.getSourceManager().getSpellingLoc(constructorDecl->getLocation(
+return true;
+const CXXRecordDecl* recordDecl = constructorDecl->getParent();
+if (std::distance(recordDecl->ctor_begin(), recordDecl->ctor_end()) != 1)
+return true;
+if (!HasTrivialConstructorBody(recordDecl, recordDecl))
+return true;
+
+// template magic in sc/inc/stlalgorithm.hxx
+if (recordDecl->getIdentifier() && recordDecl->getName() ==
"AlignedAllocator")
+return true;
+
+report(DiagnosticsEngine::Warning, "no need for explicit constructor decl",
+ constructorDecl->getLocation())
+<< constructorDecl->getSourceRange();
+if (constructorDecl->getCanonicalDecl() != constructorDecl)
+{
+constructorDecl = constructorDecl->getCanonicalDecl();
+report(DiagnosticsEngine::Warning, "no need for explicit constructor
decl",
+ constructorDecl->getLocation())
+<< constructorDecl->getSourceRange();
+}
+return true;
+}
+
+bool TrivialConstructor::HasTrivialConstructorBody(const
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source
sw/source/core/edit/autofmt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bcd3275a8c2088308970e012cf39c4753f5e582a
Author: Noel Grandin
AuthorDate: Sun Mar 13 19:15:20 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 14 08:27:23 2022 +0100
tdf#147961 Crash Typing "++" and press Enter (AutoCorrect Create Table)
regression from
commit 7cd5b35caa8d4fa9d0ba2b2c6ce4b88726ed2be6
Author: Noel Grandin
Date: Fri Sep 24 13:21:35 2021 +0200
return SwCursor from IShellCursorSupplier
Change-Id: I6a4e3f90653dc96a91091be1372f27c6303ba346
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131505
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 7c7f00a89a675dad541d32ea60695a7b11210102)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131470
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 6df314ae55c2..5b41af36d30c 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2374,7 +2374,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell,
SvxSwAutoFormatFlags const &
{
//JP 30.09.96: DoTable() builds on PopCursor and
MoveCursor after AutoFormat!
pEdShell->Pop(SwCursorShell::PopMode::DeleteCurrent);
-*pEdShell->GetCursor() = static_cast(m_aDelPam);
+static_cast(*pEdShell->GetCursor()) = m_aDelPam;
pEdShell->Push();
eStat = IS_END;
[Libreoffice-commits] core.git: 2 commits - include/vcl sc/source vcl/source
include/vcl/glyphitemcache.hxx | 69
sc/source/ui/view/output2.cxx | 55 +++
vcl/source/gdi/impglyphitem.cxx | 46 ++
3 files changed, 121 insertions(+), 49 deletions(-)
New commits:
commit 89fb3f7e87fd7ab9312bc43dffea842ffc34b140
Author: Luboš Luňák
AuthorDate: Fri Mar 11 17:48:41 2022 +0100
Commit: Luboš Luňák
CommitDate: Mon Mar 14 08:38:09 2022 +0100
cache also failures in SalLayoutGlyphsCache
This is what 3f69ec9ab4236de13d229f675943123aeb42ea29 did in Writer.
Change-Id: I40fb49ce83fd24f16050318c523d87603300b06d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131392
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index 0d8c2241a21e..1fefe68994d2 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -99,8 +99,15 @@ SalLayoutGlyphsCache::GetLayoutGlyphs(const OUString& text,
VclPtr
{
const CachedGlyphsKey key(text, outputDevice);
auto it = mCachedGlyphs.find(key);
-if (it != mCachedGlyphs.end() && it->second.IsValid())
-return >second;
+if (it != mCachedGlyphs.end())
+{
+if (it->second.IsValid())
+return >second;
+// Do not try to create the layout here. If a cache item exists, it's
already
+// been attempted and the layout was invalid (this happens with
MultiSalLayout).
+// So in that case this is a cached failure.
+return nullptr;
+}
std::unique_ptr layout = outputDevice->ImplLayout(
text, 0, text.getLength(), Point(0, 0), 0, {},
SalLayoutFlags::GlyphItemsOnly);
if (layout)
commit 3e3ef58be1c27e0ac32b0b5694f673f603d23224
Author: Luboš Luňák
AuthorDate: Fri Mar 11 17:47:40 2022 +0100
Commit: Luboš Luňák
CommitDate: Mon Mar 14 08:37:53 2022 +0100
move cache for SalLayoutGlyph's from Calc to VCL
For reuse later.
Change-Id: I43479148a8312a36e56f267435e77acc8bf9bd35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131390
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/include/vcl/glyphitemcache.hxx b/include/vcl/glyphitemcache.hxx
new file mode 100644
index ..8afc8da0bae6
--- /dev/null
+++ b/include/vcl/glyphitemcache.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_GLYPHITEMCACHE_HXX
+#define INCLUDED_VCL_GLYPHITEMCACHE_HXX
+
+#include
+#include
+
+#include
+#include
+#include
+
+/**
+A cache for SalLayoutGlyphs objects.
+
+Allows caching for OutputDevice::DrawText() and similar calls. Pass the text
and the output device
+for the call to OutputDevice::ImplLayout(). Items are cached per output device
and its font.
+If something more changes, call clear().
+*/
+class VCL_DLLPUBLIC SalLayoutGlyphsCache final
+{
+public:
+SalLayoutGlyphsCache(int size = 1000)
+: mCachedGlyphs(size)
+{
+}
+const SalLayoutGlyphs* GetLayoutGlyphs(const OUString& text,
+ VclPtr outputDevice)
const;
+void clear() { mCachedGlyphs.clear(); }
+
+private:
+struct CachedGlyphsKey
+{
+OUString text;
+VclPtr outputDevice;
+size_t hashValue;
+CachedGlyphsKey(const OUString& t, const VclPtr& dev);
+bool operator==(const CachedGlyphsKey& other) const;
+};
+struct CachedGlyphsHash
+{
+size_t operator()(const CachedGlyphsKey& key) const { return
key.hashValue; }
+};
+mutable o3tl::lru_map
mCachedGlyphs;
+
+SalLayoutGlyphsCache(const SalLayoutGlyphsCache&) = delete;
+SalLayoutGlyphsCache& operator=(const SalLayoutGlyphsCache&) = delete;
+};
+
+#endif // INCLUDED_VCL_GLYPHITEMCACHE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ab8e08c9d06f..0c394b0f7945 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -54,6 +54,7 @@
#include
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/svx sc/qa svx/source
include/svx/svdedtv.hxx |2 -
sc/qa/unit/tiledrendering/tiledrendering.cxx | 33 +--
svx/source/svdraw/svdedtv.cxx|7 +++--
3 files changed, 36 insertions(+), 6 deletions(-)
New commits:
commit 419e9bd76382f5161a81694c5dbc0784eeda708e
Author: Szymon Kłos
AuthorDate: Wed Mar 9 16:41:36 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 08:42:20 2022 +0100
svx: don't remove object right after insertion
This is regression from:
commit 2d95b3846eac367d2baadc194ab258dc31e7bd33
Author: Tomaz Vajngerl
Date: Thu Oct 7 16:48:46 2021 +0200
svx: Don't end text edit mode for all views
It was visible with "direct insertion" where user doesn't
need to draw anything but textbox is inserted in the center
of a screen (eg. used in LOK case)
Object was inserted into a view and right after that was removed when
EndTextEditCurrentView was called
Change-Id: I9943d46746aabadf96d76d6e74770b56d648b79d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131263
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index cf9955edcb15..87da3dadc39d 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -188,7 +188,7 @@ public:
* Checks if this or other views have an active text edit, if true, end
them.
*/
void EndTextEditAllViews() const;
-void EndTextEditCurrentView();
+void EndTextEditCurrentView(bool bDontDeleteReally = false);
std::vector< std::unique_ptr > CreateConnectorUndo(
SdrObject& rO );
void AddUndoActions( std::vector< std::unique_ptr > );
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index e7826eb5e227..b9b7e698c081 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -124,6 +124,7 @@ public:
void testEditCursorBounds();
void testTextSelectionBounds();
void testSheetViewDataCrash();
+void testTextBoxInsert();
CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
CPPUNIT_TEST(testRowColumnHeaders);
@@ -177,6 +178,7 @@ public:
CPPUNIT_TEST(testEditCursorBounds);
CPPUNIT_TEST(testTextSelectionBounds);
CPPUNIT_TEST(testSheetViewDataCrash);
+CPPUNIT_TEST(testTextBoxInsert);
CPPUNIT_TEST_SUITE_END();
private:
@@ -472,7 +474,12 @@ struct EditCursorMessage final {
std::stringstream aStream(pMessage);
boost::property_tree::ptree aTree;
boost::property_tree::read_json(aStream, aTree);
-std::string aVal =
aTree.get_child("refpoint").get_value();
+std::string aVal;
+boost::property_tree::ptree::const_assoc_iterator it =
aTree.find("refpoint");
+if (it != aTree.not_found())
+aVal = aTree.get_child("refpoint").get_value();
+else
+return; // happens in testTextBoxInsert test
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
@@ -836,7 +843,7 @@ void ScTiledRenderingTest::testViewLock()
CPPUNIT_ASSERT(!aView1.m_bViewLock);
}
-static void lcl_extractHandleParameters(const OString& selection, int& id,
int& x, int& y)
+void lcl_extractHandleParameters(const OString& selection, int& id, int& x,
int& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -2888,6 +2895,28 @@ void ScTiledRenderingTest::testSheetViewDataCrash()
Scheduler::ProcessEventsToIdle();
}
+void ScTiledRenderingTest::testTextBoxInsert()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("empty.ods");
+ViewCallback aView1;
+
+// insert textbox
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({
+{ "CreateDirectly", uno::Any(true) }
+}));
+comphelper::dispatchCommand(".uno:DrawText", aArgs);
+Scheduler::ProcessEventsToIdle();
+
+// check if we have textbox selected
+CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
+CPPUNIT_ASSERT(aView1.m_ShapeSelection != "EMPTY");
+
+Scheduler::ProcessEventsToIdle();
+}
+
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 6f2be8bf54f4..b383d2302ce7 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -998,7 +998,8 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj,
SdrPageView& rPV, SdrInser
}
if( IsUndoEnabled())
{
-EndTextEditCurrentView();
+bool bDontDeleteReally = true;
+EndTextEditCurrentView(bDontDeleteReally);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
}
@@ -1069,13 +1070,13 @@ void
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/source svx/sdi
sc/source/ui/view/tabvwsh2.cxx | 11 +--
svx/sdi/svx.sdi|2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 0d069f8eeb25e59802c0a8d9cd05287f40aced1f
Author: Szymon Kłos
AuthorDate: Wed Mar 9 21:32:35 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 08:42:12 2022 +0100
lok: insert textbox directly in Calc
Change-Id: I3ae00b255dfbaa34ab8d973356d12dfd0f71d345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131267
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 6644c28098d5..1b9548364be5 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -261,6 +261,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
case SID_DRAW_TEXT_MARQUEE:
case SID_DRAW_NOTEEDIT:
pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, pDoc,
aNewReq));
+bCreateDirectly = comphelper::LibreOfficeKit::isActive();
break;
case SID_FM_CREATE_CONTROL:
@@ -331,7 +332,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
}
else
{
-GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT,
SfxCallMode::ASYNCHRON);
ScViewData& rViewData = GetViewData();
tools::Long nLayoutSign =
rViewData.GetDocument().IsLayoutRTL(rViewData.GetTabNo()) ? -1 : 1;
aInsertPos = rViewData.getLOKVisibleArea().Center();
@@ -367,13 +367,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
// insert into page
pView->InsertObjectAtView(pObj.release(), *pPageView);
-if ( nNewId == SID_DRAW_CAPTION || nNewId == SID_DRAW_CAPTION_VERTICAL )
+switch ( nNewId )
{
+case SID_DRAW_CAPTION:
+case SID_DRAW_CAPTION_VERTICAL:
+case SID_DRAW_TEXT:
+case SID_DRAW_TEXT_VERTICAL:
// use KeyInput to start edit mode (FuText is created).
// For FuText objects, edit mode is handled within
CreateDefaultObject.
// KEY_F2 is handled in FuDraw::KeyInput.
pFuActual->KeyInput( KeyEvent( 0, vcl::KeyCode( KEY_F2 ) ) );
+break;
+default:
+break;
}
}
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 81a6909b0757..e905cd0daca1 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8508,7 +8508,7 @@ SfxBoolItem Text SID_ATTR_CHAR
SfxBoolItem DrawText SID_DRAW_TEXT
-
+(SfxBoolItem CreateDirectly FN_PARAM_1)
[
AutoUpdate = TRUE,
FastCall = FALSE,
[Libreoffice-commits] core.git: include/vcl svx/source vcl/source
include/vcl/fieldvalues.hxx|6 +-
svx/source/dialog/svxruler.cxx |4 ++--
vcl/source/app/svdata.cxx |4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 5337675a31a4aad5151691b9c7587bd4b3140715
Author: Stephan Bergmann
AuthorDate: Mon Mar 14 08:05:40 2022 +0100
Commit: Stephan Bergmann
CommitDate: Mon Mar 14 10:39:48 2022 +0100
Simplify vcl::EnglishStringToMetric
Change-Id: I10b93a073a58c175d487b7aac3a65d461974eb6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131514
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/vcl/fieldvalues.hxx b/include/vcl/fieldvalues.hxx
index b00fc5a47128..999f3e5fa355 100644
--- a/include/vcl/fieldvalues.hxx
+++ b/include/vcl/fieldvalues.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_FIELDVALUES_HXX
#define INCLUDED_VCL_FIELDVALUES_HXX
+#include
+
+#include
+
#include
#include
#include
@@ -29,7 +33,7 @@ class LocaleDataWrapper;
namespace vcl
{
-VCL_DLLPUBLIC FieldUnit EnglishStringToMetric(const OUString&
rEnglishMetricString);
+VCL_DLLPUBLIC FieldUnit EnglishStringToMetric(std::string_view
rEnglishMetricString);
VCL_DLLPUBLIC bool TextToValue(const OUString& rStr, double& rValue, sal_Int64
nBaseValue,
sal_uInt16 nDecDigits, const LocaleDataWrapper&
rLocaleDataWrapper,
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ddbf54445a76..ca680dd09bb9 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3267,7 +3267,7 @@ void SvxRuler::MenuSelect(std::string_view ident)
if (ident.empty())
return;
/* Handler of the context menus for switching the unit of measurement */
-SetUnit(vcl::EnglishStringToMetric(OUString::fromUtf8(ident)));
+SetUnit(vcl::EnglishStringToMetric(ident));
}
void SvxRuler::TabMenuSelect(const OString& rIdent)
@@ -3348,7 +3348,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent
)
for ( sal_uInt16 i = nCount; i; --i )
{
OString sIdent = xMenu->get_id(i - 1);
-FieldUnit eMenuUnit =
vcl::EnglishStringToMetric(OUString::fromUtf8(sIdent));
+FieldUnit eMenuUnit = vcl::EnglishStringToMetric(sIdent);
xMenu->set_active(sIdent, eMenuUnit == eUnit);
if( bReduceMetric )
{
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index cb553176cc36..68884767406b 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -279,12 +279,12 @@ const FieldUnitStringList& ImplGetFieldUnits()
namespace vcl
{
-FieldUnit EnglishStringToMetric(const OUString& rEnglishMetricString)
+FieldUnit EnglishStringToMetric(std::string_view rEnglishMetricString)
{
sal_uInt32 nUnits = SAL_N_ELEMENTS(SV_FUNIT_STRINGS);
for (sal_uInt32 i = 0; i < nUnits; ++i)
{
-if (rEnglishMetricString.toUtf8() ==
SV_FUNIT_STRINGS[i].first.mpId)
+if (rEnglishMetricString == SV_FUNIT_STRINGS[i].first.mpId)
return SV_FUNIT_STRINGS[i].second;
}
return FieldUnit::NONE;
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f34adef94825244b9834905f7cffb96505de5d2d Author: Alain Romedenne AuthorDate: Mon Mar 14 11:04:57 2022 +0100 Commit: Gerrit Code Review CommitDate: Mon Mar 14 11:04:57 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 8b84a4ae1df2b644e612cbc2544ba9dc8b8cecf5 - CallByname basic example correction Change-Id: Iccfbb52d678cae4c6ce100cfa41576f207120bb2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131204 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 9760c1727589..8b84a4ae1df2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9760c17275898f3853f7b1d3e17ffb522a223318 +Subproject commit 8b84a4ae1df2b644e612cbc2544ba9dc8b8cecf5
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/CallByName.xhp | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 8b84a4ae1df2b644e612cbc2544ba9dc8b8cecf5
Author: Alain Romedenne
AuthorDate: Wed Mar 9 17:08:57 2022 +0100
Commit: Alain Romedenne
CommitDate: Mon Mar 14 11:04:55 2022 +0100
CallByname basic example correction
Change-Id: Iccfbb52d678cae4c6ce100cfa41576f207120bb2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131204
Tested-by: Jenkins
Reviewed-by: Alain Romedenne
diff --git a/source/text/sbasic/shared/CallByName.xhp
b/source/text/sbasic/shared/CallByName.xhp
index 44be2c9a3..1933be217 100644
--- a/source/text/sbasic/shared/CallByName.xhp
+++ b/source/text/sbasic/shared/CallByName.xhp
@@ -24,6 +24,7 @@
CallByName function
+ API;OfficeFilePicker
@@ -72,7 +73,7 @@
ScriptForge.Platform.Architecture
information is retrieved.
-DisplayDirectory property of https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1ui_1_1dialogs_1_1FilePicker-members.html;
name="FilePicker">com.sun.star.ui.dialogs.FilePicker UNO service is
assigned a value, its content is read twice.
+DisplayDirectory property of https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1ui_1_1dialogs_1_1FilePicker-members.html;
name="FilePicker">com.sun.star.ui.dialogs.FilePicker UNO service is set
to the user home folder, its content is read twice.
@@ -88,10 +89,11 @@
Dim p As Object : p = CreateScriptService("ScriptForge.Platform")
MsgBox CallByName(p, "Architecture", _Get) ' 32bit/64bit
- Dim
uno As Object : uno =
CreateUNOService("com.sun.star.ui.dialogs.FilePicker")
-
CallByName(uno, "DisplayDirectory", _Let, "Libreoffice")
-
MsgBox CallByName(uno, "DisplayDirectory", _Get) ' "LibreOffice"
-
var = CallByName(uno, "getDisplayDirectory", _Get) ' "LibreOffice"
+ Dim
uno As Object : uno =
CreateUNOService("com.sun.star.ui.dialogs.OfficeFilePicker")
+ Dim fs
As Object : fs = CreateScriptService("ScriptForge.FileSystem")
+
CallByName(uno, "DisplayDirectory", _Let, fs.HomeFolder)
+
MsgBox CallByName(uno, "DisplayDirectory", _Get)
+
var = CallByName(uno, "getDisplayDirectory", _Get)
End
Sub
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hbox.h|4 +++-
hwpfilter/source/hwpreader.cxx |8 +---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit c9a4c8a8ab9933949e14de09e80333a0de6612c5
Author: Caolán McNamara
AuthorDate: Mon Mar 14 08:54:53 2022 +
Commit: Caolán McNamara
CommitDate: Mon Mar 14 11:37:36 2022 +0100
ofz#45525 Null-dereference READ
Change-Id: I9d31b89fc7fa9447823ded4f6891b47100215c0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index b3bdffa74911..f7813b225dd5 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -361,7 +361,9 @@ struct TxtBox: public FBox
/**
* Paragraph list
*/
-std::vector>> plists;
+typedef std::vector> plist_t;
+typedef std::vector plists_t;
+plists_t plists;
/**
* Caption
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 6c757409e8dc..5d364586310a 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3399,7 +3399,9 @@ void HwpReader::makeTable(TxtBox * hbox)
mxList->addAttribute("table:protected", sXML_CDATA,"true");
startEl("table:table-cell");
mxList->clear();
-parsePara(hbox->plists[tcell->pCell->key].front().get());
+TxtBox::plist_t& rVec = hbox->plists[tcell->pCell->key];
+if (!rVec.empty())
+parsePara(rVec.front().get());
endEl("table:table-cell");
}
endEl("table:table-row");
@@ -3513,7 +3515,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
startEl("draw:text-box");
mxList->clear();
/* If captions are present and it is on the top */
-if( hbox->style.cap_len > 0 && (hbox->cap_pos % 2) && hbox->type ==
TBL_TYPE )
+if (hbox->style.cap_len > 0 && (hbox->cap_pos % 2) && hbox->type ==
TBL_TYPE && !hbox->caption.empty())
{
parsePara(hbox->caption.front().get());
}
@@ -3526,7 +3528,7 @@ void HwpReader::makeTextBox(TxtBox * hbox)
parsePara(hbox->plists[0].front().get());
}
/* If captions are present and it is on the bottom */
-if( hbox->style.cap_len > 0 && !(hbox->cap_pos % 2) && hbox->type ==
TBL_TYPE)
+if (hbox->style.cap_len > 0 && !(hbox->cap_pos % 2) && hbox->type ==
TBL_TYPE && !hbox->caption.empty())
{
parsePara(hbox->caption.front().get());
}
[Libreoffice-commits] help.git: AllLangHelp_swriter.mk source/auxiliary source/text
AllLangHelp_swriter.mk|1 source/auxiliary/swriter.tree |1 source/text/shared/01/02230150.xhp|2 source/text/shared/01/02230300.xhp| 12 - source/text/shared/01/02230400.xhp|6 source/text/shared/01/0224.xhp|4 source/text/swriter/track_changes_toolbar.xhp | 246 ++ 7 files changed, 264 insertions(+), 8 deletions(-) New commits: commit e5dbb88dabc1ac5e5d0aa7ba130338690db800cc Author: Olivier Hallot AuthorDate: Fri Mar 11 14:23:09 2022 -0300 Commit: Olivier Hallot CommitDate: Mon Mar 14 12:21:30 2022 +0100 tdf#147862 add Track Change Toolbar help page Change-Id: I5e42059d5175838a8398694980f653cde5655e03 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131397 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 2ac115c02..60751d944 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -421,6 +421,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/menu/insert_frame \ helpcontent2/source/text/swriter/menu/submenu_more_breaks \ helpcontent2/source/text/swriter/mailmergetoolbar \ +helpcontent2/source/text/swriter/track_changes_toolbar \ )) # vim: set noet sw=4 ts=4: diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 4f8168608..2c96b6b4d 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -48,6 +48,7 @@ Formatting Bar Image Bar Table Bar +Track Changes Bar Drawing Object Properties Bar Bullets and Numbering Bar Status Bar diff --git a/source/text/shared/01/02230150.xhp b/source/text/shared/01/02230150.xhp index f4300bb8f..2efadc76e 100644 --- a/source/text/shared/01/02230150.xhp +++ b/source/text/shared/01/02230150.xhp @@ -31,7 +31,7 @@ -Protect Changes +Protect Changes Prevents a user from deactivating the record changes feature, or from accepting or rejecting changes unless the user enters a password. diff --git a/source/text/shared/01/02230300.xhp b/source/text/shared/01/02230300.xhp index 364f5babe..17781eec2 100644 --- a/source/text/shared/01/02230300.xhp +++ b/source/text/shared/01/02230300.xhp @@ -33,14 +33,18 @@ -Comment + + +Insert Track Change Comment Enter a comment for the recorded change. - + + + -You can attach a comment when the cursor is in a changed text passagethe changed cell is selected -, or in the Manage Changes dialog. +You can attach a comment when the cursor is in a changed text passagethe changed cell is selected +, or in the Manage Changes dialog. Comments are displayed as callouts in the sheet when you rest your mouse pointer over a cell with a recorded change. You can also view comments that are attached to a changed cell in the changes list in the Manage Changes dialog. diff --git a/source/text/shared/01/02230400.xhp b/source/text/shared/01/02230400.xhp index f16c7a852..afa5ca708 100644 --- a/source/text/shared/01/02230400.xhp +++ b/source/text/shared/01/02230400.xhp @@ -32,8 +32,12 @@ - Manage changes + + + Manage changes Accept or reject recorded changes. + + diff --git a/source/text/shared/01/0224.xhp b/source/text/shared/01/0224.xhp index 5a7eb811d..c5db1f9fe 100644 --- a/source/text/shared/01/0224.xhp +++ b/source/text/shared/01/0224.xhp @@ -30,7 +30,7 @@ -Compare Document +Compare Document Compares the current document with a document that you select. The contents of the selected document are marked as deletions in the dialog that opens. If you want, you can insert the contents of the selected file into the current document by selecting the relevant deleted entries, clicking Reject, and then clicking Insert. @@ -41,7 +41,7 @@ -The contents of footnotes, headers, frames and fields are ignored. +The contents of footnotes, headers, frames and fields are ignored. diff --git a/source/text/swriter/track_changes_toolbar.xhp b/source/text/swriter/track_changes_toolbar.xhp new file mode 100644 index 0..f80ada419 --- /dev/null +++ b/source/text/swriter/track_changes_toolbar.xhp @@ -0,0 +1,246 @@ + + + + + + +Track Changes Toolbar +/text/swriter/track_changes_toolbar.xhp + + + + + +Track Changes Toolbar +Contains the commands that are available for tracking changes in your file. + + +Choose View - Toolbars - Track Changes. + + + + + + +Icon Show track changes + + + +Show track changes + + + + + + + + +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 98d037c046913e28a517a418a76eba187afcd222 Author: Olivier Hallot AuthorDate: Mon Mar 14 08:21:31 2022 -0300 Commit: Gerrit Code Review CommitDate: Mon Mar 14 12:21:31 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e5dbb88dabc1ac5e5d0aa7ba130338690db800cc - tdf#147862 add Track Change Toolbar help page Change-Id: I5e42059d5175838a8398694980f653cde5655e03 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131397 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8b84a4ae1df2..e5dbb88dabc1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8b84a4ae1df2b644e612cbc2544ba9dc8b8cecf5 +Subproject commit e5dbb88dabc1ac5e5d0aa7ba130338690db800cc
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - lotuswordpro/source
lotuswordpro/source/filter/lwpdrawobj.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit eca150aeb9254a3c04d15be5a6278c2c65bf3fb0 Author: Caolán McNamara AuthorDate: Sun Mar 13 10:48:47 2022 + Commit: Michael Stahl CommitDate: Mon Mar 14 12:28:35 2022 +0100 ofz#45524 string is presumed to be at least length 1 Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131468 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index f1abe2c438f3..a03b6deb8827 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1249,7 +1249,11 @@ void LwpDrawTextArt::Read() - (m_aTextArtRec.aPath[1].n*3 + 1)*4; -if (!m_pStream->good() || m_aTextArtRec.nTextLen > m_pStream->remainingSize()) +if (!m_pStream->good()) +throw BadRead(); +if (m_aTextArtRec.nTextLen > m_pStream->remainingSize()) +throw BadRead(); +if (m_aTextArtRec.nTextLen < 1) throw BadRead(); m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - lotuswordpro/source
lotuswordpro/source/filter/lwpdrawobj.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 806b124218bbd4f5296b35959795599e21aa017c Author: Caolán McNamara AuthorDate: Sun Mar 13 10:48:47 2022 + Commit: Michael Stahl CommitDate: Mon Mar 14 12:28:24 2022 +0100 ofz#45524 string is presumed to be at least length 1 Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131467 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 404bc6aa1b5d..429a818e1af9 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1250,7 +1250,11 @@ void LwpDrawTextArt::Read() - (m_aTextArtRec.aPath[1].n*3 + 1)*4; -if (!m_pStream->good() || m_aTextArtRec.nTextLen > m_pStream->remainingSize()) +if (!m_pStream->good()) +throw BadRead(); +if (m_aTextArtRec.nTextLen > m_pStream->remainingSize()) +throw BadRead(); +if (m_aTextArtRec.nTextLen < 1) throw BadRead(); m_aTextArtRec.pTextString = new sal_uInt8 [m_aTextArtRec.nTextLen];
[Libreoffice-commits] core.git: 2 commits - sc/source vcl/source
sc/source/ui/view/gridwin.cxx |8 +---
sc/source/ui/view/gridwin2.cxx |3 ++-
sc/source/ui/view/tabview3.cxx |4 +++-
vcl/source/window/dockwin.cxx |5 -
vcl/source/window/floatwin.cxx |2 +-
vcl/source/window/window.cxx |7 +--
6 files changed, 20 insertions(+), 9 deletions(-)
New commits:
commit 851560310f93f87d923f39cd0cd01aa18db03ce3
Author: Szymon Kłos
AuthorDate: Thu Mar 3 11:53:49 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 13:21:48 2022 +0100
lok: fix position og autofilter in RTL mode
Change-Id: I73f2b003185c326f4d66c974a2e5aaecb4e0199a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130916
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131513
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 80ab426aa98d..094a3ef184a2 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -509,7 +509,7 @@ tools::Rectangle
FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, co
// compare coordinates in absolute screen coordinates
// Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
-if( pParentWinOutDev->HasMirroredGraphics() )
+if( pParentWinOutDev->HasMirroredGraphics() &&
!comphelper::LibreOfficeKit::isActive() )
{
if(!pReference->IsRTLEnabled() )
pParentWinOutDev->ReMirror(aFloatRect);
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 152d163f3399..453bf8e2ca14 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2712,11 +2712,14 @@ void Window::setPosSizePixel( tools::Long nX,
tools::Long nY,
{
tools::Rectangle aRect( Point ( nX, nY ), Size( nWidth,
nHeight ) );
const OutputDevice *pParentOutDev = pParent->GetOutDev();
-pParentOutDev->ReMirror( aRect );
+if (!comphelper::LibreOfficeKit::isActive())
+pParentOutDev->ReMirror( aRect );
nX = aRect.Left();
}
}
-if( !(nFlags & PosSizeFlags::X) && bHasValidSize &&
pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
+if( !comphelper::LibreOfficeKit::isActive() &&
+!(nFlags & PosSizeFlags::X) && bHasValidSize &&
+pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
{
// RTL: make sure the old right aligned position is not changed
// system windows will always grow to the right
commit 68ff5bf424fd2813cb08dfa7f165e0227cb6a703
Author: Szymon Kłos
AuthorDate: Fri Feb 25 13:22:36 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 13:21:36 2022 +0100
lok: send logic autofilter position
we need to show popup relative to the grid window
Change-Id: Ib0cf66d2c0422b765a3b8035d5499b45e83f768d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130528
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131511
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b5c6965cbcc1..da788bc9aa5b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -909,7 +909,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
nSizeX = nSizeX / fZoomX;
nSizeY = nSizeY / fZoomY;
}
-tools::Rectangle aCellRect(OutputToScreenPixel(aPos), Size(nSizeX,
nSizeY));
+tools::Rectangle aCellRect(bLOKActive ? aPos : OutputToScreenPixel(aPos),
Size(nSizeX, nSizeY));
ScDBData* pDBData = rDoc.GetDBAtCursor(nCol, nRow, nTab,
ScDBDataPortion::AREA);
if (!pDBData)
@@ -1229,7 +1229,8 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW
nRow )
Point aScrPos;
Size aScrSize;
getCellGeometry(aScrPos, aScrSize, mrViewData, nCol, nRow, eWhich);
-DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize,
ScAddress(nCol-1, nRow, nTab), pDPObj);
+bool bLOK = comphelper::LibreOfficeKit::isActive();
+DPLaunchFieldPopupMenu(bLOK ? aScrPos : OutputToScreenPixel(aScrPos),
aScrSize, ScAddress(nCol-1, nRow, nTab), pDPObj);
}
void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW nRow )
@@ -1242,7 +1243,8 @@ void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW
nRow )
Point aScrPos;
Size aScrSize;
getCellGeometry(aScrPos, aScrSize, mrViewData, nCol, nRow, eWhich);
-DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize,
ScAddress(nCol, nRow, nTab), pDPObj);
+bool bLOK = comphelper::LibreOfficeKit::isActive();
+DPLaunchFieldPopupMenu(bLOK ? aScrPos : OutputToScreenPixel(aScrPos),
aScrSize, ScAddress(nCol, nRow, nTab), pDPObj);
}
void
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter3.cxx | 21 +
1 file changed, 21 insertions(+)
New commits:
commit d6c4ec7b00f3fe7b60f6155de4e7564a4dc72c28
Author: Xisco Fauli
AuthorDate: Mon Mar 14 10:41:35 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 13:33:58 2022 +0100
tdf#147961: sw_uiwriter3: Add unittest
Change-Id: I49f4f98d77f0c5e8caa6471e9c938a472a9aaf96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131526
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 28fbddc1147f..4eea50a6529b 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -801,6 +801,27 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf139737)
Scheduler::ProcessEventsToIdle();
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf147961)
+{
+SwDoc* pDoc = createSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+
+pWrtShell->Insert("++");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+
+// Without the fix in place, this test would have crashed here
+pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf147206)
{
SwDoc* pDoc = createSwDoc();
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - connectivity/source
connectivity/source/drivers/firebird/Catalog.hxx |1 +
connectivity/source/drivers/firebird/Tables.cxx | 10 +-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 7dade11c99b412081eff0d5db49ede619e866737
Author: Julien Nabet
AuthorDate: Sat Mar 12 13:59:48 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 13:57:06 2022 +0100
tdf#147309: Recreating a view with same name and in the same session fails
(FB)
Since HSQLDB already worked, just do the same.
Change-Id: I44929cf36179cc3cdff6e61f05899c9a913c78b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131442
Tested-by: Jenkins
Reviewed-by: Julien Nabet
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131447
Reviewed-by: Xisco Fauli
diff --git a/connectivity/source/drivers/firebird/Catalog.hxx
b/connectivity/source/drivers/firebird/Catalog.hxx
index b6bf02f6b69d..3ffb9238eda7 100644
--- a/connectivity/source/drivers/firebird/Catalog.hxx
+++ b/connectivity/source/drivers/firebird/Catalog.hxx
@@ -32,6 +32,7 @@ namespace connectivity::firebird
virtual void refreshUsers() override;
sdbcx::OCollection* getPrivateTables() const { return
m_pTables.get(); }
+sdbcx::OCollection* getPrivateViews() const { return
m_pViews.get(); }
};
} // namespace connectivity::firebird
diff --git a/connectivity/source/drivers/firebird/Tables.cxx
b/connectivity/source/drivers/firebird/Tables.cxx
index 06e6806d0a4f..29662ef12643 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -9,6 +9,7 @@
#include "Table.hxx"
#include "Tables.hxx"
+#include "Views.hxx"
#include "Catalog.hxx"
#include "Util.hxx"
@@ -202,7 +203,14 @@ void Tables::dropObject(sal_Int32 nPosition, const
OUString& sName)
const OUString sQuoteString = m_xMetaData->getIdentifierQuoteString();
m_xMetaData->getConnection()->createStatement()->execute(
-"DROP " + sType + ::dbtools::quoteName(sQuoteString,sName));
+"DROP " + sType + " " + ::dbtools::quoteName(sQuoteString,sName));
+
+if (sType == "VIEW")
+{
+Views* pViews =
static_cast(static_cast(m_rParent).getPrivateViews());
+if ( pViews && pViews->hasByName(sName) )
+pViews->dropByNameImpl(sName);
+}
}
void connectivity::firebird::Tables::appendNew(const OUString& _rsNewTable)
[Libreoffice-commits] core.git: sc/source svx/sdi
sc/source/ui/view/tabvwsh2.cxx | 11 +--
svx/sdi/svx.sdi|2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit a342ac91e21dd45640b7dea063bc04b80f0feb6e
Author: Szymon Kłos
AuthorDate: Wed Mar 9 21:32:35 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 14:16:14 2022 +0100
lok: insert textbox directly in Calc
Change-Id: I3ae00b255dfbaa34ab8d973356d12dfd0f71d345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131267
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131536
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 36b4a2cb9d6e..a1cf1879c12e 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -263,6 +263,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
case SID_DRAW_TEXT_MARQUEE:
case SID_DRAW_NOTEEDIT:
pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, pDoc,
aNewReq));
+bCreateDirectly = comphelper::LibreOfficeKit::isActive();
break;
case SID_FM_CREATE_CONTROL:
@@ -333,7 +334,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
}
else
{
-GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT,
SfxCallMode::ASYNCHRON);
ScViewData& rViewData = GetViewData();
tools::Long nLayoutSign =
rViewData.GetDocument().IsLayoutRTL(rViewData.GetTabNo()) ? -1 : 1;
aInsertPos = rViewData.getLOKVisibleArea().Center();
@@ -369,13 +369,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
// insert into page
pView->InsertObjectAtView(pObj.release(), *pPageView);
-if ( nNewId == SID_DRAW_CAPTION || nNewId == SID_DRAW_CAPTION_VERTICAL )
+switch ( nNewId )
{
+case SID_DRAW_CAPTION:
+case SID_DRAW_CAPTION_VERTICAL:
+case SID_DRAW_TEXT:
+case SID_DRAW_TEXT_VERTICAL:
// use KeyInput to start edit mode (FuText is created).
// For FuText objects, edit mode is handled within
CreateDefaultObject.
// KEY_F2 is handled in FuDraw::KeyInput.
pFuActual->KeyInput( KeyEvent( 0, vcl::KeyCode( KEY_F2 ) ) );
+break;
+default:
+break;
}
}
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index e57e3e5f5938..b4e3e50a2602 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8574,7 +8574,7 @@ SfxBoolItem Text SID_ATTR_CHAR
SfxBoolItem DrawText SID_DRAW_TEXT
-
+(SfxBoolItem CreateDirectly FN_PARAM_1)
[
AutoUpdate = TRUE,
FastCall = FALSE,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - starmath/source
starmath/source/view.cxx | 21 -
1 file changed, 4 insertions(+), 17 deletions(-)
New commits:
commit aa705140c1891599202f918018ef54a6260174ce
Author: Mike Kaganski
AuthorDate: Fri Mar 11 15:19:41 2022 +0300
Commit: Xisco Fauli
CommitDate: Mon Mar 14 14:23:42 2022 +0100
Related: tdf#128610 Avoid use-after-free
Creating SvMemoryStream from string makes it non-owning, i.e. pointing
to the string's memory. So the string must outlive the stream.
Since commit 64bc8b45b5c23efc5fe57585a69aa4263aaf4e83
Date Wed Jul 08 12:31:43 2015 +
i#107734 Support for Math Input Panel in Windows 7
Was only working by chance, when destructor didn't clean the memory
(e.g., in optimized release builds) and the released memory hasn't
been reused yet.
Change-Id: I2e0c195de7bd2aff2889a94ef0f2eb084411933f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131373
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
(cherry picked from commit c964700d16d99d1569373a1eb9a1352fb3512915)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131474
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5bc143ab394b..62e8b01d5348 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1778,31 +1778,18 @@ void SmViewShell::Execute(SfxRequest& rReq)
SfxFilter::GetFilterByName(MATHML_XML);
aClipboardMedium.SetFilter(pMathFilter);
-std::unique_ptr pStrm;
// The text to be imported might asserts encoding
like 'encoding="utf-8"' but FORMAT_STRING is UTF-16.
// Force encoding to UTF-16, if encoding exists.
-bool bForceUTF16 = false;
sal_Int32 nPosL = aString.indexOf("encoding=\"");
-sal_Int32 nPosU = -1;
if ( nPosL >= 0 && nPosL +10 < aString.getLength()
)
{
nPosL += 10;
-nPosU = aString.indexOf( '"',nPosL);
+sal_Int32 nPosU = aString.indexOf( '"',nPosL);
if (nPosU > nPosL)
-{
-bForceUTF16 = true;
-}
+aString = aString.replaceAt(nPosL, nPosU -
nPosL, u"UTF-16");
}
-if ( bForceUTF16 )
-{
-OUString aNewString = aString.replaceAt(
nPosL, nPosU-nPosL, u"UTF-16");
-pStrm.reset(new SvMemoryStream(
const_cast(aNewString.getStr()), aNewString.getLength() *
sizeof(sal_Unicode), StreamMode::READ));
-}
-else
-{
-pStrm.reset(new SvMemoryStream(
const_cast(aString.getStr()), aString.getLength() *
sizeof(sal_Unicode), StreamMode::READ));
-}
-uno::Reference xStrm2( new
::utl::OInputStreamWrapper(*pStrm) );
+SvMemoryStream aStrm( const_cast(aString.getStr()), aString.getLength() * sizeof(sal_Unicode),
StreamMode::READ);
+uno::Reference xStrm2( new
::utl::OInputStreamWrapper(aStrm) );
aClipboardMedium.setStreamToLoadFrom(xStrm2, true
/*bIsReadOnly*/);
InsertFrom(aClipboardMedium);
GetDoc()->UpdateText();
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crstate.hxx|4 ++--
sw/source/core/layout/trvlfrm.cxx |6 +++---
sw/source/core/text/frmcrsr.cxx | 12 ++--
sw/source/core/text/itrcrsr.cxx | 30 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 22be1665dc6eb28ea1d52c7c5e4347628fc5a76b
Author: Noel Grandin
AuthorDate: Mon Mar 14 14:03:56 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 14 14:55:04 2022 +0100
tdf#147143 Word selection error in Arabic text
this reverts
commit 563af8fd15aa37e75af8882cccbdf8914ebe8e61
Author: Noel Grandin
Date: Fri Jan 7 22:50:29 2022 +0200
tdf#144890 Invalid selection area when text in LTR run
and
commit ec50b9e5eaec7c94df35617676077ef0d65cecc7
Author: Noel Grandin
Date: Thu May 27 11:16:11 2021 +0200
no need to allocate Sw2LinesPos separately on heap
No idea why the commits caused trouble, clearing there is some
"interesting" interaction going on.
Change-Id: I606768403db777b61554f378d3f69f9b4d33d493
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131533
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index f3430c714787..9b223319fd93 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -23,7 +23,7 @@
#include
#include "swrect.hxx"
-#include
+#include
enum class SwFillMode
{
@@ -132,7 +132,7 @@ enum class CursorMoveState
struct SwCursorMoveState
{
SwFillCursorPos *m_pFill; ///< for automatic filling with tabs etc
-std::optional m_x2Lines; ///< for selections inside/around
2line portions
+std::unique_ptr m_p2Lines; ///< for selections
inside/around 2line portions
SwSpecialPos* m_pSpecialPos; ///< for positions inside fields
Point m_aRealHeight; ///< contains then the position/height of
the cursor
CursorMoveState m_eState;
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 0e99d2b3bd0a..6942dab6a2ba 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2124,11 +2124,11 @@ void SwRootFrame::CalcFrameRects(SwShellCursor )
//ContentRects to Start- and EndFrames.
SwRect aStRect, aEndRect;
pStartFrame->GetCharRect( aStRect, *pStartPos, );
-std::optional pSt2Pos = std::move(aTmpState.m_x2Lines);
+std::unique_ptr pSt2Pos = std::move(aTmpState.m_p2Lines);
aTmpState.m_nCursorBidiLevel = pEndFrame->IsRightToLeft() ? 1 : 0;
pEndFrame->GetCharRect( aEndRect, *pEndPos, );
-std::optional pEnd2Pos = std::move(aTmpState.m_x2Lines);
+std::unique_ptr pEnd2Pos = std::move(aTmpState.m_p2Lines);
SwRect aStFrame ( pStartFrame->UnionFrame( true ) );
aStFrame.Intersection( pStartFrame->GetPaintArea() );
@@ -2145,7 +2145,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor )
// If there's no doubleline portion involved or start and end are both
// in the same doubleline portion, all works fine, but otherwise
// we need the following...
-if( (!pSt2Pos && !pEnd2Pos) && ( !pSt2Pos || !pEnd2Pos ||
+if( pSt2Pos != pEnd2Pos && ( !pSt2Pos || !pEnd2Pos ||
pSt2Pos->aPortion != pEnd2Pos->aPortion ) )
{
// If we have a start(end) position inside a doubleline portion
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 0eb130848f3d..58792ecf80d6 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -307,10 +307,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition ,
{
if ( pFrame->IsRightToLeft() )
{
-if( pCMS->m_b2Lines && pCMS->m_x2Lines)
+if( pCMS->m_b2Lines && pCMS->m_p2Lines)
{
-pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aLine );
-pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aPortion );
+pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aLine );
+pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aPortion );
}
}
@@ -327,10 +327,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition ,
pCMS->m_aRealHeight.Y() );
}
}
-if( pCMS->m_b2Lines && pCMS->m_x2Lines)
+if( pCMS->m_b2Lines && pCMS->m_p2Lines)
{
-pFrame->SwitchHorizontalToVertical( pCMS->m_x2Lines->aLine
);
-pFrame->SwitchHorizontalToVertical(
pCMS->m_x2Lines->aPortion );
+pFrame->SwitchHorizontalToVertical( pCMS->m_p2Lines->aLine
);
+pFrame->SwitchHorizontalToVertical(
pCMS->m_p2Lines->aPortion );
}
}
diff --git a/sw/source/core/text/itrcrsr.cxx
[Libreoffice-commits] core.git: filter/source include/filter oox/source
filter/source/msfilter/escherex.cxx|3 +--
filter/source/msfilter/util.cxx|8
include/filter/msfilter/util.hxx |4 ++--
oox/source/export/DMLPresetShapeExport.cxx |8 +++-
oox/source/export/shapes.cxx |2 +-
5 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit d67017bfe251c71ac1345615d9a3080a7fefdf32
Author: Noel Grandin
AuthorDate: Mon Mar 14 11:30:45 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 14 13:14:55 2022 +0100
simplify GetOOXMLPresetGeometry
all the call sites are using OUString, so push the utf8 conversion
into the function
Change-Id: I875249b8702cde63737fd42dc1d1592be059cc11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131525
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 3f817a72bcb1..3e79fe28a8b1 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3717,8 +3717,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType(
const uno::Reference< drawi
// In case of VML export, try to handle the
// ooxml- prefix in rShapeType. If that fails,
// just do the same as the binary export.
-OString aType = OUStringToOString(rShapeType,
RTL_TEXTENCODING_UTF8);
-eShapeType =
msfilter::util::GETVMLShapeType(aType);
+eShapeType =
msfilter::util::GETVMLShapeType(rShapeType);
if (eShapeType == mso_sptNil)
eShapeType =
EnhancedCustomShapeTypeNames::Get(rShapeType);
}
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 23b4de1e87be..d0e4b24fe08c 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1215,7 +1215,7 @@ struct {
{"textBox", mso_sptTextBox},
};
-const char* GetOOXMLPresetGeometry( const char* sShapeType )
+const char* GetOOXMLPresetGeometry( const OUString& rShapeType )
{
typedef std::unordered_map< const char*, const char*, rtl::CStringHash,
rtl::CStringEqual> CustomShapeTypeTranslationHashMap;
static CustomShapeTypeTranslationHashMap
aCustomShapeTypeTranslationHashMap = []()
@@ -1228,11 +1228,11 @@ const char* GetOOXMLPresetGeometry( const char*
sShapeType )
return tmp;
}();
CustomShapeTypeTranslationHashMap::iterator i(
-aCustomShapeTypeTranslationHashMap.find(sShapeType));
+aCustomShapeTypeTranslationHashMap.find(rShapeType.toUtf8().getStr()));
return i == aCustomShapeTypeTranslationHashMap.end() ? "rect" : i->second;
}
-MSO_SPT GETVMLShapeType(const OString& aType)
+MSO_SPT GETVMLShapeType(const OUString& aType)
{
typedef std::unordered_map< const char*, MSO_SPT, rtl::CStringHash,
rtl::CStringEqual> DMLToVMLTranslationHashMap;
static DMLToVMLTranslationHashMap aDMLToVMLMap = []()
@@ -1243,7 +1243,7 @@ MSO_SPT GETVMLShapeType(const OString& aType)
return tmp;
}();
-const char* pDML = GetOOXMLPresetGeometry(aType.getStr());
+const char* pDML = GetOOXMLPresetGeometry(aType);
DMLToVMLTranslationHashMap::iterator i(aDMLToVMLMap.find(pDML));
return i == aDMLToVMLMap.end() ? mso_sptNil : i->second;
}
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index f2c2a0dbfcfe..3e7610c28a4f 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -115,10 +115,10 @@ struct MSFILTER_DLLPUBLIC EquationResult
MSFILTER_DLLPUBLIC EquationResult ParseCombinedChars(const OUString& rStr);
/// Similar to EnhancedCustomShapeTypeNames::Get(), but it also supports OOXML
types and returns a drawingML string.
-MSFILTER_DLLPUBLIC const char* GetOOXMLPresetGeometry( const char* sShapeType
);
+MSFILTER_DLLPUBLIC const char* GetOOXMLPresetGeometry( const OUString&
rShapeType );
/// Similar to EnhancedCustomShapeTypeNames::Get(), but returns an MSO_SPT
(binary / VML type).
-MSFILTER_DLLPUBLIC MSO_SPT GETVMLShapeType(const OString& aType);
+MSFILTER_DLLPUBLIC MSO_SPT GETVMLShapeType(const OUString& aType);
/**
* The following function checks if a MSO shapetype is allowed to have
textboxcontent.
diff --git a/oox/source/export/DMLPresetShapeExport.cxx
b/oox/source/export/DMLPresetShapeExport.cxx
index b374eb6b6c1a..ad603bcd2bd2 100644
--- a/oox/source/export/DMLPresetShapeExport.cxx
+++ b/oox/source/export/DMLPresetShapeExport.cxx
@@ -223,8 +223,7 @@ bool DMLPresetShapeExporter::WriteShape()
if (!m_bHasHandleValues)
{
OUString sShapeType = GetShapeType();
-const char* sPresetShape
-=
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source
sw/source/core/access/AccessibilityIssue.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit c9d70787ad1a4262ea7fee852ace20465774b38f
Author: Szymon Kłos
AuthorDate: Wed Mar 2 12:00:34 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 13:47:11 2022 +0100
lok: fix goto functionality in Accessibility Check dialog
Change-Id: Ie9ce42ccdb5cf6c72df3d3d48d3e7369f9e2f9cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130830
Reviewed-by: Pranam Lashkari
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131121
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/sw/source/core/access/AccessibilityIssue.cxx
b/sw/source/core/access/AccessibilityIssue.cxx
index b15d22955a87..f8b8e3858013 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
namespace sw
{
@@ -49,12 +50,16 @@ void AccessibilityIssue::gotoIssue() const
{
SwWrtShell* pWrtShell = m_pDoc->GetDocShell()->GetWrtShell();
pWrtShell->GotoFly(m_sObjectID, FLYCNTTYPE_ALL, true);
+if (comphelper::LibreOfficeKit::isActive())
+pWrtShell->ShowCursor();
}
break;
case IssueObject::TABLE:
{
SwWrtShell* pWrtShell = m_pDoc->GetDocShell()->GetWrtShell();
pWrtShell->GotoTable(m_sObjectID);
+if (comphelper::LibreOfficeKit::isActive())
+pWrtShell->ShowCursor();
}
break;
case IssueObject::TEXT:
@@ -70,6 +75,8 @@ void AccessibilityIssue::gotoIssue() const
pPaM->SetMark();
*pPaM->GetMark() = aMark;
pWrtShell->EndAllAction();
+if (comphelper::LibreOfficeKit::isActive())
+pWrtShell->ShowCursor();
}
break;
default:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source
sw/source/uibase/shells/annotsh.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 50f231d061e614f1127894a58cbeae8d9486f2ec Author: Xisco Fauli AuthorDate: Mon Mar 14 11:26:52 2022 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Mar 14 13:57:44 2022 +0100 sw: fix bug id in comment Change-Id: I510a48765b2ad286ddc194f6ca1a96211bcb05f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131528 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 01ec377c04c8dfaebdeb1002fd2d9a0e8f135b8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131475 Tested-by: Adolfo Jayme Barrientos Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 4647656a0226..d7fb25861c92 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1505,7 +1505,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest ) SwWrtShell = m_rView.GetWrtShell(); SwUndoId nUndoId(SwUndoId::EMPTY); -// tdf#147929 get these before "undo" which may delete this SwAnnotationShell +// tdf#147928 get these before "undo" which may delete this SwAnnotationShell SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr(); SfxBindings& rBindings = m_rView.GetViewFrame()->GetBindings();
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - svx/source xmloff/source
svx/source/unodraw/unoshtxt.cxx |8 +++-
xmloff/source/draw/ximpshap.cxx |7 +++
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 7134ea5137f13a72f1462898a3f47827259ddae1
Author: Szymon Kłos
AuthorDate: Wed Feb 23 11:18:59 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 14:07:30 2022 +0100
tdf#72776 Allow text removal in the shapes
Previous fix had crafted condition for fixing one specific
case but it was braking other cases.
(svx/source/unodraw/unoshtxt.cxx)
For example it was not possible to remove text inside textbox
and save that -> it was not saved in LOK case.
Problem is that we had not saved text inside shape and due
to calling GetBackgroundTextForwarder() we did reset to
empty content. In this patch we force UpdateData() call
by releasing lock just before we try to do some final
text cursor operations what applies changes in the content
and prevents us from losing it.
Call which was invoking GetBackgroundTextForwarder() was:
file: xmloff/source/draw/ximpshap.cxx
method: SdXMLShapeContext::endFastElement
line: mxCursor->gotoEnd( false );
After that I found that we had bug which breaks test:
sd/qa/unit/import-tests.cxxodp/shapes-test.odp
It occurs when using this patch or when not using my code
but removing locking functionality for SvxTextEditSourceImpl.
NbcSetOutlinerParaObjectForText triggers shape resizing
even when no text is present inside.
Summary:
1. revert hack from
https://git.libreoffice.org/core/+/71b66b0039819f38c935b4eb5d5951ceaf6e8468%5E%21
2. trigger text update by releasing lock for a moment to keep
correct state
3. fix bug with resizing empty shape
Change-Id: Idf1fc6caf19dfb932ce7caa21034f76fa04ce5f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130415
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131119
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 8ccf0e8e47b8..23c772daa1da 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -547,10 +547,7 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( pOutlinerParaObject && ( bOwnParaObj ||
!mpObject->IsEmptyPresObj() ||
mpObject->getSdrPageFromSdrObject()->IsMasterPage() ) )
{
-// tdf#72776: do not set empty text to SdrOutliner, if it is
already set
-if( !mpOutliner->GetEditEngine().GetTextLen() ||
pOutlinerParaObject->Count() > 1 || ( pOutlinerParaObject->Count() == 1 &&
-!pOutlinerParaObject->GetTextObject().GetText(0).isEmpty() ) )
-mpOutliner->SetText( *pOutlinerParaObject );
+mpOutliner->SetText( *pOutlinerParaObject );
// put text to object and set EmptyPresObj to FALSE
if( mpText && bOwnParaObj && mpObject->IsEmptyPresObj() &&
pTextObj->IsReallyEdited() )
@@ -778,7 +775,8 @@ void SvxTextEditSourceImpl::UpdateData()
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mpObject );
if( pTextObj )
{
-if( mpOutliner->GetParagraphCount() != 1 ||
mpOutliner->GetEditEngine().GetTextLen( 0 ) )
+if( (mpOutliner->GetParagraphCount() != 1 &&
mpOutliner->GetParagraphCount() != 2)
+|| mpOutliner->GetEditEngine().GetTextLen( 0 ) )
{
pTextObj->NbcSetOutlinerParaObjectForText(
mpOutliner->CreateParaObject(), mpText );
}
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a19a6c19d936..76ca2c4fe4d9 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -326,6 +326,13 @@ void SdXMLShapeContext::endFastElement(sal_Int32 )
{
if(mxCursor.is())
{
+// tdf#72776 force UpdateData in the EditSource so we will not
override text in SdrOutliner
+if( mxLockable.is() )
+{
+mxLockable->removeActionLock();
+mxLockable->addActionLock();
+}
+
// delete addition newline
mxCursor->gotoEnd( false );
mxCursor->goLeft( 1, true );
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/source sfx2/source
desktop/source/lib/init.cxx |1 +
sfx2/source/control/unoctitm.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 0090e414341f7ca9c70a2191a53d5b8fc855f4c8
Author: Aron Budea
AuthorDate: Thu Mar 10 06:30:23 2022 +0100
Commit: Andras Timar
CommitDate: Mon Mar 14 14:10:19 2022 +0100
Send Calc Insert Headers and Footers state change to LOK
Change-Id: Id51b4cf1eb962f22ee1e381873f4670789675525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131293
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ca65ec4ae2ca..b3b506043ba6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3089,6 +3089,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:NumberFormatPercent"),
OUString(".uno:NumberFormatDecimal"),
OUString(".uno:NumberFormatDate"),
+OUString(".uno:EditHeaderAndFooter"),
OUString(".uno:FrameLineColor"),
OUString(".uno:SortAscending"),
OUString(".uno:SortDescending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7bc371cc78d3..2b55f8d202be 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1217,6 +1217,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "ResetAttributes" ||
aEvent.FeatureURL.Path == "IncrementIndent" ||
aEvent.FeatureURL.Path == "DecrementIndent" ||
+ aEvent.FeatureURL.Path == "EditHeaderAndFooter" ||
aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
aEvent.FeatureURL.Path == "NumberFormatIncDecimals")
{
[Libreoffice-commits] core.git: cui/source desktop/source include/editeng include/sfx2 include/svx sc/qa sc/source sd/inc sd/qa sd/source sfx2/source svx/source sw/inc sw/qa sw/source
cui/source/options/treeopt.cxx | 31 +++--
desktop/source/lib/init.cxx | 18 ++---
include/editeng/editids.hrc | 12 ++-
include/sfx2/bindings.hxx |8 ++
include/sfx2/dispatch.hxx |5 +
include/sfx2/sfxsids.hrc| 15 ++--
include/svx/rulritem.hxx|8 +-
include/svx/svxids.hrc |3
sc/qa/unit/tiledrendering/tiledrendering.cxx| 20 ++
sc/source/ui/view/formatsh.cxx | 10 +--
sc/source/ui/view/viewutil.cxx |4 -
sd/inc/app.hrc |6 -
sd/qa/unit/tiledrendering/tiledrendering.cxx| 30 +++--
sd/source/ui/func/bulmaper.cxx |2
sd/source/ui/unoidl/unomodel.cxx|5 -
sd/source/ui/view/drviews3.cxx |4 -
sd/source/ui/view/drviewsf.cxx | 20 ++
sd/source/ui/view/outlnvsh.cxx |5 -
sfx2/source/dialog/securitypage.cxx | 14 ++--
svx/source/dialog/rubydialog.cxx|5 -
svx/source/fmcomp/fmgridcl.cxx |4 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |8 +-
svx/source/sidebar/text/TextCharacterSpacingControl.cxx |5 -
svx/source/sidebar/text/TextUnderlineControl.cxx|6 -
sw/inc/cmdid.h |4 -
sw/qa/extras/tiledrendering/tiledrendering.cxx | 53 ++--
sw/qa/extras/uiwriter/uiwriter.cxx |9 +-
sw/source/uibase/app/docst.cxx |5 -
sw/source/uibase/dialog/watermarkdialog.cxx |7 --
sw/source/uibase/sidebar/PageColumnControl.cxx |6 -
sw/source/uibase/sidebar/PageMarginControl.cxx | 21 ++
sw/source/uibase/sidebar/PageOrientationControl.cxx | 16 ++--
sw/source/uibase/sidebar/PageSizeControl.cxx| 17 ++---
33 files changed, 180 insertions(+), 206 deletions(-)
New commits:
commit 6ba9daac763baf37c833911be5e5fb97e068bea1
Author: Noel Grandin
AuthorDate: Mon Mar 14 12:28:06 2022 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 14 14:20:26 2022 +0100
add TypedWhichId version of QueryState
Change-Id: I95b86fc081847da01e06f50a1b2c7e7f5456c638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131529
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 8d274f83ce4c..ed43861d654b 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1050,12 +1050,12 @@ std::optional
OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if ( pViewFrame )
{
-const SfxPoolItem* pItem = nullptr;
+const SfxUInt16Item* pItem = nullptr;
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
// miscellaneous - Year2000
if( SfxItemState::DEFAULT <= pDispatch->QueryState(
SID_ATTR_YEAR2000, pItem ) )
-pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000,
static_cast(pItem)->GetValue() ) );
+pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000,
pItem->GetValue() ) );
else
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000,
officecfg::Office::Common::DateFormat::TwoDigitYear::get() ) );
}
@@ -1100,28 +1100,17 @@ std::optional
OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SfxViewFrame* pViewFrame = SfxViewFrame::Current();
if ( pViewFrame )
{
-const SfxPoolItem* pItem = nullptr;
+const SvxLanguageItem* pLangItem = nullptr;
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
-if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem))
-pRet->Put(
-SvxLanguageItem(
-(static_cast(pItem)
- ->GetLanguage()),
-SID_ATTR_LANGUAGE));
-if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem))
-pRet->Put(
-SvxLanguageItem(
-(static_cast(pItem)
- ->GetLanguage()),
-SID_ATTR_CHAR_CJK_LANGUAGE));
-if(SfxItemState::DEFAULT <=
pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem))
-pRet->Put(
-
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source
sc/source/core/tool/interpr4.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 91ca6a8eded939373e78ecf6091b3598936f2c08
Author: Eike Rathke
AuthorDate: Fri Mar 11 21:44:21 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 14:20:26 2022 +0100
Related: tdf#111675 Clear global error for arguments if possible
... i.e. if the last result / current stack value is svError
already (usually is nowadays in case of error) and error
evaluating functions may be pending.
Change-Id: I36fc0f169d36dfa7007e8bd3a5c368ed2bb3c919
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131405
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit efb713febeaaf3e4b17886d405d46845d4a0e676)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131363
Reviewed-by: Xisco Fauli
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index bc99592a15a8..1a0eed81302f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4540,6 +4540,18 @@ StackVar ScInterpreter::Interpret()
}
if ( nErrorFunction >= nErrorFunctionCount )
++nErrorFunction; // that's it, error => terminate
+else if (nErrorFunctionCount && sp && GetStackType() == svError)
+{
+// Clear global error if we have an individual error result, so
+// an error evaluating function can receive multiple arguments
+// and not all evaluated arguments inheriting the error.
+// This is important for at least IFS() and SWITCH() as long as
+// they are classified as error evaluating functions and not
+// implemented as short-cutting jump code paths, but also for
+// more than one evaluated argument to AGGREGATE() or COUNT()
+// that may ignore errors.
+nGlobalError = FormulaError::NONE;
+}
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source
sw/source/filter/ww8/sprmids.hxx |1 +
sw/source/filter/ww8/ww8par2.cxx |8
sw/source/filter/ww8/ww8scan.cxx | 21 +++--
3 files changed, 8 insertions(+), 22 deletions(-)
New commits:
commit 475be6f24ec3190ed3476319371efc815cfbe2dd
Author: Caolán McNamara
AuthorDate: Fri Mar 11 17:03:41 2022 +
Commit: Michael Stahl
CommitDate: Mon Mar 14 12:50:06 2022 +0100
ofz#45488 get WW8+ calculation of sprmTDefTable length right
we have the calculation correct for WW7- which is what the special
L_VAR2 case is for, but for the WW8+ variant that wasn't understood.
Change-Id: Ic9dde07223386df796f57dd1f33e69d16d3abf21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131395
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit 13f2e8ab8d1d8b33f3208f82d21d61250f81057d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131360
Reviewed-by: Michael Stahl
diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx
index ac1d33cf8a80..1d023c3424a9 100644
--- a/sw/source/filter/ww8/sprmids.hxx
+++ b/sw/source/filter/ww8/sprmids.hxx
@@ -66,6 +66,7 @@ const sal_uInt16 LN_SGprfIhdt = 0x3014;
const sal_uInt16 LN_SBCustomize = 0x301e;
const sal_uInt16 LN_SPropRMark = 0xd227;
const sal_uInt16 LN_SFFacingCol = 0x3229;
+const sal_uInt16 LN_TDefTable = 0xd608;
const sal_uInt16 LN_TDefTable10 = 0xd606;
const sal_uInt16 LN_THTMLProps = 0x740c;
const sal_uInt16 LN_TSetBrc10 = 0xd626;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 52ad77c6c6ec..3f3c3adfb74f 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1141,14 +1141,6 @@ WW8TabBandDesc::WW8TabBandDesc( WW8TabBandDesc const &
rBand )
// ReadDef reads the cell position and the borders of a band
void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen)
{
-if (!bVer67)
-{
-//the ww8 version of this is unusual in masquerading as a srpm with a
-//single byte len arg while it really has a word len arg, after this
-//increment nLen is correct to describe the remaining amount of data
-pS++;
-}
-
--nLen; //reduce len by expected nCols arg
if (nLen < 0)
return;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index cf81cc434560..71c424bf4546 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -704,7 +704,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
{NS_sprm::LN_TDefTable10, { 0, L_VAR} }, // "sprmTDefTable10"
tap.rgdxaCenter,
// tap.rgtc;complex
InfoRow(), // tap.dyaRowHeight;dya;word;
-InfoRow(), // tap.rgtc;complex
+{NS_sprm::LN_TDefTable, { 0, L_VAR2} }, // "sprmTDefTable"
tap.rgtc;complex
InfoRow(), // tap.rgshd;complex
InfoRow(), // tap.tlp;TLP;4 bytes;
InfoRow(), // ;;;
@@ -8413,18 +8413,6 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId,
const sal_uInt8* pSprm,
nL = 2 + 4 * nDel + 3 * nIns;
}
break;
-case 0xD608:
-{
-sal_uInt8 nIndex = 1 + mnDelta;
-if (nIndex + 1 >= nRemLen)
-{
-SAL_WARN("sw.ww8", "sprm longer than remaining bytes, doc or
parser is wrong");
-nL = 0;
-}
-else
-nL = SVBT16ToUInt16([nIndex]);
-break;
-}
default:
switch (aSprm.nVari)
{
@@ -8448,8 +8436,13 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId,
const sal_uInt8* pSprm,
nCount = 0;
}
else
+{
nCount = SVBT16ToUInt16([nIndex]);
-nL = static_cast< sal_uInt16 >(nCount + aSprm.nLen - 1);
+SAL_WARN_IF(nCount < 1, "sw.ww8", "length should have
been at least 1");
+if (nCount)
+--nCount;
+}
+nL = static_cast(nCount + aSprm.nLen);
break;
}
default:
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests3/tdf147767.py | 49 ++
sc/qa/uitest/data/tdf147767.html | 12
2 files changed, 61 insertions(+)
New commits:
commit c4c8146c9982313fd11f27894360ceaee3b3cbca
Author: Xisco Fauli
AuthorDate: Mon Mar 14 12:02:36 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 13:05:56 2022 +0100
tdf#147767: sc: Add UItest
Change-Id: I87d94c33af9676a147a07380b5f39add59b26038
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131530
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/calc_tests3/tdf147767.py
b/sc/qa/uitest/calc_tests3/tdf147767.py
new file mode 100644
index ..4a3b3c78843c
--- /dev/null
+++ b/sc/qa/uitest/calc_tests3/tdf147767.py
@@ -0,0 +1,49 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_url_for_data_file
+from libreoffice.calc.document import get_cell_by_position
+
+class tdf147767(UITestCase):
+
+def test_tdf147767(self):
+
+with self.ui_test.create_doc_in_start_center("calc") as calc_doc:
+
+with
self.ui_test.execute_dialog_through_command(".uno:InsertExternalDataSource",
close_button="") as xDialog:
+xUrl = xDialog.getChild("url")
+xUrl.executeAction("TYPE", mkPropertyValues({"TEXT":
get_url_for_data_file("tdf147767.html")}))
+
+with self.ui_test.execute_blocking_action(xUrl.executeAction,
args=("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))):
+pass
+
+xRanges = xDialog.getChild("ranges")
+self.assertEqual("3", get_state_as_dict(xRanges)["Children"])
+
+self.assertEqual("HTML_all",
get_state_as_dict(xRanges.getChild("0"))["Text"])
+self.assertEqual("HTML_tables",
get_state_as_dict(xRanges.getChild("1"))["Text"])
+
+# FIXME: close_dialog_through_button fails here
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+xCell = get_cell_by_position(calc_doc, 0, 0, 0)
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 14.0 != 0.69988079071
+self.assertEqual(14.0, xCell.CharHeight)
+self.assertEqual("0x90080c", hex(xCell.CellBackColor))
+self.assertEqual("0xff", hex(xCell.CharColor))
+self.assertEqual("Fecha", xCell.getString())
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/tdf147767.html b/sc/qa/uitest/data/tdf147767.html
new file mode 100644
index ..86a10e2d1675
--- /dev/null
+++ b/sc/qa/uitest/data/tdf147767.html
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+ Fecha
+
+
+
+
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source
sc/source/core/tool/interpr1.cxx |8
sc/source/core/tool/interpr4.cxx |4 ++--
sc/source/core/tool/interpr6.cxx |2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 69bf8f5e6dc43adde087403531641f2bd064a22c
Author: Eike Rathke
AuthorDate: Fri Mar 11 21:28:19 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 14:20:02 2022 +0100
Related: tdf#111675 Replace Pop() with PopError() where relevant
... to propagate the original (previous) error instead of
overriding it with a new error. Pop() may only be used if the
stack type is already known to be not svError, or to explicitly
ignore a current error.
Change-Id: I5a980c29f2d2679c0e2f2fc7e53c458dc147911f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131404
Reviewed-by: Julien Nabet
Tested-by: Jenkins
(cherry picked from commit 84720c09ef30e79c56936026c3992240b4ae010b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131362
Reviewed-by: Xisco Fauli
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 131f76cca889..d40e93608d6e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2828,7 +2828,7 @@ void ScInterpreter::ScFormula()
}
break;
default:
-Pop();
+PopError();
SetError( FormulaError::NotAvailable );
}
PushString( aFormula );
@@ -3727,7 +3727,7 @@ void ScInterpreter::ScMin( bool bTextAsZero )
}
break;
default :
-Pop();
+PopError();
SetError(FormulaError::IllegalParameter);
}
}
@@ -3885,7 +3885,7 @@ void ScInterpreter::ScMax( bool bTextAsZero )
}
break;
default :
-Pop();
+PopError();
SetError(FormulaError::IllegalParameter);
}
}
@@ -4096,7 +4096,7 @@ void ScInterpreter::GetStVarParams( bool bTextAsZero,
double(*VarResult)( double
}
break;
default :
-Pop();
+PopError();
SetError(FormulaError::IllegalParameter);
}
}
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 929844886b66..bc99592a15a8 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2701,7 +2701,7 @@ void ScInterpreter::ScExternal()
else
{
while( nParamCount-- > 0)
-Pop();
+PopError();
PushIllegalParameter();
}
}
@@ -3077,7 +3077,7 @@ void ScInterpreter::ScExternal()
{
while( nParamCount-- > 0)
{
-Pop();
+PopError();
}
PushError( FormulaError::NoAddin );
}
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index dbeab67fe35c..9dd442624884 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -515,7 +515,7 @@ void ScInterpreter::IterateParameters( ScIterFunc eFunc,
bool bTextAsZero )
else
{
while (nParamCount-- > 0)
-Pop();
+PopError();
SetError( FormulaError::NoValue );
}
}
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/viscrs.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 3a2c156eb8b5e68e9de430e788a57e0c220f7e3a
Author: Mert Tumer
AuthorDate: Fri Feb 25 13:05:28 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:53:31 2022 +0100
dont send text selection start/end when there is no selection
when there is no selection, startrect and endrect get the
cursor coordinates, we should not send it. Otherwise this
causes selection handles to appear on online
Signed-off-by: Mert Tumer
Change-Id: I4402e04d4a16a1f840499c57421fd01caf43f116
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130525
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131520
Tested-by: Jenkins
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 26e43813575d..0501162a2a16 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -521,6 +521,13 @@ OString SwSelPaintRects::getLOKPayload( int nType, int
nViewId, bool* ignore ) c
SwRect aEndRect;
FillStartEnd(aStartRect, aEndRect);
+// no selection rect
+if (!size())
+{
+*ignore = true;
+return OString();
+}
+
if( nType == LOK_CALLBACK_TEXT_SELECTION_START )
{
if (aStartRect.HasArea())
[Libreoffice-commits] core.git: 2 commits - include/svtools sc/source svx/source
include/svtools/ctrlbox.hxx |1 +
sc/source/ui/view/gridwin.cxx|7 +++
svx/source/tbxctrls/tbcontrl.cxx |5 -
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit dc05d912b56751ee53e2ee3d2638d85829b6a2d9
Author: Mert Tumer
AuthorDate: Tue Jan 18 12:57:16 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:52:59 2022 +0100
set active element to -1 when no selection for fontnamebox
FontNameBox sets the currentVal to emptystring when there's
a mixed font-name selection on the text but does not update
the active_element which is incorrect whereas other comboboxes such
as FontSize does it correctly.
Signed-off-by: Mert Tumer
Change-Id: Iff86bba64c2ab564ff5c5fa979eb846af9651a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128551
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131518
Tested-by: Jenkins
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 28730d16e85a..ca45b081cf5a 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -368,6 +368,7 @@ public:
int get_active() const { return m_xComboBox->get_active(); }
OUString get_active_text() const { return m_xComboBox->get_active_text(); }
void set_active_or_entry_text(const OUString& rText);
+void set_active(int nPos) { m_xComboBox->set_active(nPos); }
int get_count() const { return m_xComboBox->get_count(); }
OUString get_text(int nIndex) const { return
m_xComboBox->get_text(nIndex); }
void set_sensitive(bool bSensitive) {
m_xComboBox->set_sensitive(bSensitive); }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d9971a2e5f21..70b14ee14bba 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3159,8 +3159,11 @@ void SvxFontNameBox_Base::statusChanged_Impl( const
css::frame::FeatureStateEven
css::awt::FontDescriptor aFontDesc;
if ( rEvent.State >>= aFontDesc )
Update();
-else
+else {
+// no active element; delete value in the display
+m_xWidget->set_active(-1);
set_active_or_entry_text("");
+}
m_xWidget->save_value();
}
}
commit 74d24d03afc58a535d3afb7d0c2d172fa1636829
Author: Mert Tumer
AuthorDate: Wed Jan 12 19:02:23 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:52:47 2022 +0100
lok: remove residue text selection when there's none in the core
Residue selection can stay at the browser even after changing the
cellcursor pos
make sure to clean it up if there is no selection rectangle in reality
to be synced with core.
Signed-off-by: Mert Tumer
Change-Id: I1b06b6ec84ae195936d12dc986ef4a19b26dbc8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128351
Tested-by: Jenkins CollaboraOffice
Tested-by: Henry Castro
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131517
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e676dcfadd42..b5c6965cbcc1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5932,6 +5932,13 @@ void ScGridWindow::notifyKitCellCursor() const
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR,
getCellCursor().getStr());
if (bListValButton && aListValPos == mrViewData.GetCurPos())
updateLOKValListButton(true, aListValPos);
+std::vector aRects;
+GetSelectionRects(aRects);
+if (aRects.empty() || !mrViewData.IsActive())
+{
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION,
"");
+SfxLokHelper::notifyOtherViews(pViewShell,
LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", "EMPTY");
+}
}
void ScGridWindow::notifyKitCellViewCursor(const SfxViewShell* pForShell) const
[Libreoffice-commits] core.git: 2 commits - sd/qa svx/source vcl/unx
sd/qa/unit/tiledrendering/tiledrendering.cxx | 16 ++--
svx/source/svdraw/svdxcgv.cxx|5 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 21 -
3 files changed, 6 insertions(+), 36 deletions(-)
New commits:
commit 7545a53f53c786c1124ba750f9339ffc237d6467
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 11:21:35 2022 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 14 11:53:22 2022 +0100
unit_online_get_fonts() has not been used by Online since 2017
Change-Id: I7dddb4fd40f219df1969f452c95170bc70caa44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131524
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index bee1f4d4d92b..eb2b869217b3 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1141,25 +1141,4 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
CloseTTFont(pTTFont);
}
-/// used by online unit tests via dlopen.
-extern "C" {
-SAL_DLLPUBLIC_EXPORT const char * unit_online_get_fonts(void)
-{
-std::vector< fontID > aFontIDs;
-PrintFontManager = PrintFontManager::get();
-rMgr.getFontList(aFontIDs);
-OStringBuffer aBuf;
-aBuf.append( static_cast(aFontIDs.size()) );
-aBuf.append( " PS fonts.\n" );
-for( auto nId : aFontIDs )
-{
-const OUString& rName = rMgr.getPSName( nId );
-aBuf.append( OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ) );
-aBuf.append( "\n" );
-}
-static OString aResult = aBuf.makeStringAndClear();
-return aResult.getStr();
-}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9630bbc6df8bbff2c853e07be93579a96cc7cdbb
Author: Mert Tumer
AuthorDate: Wed Jan 19 14:23:52 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:53:10 2022 +0100
lok: Set pasted text rect pos to 0, 0
Rect size change according to the length of the text
however, this can make the text inserted in the negative coordinates
and half of it becomes invisible.
Signed-off-by: Mert Tumer
Change-Id: Ibd4e6164c21088205efecf024c1888c55ac33f0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128603
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131519
Tested-by: Jenkins
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index d5972c459e92..8a4da8dbf301 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2469,21 +2469,9 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
SdrTextObj* pTextObj = dynamic_cast(pObject);
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(SdrObjKind::Text, pTextObj->GetObjIdentifier());
-// This test is unreliable: it gives alternating results for the following
coordinates.
-// As a compromise, instead of disabling it altogether, we allow for both
sets of values.
const Point aPos = pTextObj->GetLastBoundRect().TopLeft();
-if (aPos.getX() < 1)
-{
-// We get this with 'make CppunitTest_sd_tiledrendering'
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(6739),
aPos.getX(), 100);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(6822),
aPos.getY(), 100);
-}
-else
-{
-// We get this with 'make check'
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(12990),
aPos.getX(), 100);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(7393),
aPos.getY(), 100);
-}
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aPos.getX());
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aPos.getY());
}
void SdTiledRenderingTest::testTdf115873()
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 513eb39c7996..a9b720f300d8 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -406,7 +407,9 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj,
SdrObjList& rLst, const Po
nSizY /= aDstFr.GetNumerator();
tools::Long xs=nSizX;
tools::Long ys=nSizY;
-Point aPos(rCenter.X()-xs/2,rCenter.Y()-ys/2);
+// set the pos to 0, 0 for online case
+bool isLOK = comphelper::LibreOfficeKit::isActive();
+Point aPos(isLOK ? 0 : rCenter.X()-xs/2, isLOK ? 0 : rCenter.Y()-ys/2);
tools::Rectangle aR(aPos.X(),aPos.Y(),aPos.X()+xs,aPos.Y()+ys);
pObj->SetLogicRect(aR);
rLst.InsertObject(pObj, SAL_MAX_SIZE);
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/uicalc/uicalc.cxx | 25 +
1 file changed, 25 insertions(+)
New commits:
commit 3d8c11a8ea9cabb0ee77b279cc815ca67d39ba24
Author: Xisco Fauli
AuthorDate: Mon Mar 14 11:18:46 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 12:11:37 2022 +0100
tdf#147894: sc_uicalc: Add unittest
Change-Id: Id7e5159542b17a510958ea8e22343e979720a56b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131527
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 2922521a97b5..1409c0c7a534 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -355,6 +355,31 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf63805)
CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(0, 1, 0)));
}
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf147894)
+{
+mxComponent = loadFromDesktop("private:factory/scalc");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pModelObj);
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+//Select the first row
+goToCell("1:1");
+
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({ { "FillDir",
uno::Any(OUString("R")) },
+ { "FillCmd",
uno::Any(OUString("L")) },
+ { "FillStep",
uno::Any(OUString("1")) },
+ { "FillDateCmd",
uno::Any(OUString("D")) },
+ { "FillStart",
uno::Any(OUString("1")) } }));
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:FillSeries", aArgs);
+
+CPPUNIT_ASSERT_EQUAL(1.0, pDoc->GetValue(ScAddress(0, 0, 0)));
+CPPUNIT_ASSERT_EQUAL(16384.0, pDoc->GetValue(ScAddress(16383, 0, 0)));
+}
+
CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf94208)
{
mxComponent = loadFromDesktop("private:factory/scalc");
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/annotsh.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 01ec377c04c8dfaebdeb1002fd2d9a0e8f135b8c Author: Xisco Fauli AuthorDate: Mon Mar 14 11:26:52 2022 +0100 Commit: Xisco Fauli CommitDate: Mon Mar 14 12:38:42 2022 +0100 sw: fix bug id in comment Change-Id: I510a48765b2ad286ddc194f6ca1a96211bcb05f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131528 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 481d550a0328..e99ee1eb2a24 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1518,7 +1518,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest ) SwWrtShell = m_rView.GetWrtShell(); SwUndoId nUndoId(SwUndoId::EMPTY); -// tdf#147929 get these before "undo" which may delete this SwAnnotationShell +// tdf#147928 get these before "undo" which may delete this SwAnnotationShell SwPostItMgr* pPostItMgr = m_rView.GetPostItMgr(); SfxBindings& rBindings = m_rView.GetViewFrame()->GetBindings();
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 2 commits - desktop/source sfx2/source sw/source
desktop/source/lib/init.cxx|7 ++-
sfx2/source/view/viewsh.cxx|1 +
sw/source/core/crsr/viscrs.cxx |7 +++
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 5bd14dff1d20250f52c23a11f8f54da639c072a1
Author: Mert Tumer
AuthorDate: Fri Feb 25 13:05:28 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:46:25 2022 +0100
dont send text selection start/end when there is no selection
when there is no selection, startrect and endrect get the
cursor coordinates, we should not send it. Otherwise this
causes selection handles to appear on online
Signed-off-by: Mert Tumer
Change-Id: I4402e04d4a16a1f840499c57421fd01caf43f116
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130525
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131522
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 26e43813575d..0501162a2a16 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -521,6 +521,13 @@ OString SwSelPaintRects::getLOKPayload( int nType, int
nViewId, bool* ignore ) c
SwRect aEndRect;
FillStartEnd(aStartRect, aEndRect);
+// no selection rect
+if (!size())
+{
+*ignore = true;
+return OString();
+}
+
if( nType == LOK_CALLBACK_TEXT_SELECTION_START )
{
if (aStartRect.HasArea())
commit 318e2b0e8dc7901271a121b8fd11e89cbc65d335
Author: Mert Tumer
AuthorDate: Mon Jan 10 13:23:03 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:46:14 2022 +0100
lok: Fix freshly added comments are not displayed
Signed-off-by: Mert Tumer
Change-Id: Ice772eff8b9f8ae8c23ec1e66675e33a80492028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128217
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131521
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9720a7a78967..183578df411a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1484,13 +1484,18 @@ void CallbackFlushHandler::queue(const int type,
CallbackData& aCallbackData)
SAL_INFO("lok", "Queue: [" << type << "]: [" << aCallbackData.getPayload()
<< "] on " << m_queue1.size() << " entries.");
bool bIsChartActive = false;
+bool bIsComment = false;
if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
{
LokChartHelper aChartHelper(SfxViewShell::Current());
bIsChartActive = aChartHelper.GetWindow() != nullptr;
}
+else if (type == LOK_CALLBACK_COMMENT)
+{
+bIsComment = true;
+}
-if (callbacksDisabled() && !bIsChartActive)
+if (callbacksDisabled() && !bIsChartActive && !bIsComment)
{
// We drop notifications when this is set, except for important ones.
// When we issue a complex command (such as .uno:InsertAnnotation)
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f4ec9b29b0a1..cbb3749ec737 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1447,6 +1447,7 @@ static bool ignoreLibreOfficeKitViewCallback(int nType,
const SfxViewShell_Impl*
{
case LOK_CALLBACK_FORM_FIELD_BUTTON:
case LOK_CALLBACK_TEXT_SELECTION:
+case LOK_CALLBACK_COMMENT:
break;
default:
// Reject e.g. invalidate during paint.
[Libreoffice-commits] core.git: 2 commits - desktop/source sc/source sfx2/source
desktop/source/lib/init.cxx |7 ++-
sc/source/ui/docshell/docsh.cxx | 29 ++---
sfx2/source/view/viewsh.cxx |1 +
3 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit 422fd364934d93ea02a614e8f431bfc1126b5a2d
Author: Mert Tumer
AuthorDate: Wed Dec 29 16:34:38 2021 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:52:33 2022 +0100
LOK android: Fix csv sheet name becomes temp name
Signed-off-by: Mert Tumer
Change-Id: If43d7a995a5e53734fc7ecdcbf9b750b4886dc45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127684
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131516
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 4179a0ba5acf..8c64e3a8416f 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -137,6 +137,8 @@
#include
#include
+#include
+
using namespace com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -1286,17 +1288,22 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
sc::SetFormulaDirtyContext aCxt;
m_aDocument.SetAllFormulasDirty(aCxt);
-// The same resulting name has to be handled in
-// ScExternalRefCache::initializeDoc() and related, hence
-// pass 'true' for RenameTab()'s bExternalDocument for a
-// composed name so ValidTabName() will not be checked,
-// which could veto the rename in case it contained
-// characters that Excel does not handle. If we wanted to
-// change that then it needed to be handled in all
-// corresponding places of the external references
-// manager/cache. Likely then we'd also need a method to
-// compose a name excluding such characters.
-m_aDocument.RenameTab( 0, INetURLObject(
rMedium.GetName()).GetBase(), true/*bExternalDocument*/);
+bool bIsMobile = comphelper::LibreOfficeKit::isActive() &&
SfxViewShell::Current()
+&& SfxViewShell::Current()->isLOKMobilePhone();
+// for mobile case, we use a copy of the original document
and give it a temporary name before editing
+// Therefore, the sheet name becomes ugly, long and
nonsensical.
+if (!bIsMobile)
+// The same resulting name has to be handled in
+// ScExternalRefCache::initializeDoc() and related,
hence
+// pass 'true' for RenameTab()'s bExternalDocument for
a
+// composed name so ValidTabName() will not be checked,
+// which could veto the rename in case it contained
+// characters that Excel does not handle. If we wanted
to
+// change that then it needed to be handled in all
+// corresponding places of the external references
+// manager/cache. Likely then we'd also need a method
to
+// compose a name excluding such characters.
+m_aDocument.RenameTab( 0, INetURLObject(
rMedium.GetName()).GetBase(), true/*bExternalDocument*/);
bOverflowRow = aImpEx.IsOverflowRow();
bOverflowCol = aImpEx.IsOverflowCol();
commit 2df5a083a83f6e83ac45465d4b65887421ac945d
Author: Mert Tumer
AuthorDate: Mon Jan 10 13:23:03 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:52:20 2022 +0100
lok: Fix freshly added comments are not displayed
Signed-off-by: Mert Tumer
Change-Id: Ice772eff8b9f8ae8c23ec1e66675e33a80492028
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128217
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131515
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b5db7f8cb1e6..0e1c47e9b5dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1479,13 +1479,18 @@ void CallbackFlushHandler::queue(const int type,
CallbackData& aCallbackData)
SAL_INFO("lok", "Queue: [" << type << "]: [" << aCallbackData.getPayload()
<< "] on " << m_queue1.size() << " entries.");
bool bIsChartActive = false;
+bool bIsComment = false;
if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
{
LokChartHelper aChartHelper(SfxViewShell::Current());
bIsChartActive = aChartHelper.GetWindow() != nullptr;
}
+else if (type == LOK_CALLBACK_COMMENT)
+{
+bIsComment = true;
+}
-if (callbacksDisabled() &&
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0117.xhp | 396 +++-- source/text/shared/02/01171200.xhp | 21 - source/text/shared/02/01171300.xhp | 12 - source/text/shared/02/01171400.xhp |9 source/text/shared/main0226.xhp| 81 --- 5 files changed, 276 insertions(+), 243 deletions(-) New commits: commit 298513eb58210a77aed5d4ab8325f9c142bc4457 Author: Olivier Hallot AuthorDate: Fri Mar 11 09:21:14 2022 -0300 Commit: Olivier Hallot CommitDate: Mon Mar 14 12:22:02 2022 +0100 tdf#147862 (part) Update Form Control & Design toolbars Change-Id: Id19ec57e715e9d1fb85df45736ebac258a9d255b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131372 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0117.xhp b/source/text/shared/02/0117.xhp index c6432100e..eb9ec45d3 100644 --- a/source/text/shared/02/0117.xhp +++ b/source/text/shared/02/0117.xhp @@ -57,7 +57,7 @@ - Icon + Icon Select Form Controls @@ -92,12 +92,12 @@ You can drag and drop controls from one document to another document. You can also copy and paste controls between documents. When you insert a control from another document, $[officename] analyzes the data source, content type, and content properties of the control so that the control fits the logical structure in the target document. For example, a control that displays contents from an address book continues to display the same contents after you copy the control to a different document. You can view these properties on the Data tab page of the Form properties dialog. - + Selectcontrols and design bars - Icon + Icon Select This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form. @@ -106,76 +106,97 @@ + - - -Check Boxcontrols bar + + +Wizards On/OffControls bar - Icon Check Box + Icon Toggle Form Control Wizards - Creates a check box. Check boxes allow you to activate or deactivate a function in a form. + Turns on and turns off the automatic form controls wizards. + These wizards help you to enter the properties of list boxes, table controls, and other controls. - - -Text Boxcontrols bar - + + +Form DesignControls bar + + + + +Icon Form Design Tools + + + +Opens the Form Design toolbar. + + + + + + +Label Fieldcontrols bar + - Icon Text Box + Icon Label Field - Creates a text box. Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input. + Creates a field for displaying text. These labels are only for displaying predefined text. Entries cannot be made in these fields. - - -Formatted Fieldcontrols bar + + + +Text Boxcontrols bar - Icon Formatted Field + Icon Text Box - Creates a formatted field. A formatted field is a text box in which you can define how the inputs and outputs are formatted, and which limiting values apply. + Creates a text box. Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input. -A formatted field has special control properties (choose Format - Control). - - -Push Buttoncontrols bar - + + + +Check Boxcontrols bar + - Icon Push Button + Icon Check Box - Creates a push button. This function can be used to execute a command for a defined event, such as a mouse click. - You can apply text and graphics to these buttons. + Creates a check box. Check boxes allow you to activate or deactivate a function in a form. + Option Buttoncontrols bar - Icon Option Button + Icon Option Button Creates an option button. Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (Name property). Normally, they are given a group box. @@ -183,13 +204,14 @@ + List Boxcontrols bar - Icon List Box + Icon List Box Creates a list box. A list box lets users select an entry from a list. If the form is linked to a database and the database connection is active, the List Box Wizard will automatically appear after the list box is inserted in the document. This wizard helps you create the list box. @@ -197,13 +219,14 @@ + Combo Boxcontrols bar - Icon Combo Box + Icon Combo Box Creates a combo box. A combo box is a single-line list box with a drop-down list from which users choose an
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76bb029866a15918c1a842f81236b9caeac674ca Author: Olivier Hallot AuthorDate: Mon Mar 14 08:22:05 2022 -0300 Commit: Gerrit Code Review CommitDate: Mon Mar 14 12:22:05 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 298513eb58210a77aed5d4ab8325f9c142bc4457 - tdf#147862 (part) Update Form Control & Design toolbars Change-Id: Id19ec57e715e9d1fb85df45736ebac258a9d255b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131372 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e5dbb88dabc1..298513eb5821 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e5dbb88dabc1ac5e5d0aa7ba130338690db800cc +Subproject commit 298513eb58210a77aed5d4ab8325f9c142bc4457
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0450.xhp |2 source/text/shared/02/1203.xhp | 16 - source/text/shared/02/1205.xhp | 12 - source/text/shared/02/12100100.xhp | 10 - source/text/shared/02/1211.xhp |8 source/text/shared/02/1212.xhp |4 source/text/shared/02/1213.xhp |8 source/text/shared/main0213.xhp| 360 +++-- 8 files changed, 212 insertions(+), 208 deletions(-) New commits: commit 01883bab23e9bf50fbf1ce801fcde80f00508f5b Author: Olivier Hallot AuthorDate: Fri Mar 11 11:50:51 2022 -0300 Commit: Olivier Hallot CommitDate: Mon Mar 14 12:39:53 2022 +0100 tdf#147862 (part) Update Navigation bar help page Change-Id: If10e2cfa110f62906028571ed23ef1adb0abf539 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131380 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0450.xhp b/source/text/shared/00/0450.xhp index 77e9f26be..ead7d9e84 100644 --- a/source/text/shared/00/0450.xhp +++ b/source/text/shared/00/0450.xhp @@ -103,7 +103,7 @@ -Sort Order Icon +Sort Order Icon Sort Order diff --git a/source/text/shared/02/1203.xhp b/source/text/shared/02/1203.xhp index 2c02bd81d..5faf2c589 100644 --- a/source/text/shared/02/1203.xhp +++ b/source/text/shared/02/1203.xhp @@ -1,7 +1,4 @@ - - - - - - + AutoFilter @@ -31,18 +26,17 @@ -AutoFilter +AutoFilter Filters the records, based on the content of the currently selected data field. - + -Icon - +Icon AutoFilter - + AutoFilter diff --git a/source/text/shared/02/1205.xhp b/source/text/shared/02/1205.xhp index 61b1c236a..1e7955917 100644 --- a/source/text/shared/02/1205.xhp +++ b/source/text/shared/02/1205.xhp @@ -1,6 +1,4 @@ - - - @@ -32,18 +29,17 @@ -Refresh +Refresh Refreshes the displayed data. In a multi-user environment, refreshing the data ensures that it remains current. - + -Icon - +Icon Refresh - + Refresh diff --git a/source/text/shared/02/12100100.xhp b/source/text/shared/02/12100100.xhp index 37947e676..c46963aed 100644 --- a/source/text/shared/02/12100100.xhp +++ b/source/text/shared/02/12100100.xhp @@ -30,7 +30,7 @@ -Sort Order +Sort Order Specifies the sort criteria for the data display. @@ -38,14 +38,14 @@ While the functions Sort in Ascending Order and Sort in Descending Order sort by one criterion only, you can combine several criteria in the Sort Order dialog. You can remove a sorting that has been performed with the Reset Filter/Sorting icon. -Sorting +Sorting Use this area to enter sorting criteria. If you enter additional sorting criteria under and then, the data matching the content of the higher-order criterion is ordered according to the next criterion. If you sort the field name "First name" in ascending order and the field name "Last name" in descending order, all records will be sorted in ascending order by first name, and then within the first names, in descending order by last name. -Field name +Field name Specifies the data field name whose content will determine the sort order. -Order +Order Specifies the sort order (either ascending or descending). -and then +and then Specifies additional subordinate sort criteria from the other fields. diff --git a/source/text/shared/02/1211.xhp b/source/text/shared/02/1211.xhp index da597b677..46f7932f0 100644 --- a/source/text/shared/02/1211.xhp +++ b/source/text/shared/02/1211.xhp @@ -30,17 +30,17 @@ -Form-based Filters +Form-based Filters Prompts the database server to filter the visible data by specified criteria. Unlike the normal search, which is activated by the Find Record icon on the Form bar, you can search more quickly by using the form-based filter. Usually a quick database server is charged with the search. Also, you can enter more complex search conditions. - - Icon + + Icon Form Filter - + Form-based Filters diff --git a/source/text/shared/02/1212.xhp b/source/text/shared/02/1212.xhp index fd56ba479..364410a83 100644 --- a/source/text/shared/02/1212.xhp +++ b/source/text/shared/02/1212.xhp @@ -30,14 +30,14 @@ -Apply Filter +Apply Filter Switches between the filtered and unfiltered view of the table. - Icon + Icon Form Filter Apply Filter diff --git a/source/text/shared/02/1213.xhp b/source/text/shared/02/1213.xhp index 828b8eae2..655d18521 100644 --- a/source/text/shared/02/1213.xhp +++ b/source/text/shared/02/1213.xhp @@ -32,16 +32,16 @@ data sources; as tables -Data source as table +Data source as table Activates an additional table view when in the form view. When the Data source as table function is activated, you see the table in an area
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 74f6f2cd88a4905e796d9b66393f4e9cd9eac3a7 Author: Olivier Hallot AuthorDate: Mon Mar 14 08:39:54 2022 -0300 Commit: Gerrit Code Review CommitDate: Mon Mar 14 12:39:54 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 01883bab23e9bf50fbf1ce801fcde80f00508f5b - tdf#147862 (part) Update Navigation bar help page Change-Id: If10e2cfa110f62906028571ed23ef1adb0abf539 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131380 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 298513eb5821..01883bab23e9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 298513eb58210a77aed5d4ab8325f9c142bc4457 +Subproject commit 01883bab23e9bf50fbf1ce801fcde80f00508f5b
[Libreoffice-commits] help.git: source/text
source/text/shared/00/edit_menu.xhp |5 +++ source/text/shared/01/02230100.xhp|2 + source/text/shared/01/02230150.xhp|5 +++ source/text/shared/01/02230200.xhp|2 + source/text/shared/01/02230400.xhp|4 +- source/text/shared/01/02230500.xhp| 10 +++--- source/text/shared/01/0224.xhp|5 +-- source/text/swriter/track_changes_toolbar.xhp | 43 +++--- 8 files changed, 57 insertions(+), 19 deletions(-) New commits: commit 80f1bca2adc9b5b0b63d266943779a1c0ae08ce2 Author: Olivier Hallot AuthorDate: Mon Mar 14 10:54:28 2022 -0300 Commit: Olivier Hallot CommitDate: Mon Mar 14 15:01:26 2022 +0100 Improve track changes help pages Change-Id: I04ee3cd429e96d1830c1038337a88a3a2dcf8e9c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131544 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp index 273a923e5..13bbc3404 100644 --- a/source/text/shared/00/edit_menu.xhp +++ b/source/text/shared/00/edit_menu.xhp @@ -172,10 +172,15 @@ Choose Edit - Track Changes - Manage - Filter tab. Choose Edit - Track Changes - Merge Document. Choose Edit - Track Changes - Compare Document. + +Choose Edit - Track Changes - Protect + Choose Edit - Track Changes - Comment. Choose Edit - Track Changes - Manage - List tab.Click an entry in the list and open the context menu.Choose Edit Comment. + + Choose Edit - Find. CommandCtrl+F diff --git a/source/text/shared/01/02230100.xhp b/source/text/shared/01/02230100.xhp index 2db299b0f..72d2a830b 100644 --- a/source/text/shared/01/02230100.xhp +++ b/source/text/shared/01/02230100.xhp @@ -36,6 +36,8 @@ + On the Track Changes toolbar, click + If you choose Edit - Track Changes - Show, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing %PRODUCTNAME Writer - Changes in the Options dialog box. diff --git a/source/text/shared/01/02230150.xhp b/source/text/shared/01/02230150.xhp index 2efadc76e..2b004d63e 100644 --- a/source/text/shared/01/02230150.xhp +++ b/source/text/shared/01/02230150.xhp @@ -34,6 +34,11 @@ Protect Changes Prevents a user from deactivating the record changes feature, or from accepting or rejecting changes unless the user enters a password. + + +On the Track Changes toolbar, click + + diff --git a/source/text/shared/01/02230200.xhp b/source/text/shared/01/02230200.xhp index f0190c268..3a1815654 100644 --- a/source/text/shared/01/02230200.xhp +++ b/source/text/shared/01/02230200.xhp @@ -43,6 +43,8 @@ + On the Track Changes toolbar, click + You can change the display properties of the markup elements by choosing %PRODUCTNAME Writer - Changes %PRODUCTNAME Calc - Changes in the Options dialog box. diff --git a/source/text/shared/01/02230400.xhp b/source/text/shared/01/02230400.xhp index afa5ca708..74c01210d 100644 --- a/source/text/shared/01/02230400.xhp +++ b/source/text/shared/01/02230400.xhp @@ -39,7 +39,9 @@ - + +On the Track Changes toolbar, click + diff --git a/source/text/shared/01/02230500.xhp b/source/text/shared/01/02230500.xhp index b50d5ad70..1dccf43d9 100644 --- a/source/text/shared/01/02230500.xhp +++ b/source/text/shared/01/02230500.xhp @@ -30,13 +30,13 @@ -Merge Document +Merge Document Imports changes made to copies of the same document into the original document. Changes made to footnotes, headers, frames and fields are ignored. Identical changes are merged automatically. - - + + +On the Track Changes toolbar, click + - - diff --git a/source/text/shared/01/0224.xhp b/source/text/shared/01/0224.xhp index c5db1f9fe..8fef7ab09 100644 --- a/source/text/shared/01/0224.xhp +++ b/source/text/shared/01/0224.xhp @@ -36,13 +36,14 @@ The contents of the selected document are marked as deletions in the dialog that opens. If you want, you can insert the contents of the selected file into the current document by selecting the relevant deleted entries, clicking Reject, and then clicking Insert. - + +On the Track Changes toolbar, click + The contents of footnotes, headers, frames and fields are ignored. - diff --git a/source/text/swriter/track_changes_toolbar.xhp b/source/text/swriter/track_changes_toolbar.xhp index f80ada419..080a2d997 100644 --- a/source/text/swriter/track_changes_toolbar.xhp +++ b/source/text/swriter/track_changes_toolbar.xhp @@ -25,7 +25,9 @@ Choose View - Toolbars - Track Changes. - + + + @@ -36,9 +38,11 @@ Show track changes -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a8e3560d8ee4f90e877f4535ff07d0d26edee714 Author: Olivier Hallot AuthorDate: Mon Mar 14 11:01:27 2022 -0300 Commit: Gerrit Code Review CommitDate: Mon Mar 14 15:01:27 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 80f1bca2adc9b5b0b63d266943779a1c0ae08ce2 - Improve track changes help pages Change-Id: I04ee3cd429e96d1830c1038337a88a3a2dcf8e9c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131544 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 01883bab23e9..80f1bca2adc9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 01883bab23e9bf50fbf1ce801fcde80f00508f5b +Subproject commit 80f1bca2adc9b5b0b63d266943779a1c0ae08ce2
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 33af49a83e06920f9d24d6127e18ca1ccdc6d321 Author: Olivier Hallot AuthorDate: Mon Mar 14 11:19:26 2022 -0300 Commit: Gerrit Code Review CommitDate: Mon Mar 14 15:19:26 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e159fae8ea7be0552646da8de925b6b7dafeefe9 - tdf#147862 (part) - Fontwork toolbar description Change-Id: Ia43a7b69b301cbd85dac2e34ca5ea061ba09de6e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131330 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 80f1bca2adc9..e159fae8ea7b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 80f1bca2adc9b5b0b63d266943779a1c0ae08ce2 +Subproject commit e159fae8ea7be0552646da8de925b6b7dafeefe9
[Libreoffice-commits] help.git: source/text
source/text/shared/fontwork_toolbar.xhp | 109 +--- 1 file changed, 88 insertions(+), 21 deletions(-) New commits: commit e159fae8ea7be0552646da8de925b6b7dafeefe9 Author: Olivier Hallot AuthorDate: Thu Mar 10 20:16:42 2022 -0300 Commit: Adolfo Jayme Barrientos CommitDate: Mon Mar 14 15:19:25 2022 +0100 tdf#147862 (part) - Fontwork toolbar description Change-Id: Ia43a7b69b301cbd85dac2e34ca5ea061ba09de6e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131330 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/fontwork_toolbar.xhp b/source/text/shared/fontwork_toolbar.xhp index 7d27f9083..2f816685b 100644 --- a/source/text/shared/fontwork_toolbar.xhp +++ b/source/text/shared/fontwork_toolbar.xhp @@ -28,33 +28,100 @@ - Fontwork + Fontwork The Fontwork toolbar opens when you select a Fontwork object. - Fontwork Gallery - Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object. + Fontwork Gallery + + + + + Icon Fontwork Gallery + + + + Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object. + + + + -Fontwork Shape - Opens the Fontwork Shape toolbar. Click a shape to apply the shape to all selected Fontwork objects. +Fontwork Shape + + + + +Icon Fontwork Shape + + + +Opens the Fontwork Shape toolbar. Click a shape to apply the shape to all selected Fontwork objects. + + + + -Fontwork Same Letter Heights - Switches the letter height of the selected Fontwork objects from normal to the same height for all objects. +Fontwork Same Letter Heights + + + + +Icon Fontwork Same Letter Height + + + +Switches the letter height of the selected Fontwork objects from normal to the same height for all objects. + + + + -Fontwork Alignment - Opens the Fontwork Alignment window. -Click to apply the alignment to the selected Fontwork objects. +Fontwork Alignment + + + + +Icon Fontwork Alignment + + + +Opens the Fontwork Alignment window. +Click to apply the alignment to the selected Fontwork objects. + + + + -Fontwork Character Spacing - Opens the Fontwork Character Spacing window. -Click to apply the character spacing to the selected Fontwork objects. - Custom - Opens the Fontwork Character Spacing dialog where you can enter a new character spacing value. - - -Value - Enter the Fontwork character spacing value. - Kern Character Pairs - Switches the kerning of character pairs on and off. +Fontwork Character Spacing + + + + +Icon Fontwork Character Spacing + + + +Select the character spacing values to apply to the Fontwork object. +Custom: Opens the Fontwork Character Spacing dialog where you can enter a new character spacing value. + + +Value: enter the Fontwork character spacing value. + + + +Toggle Extrusion + + + + +Icon Toggle Extrusion + + + +Switches the 3D effects on and off for the Fontwork objects. + + +
[Libreoffice-commits] core.git: sc/Module_sc.mk sc/qa sc/UITest_external_links.mk
sc/Module_sc.mk |1 + sc/UITest_external_links.mk | 20 2 files changed, 21 insertions(+) New commits: commit a77981ad21aa0793f0af2ac262bd3573e0501235 Author: Xisco Fauli AuthorDate: Mon Mar 14 12:07:50 2022 +0100 Commit: Xisco Fauli CommitDate: Mon Mar 14 15:26:38 2022 +0100 uitest: sc: move external links tests to their own place Change-Id: Ie02318a502ec9baf8c27c9a353b070ae113672f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131531 Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 5179c5fdb292..1c146060b3a4 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -258,6 +258,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\ UITest_calc_tests4 \ UITest_calc_tests6 \ UITest_csv_dialog \ + UITest_external_links \ UITest_statistics \ UITest_solver \ UITest_goalSeek \ diff --git a/sc/UITest_external_links.mk b/sc/UITest_external_links.mk new file mode 100644 index ..161883227d08 --- /dev/null +++ b/sc/UITest_external_links.mk @@ -0,0 +1,20 @@ +# -*- 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 gb_UITest_UITest,external_links)) + +$(eval $(call gb_UITest_add_modules,external_links,$(SRCDIR)/sc/qa/uitest,\ + external_links/ \ +)) + +$(eval $(call gb_UITest_set_defs,external_links, \ +TDOC="$(SRCDIR)/sc/qa/uitest/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/qa/uitest/calc_tests3/tdf114995.py b/sc/qa/uitest/external_links/tdf114995.py similarity index 100% rename from sc/qa/uitest/calc_tests3/tdf114995.py rename to sc/qa/uitest/external_links/tdf114995.py diff --git a/sc/qa/uitest/calc_tests3/tdf127484.py b/sc/qa/uitest/external_links/tdf127484.py similarity index 100% rename from sc/qa/uitest/calc_tests3/tdf127484.py rename to sc/qa/uitest/external_links/tdf127484.py diff --git a/sc/qa/uitest/calc_tests3/tdf147767.py b/sc/qa/uitest/external_links/tdf147767.py similarity index 100% rename from sc/qa/uitest/calc_tests3/tdf147767.py rename to sc/qa/uitest/external_links/tdf147767.py diff --git a/sc/qa/uitest/calc_tests3/tdf95217.py b/sc/qa/uitest/external_links/tdf95217.py similarity index 100% rename from sc/qa/uitest/calc_tests3/tdf95217.py rename to sc/qa/uitest/external_links/tdf95217.py diff --git a/sc/qa/uitest/calc_tests3/tdf96499.py b/sc/qa/uitest/external_links/tdf96499.py similarity index 100% rename from sc/qa/uitest/calc_tests3/tdf96499.py rename to sc/qa/uitest/external_links/tdf96499.py
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sc/source vcl/source
sc/source/ui/view/gridwin.cxx |8 +---
sc/source/ui/view/gridwin2.cxx |3 ++-
sc/source/ui/view/tabview3.cxx |4 +++-
vcl/source/window/dockwin.cxx |5 -
4 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 06de346ffb712e43c9e1b9527a08c42349e78598
Author: Szymon Kłos
AuthorDate: Fri Feb 25 13:22:36 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 16:18:35 2022 +0100
lok: send logic autofilter position
we need to show popup relative to the grid window
Change-Id: Ib0cf66d2c0422b765a3b8035d5499b45e83f768d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130528
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131122
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index eced196db277..d050c59175fe 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -895,7 +895,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
nSizeX = nSizeX / fZoomX;
nSizeY = nSizeY / fZoomY;
}
-tools::Rectangle aCellRect(OutputToScreenPixel(aPos), Size(nSizeX,
nSizeY));
+tools::Rectangle aCellRect(bLOKActive ? aPos : OutputToScreenPixel(aPos),
Size(nSizeX, nSizeY));
ScDBData* pDBData = rDoc.GetDBAtCursor(nCol, nRow, nTab,
ScDBDataPortion::AREA);
if (!pDBData)
@@ -1207,7 +1207,8 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW
nRow )
Point aScrPos;
Size aScrSize;
getCellGeometry(aScrPos, aScrSize, mrViewData, nCol, nRow, eWhich);
-DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize,
ScAddress(nCol-1, nRow, nTab), pDPObj);
+bool bLOK = comphelper::LibreOfficeKit::isActive();
+DPLaunchFieldPopupMenu(bLOK ? aScrPos : OutputToScreenPixel(aScrPos),
aScrSize, ScAddress(nCol-1, nRow, nTab), pDPObj);
}
void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW nRow )
@@ -1220,7 +1221,8 @@ void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW
nRow )
Point aScrPos;
Size aScrSize;
getCellGeometry(aScrPos, aScrSize, mrViewData, nCol, nRow, eWhich);
-DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize,
ScAddress(nCol, nRow, nTab), pDPObj);
+bool bLOK = comphelper::LibreOfficeKit::isActive();
+DPLaunchFieldPopupMenu(bLOK ? aScrPos : OutputToScreenPixel(aScrPos),
aScrSize, ScAddress(nCol, nRow, nTab), pDPObj);
}
void ScGridWindow::ShowFilterMenu(weld::Window* pParent, const
tools::Rectangle& rCellRect, bool bLayoutRTL)
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 7071bd384f4b..4e497e80d664 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -343,6 +343,7 @@ bool ScGridWindow::DPTestFieldPopupArrow(
const MouseEvent& rMEvt, const ScAddress& rPos, const ScAddress& rDimPos,
ScDPObject* pDPObj)
{
bool bLayoutRTL = mrViewData.GetDocument().IsLayoutRTL(
mrViewData.GetTabNo() );
+bool bLOK = comphelper::LibreOfficeKit::isActive();
// Get the geometry of the cell.
Point aScrPos = mrViewData.GetScrPos(rPos.Col(), rPos.Row(), eWhich);
@@ -361,7 +362,7 @@ bool ScGridWindow::DPTestFieldPopupArrow(
if (aRect.Contains(rMEvt.GetPosPixel()))
{
// Mouse cursor inside the popup arrow box. Launch the field menu.
-DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize,
rDimPos, pDPObj);
+DPLaunchFieldPopupMenu(bLOK ? aScrPos : OutputToScreenPixel(aScrPos),
aScrSize, rDimPos, pDPObj);
return true;
}
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index c2cd024fecac..3d9d0e3996be 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2618,7 +2618,9 @@ void ScTabView::DoDPFieldPopup(std::u16string_view
rPivotTableName, sal_Int32 nD
pDPObject->BuildAllDimensionMembers();
-Point aScreenPoint = pWin->OutputToScreenPixel(pWin->LogicToPixel(aPoint));
+Point aPos = pWin->LogicToPixel(aPoint);
+bool bLOK = comphelper::LibreOfficeKit::isActive();
+Point aScreenPoint = bLOK ? aPos : pWin->OutputToScreenPixel(aPos);
Size aScreenSize = pWin->LogicToPixel(aSize);
pWin->DPLaunchFieldPopupMenu(aScreenPoint, aScreenSize, nDimensionIndex,
pDPObject);
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 99c4f1bba398..f94a04cbb1d8 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
#include
@@ -923,7 +924,9 @@ Point DockingWindow::GetFloatingPos() const
aData.SetMask( WindowStateMask::Pos );
pWrapper->mpFloatWin->GetWindowStateData( aData );
Point aPos( aData.GetX(), aData.GetY() );
-aPos =
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dochdl/swdtflvr.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 24e213b11569400751fc54bfbeb5a5f6afdd4172
Author: Eike Rathke
AuthorDate: Mon Mar 14 15:25:02 2022 +0100
Commit: Eike Rathke
CommitDate: Mon Mar 14 16:18:33 2022 +0100
Resolves: tdf#147935 A row may have no newline character, tdf#147496
follow-up
Change-Id: I91672e31e324cdd17c02ca328863b636beeb5e45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131546
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 56b828187d67..004e57c24b3e 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2665,7 +2665,9 @@ bool SwTransferable::PasteDDE( const
TransferableDataHelper& rData,
( rData.HasFormat( SotClipboardFormatId::SYLK ) ||
rData.HasFormat( SotClipboardFormatId::SYLK_BIGCAPS ) ) )
{
-const sal_Int32 nRows = nNewlines ? nNewlines-1 : 0;
+sal_Int32 nRows = nNewlines ? nNewlines-1 : 0;
+if (!aExpand.endsWith("\n"))
+++nRows;// last row has no newline, e.g. one single
cell
const sal_Int32 nCols =
comphelper::string::getTokenCount(aExpand.getToken(0, '\n'), '\t');
// don't try to insert tables that are too large for writer
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - include/vcl vcl/inc vcl/jsdialog vcl/source
include/vcl/toolkit/fixed.hxx|1
vcl/inc/jsdialog/jsdialogbuilder.hxx |8 ---
vcl/jsdialog/enabled.cxx |3 +-
vcl/jsdialog/jsdialogbuilder.cxx | 39 +--
vcl/source/control/fixed.cxx |7 ++
5 files changed, 48 insertions(+), 10 deletions(-)
New commits:
commit e9ddfd06fc706b4be2955c6aa462a41ec22bce93
Author: Szymon Kłos
AuthorDate: Tue Mar 1 16:19:07 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 16:19:54 2022 +0100
jsdialog: enable Accessibility Check dialog
- fix crash due to wrong type for label
- deduplicate widgets with the same id in one dialog/builder
- refresh on box reordering
Change-Id: I6993552342a3f139de40c3f87243bdf4e0617fc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130797
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131120
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx
index afa0004f7ec8..238d1cbdfafb 100644
--- a/include/vcl/toolkit/fixed.hxx
+++ b/include/vcl/toolkit/fixed.hxx
@@ -83,6 +83,7 @@ public:
virtual voidLoseFocus() override;
virtual voidApplySettings(vcl::RenderContext&) override;
+virtual voidDumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
override;
};
class VCL_DLLPUBLIC FixedLine final : public Control
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index b3beba7d14a7..db010df11d21 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -225,7 +225,7 @@ class JSInstanceBuilder final : public SalInstanceBuilder,
public JSDialogSender
static std::map& GetLOKWeldWidgetsMap();
static void InsertWindowToMap(const std::string& nWindowId);
-void RememberWidget(const OString& id, weld::Widget* pWidget);
+void RememberWidget(OString id, weld::Widget* pWidget);
static void RememberWidget(const std::string& nWindowId, const OString& id,
weld::Widget* pWidget);
static weld::Widget* FindWeldWidgetsMap(const std::string& nWindowId,
const OString& rWidget);
@@ -460,10 +460,10 @@ public:
bool bTakeOwnership);
};
-class JSLabel final : public JSWidget
+class JSLabel final : public JSWidget
{
public:
-JSLabel(JSDialogSender* pSender, FixedText* pLabel, SalInstanceBuilder*
pBuilder,
+JSLabel(JSDialogSender* pSender, Control* pLabel, SalInstanceBuilder*
pBuilder,
bool bTakeOwnership);
virtual void set_label(const OUString& rText) override;
};
@@ -706,6 +706,8 @@ class JSBox : public JSWidget
{
public:
JSBox(JSDialogSender* pSender, VclBox* pBox, SalInstanceBuilder* pBuilder,
bool bTakeOwnership);
+
+void reorder_child(weld::Widget* pWidget, int nNewPosition) override;
};
class JSWidgetInstance : public JSWidget
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 6de05a65c9eb..9aa8d19db108 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -54,7 +54,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/textimportcsv.ui"
|| rUIFile == u"xmlsec/ui/digitalsignaturesdialog.ui"
|| rUIFile == u"xmlsec/ui/viewcertdialog.ui" || rUIFile ==
u"xmlsec/ui/certgeneral.ui"
-|| rUIFile == u"xmlsec/ui/certpage.ui")
+|| rUIFile == u"xmlsec/ui/certpage.ui" || rUIFile ==
u"svx/ui/accessibilitycheckdialog.ui"
+|| rUIFile == u"svx/ui/accessibilitycheckentry.ui")
{
return true;
}
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 693ddd6232c4..7ca9cceb16c9 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -704,10 +704,31 @@ void JSInstanceBuilder::InsertWindowToMap(const
std::string& nWindowId)
GetLOKWeldWidgetsMap().insert(std::map::value_type(nWindowId, map));
}
-void JSInstanceBuilder::RememberWidget(const OString& id, weld::Widget*
pWidget)
+void JSInstanceBuilder::RememberWidget(OString sId, weld::Widget* pWidget)
{
-RememberWidget(getMapIdFromWindowId(), id, pWidget);
-m_aRememberedWidgets.push_back(id.getStr());
+// do not use the same id for two widgets inside one builder
+// exception is sidebar where we base our full invalidation on that
"Panel" id sharing
+if (m_sTypeOfJSON != "sidebar")
+{
+static std::atomic nNotRepeatIndex = 0;
+auto aWindowIt = GetLOKWeldWidgetsMap().find(getMapIdFromWindowId());
+if (aWindowIt != GetLOKWeldWidgetsMap().end())
+{
+auto aWidgetIt = aWindowIt->second.find(sId);
+if (aWidgetIt != aWindowIt->second.end())
+{
+unsigned long long int nIndex = nNotRepeatIndex++;
[Libreoffice-commits] core.git: uitest/math_tests uitest/UITest_math_demo.mk
uitest/UITest_math_demo.mk|4
uitest/math_tests/data/tdf128610.fodt | 34 ++
uitest/math_tests/tdf128610.py| 32
3 files changed, 70 insertions(+)
New commits:
commit 360e7eaef92ed38f25a454c8f0f605e7cda974f7
Author: Xisco Fauli
AuthorDate: Mon Mar 14 13:48:58 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 15:25:08 2022 +0100
tdf#128610: math: add UItest
Change-Id: I9fe1a349a73790e7fa1c503112a27f76d238c0c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131538
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/uitest/UITest_math_demo.mk b/uitest/UITest_math_demo.mk
index 5c1a6dbd8ee8..a49b29f2c2dd 100644
--- a/uitest/UITest_math_demo.mk
+++ b/uitest/UITest_math_demo.mk
@@ -12,4 +12,8 @@ $(eval $(call gb_UITest_UITest,math_demo))
$(eval $(call gb_UITest_add_modules,math_demo,$(SRCDIR)/uitest,\
math_tests/ \
))
+
+$(eval $(call gb_UITest_set_defs,math_demo, \
+TDOC="$(SRCDIR)/uitest/math_tests/data" \
+))
# vim: set noet sw=4 ts=4:
diff --git a/uitest/math_tests/data/tdf128610.fodt
b/uitest/math_tests/data/tdf128610.fodt
new file mode 100644
index ..cee4ed8e59fe
--- /dev/null
+++ b/uitest/math_tests/data/tdf128610.fodt
@@ -0,0 +1,34 @@
+
+
+http://openoffice.org/2009/office;
xmlns:css3t="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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xmlns:xsd="http://www.w3.org/2001/XMLSchema;
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:oooc="http://openoffice.org/2004/calc;
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:ooow="http://openoffice.org/2004/writer;
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/;
xmlns:rpt="http://openoffice.org/2005/report;
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink;
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:ooo="http://openoffice.org/2004/office;
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:tableooo="http://openoffice.org/2009/table;
xmlns:drawooo="http://openoffice.org/2010/draw;
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events;
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML;
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
n:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+ ?xml version=1.0
encoding=UTF-8?
+ math xmlns=http://www.w3.org/1998/Math/MathML;
text:style-name="Internet_20_link"
text:visited-style-name="Visited_20_Internet_20_Link">http://www.w3.org/1998/Math/MathML
display=block
+ semantics
+ mrow
+ msub
+ mif/mi
+ mic/mi
+ /msub
+ mo
stretchy=false=/mo
+ mfrac
+ mn1/mn
+ msub
+ miK/mi
+ mim/mi
+ /msub
+ /mfrac
+ /mrow
+ /semantics
+ /math
+
+
+
diff --git a/uitest/math_tests/tdf128610.py b/uitest/math_tests/tdf128610.py
new file mode 100644
index ..4fdd9c2dbc52
--- /dev/null
+++ b/uitest/math_tests/tdf128610.py
@@ -0,0 +1,32 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import get_url_for_data_file
+
+class Tdf128610(UITestCase):
+
+def test_tdf128610(self):
+with self.ui_test.load_file(get_url_for_data_file('tdf128610.fodt')):
+self.xUITest.executeCommand('.uno:SelectAll')
+self.xUITest.executeCommand('.uno:Copy')
+
+with self.ui_test.load_empty_file("math"):
+
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/inc sw/source
sw/inc/crstate.hxx|4 ++--
sw/source/core/layout/trvlfrm.cxx |6 +++---
sw/source/core/text/frmcrsr.cxx | 12 ++--
sw/source/core/text/itrcrsr.cxx | 30 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 1b94a54826d4f8a4ae0c670868c317d68e246e3e
Author: Noel Grandin
AuthorDate: Mon Mar 14 14:03:56 2022 +0200
Commit: Xisco Fauli
CommitDate: Mon Mar 14 17:02:41 2022 +0100
tdf#147143 Word selection error in Arabic text
this reverts
commit 563af8fd15aa37e75af8882cccbdf8914ebe8e61
Author: Noel Grandin
Date: Fri Jan 7 22:50:29 2022 +0200
tdf#144890 Invalid selection area when text in LTR run
and
commit ec50b9e5eaec7c94df35617676077ef0d65cecc7
Author: Noel Grandin
Date: Thu May 27 11:16:11 2021 +0200
no need to allocate Sw2LinesPos separately on heap
No idea why the commits caused trouble, clearing there is some
"interesting" interaction going on.
Change-Id: I606768403db777b61554f378d3f69f9b4d33d493
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131533
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 22be1665dc6eb28ea1d52c7c5e4347628fc5a76b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131477
Reviewed-by: Xisco Fauli
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index f3430c714787..9b223319fd93 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -23,7 +23,7 @@
#include
#include "swrect.hxx"
-#include
+#include
enum class SwFillMode
{
@@ -132,7 +132,7 @@ enum class CursorMoveState
struct SwCursorMoveState
{
SwFillCursorPos *m_pFill; ///< for automatic filling with tabs etc
-std::optional m_x2Lines; ///< for selections inside/around
2line portions
+std::unique_ptr m_p2Lines; ///< for selections
inside/around 2line portions
SwSpecialPos* m_pSpecialPos; ///< for positions inside fields
Point m_aRealHeight; ///< contains then the position/height of
the cursor
CursorMoveState m_eState;
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 0e99d2b3bd0a..6942dab6a2ba 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2124,11 +2124,11 @@ void SwRootFrame::CalcFrameRects(SwShellCursor )
//ContentRects to Start- and EndFrames.
SwRect aStRect, aEndRect;
pStartFrame->GetCharRect( aStRect, *pStartPos, );
-std::optional pSt2Pos = std::move(aTmpState.m_x2Lines);
+std::unique_ptr pSt2Pos = std::move(aTmpState.m_p2Lines);
aTmpState.m_nCursorBidiLevel = pEndFrame->IsRightToLeft() ? 1 : 0;
pEndFrame->GetCharRect( aEndRect, *pEndPos, );
-std::optional pEnd2Pos = std::move(aTmpState.m_x2Lines);
+std::unique_ptr pEnd2Pos = std::move(aTmpState.m_p2Lines);
SwRect aStFrame ( pStartFrame->UnionFrame( true ) );
aStFrame.Intersection( pStartFrame->GetPaintArea() );
@@ -2145,7 +2145,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor )
// If there's no doubleline portion involved or start and end are both
// in the same doubleline portion, all works fine, but otherwise
// we need the following...
-if( (!pSt2Pos && !pEnd2Pos) && ( !pSt2Pos || !pEnd2Pos ||
+if( pSt2Pos != pEnd2Pos && ( !pSt2Pos || !pEnd2Pos ||
pSt2Pos->aPortion != pEnd2Pos->aPortion ) )
{
// If we have a start(end) position inside a doubleline portion
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 0eb130848f3d..58792ecf80d6 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -307,10 +307,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition ,
{
if ( pFrame->IsRightToLeft() )
{
-if( pCMS->m_b2Lines && pCMS->m_x2Lines)
+if( pCMS->m_b2Lines && pCMS->m_p2Lines)
{
-pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aLine );
-pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aPortion );
+pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aLine );
+pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aPortion );
}
}
@@ -327,10 +327,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition ,
pCMS->m_aRealHeight.Y() );
}
}
-if( pCMS->m_b2Lines && pCMS->m_x2Lines)
+if( pCMS->m_b2Lines && pCMS->m_p2Lines)
{
-pFrame->SwitchHorizontalToVertical( pCMS->m_x2Lines->aLine
);
-pFrame->SwitchHorizontalToVertical(
pCMS->m_x2Lines->aPortion );
+pFrame->SwitchHorizontalToVertical( pCMS->m_p2Lines->aLine
);
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e73fa6661af591d98a262da0e7f32b346570281 Author: Andrea Gelmini AuthorDate: Mon Mar 14 20:54:16 2022 +0100 Commit: Gerrit Code Review CommitDate: Mon Mar 14 20:54:16 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d6e1ebf3f0b5cf3ea1b9d7678f86f67f3221af36 - Fix typo Change-Id: I4856441ef0a64900b7b20c8f49333fec9002f250 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131554 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/helpcontent2 b/helpcontent2 index f620b42736be..d6e1ebf3f0b5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f620b42736be0f4a3efc01100e223a6c877b0716 +Subproject commit d6e1ebf3f0b5cf3ea1b9d7678f86f67f3221af36
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-2' - sc/source
sc/source/filter/html/htmlpars.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 62f071f0904cd00c401f732ce6d5c9248e3944f6
Author: Noel Grandin
AuthorDate: Fri Mar 11 18:58:58 2022 +0200
Commit: Caolán McNamara
CommitDate: Mon Mar 14 21:54:33 2022 +0100
tdf#147767 html pasted to calc has very small font
regression from
commit da9bba7cc3c243e936daea689fea64ecaf110f35
Author: Noel Grandin
Date: Mon Jul 26 10:10:17 2021 +0200
use officecfg for SvxHtmlOptions
Change-Id: Ia84d713a18b4c694af98478681996b6156cbb928
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131393
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
(cherry picked from commit 15c097010f1567d933abf046bc43447bd7415e4c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131364
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit f7f28aa16efd4a113df0f8646fbb9b100acda8ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131469
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Xisco Fauli
Tested-by: Caolán McNamara
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index ae93c3e56021..f86b9e3b145c 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -188,13 +188,13 @@ ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine,
ScDocument* pDoc ) :
ScEEParser( pEditEngine ),
mpDoc( pDoc )
{
-maFontHeights[0] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get();
-maFontHeights[1] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get();
-maFontHeights[2] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get();
-maFontHeights[3] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get();
-maFontHeights[4] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get();
-maFontHeights[5] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get();
-maFontHeights[6] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get();
+maFontHeights[0] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get() * 20;
+maFontHeights[1] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get() * 20;
+maFontHeights[2] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_3::get() * 20;
+maFontHeights[3] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_4::get() * 20;
+maFontHeights[4] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_5::get() * 20;
+maFontHeights[5] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_6::get() * 20;
+maFontHeights[6] =
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_7::get() * 20;
}
ScHTMLParser::~ScHTMLParser()
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - 9 commits - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-theme
dev/null |binary icon-themes/breeze/cmd/32/autocorrectdlg.png |binary icon-themes/breeze/cmd/32/editframeset.png |binary icon-themes/breeze/cmd/32/insertfooter.png |binary icon-themes/breeze/cmd/32/insertheader.png |binary icon-themes/breeze/cmd/32/pasteonlyformula.png |binary icon-themes/breeze/cmd/32/pasteonlytext.png|binary icon-themes/breeze/cmd/32/pasteonlyvalue.png |binary icon-themes/breeze/cmd/32/pastespecial.png |binary icon-themes/breeze/cmd/32/pasteunformatted.png |binary icon-themes/breeze/cmd/32/scriptorganizer.png |binary icon-themes/breeze/cmd/32/sendfeedback.png |binary icon-themes/breeze/cmd/32/textattributes.png |binary icon-themes/breeze/cmd/lc_autocorrectdlg.png |binary icon-themes/breeze/cmd/lc_editframeset.png |binary icon-themes/breeze/cmd/lc_insertfooter.png |binary icon-themes/breeze/cmd/lc_insertheader.png |binary icon-themes/breeze/cmd/lc_pasteonlyformula.png |binary icon-themes/breeze/cmd/lc_pasteonlytext.png|binary icon-themes/breeze/cmd/lc_pasteonlyvalue.png |binary icon-themes/breeze/cmd/lc_pastespecial.png |binary icon-themes/breeze/cmd/lc_scriptorganizer.png |binary icon-themes/breeze/cmd/lc_sendfeedback.png |binary icon-themes/breeze/cmd/sc_autocorrectdlg.png |binary icon-themes/breeze/cmd/sc_editframeset.png |binary icon-themes/breeze/cmd/sc_insertfooter.png |binary icon-themes/breeze/cmd/sc_insertheader.png |binary icon-themes/breeze/cmd/sc_pastespecial.png |binary icon-themes/breeze/cmd/sc_scriptorganizer.png |binary icon-themes/breeze/links.txt | 12 ++ icon-themes/breeze_dark/cmd/32/autocorrectdlg.png |binary icon-themes/breeze_dark/cmd/32/editframeset.png|binary icon-themes/breeze_dark/cmd/32/insertfooter.png|binary icon-themes/breeze_dark/cmd/32/insertheader.png|binary icon-themes/breeze_dark/cmd/32/pasteonlyformula.png|binary icon-themes/breeze_dark/cmd/32/pasteonlytext.png |binary icon-themes/breeze_dark/cmd/32/pasteonlyvalue.png |binary icon-themes/breeze_dark/cmd/32/pastespecial.png|binary icon-themes/breeze_dark/cmd/32/pasteunformatted.png|binary icon-themes/breeze_dark/cmd/32/scriptorganizer.png |binary icon-themes/breeze_dark/cmd/32/sendfeedback.png|binary icon-themes/breeze_dark/cmd/32/textattributes.png |binary icon-themes/breeze_dark/cmd/lc_autocorrectdlg.png |binary icon-themes/breeze_dark/cmd/lc_editframeset.png|binary icon-themes/breeze_dark/cmd/lc_insertfooter.png|binary icon-themes/breeze_dark/cmd/lc_insertheader.png|binary icon-themes/breeze_dark/cmd/lc_pasteonlyformula.png|binary icon-themes/breeze_dark/cmd/lc_pasteonlytext.png |binary icon-themes/breeze_dark/cmd/lc_pasteonlyvalue.png |binary icon-themes/breeze_dark/cmd/lc_pastespecial.png|binary icon-themes/breeze_dark/cmd/lc_scriptorganizer.png |binary icon-themes/breeze_dark/cmd/lc_sendfeedback.png|binary icon-themes/breeze_dark/cmd/sc_autocorrectdlg.png |binary icon-themes/breeze_dark/cmd/sc_editframeset.png|binary icon-themes/breeze_dark/cmd/sc_insertfooter.png|binary icon-themes/breeze_dark/cmd/sc_insertheader.png|binary icon-themes/breeze_dark/cmd/sc_pastespecial.png|binary icon-themes/breeze_dark/cmd/sc_scriptorganizer.png |binary icon-themes/breeze_dark/links.txt | 12 ++ icon-themes/breeze_dark_svg/cmd/32/autocorrectdlg.svg |1 icon-themes/breeze_dark_svg/cmd/32/editframeset.svg|1 icon-themes/breeze_dark_svg/cmd/32/insertfooter.svg|1 icon-themes/breeze_dark_svg/cmd/32/insertheader.svg|1 icon-themes/breeze_dark_svg/cmd/32/pasteonlyformula.svg|1 icon-themes/breeze_dark_svg/cmd/32/pasteonlytext.svg |1 icon-themes/breeze_dark_svg/cmd/32/pasteonlyvalue.svg
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/xmlimp.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 9aae749e99a92e6622fe18539e186e5cb07fa721
Author: Julien Nabet
AuthorDate: Mon Mar 14 20:25:42 2022 +0100
Commit: Julien Nabet
CommitDate: Mon Mar 14 21:48:09 2022 +0100
Return early if empty ref (xmloff/xmlimp)
+ fix a comment, the function uses "bool" not old "sal_Bool"
Change-Id: I777dc93450a56eb826d15691d56c23cb051a4afb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131561
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 9c68c2be6da1..a710e87b3bb7 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1627,7 +1627,7 @@ OUString SvXMLImport::GetAbsoluteReference(const
OUString& rValue) const
bool SvXMLImport::IsODFVersionConsistent( const OUString& aODFVersion )
{
-// the check returns sal_False only if the storage version could be
retrieved
+// the check returns false only if the storage version could be retrieved
bool bResult = true;
if ( !aODFVersion.isEmpty() && aODFVersion.compareTo( ODFVER_012_TEXT ) >=
0 )
@@ -1637,6 +1637,8 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString&
aODFVersion )
try
{ // don't use getDocumentStorage(), it's temporary and latest
version
uno::Reference const xStor(GetSourceStorage());
+if (!xStor.is())
+return bResult;
uno::Reference< beans::XPropertySet > xStorProps( xStor,
uno::UNO_QUERY_THROW );
// the check should be done only for OASIS format
[Libreoffice-commits] core.git: package/inc package/source sw/inc sw/source
package/inc/ZipEnumeration.hxx |1 -
package/source/zipapi/ZipEnumeration.cxx |1 -
sw/inc/IDocumentMarkAccess.hxx |1 -
sw/source/core/doc/docbm.cxx |4
4 files changed, 7 deletions(-)
New commits:
commit 83dd8deed7b5013fa0f0592140e136770fbda4d6
Author: Stephan Bergmann
AuthorDate: Mon Mar 14 20:14:41 2022 +0100
Commit: Stephan Bergmann
CommitDate: Mon Mar 14 22:30:44 2022 +0100
loplugin:trivialdestructor (-stdlib=libc++)
That these are only flagged when building against libc++ and not against
libstdc++ is a consequence of the plugin's dependence on implementation
details
of the relevant classes, but so be it.
Change-Id: I6b96f81939edab2b8e618aa53c9fe23492edfbbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131562
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index f0a810ea29cd..50533cc28920 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.hxx
@@ -30,7 +30,6 @@ public:
bool hasMoreElements();
const ZipEntry* nextElement();
ZipEnumeration(EntryHash& rNewEntryHash);
-~ZipEnumeration();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/source/zipapi/ZipEnumeration.cxx
b/package/source/zipapi/ZipEnumeration.cxx
index 9849c6854f61..0c036882f079 100644
--- a/package/source/zipapi/ZipEnumeration.cxx
+++ b/package/source/zipapi/ZipEnumeration.cxx
@@ -26,7 +26,6 @@ ZipEnumeration::ZipEnumeration(EntryHash& rNewEntryHash)
, aIterator(rEntryHash.begin())
{
}
-ZipEnumeration::~ZipEnumeration() {}
bool ZipEnumeration::hasMoreElements() { return (aIterator !=
rEntryHash.end()); }
const ZipEntry* ZipEnumeration::nextElement()
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 1d11734e46e9..5596665453e3 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -79,7 +79,6 @@ class IDocumentMarkAccess
iterator& operator=(iterator const& rOther);
iterator(iterator && rOther) noexcept;
iterator& operator=(iterator && rOther) noexcept;
-~iterator();
// FIXME unfortunately there's a requirement on input iterator
// and forward iterator to return reference, which isn't
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index c15c1dd3fcea..37c33edc 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -86,10 +86,6 @@ auto IDocumentMarkAccess::iterator::operator=(iterator &&
rOther) noexcept -> it
return *this;
}
-IDocumentMarkAccess::iterator::~iterator()
-{
-}
-
// ARGH why does it *need* to return const& ?
::sw::mark::IMark* /*const&*/
IDocumentMarkAccess::iterator::operator*() const
[Libreoffice-commits] core.git: emfio/README.md
emfio/README.md |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 4d2d2f04288b87228511ff9afcdda691f103de16 Author: Hossein AuthorDate: Fri Mar 11 18:02:18 2022 +0100 Commit: Hossein CommitDate: Mon Mar 14 22:35:10 2022 +0100 Remove EMR_SETARCDIRECTION from unimplemented records As EMR_SETARCDIRECTION record for EMF is now implemented in commit 7b28920382d3820344bfc4075bac98f85e838dba, it is now removed from the unimplemented list of records for EMF. Change-Id: Ib2931d339f924e813d243ba503d4b17aab0d6868 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131401 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/emfio/README.md b/emfio/README.md index 4cbd9d45a4ad..665af1fa4e0c 100644 --- a/emfio/README.md +++ b/emfio/README.md @@ -55,7 +55,7 @@ records are marked as "not implemented", and a warning message will printed if they are actually read within a file. You can file a bug report for implementing these records. -Currently, these records are not implemented (specified in +Currently, these records are not implemented for WMF (specified in `wmfreader.cxx`): ``` @@ -69,12 +69,12 @@ W_META_RESETDC W_META_STARTDOC W_META_STARTPAGE W_META_ENDPAGE W_META_ABORTDOC W_META_ENDDOC ``` -And these records are not implemented (specified in `emfreader.cxx`): +And these records are not implemented for EMF/EMF+ (specified in `emfreader.cxx`): ``` EMR_MASKBLT EMR_PLGBLT EMR_SETDIBITSTODEVICE EMR_FRAMERGN EMR_INVERTRGN EMR_FLATTENPATH EMR_WIDENPATH EMR_POLYDRAW -EMR_SETARCDIRECTION EMR_SETPALETTEENTRIES EMR_RESIZEPALETTE +EMR_SETPALETTEENTRIES EMR_RESIZEPALETTE EMR_EXTFLOODFILL EMR_ANGLEARC EMR_SETCOLORADJUSTMENT EMR_POLYDRAW16 EMR_CREATECOLORSPACE EMR_SETCOLORSPACE EMR_DELETECOLORSPACE EMR_GLSRECORD EMR_GLSBOUNDEDRECORD EMR_PIXELFORMAT EMR_DRAWESCAPE
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
New commits:
commit ca9e48c663b16bf461c37a5449c6ad5a930ad5a4
Author: Caolán McNamara
AuthorDate: Mon Mar 14 13:58:42 2022 +
Commit: Caolán McNamara
CommitDate: Mon Mar 14 18:32:42 2022 +0100
cid#1502951 Logically dead code
Change-Id: I5968dda3b0638576fcc9ce222e47a3c04c949484
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131545
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 45d8d809084f..98a3767cd865 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3552,19 +3552,17 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
break;
}
case RedlineType::ParagraphFormat:
-if ( bNoDate )
-m_pSerializer->startElementNS( XML_w, XML_pPrChange,
-FSNS( XML_w, XML_id ), aId,
-FSNS( XML_w, XML_author ), bRemovePersonalInfo
-? "Author" + OUString::number(
GetExport().GetInfoID(rAuthor) )
-: rAuthor );
-else
-m_pSerializer->startElementNS( XML_w, XML_pPrChange,
-FSNS( XML_w, XML_id ), aId,
-FSNS( XML_w, XML_author ), bRemovePersonalInfo
-? "Author" + OUString::number(
GetExport().GetInfoID(rAuthor) )
-: rAuthor,
-FSNS( XML_w, XML_date ), DateTimeToOString( aDateTime ) );
+{
+rtl::Reference pAttributeList
+= sax_fastparser::FastSerializerHelper::createAttrList();
+
+pAttributeList->add(FSNS( XML_w, XML_id ), aId);
+pAttributeList->add(FSNS( XML_w, XML_author ), bRemovePersonalInfo
+? "Author" + OString::number(
GetExport().GetInfoID(rAuthor) )
+: rAuthor.toUtf8());
+if (!bNoDate)
+pAttributeList->add(FSNS( XML_w, XML_date ), DateTimeToOString(
aDateTime ));
+m_pSerializer->startElementNS( XML_w, XML_pPrChange, pAttributeList );
// Check if there is any extra data stored in the redline object
if (pRedlineData->GetExtraData())
@@ -3617,7 +3615,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
}
m_pSerializer->endElementNS( XML_w, XML_pPrChange );
break;
-
+}
default:
SAL_WARN("sw.ww8", "Unhandled redline type for export " <<
SwRedlineTypeToOUString(pRedlineData->GetType()));
break;
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d7a7ec2157d30a0d6a1024081e0bc161574d1982 Author: Julien Nabet AuthorDate: Mon Mar 14 22:04:43 2022 +0200 Commit: Gerrit Code Review CommitDate: Mon Mar 14 21:04:43 2022 +0100 Update git submodules * Update dictionaries from branch 'distro/mimo/mimo-7-1' to 7ebbf21f141c5d3694283ed25b2e827c2fd814c8 - Esperanto dictionary: Package extension's description Change-Id: Ib080d1ad1ac4f5af6b736fd161a07871f4b1d861 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/117941 Tested-by: Andras Timar Reviewed-by: Andras Timar (cherry picked from commit 16eb021d2bb008fdef06f69f52df3b5d38c0d028) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/117865 (cherry picked from commit 32bd34b7c0e0164d3f80ad39f0033ac88b757eb3) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/117866 - Add Esperanto dictionary Signed-off-by: Carmen Bianca Bakker Change-Id: I1852b0eedc9b397c43f213dab60ff08e44b01678 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/110415 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/dictionaries b/dictionaries index 39658b570567..7ebbf21f141c 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 39658b5705671893f251e78655c3bb775a1b0d2f +Subproject commit 7ebbf21f141c5d3694283ed25b2e827c2fd814c8
[Libreoffice-commits] dictionaries.git: Changes to 'distro/mimo/mimo-7-1'
New branch 'distro/mimo/mimo-7-1' available with the following commits: commit 7ebbf21f141c5d3694283ed25b2e827c2fd814c8 Author: Julien Nabet Date: Sun Jun 27 09:38:59 2021 +0200 Esperanto dictionary: Package extension's description Change-Id: Ib080d1ad1ac4f5af6b736fd161a07871f4b1d861 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/117941 Tested-by: Andras Timar Reviewed-by: Andras Timar (cherry picked from commit 16eb021d2bb008fdef06f69f52df3b5d38c0d028) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/117865 (cherry picked from commit 32bd34b7c0e0164d3f80ad39f0033ac88b757eb3) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/117866 commit b87e300a8eb541a6218eecca21e9ef11fd3a9b0d Author: Carmen Bianca Bakker Date: Thu Feb 4 13:13:07 2021 +0100 Add Esperanto dictionary Signed-off-by: Carmen Bianca Bakker Change-Id: I1852b0eedc9b397c43f213dab60ff08e44b01678 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/110415 Tested-by: Andras Timar Reviewed-by: Andras Timar
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx |1 +
sfx2/source/control/unoctitm.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit b456297ced6f5111cf311556a2904cbb27598289
Author: Aron Budea
AuthorDate: Thu Mar 10 06:30:23 2022 +0100
Commit: Aron Budea
CommitDate: Mon Mar 14 19:59:32 2022 +0100
Send Calc Insert Headers and Footers state change to LOK
Change-Id: Id51b4cf1eb962f22ee1e381873f4670789675525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131293
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131543
Tested-by: Jenkins
Reviewed-by: Aron Budea
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c8fd1be5ce88..933a119d696d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3050,6 +3050,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:NumberFormatPercent"),
OUString(".uno:NumberFormatDecimal"),
OUString(".uno:NumberFormatDate"),
+OUString(".uno:EditHeaderAndFooter"),
OUString(".uno:FrameLineColor"),
OUString(".uno:SortAscending"),
OUString(".uno:SortDescending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index e7da4f4274f6..dde7c4cc6e6b 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1102,6 +1102,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "ResetAttributes" ||
aEvent.FeatureURL.Path == "IncrementIndent" ||
aEvent.FeatureURL.Path == "DecrementIndent" ||
+ aEvent.FeatureURL.Path == "EditHeaderAndFooter" ||
aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
aEvent.FeatureURL.Path == "NumberFormatIncDecimals")
{
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-1' - 6 commits - external/liborcus instsetoo_native/CustomTarget_install.mk officecfg/registry postprocess/CustomTarget_signing.mk postproces
external/liborcus/UnpackedTarball_liborcus.mk |4 ++ instsetoo_native/CustomTarget_install.mk |2 - officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |2 - postprocess/CustomTarget_signing.mk|2 - postprocess/signing/signing.pl |3 +- readlicense_oo/license/license.xml |5 +++ scp2/source/ooo/file_ooo.scp |9 ++ scp2/source/ooo/module_ooo.scp | 11 +++ scp2/source/ooo/module_ooo.ulf |6 setup_native/source/packinfo/packinfo_office.txt | 15 ++ setup_native/source/packinfo/spellchecker_selection.txt|3 +- solenv/bin/modules/installer/windows/msp.pm|2 - 12 files changed, 58 insertions(+), 6 deletions(-) New commits: commit 398ea01a373c0bb373b6a3de9fa75d97ec2a633a Author: Andras Timar AuthorDate: Mon Jun 7 09:00:47 2021 +0200 Commit: Andras Timar CommitDate: Mon Mar 14 20:54:47 2022 +0100 no MinimumWidth of Sidebar for MIMO Change-Id: I66fc17b1d791e06debe95248a8952986171a4596 diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs index c54c3d6076c0..0fba94791836 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs @@ -247,7 +247,7 @@ Minimum width the sidebar can have. If true, the minumum width is calculated from the largest deck. -true +false commit c1631593b3e61ed71f290ea8dfba4c610f07498a Author: Andras Timar AuthorDate: Tue May 25 10:16:03 2021 +0200 Commit: Andras Timar CommitDate: Mon Mar 14 20:53:08 2022 +0100 Dictionary list required by MIMO Change-Id: Idefb9480460ae4ba946d7171811fde432c3c0927 diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index b4f568b8e673..4a6a7ff83f8f 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -46,7 +46,7 @@ en-ZA = "en,es,fr" eo = "eo" es = "es,an,ca,fr,gl,oc,pt-PT" et = "et" -fr = "fr,es" +fr = "de,en,eo,es,fr,it,pt-PT" gd = "gd" gl = "gl,pt-PT,es" gu = "gu" commit c056b7a92d16b6e8c7465169e18ef40be4a14202 Author: Andras Timar AuthorDate: Sun Apr 11 10:00:41 2021 +0200 Commit: Andras Timar CommitDate: Mon Mar 14 20:53:03 2022 +0100 Add Esperanto dictionaries Change-Id: I22d73bb5a6e4d215dc35acdd4ded47d29882671e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113941 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 2c45a12fd202..eb02fd8588cb 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -3351,6 +3351,11 @@ Jump to GPL Version 3 Jump to LGPL Version 3 Jump to MPL Version 1.1 +Esperanto +Spelling dictionary, hyphenation patterns, and thesaurus +The following software may be included in this product: Esperanto spelling dictionary, hyphenation patterns, +and thesaurus. Use of any of this software is governed by the terms of the license below: +GNU General Public License version 3. Estonian Spelling dictionary The following software may be included in this product: Estonian spelling dictionary. Use of any of this diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 7d2a1eed2f0e..dc1697395b14 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -401,6 +401,15 @@ File gid_File_Extension_Dictionary_El End #endif +#if defined WITH_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Eo + Dir = FILELIST_DIR; + Name = "Dictionary/dict-eo.filelist"; + Styles = (PACKED, FORCELANGUAGEPACK, FILELIST); + TXT_FILE_BODY; +End +#endif + #if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Es Dir = FILELIST_DIR; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index ee8024fe8f21..5bfc0137a38a 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -291,6 +291,17 @@ Module gid_Module_Root_Extension_Dictionary_El Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Eo +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EO ); +Files = (gid_File_Extension_Dictionary_Eo); +InstallOrder = "2000"; +Sortkey = "721"; +Spellcheckerlanguage = "eo"; +PackageInfo = "packinfo_office.txt"; +ParentID = gid_Module_Dictionaries; +Styles = ();
[Libreoffice-commits] help.git: source/text
source/text/shared/02/0117.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6e1ebf3f0b5cf3ea1b9d7678f86f67f3221af36 Author: Andrea Gelmini AuthorDate: Mon Mar 14 18:22:02 2022 +0100 Commit: Julien Nabet CommitDate: Mon Mar 14 20:54:14 2022 +0100 Fix typo Change-Id: I4856441ef0a64900b7b20c8f49333fec9002f250 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131554 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/source/text/shared/02/0117.xhp b/source/text/shared/02/0117.xhp index eb9ec45d3..1cfbd43f2 100644 --- a/source/text/shared/02/0117.xhp +++ b/source/text/shared/02/0117.xhp @@ -465,7 +465,7 @@ - Icon Scroolbar + Icon Scrollbar Creates a scrollbar.
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source svx/sdi
sc/source/ui/view/tabvwsh2.cxx | 11 +--
svx/sdi/svx.sdi|2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit bf995bf71c87cd2deb5237a2ab87a78b57caecf2
Author: Szymon Kłos
AuthorDate: Wed Mar 9 21:32:35 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 21:23:33 2022 +0100
lok: insert textbox directly in Calc
Change-Id: I3ae00b255dfbaa34ab8d973356d12dfd0f71d345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131267
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131535
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index dc48b24dc52c..693ef04ed055 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -262,6 +262,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
case SID_DRAW_TEXT_MARQUEE:
case SID_DRAW_NOTEEDIT:
pTabView->SetDrawFuncPtr(new FuText(*this, pWin, pView, pDoc,
aNewReq));
+bCreateDirectly = comphelper::LibreOfficeKit::isActive();
break;
case SID_FM_CREATE_CONTROL:
@@ -331,7 +332,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
}
else
{
-GetViewFrame()->GetDispatcher()->Execute(SID_OBJECT_SELECT,
SfxCallMode::ASYNCHRON);
ScViewData& rViewData = GetViewData();
aInsertPos = rViewData.getLOKVisibleArea().Center();
if (comphelper::LibreOfficeKit::isCompatFlagSet(
@@ -363,13 +363,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
// insert into page
pView->InsertObjectAtView(pObj.release(), *pPageView);
-if ( nNewId == SID_DRAW_CAPTION || nNewId ==
SID_DRAW_CAPTION_VERTICAL )
+switch ( nNewId )
{
+case SID_DRAW_CAPTION:
+case SID_DRAW_CAPTION_VERTICAL:
+case SID_DRAW_TEXT:
+case SID_DRAW_TEXT_VERTICAL:
// use KeyInput to start edit mode (FuText is
created).
// For FuText objects, edit mode is handled within
CreateDefaultObject.
// KEY_F2 is handled in FuDraw::KeyInput.
pFuActual->KeyInput( KeyEvent( 0, vcl::KeyCode( KEY_F2
) ) );
+break;
+default:
+break;
}
}
}
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9b3d9c89a48f..3f268536390e 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8373,7 +8373,7 @@ SfxBoolItem Text SID_ATTR_CHAR
SfxBoolItem DrawText SID_DRAW_TEXT
-
+(SfxBoolItem CreateDirectly FN_PARAM_1)
[
AutoUpdate = TRUE,
FastCall = FALSE,
[Libreoffice-commits] core.git: sw/qa
sw/qa/uitest/writer_tests5/tdf147935.py | 43
1 file changed, 43 insertions(+)
New commits:
commit 061c71c8f9cbf154c21e3726325894a529c89e1b
Author: Xisco Fauli
AuthorDate: Mon Mar 14 15:47:40 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 18:16:57 2022 +0100
tdf#147935: sw: Add UItest
Change-Id: I80ef9cff8956402d6286741fa52885f66dac6f9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131548
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/uitest/writer_tests5/tdf147935.py
b/sw/qa/uitest/writer_tests5/tdf147935.py
new file mode 100644
index ..fa0e773a980d
--- /dev/null
+++ b/sw/qa/uitest/writer_tests5/tdf147935.py
@@ -0,0 +1,43 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.calc import enter_text_to_cell
+
+class Tdf147935(UITestCase):
+
+def test_tdf147935(self):
+
+with self.ui_test.create_doc_in_start_center("calc") as document:
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+#enter data
+enter_text_to_cell(gridwin, "A1", "DDE")
+
+#select A1
+gridwin.executeAction("SELECT", mkPropertyValues({"Cell": "A1"}))
+
+self.xUITest.executeCommand(".uno:Copy")
+
+with self.ui_test.load_empty_file("writer") as writer_doc:
+
+# Paste as DDE
+formatProperty = mkPropertyValues({"SelectedFormat": 59})
+
self.xUITest.executeCommandWithParameters(".uno:ClipboardFormatItems",
formatProperty)
+
+# Without the fix in place, this test would have failed
because the warning message
+# "A table with no rows or no cells cannot be inserted" would
have been displayed
+
+self.assertEqual(1, writer_doc.TextTables.getCount())
+table = writer_doc.getTextTables()[0]
+self.assertEqual("DDE", table.getCellByName("A1").getString())
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source sfx2/source
desktop/source/lib/init.cxx |1 +
sfx2/source/control/unoctitm.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 08bc6c1101b30b064119cdabf0a6d60e39cb321a
Author: Aron Budea
AuthorDate: Thu Mar 10 06:30:23 2022 +0100
Commit: Aron Budea
CommitDate: Mon Mar 14 19:51:08 2022 +0100
Send Calc Insert Headers and Footers state change to LOK
Change-Id: Id51b4cf1eb962f22ee1e381873f4670789675525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131293
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
(cherry picked from commit 0090e414341f7ca9c70a2191a53d5b8fc855f4c8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131476
Tested-by: Aron Budea
Reviewed-by: Aron Budea
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 183578df411a..18259e045415 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3057,6 +3057,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:NumberFormatPercent"),
OUString(".uno:NumberFormatDecimal"),
OUString(".uno:NumberFormatDate"),
+OUString(".uno:EditHeaderAndFooter"),
OUString(".uno:FrameLineColor"),
OUString(".uno:SortAscending"),
OUString(".uno:SortDescending"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 44350d96ab9a..f7b6ecefba0d 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1107,6 +1107,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "ResetAttributes" ||
aEvent.FeatureURL.Path == "IncrementIndent" ||
aEvent.FeatureURL.Path == "DecrementIndent" ||
+ aEvent.FeatureURL.Path == "EditHeaderAndFooter" ||
aEvent.FeatureURL.Path == "NumberFormatDecDecimals" ||
aEvent.FeatureURL.Path == "NumberFormatIncDecimals")
{
[Libreoffice-commits] core.git: sc/CppunitTest_sc_sparkline_test.mk sc/Module_sc.mk sc/qa
sc/CppunitTest_sc_sparkline_test.mk | 60 +++
sc/Module_sc.mk |1
sc/qa/unit/SparklineImportExportTest.cxx | 159 +++
sc/qa/unit/data/xlsx/Sparklines.xlsx |binary
4 files changed, 220 insertions(+)
New commits:
commit 860299fe04ec5a2ff0d716186d43d517006069aa
Author: Tomaž Vajngerl
AuthorDate: Thu Feb 24 18:04:37 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Mar 15 06:31:13 2022 +0100
sc: test Sparkline OOXML Import into Calc Sparkline doc. model
Change-Id: I513571de398be419074d54c5861374effae07709
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131490
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/CppunitTest_sc_sparkline_test.mk
b/sc/CppunitTest_sc_sparkline_test.mk
new file mode 100644
index ..5dcd9a9921b5
--- /dev/null
+++ b/sc/CppunitTest_sc_sparkline_test.mk
@@ -0,0 +1,60 @@
+# -*- 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 gb_CppunitTest_CppunitTest,sc_sparkline_test))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_sparkline_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_sparkline_test, \
+sc/qa/unit/SparklineImportExportTest \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_sparkline_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+salhelper \
+sax \
+sc \
+scqahelper \
+sfx \
+subsequenttest \
+test \
+tl \
+unotest \
+vcl \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_sparkline_test,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_sparkline_test,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_sparkline_test))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_sparkline_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_sparkline_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_sparkline_test,services))
+
+$(eval $(call gb_CppunitTest_use_components,sc_sparkline_test))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_sparkline_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 1c146060b3a4..6dde171ebdc8 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -209,6 +209,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_sheetlinkobj \
CppunitTest_sc_sheetlinksobj \
CppunitTest_sc_sortdescriptorbaseobj \
+ CppunitTest_sc_sparkline_test \
CppunitTest_sc_spreadsheetsettings \
CppunitTest_sc_spreadsheetsettingsobj \
CppunitTest_sc_styleobj \
diff --git a/sc/qa/unit/SparklineImportExportTest.cxx
b/sc/qa/unit/SparklineImportExportTest.cxx
new file mode 100644
index ..cf970ae8995c
--- /dev/null
+++ b/sc/qa/unit/SparklineImportExportTest.cxx
@@ -0,0 +1,159 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include "helper/qahelper.hxx"
+
+#include
+#include
+#include
+
+using namespace css;
+
+class SparklineImportExportTest : public ScBootstrapFixture
+{
+private:
+uno::Reference m_xCalcComponent;
+
+public:
+SparklineImportExportTest()
+: ScBootstrapFixture("sc/qa/unit/data")
+{
+}
+
+virtual void setUp() override
+{
+test::BootstrapFixture::setUp();
+
+// This is a bit of a fudge, we do this to ensure that
ScGlobals::ensure,
+// which is a private symbol to us, gets called
+m_xCalcComponent = getMultiServiceFactory()->createInstance(
+"com.sun.star.comp.Calc.SpreadsheetDocument");
+CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
+}
+
+virtual void tearDown() override
+{
+uno::Reference(m_xCalcComponent,
uno::UNO_QUERY_THROW)->dispose();
+test::BootstrapFixture::tearDown();
+}
+
+void testSparklines();
+
+CPPUNIT_TEST_SUITE(SparklineImportExportTest);
+CPPUNIT_TEST(testSparklines);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void SparklineImportExportTest::testSparklines()
+{
+ScDocShellRef xDocSh = loadDoc(u"Sparklines.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh);
+
+ScDocument& rDocument =
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/SparklineGroup.hxx | 32 ++---
sc/source/filter/oox/SparklineFragment.cxx | 44 +
sc/source/ui/view/output.cxx |7 ++--
3 files changed, 70 insertions(+), 13 deletions(-)
New commits:
commit 055fcef3fe3c3f74ed485a35451c48f6723991b6
Author: Tomaž Vajngerl
AuthorDate: Fri Feb 25 11:57:15 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Mar 15 04:26:19 2022 +0100
sc: use enums instead strings for some SparklineGroup props.
Change-Id: I082c0a7693c97a67bc4972398224bce4bdae85eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131489
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/SparklineGroup.hxx b/sc/inc/SparklineGroup.hxx
index 4e1cd782abf0..620a5ae0bf4a 100644
--- a/sc/inc/SparklineGroup.hxx
+++ b/sc/inc/SparklineGroup.hxx
@@ -16,6 +16,30 @@
namespace sc
{
+/** Supported sparkline types */
+enum class SparklineType
+{
+Line,
+Column,
+Stacked
+};
+
+/** The method of calculating the axis min or max value */
+enum class AxisType
+{
+Individual, // calculate the min/max of a sparkline
+Group, // calculate the min or max of the whole sparkline group
+Custom // user defined
+};
+
+/** Determines how to display the empty cells */
+enum class DisplayEmptyCellAs
+{
+Span,
+Gap,
+Zero // empty cell equals zero
+};
+
/** Common properties for a group of sparklines */
class SC_DLLPUBLIC SparklineGroup
{
@@ -29,16 +53,16 @@ public:
Color m_aColorHigh;
Color m_aColorLow;
-OUString m_sMinAxisType; // individual, group, custom
-OUString m_sMaxAxisType; // individual, group, custom
+AxisType m_eMinAxisType;
+AxisType m_eMaxAxisType;
double m_fLineWeight; // In pt
-OUString m_sType; // line, column, stacked
+SparklineType m_eType;
bool m_bDateAxis;
-OUString m_sDisplayEmptyCellsAs; // span, gap, zero
+DisplayEmptyCellAs m_eDisplayEmptyCellsAs;
bool m_bMarkers;
bool m_bHigh;
diff --git a/sc/source/filter/oox/SparklineFragment.cxx
b/sc/source/filter/oox/SparklineFragment.cxx
index 54ef0df3c6ec..0e65a192af54 100644
--- a/sc/source/filter/oox/SparklineFragment.cxx
+++ b/sc/source/filter/oox/SparklineFragment.cxx
@@ -90,6 +90,33 @@ void addColorsToSparklineGroup(sc::SparklineGroup&
rSparklineGroup, sal_Int32 nE
}
}
+sc::SparklineType parseSparklineType(std::u16string_view rString)
+{
+if (rString == u"column")
+return sc::SparklineType::Column;
+else if (rString == u"stacked")
+return sc::SparklineType::Stacked;
+return sc::SparklineType::Line;
+}
+
+sc::DisplayEmptyCellAs parseDisplayEmptyCellAs(std::u16string_view rString)
+{
+if (rString == u"span")
+return sc::DisplayEmptyCellAs::Span;
+else if (rString == u"gap")
+return sc::DisplayEmptyCellAs::Gap;
+return sc::DisplayEmptyCellAs::Zero;
+}
+
+sc::AxisType parseAxisType(std::u16string_view rString)
+{
+if (rString == u"group")
+return sc::AxisType::Group;
+else if (rString == u"custom")
+return sc::AxisType::Custom;
+return sc::AxisType::Individual;
+}
+
void addAttributesToSparklineGroup(sc::SparklineGroup& rSparklineGroup,
const AttributeList& rAttribs)
{
@@ -98,11 +125,13 @@ void addAttributesToSparklineGroup(sc::SparklineGroup&
rSparklineGroup,
rSparklineGroup.m_fLineWeight = rAttribs.getDouble(XML_lineWeight, 0.75);
-rSparklineGroup.m_sType = rAttribs.getString(XML_type, "line");
+OUString sType = rAttribs.getString(XML_type, "line");
+rSparklineGroup.m_eType = parseSparklineType(sType);
rSparklineGroup.m_bDateAxis = rAttribs.getBool(XML_dateAxis, false);
-rSparklineGroup.m_sDisplayEmptyCellsAs =
rAttribs.getString(XML_displayEmptyCellsAs, "zero");
+OUString sDisplayEmptyCellsAs =
rAttribs.getString(XML_displayEmptyCellsAs, "zero");
+rSparklineGroup.m_eDisplayEmptyCellsAs =
parseDisplayEmptyCellAs(sDisplayEmptyCellsAs);
rSparklineGroup.m_bMarkers = rAttribs.getBool(XML_markers, false);
rSparklineGroup.m_bHigh = rAttribs.getBool(XML_high, false);
@@ -113,16 +142,19 @@ void addAttributesToSparklineGroup(sc::SparklineGroup&
rSparklineGroup,
rSparklineGroup.m_bDisplayXAxis = rAttribs.getBool(XML_displayXAxis,
false);
rSparklineGroup.m_bDisplayHidden = rAttribs.getBool(XML_displayHidden,
false);
-rSparklineGroup.m_sMinAxisType = rAttribs.getString(XML_minAxisType,
"individual");
-rSparklineGroup.m_sMaxAxisType = rAttribs.getString(XML_maxAxisType,
"individual");
+OUString sMinAxisType = rAttribs.getString(XML_minAxisType, "individual");
+rSparklineGroup.m_eMinAxisType = parseAxisType(sMinAxisType);
+
+OUString sMaxAxisType = rAttribs.getString(XML_maxAxisType, "individual");
+rSparklineGroup.m_eMaxAxisType = parseAxisType(sMaxAxisType);
rSparklineGroup.m_bRightToLeft =
[Libreoffice-commits] core.git: filter/source include/filter include/oox oox/source
filter/source/msfilter/util.cxx| 1244 ++---
include/filter/msfilter/util.hxx |4
include/oox/export/drawingml.hxx |6
oox/source/export/DMLPresetShapeExport.cxx |4
oox/source/export/drawingml.cxx| 12
oox/source/export/shapes.cxx |4
6 files changed, 620 insertions(+), 654 deletions(-)
New commits:
commit d65c8b37595a4775fd766b2b7becbc01fe21a04e
Author: Mike Kaganski
AuthorDate: Mon Mar 14 18:27:43 2022 +0300
Commit: Mike Kaganski
CommitDate: Tue Mar 15 06:19:53 2022 +0100
Simplify GetOOXMLPresetGeometry and GETVMLShapeType
Let them use types that know string lengths, don't require conversion,
and are convenient at call sites.
Also inline the maps initialization, instead of having separate arrays
and initialization loops.
Change-Id: Id4469f3f99f3f0eb2cd83f0671cf892df4e420a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131550
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index d0e4b24fe08c..51e2d3de5a80 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -601,650 +601,616 @@ EquationResult ParseCombinedChars(const OUString& rStr)
return aResult;
}
-namespace {
-
-struct CustomShapeTypeTranslationTable
-{
-const char* sOOo;
-const char* sMSO;
-};
-
-}
-
-const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[] =
+OString GetOOXMLPresetGeometry( std::u16string_view rShapeType )
{
-// { "non-primitive", mso_sptMin },
-{ "frame", "frame" },
-{ "rectangle", "rect" },
-{ "round-rectangle", "roundRect" },
-{ "ellipse", "ellipse" },
-{ "diamond", "diamond" },
-{ "isosceles-triangle", "triangle" },
-{ "right-triangle", "rtTriangle" },
-{ "parallelogram", "parallelogram" },
-{ "trapezoid", "trapezoid" },
-{ "hexagon", "hexagon" },
-{ "octagon", "octagon" },
-{ "cross", "plus" },
-{ "star5", "star5" },
-{ "right-arrow", "rightArrow" },
-// { "mso-spt14", mso_sptThickArrow },
-{ "pentagon-right", "homePlate" },
-{ "cube", "cube" },
-// { "mso-spt17", mso_sptBalloon },
-// { "mso-spt18", mso_sptSeal },
-{ "mso-spt19", "arc" },
-{ "mso-spt20", "line" },
-{ "mso-spt21", "plaque" },
-{ "can", "can" },
-{ "ring", "donut" },
-{ "mso-spt24", "textPlain" },
-{ "mso-spt25", "textStop" },
-{ "mso-spt26", "textTriangle" },
-{ "mso-spt27", "textCanDown" },
-{ "mso-spt28", "textWave1" },
-{ "mso-spt29", "textArchUpPour" },
-{ "mso-spt30", "textCanDown" },
-{ "mso-spt31", "textArchUp" },
-{ "mso-spt32", "straightConnector1" },
-{ "mso-spt33", "bentConnector2" },
-{ "mso-spt34", "bentConnector3" },
-{ "mso-spt35", "bentConnector4" },
-{ "mso-spt36", "bentConnector5" },
-{ "mso-spt37", "curvedConnector2" },
-{ "mso-spt38", "curvedConnector3" },
-{ "mso-spt39", "curvedConnector4" },
-{ "mso-spt40", "curvedConnector5" },
-{ "mso-spt41", "callout1" },
-{ "mso-spt42", "callout2" },
-{ "mso-spt43", "callout3" },
-{ "mso-spt44", "accentCallout1" },
-{ "mso-spt45", "accentCallout2" },
-{ "mso-spt46", "accentCallout3" },
-{ "line-callout-1", "borderCallout1" },
-{ "line-callout-2", "borderCallout2" },
-{ "line-callout-3", "borderCallout3" },
-{ "mso-spt49", "borderCallout3" },
-{ "mso-spt50", "accentBorderCallout1" },
-{ "mso-spt51", "accentBorderCallout2" },
-{ "mso-spt52", "accentBorderCallout3" },
-{ "mso-spt53", "ribbon" },
-{ "mso-spt54", "ribbon2" },
-{ "chevron", "chevron" },
-{ "pentagon", "pentagon" },
-{ "forbidden", "noSmoking" },
-{ "star8", "star8" },
-{ "mso-spt59", "star16" },
-{ "mso-spt60", "star32" },
-{ "rectangular-callout", "wedgeRectCallout" },
-{ "round-rectangular-callout", "wedgeRoundRectCallout" },
-{ "round-callout", "wedgeEllipseCallout" },
-{ "mso-spt64", "wave" },
-{ "paper", "foldedCorner" },
-{ "left-arrow", "leftArrow" },
-{ "down-arrow", "downArrow" },
-{ "up-arrow", "upArrow" },
-{ "left-right-arrow", "leftRightArrow" },
-{ "up-down-arrow", "upDownArrow" },
-{ "mso-spt71", "irregularSeal1" },
-{ "bang", "irregularSeal2" },
-{ "lightning", "lightningBolt" },
-{ "heart", "heart" },
-{ "quad-arrow", "quadArrow" },
-{ "left-arrow-callout", "leftArrowCallout" },
-{ "right-arrow-callout", "rightArrowCallout" },
-{ "up-arrow-callout", "upArrowCallout" },
-{ "down-arrow-callout", "downArrowCallout" },
-{ "left-right-arrow-callout", "leftRightArrowCallout" },
-{ "up-down-arrow-callout", "upDownArrowCallout" },
-{ "quad-arrow-callout", "quadArrowCallout" },
-{ "quad-bevel", "bevel" },
-{ "left-bracket", "leftBracket" },
-{ "right-bracket",
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0106.xhp|6 ++ source/text/shared/guide/auto_redact.xhp |5 +++-- source/text/shared/guide/redaction.xhp|5 +++-- source/text/swriter/guide/auto_spellcheck.xhp | 13 +++-- source/text/swriter/guide/using_thesaurus.xhp | 10 ++ 5 files changed, 25 insertions(+), 14 deletions(-) New commits: commit 14a38203c36eab86b30e02c1acd66b1841cbfaf0 Author: Olivier Hallot AuthorDate: Mon Mar 14 15:09:22 2022 -0300 Commit: Olivier Hallot CommitDate: Tue Mar 15 00:11:11 2022 +0100 Update Calc's Tools menu Help page Change-Id: I9f52bd1636a472fc02924c1adf6685358b504e47 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131555 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0106.xhp b/source/text/scalc/main0106.xhp index 65815915b..c1b38cb18 100644 --- a/source/text/scalc/main0106.xhp +++ b/source/text/scalc/main0106.xhp @@ -32,11 +32,17 @@ You can also create and assign macros and configure the look and feel of toolbars, menus, keyboard, and set the default options for $[officename] applications. + + + AutoCorrect Options + + + ImageMap diff --git a/source/text/shared/guide/auto_redact.xhp b/source/text/shared/guide/auto_redact.xhp index 9a602a222..1b61e109a 100644 --- a/source/text/shared/guide/auto_redact.xhp +++ b/source/text/shared/guide/auto_redact.xhp @@ -25,9 +25,10 @@ -Automatic Redaction -Use automatic redaction to define words and patterns that are automatically marked for redaction. This makes it easier to redact %PRODUCTNAME documents that have multiple portions of text that need to be hidden due to sensitivity or privacy issues. +Auto-Redact +Use automatic redaction to define words and patterns that are automatically marked for redaction. + Automatic redaction makes it easier to redact %PRODUCTNAME documents that have multiple portions of text that need to be hidden due to sensitivity or privacy issues. Choose Tools - Auto-Redact diff --git a/source/text/shared/guide/redaction.xhp b/source/text/shared/guide/redaction.xhp index 53978586a..851834bd7 100644 --- a/source/text/shared/guide/redaction.xhp +++ b/source/text/shared/guide/redaction.xhp @@ -24,9 +24,10 @@ -Redacting Documents -Redacting documents blocks out words or portions of a document for authorized use or viewing. Redaction protects sensitive information and helps enterprises and organizations to comply with regulations on confidentiality or privacy. +Redaction +Redacting documents blocks out words or portions of a document for authorized use or viewing. +Redaction protects sensitive information and helps enterprises and organizations to comply with regulations on confidentiality or privacy. Choose Tools - Redact diff --git a/source/text/swriter/guide/auto_spellcheck.xhp b/source/text/swriter/guide/auto_spellcheck.xhp index 96d034f14..48ceed5fe 100644 --- a/source/text/swriter/guide/auto_spellcheck.xhp +++ b/source/text/swriter/guide/auto_spellcheck.xhp @@ -32,10 +32,11 @@ checking spelling;while typing words;disabling spellcheck MW deleted "text;" -Automatically Check Spelling - - You can have $[officename] automatically check spelling while you type and underline possible misspelt words with a red wavy line. - To Check Spelling Automatically While You Type + +Automatic Check Spelling +%PRODUCTNAME can automatically check spelling while you type and underline possible misspelled words with a red wavy line. + +To Check Spelling Automatically While You Type Choose Tools - Automatic Spell Checking. @@ -46,7 +47,7 @@ If you choose a word from the AutoCorrect submenu, the underlined word and the replacement word are automatically added to the AutoCorrect list for the current language. To view the AutoCorrect list, choose Tools - AutoCorrect - AutoCorrect Options, and then click the Replace tab. You can also add the underlined word to your custom dictionary by choosing Add. - To Exclude Words From the Spellcheck + To Exclude Words From the Spellcheck Select the words that you want to exclude. @@ -63,4 +64,4 @@ - \ No newline at end of file + diff --git a/source/text/swriter/guide/using_thesaurus.xhp b/source/text/swriter/guide/using_thesaurus.xhp index 356516c85..051ec6145 100644 --- a/source/text/swriter/guide/using_thesaurus.xhp +++ b/source/text/swriter/guide/using_thesaurus.xhp @@ -35,9 +35,11 @@ synonyms in thesaurus searching;synonyms -Thesaurus - - You can use the thesaurus to look up synonyms or related terms. + +Thesaurus +Use the thesaurus to look up synonyms or related terms. + + Click
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 84ada418f4fb47e18e4c4bbacb3442076908f71c Author: Olivier Hallot AuthorDate: Mon Mar 14 20:11:13 2022 -0300 Commit: Gerrit Code Review CommitDate: Tue Mar 15 00:11:13 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 14a38203c36eab86b30e02c1acd66b1841cbfaf0 - Update Calc's Tools menu Help page Change-Id: I9f52bd1636a472fc02924c1adf6685358b504e47 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131555 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 15250e5e0374..14a38203c36e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 15250e5e03742751ec8b78b5f1a8eb339e66950d +Subproject commit 14a38203c36eab86b30e02c1acd66b1841cbfaf0
[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/text
AllLangHelp_shared.mk |1 + source/text/scalc/00/0406.xhp |2 ++ source/text/scalc/main0106.xhp |4 source/text/shared/02/01170400.xhp | 23 +-- source/text/shared/guide/dev_tools.xhp |7 +-- source/text/swriter/main0120.xhp | 18 -- 6 files changed, 37 insertions(+), 18 deletions(-) New commits: commit 31f0c48d3bc30742d49af32ac9686d71f8aa7215 Author: Olivier Hallot AuthorDate: Mon Mar 14 20:08:09 2022 -0300 Commit: Olivier Hallot CommitDate: Tue Mar 15 00:11:45 2022 +0100 Update Clac Tools menu with Forms submenu Change-Id: Ib8ac1f43116592ea569d88d16f84db44b0333286 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131567 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 2f3c9b40a..344f2bc4d 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -777,6 +777,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/main0800 \ helpcontent2/source/text/shared/submenu_text \ helpcontent2/source/text/shared/submenu_spacing \ +helpcontent2/source/text/shared/menu/forms \ helpcontent2/source/text/shared/menu/insert_chart \ helpcontent2/source/text/shared/menu/insert_form_control \ helpcontent2/source/text/shared/menu/insert_shape \ diff --git a/source/text/scalc/00/0406.xhp b/source/text/scalc/00/0406.xhp index 6fee82076..64239b361 100644 --- a/source/text/scalc/00/0406.xhp +++ b/source/text/scalc/00/0406.xhp @@ -51,6 +51,8 @@ Choose Tools - Solver, click Options button. Choose Tools - Scenarios. +Choose Tools - Forms. + Choose Tools - Share Spreadsheet Choose Tools - Protect Sheet. diff --git a/source/text/scalc/main0106.xhp b/source/text/scalc/main0106.xhp index c1b38cb18..908491258 100644 --- a/source/text/scalc/main0106.xhp +++ b/source/text/scalc/main0106.xhp @@ -54,11 +54,15 @@ Scenarios + + + + Customize diff --git a/source/text/shared/02/01170400.xhp b/source/text/shared/02/01170400.xhp index 70ba11085..6df2946e5 100644 --- a/source/text/shared/02/01170400.xhp +++ b/source/text/shared/02/01170400.xhp @@ -1,7 +1,4 @@ - - - - - - + Add Field @@ -30,13 +25,21 @@ -Add Field -Opens a window where you can select a database field to add to the form or report. -same help id used for forms and reports + +database field;add to form +forms;add database field +database field;add to report +report;add database field + + +Add Field +Opens a window where you can select a database field to add to the form or report.same help id used for forms and reports + -The field selection window lists all database fields of the table or query that was specified as the data source in the Form Properties. + +The field selection window lists all database fields of the table or query that was specified as the data source in the Form Properties. You can insert a field into the current document by dragging and dropping. A field is then inserted which contains a link to the database. If you add fields to a form and you switch off the Design Mode, you can see that $[officename] adds a labeled input field for every inserted database field.may be different for reports diff --git a/source/text/shared/guide/dev_tools.xhp b/source/text/shared/guide/dev_tools.xhp index 1b905c3f0..5463a7312 100644 --- a/source/text/shared/guide/dev_tools.xhp +++ b/source/text/shared/guide/dev_tools.xhp @@ -31,8 +31,11 @@ - Development Tools - Inspects objects in %PRODUCTNAME documents and shows supported UNO services, as well as available methods, properties and implemented interfaces. This feature also allows to explore the document structure using the Document Object Model (DOM). + +Development Tools +Inspects objects in %PRODUCTNAME documents and shows supported UNO services, as well as available methods, properties and implemented interfaces. + +This feature also allows to explore the document structure using the Document Object Model (DOM). Choose Tools - Development Tools diff --git a/source/text/swriter/main0120.xhp b/source/text/swriter/main0120.xhp index d0571c0b0..61582ff91 100644 --- a/source/text/swriter/main0120.xhp +++ b/source/text/swriter/main0120.xhp @@ -19,12 +19,16 @@ Form -Contains commands for activate form design mode, open control wizards and insert form controls in your text document. +Contains commands for activate form design mode, open control wizards and insert form controls in your document. -Design Mode -Enable or disable form design mode. -Control Wizards + +Design Mode +Enable or disable form design mode. + + +Control Wizards Enable or disable control wizards. +
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1 source/text/scalc/00/0406.xhp |3 + source/text/scalc/01/shared_spreadsheet.xhp | 47 source/text/scalc/main0106.xhp |5 ++ source/text/shared/guide/collab.xhp | 21 ++-- 5 files changed, 66 insertions(+), 11 deletions(-) New commits: commit 15250e5e03742751ec8b78b5f1a8eb339e66950d Author: Olivier Hallot AuthorDate: Mon Mar 14 13:58:56 2022 -0300 Commit: Olivier Hallot CommitDate: Tue Mar 15 00:10:36 2022 +0100 tdf#147977 Add Share Spreadsheet help page Change-Id: Ic4d77dd4b33d3e0bd74c48a195a3d97b2ad647e4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131553 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index de4304d99..7e70a9fec 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -278,6 +278,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/live_data_stream \ helpcontent2/source/text/scalc/01/recalculate_hard \ helpcontent2/source/text/scalc/01/solver \ +helpcontent2/source/text/scalc/01/shared_spreadsheet \ helpcontent2/source/text/scalc/01/solver_options \ helpcontent2/source/text/scalc/01/solver_options_algo \ helpcontent2/source/text/scalc/01/statistics \ diff --git a/source/text/scalc/00/0406.xhp b/source/text/scalc/00/0406.xhp index 7c90749a1..6fee82076 100644 --- a/source/text/scalc/00/0406.xhp +++ b/source/text/scalc/00/0406.xhp @@ -50,6 +50,9 @@ Choose Tools - Solver. Choose Tools - Solver, click Options button. Choose Tools - Scenarios. + +Choose Tools - Share Spreadsheet + Choose Tools - Protect Sheet. Choose Tools - Protect Spreadsheet Structure. diff --git a/source/text/scalc/01/shared_spreadsheet.xhp b/source/text/scalc/01/shared_spreadsheet.xhp new file mode 100644 index 0..919d77b87 --- /dev/null +++ b/source/text/scalc/01/shared_spreadsheet.xhp @@ -0,0 +1,47 @@ + + + + + + +page_title +/text/scalc/01/shared_spreadsheet.xhp + + + + +share spreadsheet +spreadsheet;collaboration +spreadsheet;share + + + +Share Spreadsheet +Sharing a spreadsheet allows several users to open the same file for editing at the same time. + + + + +The spreadsheet needs to be on a shared drive, server, website, or similar. Some conditions must be met on operating systems with user permission management: + + +The shared file needs to reside in a location which is accessible by all collaborators. + + +The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files. + + +In order to correctly identify the changes, each collaborator should enter their name in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - User Data on the Menu bar. + + + + + + diff --git a/source/text/scalc/main0106.xhp b/source/text/scalc/main0106.xhp index 8336e9019..65815915b 100644 --- a/source/text/scalc/main0106.xhp +++ b/source/text/scalc/main0106.xhp @@ -47,10 +47,13 @@ Scenarios + + + + - Customize diff --git a/source/text/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp index ec2695ce2..3d9515b35 100644 --- a/source/text/shared/guide/collab.xhp +++ b/source/text/shared/guide/collab.xhp @@ -1,4 +1,5 @@ - + +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3611192af750a34e681f3c1f59490132cef5b69f Author: Olivier Hallot AuthorDate: Mon Mar 14 20:10:38 2022 -0300 Commit: Gerrit Code Review CommitDate: Tue Mar 15 00:10:38 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 15250e5e03742751ec8b78b5f1a8eb339e66950d - tdf#147977 Add Share Spreadsheet help page Change-Id: Ic4d77dd4b33d3e0bd74c48a195a3d97b2ad647e4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131553 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d6e1ebf3f0b5..15250e5e0374 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d6e1ebf3f0b5cf3ea1b9d7678f86f67f3221af36 +Subproject commit 15250e5e03742751ec8b78b5f1a8eb339e66950d
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 288c78cb990bc427055dea7d97748de5cc4b8ab0 Author: Olivier Hallot AuthorDate: Mon Mar 14 20:11:48 2022 -0300 Commit: Gerrit Code Review CommitDate: Tue Mar 15 00:11:48 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 31f0c48d3bc30742d49af32ac9686d71f8aa7215 - Update Clac Tools menu with Forms submenu Change-Id: Ib8ac1f43116592ea569d88d16f84db44b0333286 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131567 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 14a38203c36e..31f0c48d3bc3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 14a38203c36eab86b30e02c1acd66b1841cbfaf0 +Subproject commit 31f0c48d3bc30742d49af32ac9686d71f8aa7215
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/colibre sd/uiconfig
icon-themes/colibre/cmd/sc_add.png |binary icon-themes/colibre/cmd/sc_list_remove.png |binary sd/uiconfig/simpress/ui/customanimationspanel.ui |4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 800142eca5c52ca1e936a1c435f6617806824155 Author: Pedro Pinto Silva AuthorDate: Mon Mar 14 15:36:32 2022 +0100 Commit: Pedro Silva CommitDate: Mon Mar 14 17:54:27 2022 +0100 Fix btn image size inconsistencies on CustomAnimationsPanel Animations btns (Add, Remove, Move Up, Move Down) - Images were being loaded from different locations - Images did not share the same size Signed-off-by: Pedro Pinto Silva Change-Id: I33c033d50c802b7f2c9506b2c5a7b82967af7db8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131551 Tested-by: Jenkins CollaboraOffice diff --git a/icon-themes/colibre/cmd/sc_add.png b/icon-themes/colibre/cmd/sc_add.png index 5d1b3b8e8146..7b0680d5c24e 100644 Binary files a/icon-themes/colibre/cmd/sc_add.png and b/icon-themes/colibre/cmd/sc_add.png differ diff --git a/icon-themes/colibre/cmd/sc_list_remove.png b/icon-themes/colibre/cmd/sc_list_remove.png new file mode 100644 index ..05a11237416f Binary files /dev/null and b/icon-themes/colibre/cmd/sc_list_remove.png differ diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 618ac8b89577..43cb2119f5cd 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -20,7 +20,7 @@ True False -svtools/res/list_add.png +cmd/sc_add.png 2 @@ -37,7 +37,7 @@ True False -extensions/res/buttonminus.png +cmd/sc_list_remove.png 2
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/logical/fods/ifs.fods| 48 - sc/qa/unit/data/functions/logical/fods/switch.fods | 31 + 2 files changed, 77 insertions(+), 2 deletions(-) New commits: commit 9d5ec2c9d0bf8765fc75c17a0e6fdcb2583335d0 Author: Xisco Fauli AuthorDate: Mon Mar 14 14:15:42 2022 +0100 Commit: Xisco Fauli CommitDate: Mon Mar 14 15:25:42 2022 +0100 tdf#111675: sc_logical_functions: Add unittest Change-Id: I72f158007f456fd70149fcfd6029a0157e47837c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131539 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/qa/unit/data/functions/logical/fods/ifs.fods b/sc/qa/unit/data/functions/logical/fods/ifs.fods index 5e881dfeb641..23a98aa78480 100644 --- a/sc/qa/unit/data/functions/logical/fods/ifs.fods +++ b/sc/qa/unit/data/functions/logical/fods/ifs.fods @@ -3821,6 +3821,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5649,4 +5695,4 @@ - \ No newline at end of file + diff --git a/sc/qa/unit/data/functions/logical/fods/switch.fods b/sc/qa/unit/data/functions/logical/fods/switch.fods index c29ee2e5e74b..4a34f34345a7 100644 --- a/sc/qa/unit/data/functions/logical/fods/switch.fods +++ b/sc/qa/unit/data/functions/logical/fods/switch.fods @@ -3657,6 +3657,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5543,4 +5572,4 @@ - \ No newline at end of file +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 579f3b50bcffe14a5979d76a5316b4f51c76b7ad Author: Olivier Hallot AuthorDate: Mon Mar 14 12:01:56 2022 -0300 Commit: Gerrit Code Review CommitDate: Mon Mar 14 16:01:56 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to f620b42736be0f4a3efc01100e223a6c877b0716 - Fix a D'oh! in help page. Change-Id: Ib3e5c2f00320a6679b655d1a22ea0bb70950852f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131547 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e159fae8ea7b..f620b42736be 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e159fae8ea7be0552646da8de925b6b7dafeefe9 +Subproject commit f620b42736be0f4a3efc01100e223a6c877b0716
[Libreoffice-commits] help.git: source/text
source/text/shared/01/02230100.xhp|4 ++-- source/text/swriter/track_changes_toolbar.xhp |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit f620b42736be0f4a3efc01100e223a6c877b0716 Author: Olivier Hallot AuthorDate: Mon Mar 14 11:39:59 2022 -0300 Commit: Olivier Hallot CommitDate: Mon Mar 14 16:01:55 2022 +0100 Fix a D'oh! in help page. Change-Id: Ib3e5c2f00320a6679b655d1a22ea0bb70950852f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/131547 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/02230100.xhp b/source/text/shared/01/02230100.xhp index 72d2a830b..ac239901f 100644 --- a/source/text/shared/01/02230100.xhp +++ b/source/text/shared/01/02230100.xhp @@ -31,7 +31,7 @@ -Record Changes +Record Changes Tracks each change that is made in the current document by author and date. @@ -100,7 +100,7 @@ -When the record changes command is active, you cannot delete, move, merge, split, or copy cells or delete sheets. +When the record changes command is active, you cannot delete, move, merge, split, or copy cells or delete sheets. removed the note about no-tables-comparing in Writer diff --git a/source/text/swriter/track_changes_toolbar.xhp b/source/text/swriter/track_changes_toolbar.xhp index 080a2d997..eff70974a 100644 --- a/source/text/swriter/track_changes_toolbar.xhp +++ b/source/text/swriter/track_changes_toolbar.xhp @@ -41,7 +41,7 @@ - +
[Libreoffice-commits] core.git: include/svx sc/qa svx/source
include/svx/svdedtv.hxx |2 -
sc/qa/unit/tiledrendering/tiledrendering.cxx | 31 ++-
svx/source/svdraw/svdedtv.cxx|7 +++---
3 files changed, 35 insertions(+), 5 deletions(-)
New commits:
commit 7fced7bbd0d6d7769dcf13ab326c793d4096a247
Author: Szymon Kłos
AuthorDate: Wed Mar 9 16:41:36 2022 +0100
Commit: Szymon Kłos
CommitDate: Mon Mar 14 16:04:48 2022 +0100
svx: don't remove object right after insertion
This is regression from:
commit 2d95b3846eac367d2baadc194ab258dc31e7bd33
Author: Tomaz Vajngerl
Date: Thu Oct 7 16:48:46 2021 +0200
svx: Don't end text edit mode for all views
It was visible with "direct insertion" where user doesn't
need to draw anything but textbox is inserted in the center
of a screen (eg. used in LOK case)
Object was inserted into a view and right after that was removed when
EndTextEditCurrentView was called
Change-Id: I9943d46746aabadf96d76d6e74770b56d648b79d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131263
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131537
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 6f80c3aca0fa..d2c9b3816f6a 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -188,7 +188,7 @@ public:
* Checks if this or other views have an active text edit, if true, end
them.
*/
void EndTextEditAllViews() const;
-void EndTextEditCurrentView();
+void EndTextEditCurrentView(bool bDontDeleteReally = false);
std::vector< std::unique_ptr > CreateConnectorUndo( const
SdrObject& rO );
void AddUndoActions( std::vector< std::unique_ptr > );
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 5b84eef452b9..04c22438f74b 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -121,6 +121,7 @@ public:
void testEditCursorBounds();
void testTextSelectionBounds();
void testSheetViewDataCrash();
+void testTextBoxInsert();
CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
CPPUNIT_TEST(testRowColumnHeaders);
@@ -175,6 +176,7 @@ public:
CPPUNIT_TEST(testEditCursorBounds);
CPPUNIT_TEST(testTextSelectionBounds);
CPPUNIT_TEST(testSheetViewDataCrash);
+CPPUNIT_TEST(testTextBoxInsert);
CPPUNIT_TEST_SUITE_END();
private:
@@ -456,7 +458,12 @@ struct EditCursorMessage final {
std::stringstream aStream(pMessage);
boost::property_tree::ptree aTree;
boost::property_tree::read_json(aStream, aTree);
-std::string aVal =
aTree.get_child("refpoint").get_value();
+std::string aVal;
+boost::property_tree::ptree::const_assoc_iterator it =
aTree.find("refpoint");
+if (it != aTree.not_found())
+aVal = aTree.get_child("refpoint").get_value();
+else
+return; // happens in testTextBoxInsert test
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
@@ -2783,6 +2790,28 @@ void ScTiledRenderingTest::testSheetViewDataCrash()
Scheduler::ProcessEventsToIdle();
}
+void ScTiledRenderingTest::testTextBoxInsert()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("empty.ods");
+ViewCallback aView1;
+
+// insert textbox
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({
+{ "CreateDirectly", uno::Any(true) }
+}));
+comphelper::dispatchCommand(".uno:DrawText", aArgs);
+Scheduler::ProcessEventsToIdle();
+
+// check if we have textbox selected
+CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
+CPPUNIT_ASSERT(aView1.m_ShapeSelection != "EMPTY");
+
+Scheduler::ProcessEventsToIdle();
+}
+
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index c59b1e6be864..df42a3d78dea 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -1008,7 +1008,8 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj,
SdrPageView& rPV, SdrInser
}
if( IsUndoEnabled())
{
-EndTextEditCurrentView();
+bool bDontDeleteReally = true;
+EndTextEditCurrentView(bDontDeleteReally);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
}
@@ -1088,13 +1089,13 @@ void SdrEditView::EndTextEditAllViews() const
}
}
-void SdrEditView::EndTextEditCurrentView()
+void SdrEditView::EndTextEditCurrentView(bool bDontDeleteReally)
{
if (IsTextEdit())
{
SdrView* pSdrView = dynamic_cast(this);
if (pSdrView)
-
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/parallelism.cxx | 30 ++
1 file changed, 30 insertions(+)
New commits:
commit bee6568ae5d49f5b697740a23c5a1c6775f64d52
Author: Xisco Fauli
AuthorDate: Mon Mar 14 16:23:57 2022 +0100
Commit: Xisco Fauli
CommitDate: Mon Mar 14 17:27:59 2022 +0100
tdf#147905: sc_parallelism: Add unittest
Change-Id: Ib71a30d7ef8d907c1fd86e35d3e6cae5c15218bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131549
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 37dcd79e546c..5fc47c23304d 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -35,6 +35,7 @@ public:
void testVLOOKUP();
void testVLOOKUPSUM();
void testSingleRef();
+void testTdf147905();
void testSUMIFImplicitRange();
void testFGCycleWithPlainFormulaCell1();
void testFGCycleWithPlainFormulaCell2();
@@ -54,6 +55,7 @@ public:
CPPUNIT_TEST(testVLOOKUP);
CPPUNIT_TEST(testVLOOKUPSUM);
CPPUNIT_TEST(testSingleRef);
+CPPUNIT_TEST(testTdf147905);
CPPUNIT_TEST(testSUMIFImplicitRange);
CPPUNIT_TEST(testFGCycleWithPlainFormulaCell1);
CPPUNIT_TEST(testFGCycleWithPlainFormulaCell2);
@@ -400,6 +402,34 @@ void ScParallelismTest::testSingleRef()
m_pDoc->DeleteTab(0);
}
+void ScParallelismTest::testTdf147905()
+{
+m_pDoc->InsertTab(0, "1");
+
+OUString aFormula;
+const size_t nNumRows = 500;
+for (size_t i = 0; i < nNumRows; ++i)
+{
+m_pDoc->SetString(0, i, 0, "");
+aFormula = "=PROPER($A" + OUString::number(i+1) + ")";
+m_pDoc->SetFormula(ScAddress(1, i, 0),
+ aFormula,
+ formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+m_xDocShell->DoHardRecalc();
+
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OString aMsg = "At row " + OString::number(i);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), OUString(""),
m_pDoc->GetString(0, i, 0));
+
+// Without the fix in place, this test would have failed here
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), OUString("Aaaa"),
m_pDoc->GetString(1, i, 0));
+}
+m_pDoc->DeleteTab(0);
+}
+
// Common test setup steps for testSUMIFImplicitRange*()
static void lcl_setupCommon(ScDocument* pDoc, size_t nNumRows, size_t
nConstCellValue)
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/inc sw/source
sw/inc/crstate.hxx|4 ++--
sw/source/core/layout/trvlfrm.cxx |6 +++---
sw/source/core/text/frmcrsr.cxx | 12 ++--
sw/source/core/text/itrcrsr.cxx | 30 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit e8f62db1c0ac5f9fa2510d4c0c8d2111bbeb6427
Author: Noel Grandin
AuthorDate: Mon Mar 14 14:03:56 2022 +0200
Commit: Xisco Fauli
CommitDate: Mon Mar 14 17:28:28 2022 +0100
tdf#147143 Word selection error in Arabic text
this reverts
commit 563af8fd15aa37e75af8882cccbdf8914ebe8e61
Author: Noel Grandin
Date: Fri Jan 7 22:50:29 2022 +0200
tdf#144890 Invalid selection area when text in LTR run
and
commit ec50b9e5eaec7c94df35617676077ef0d65cecc7
Author: Noel Grandin
Date: Thu May 27 11:16:11 2021 +0200
no need to allocate Sw2LinesPos separately on heap
No idea why the commits caused trouble, clearing there is some
"interesting" interaction going on.
Change-Id: I606768403db777b61554f378d3f69f9b4d33d493
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131533
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 22be1665dc6eb28ea1d52c7c5e4347628fc5a76b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131478
Reviewed-by: Xisco Fauli
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index f3430c714787..9b223319fd93 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -23,7 +23,7 @@
#include
#include "swrect.hxx"
-#include
+#include
enum class SwFillMode
{
@@ -132,7 +132,7 @@ enum class CursorMoveState
struct SwCursorMoveState
{
SwFillCursorPos *m_pFill; ///< for automatic filling with tabs etc
-std::optional m_x2Lines; ///< for selections inside/around
2line portions
+std::unique_ptr m_p2Lines; ///< for selections
inside/around 2line portions
SwSpecialPos* m_pSpecialPos; ///< for positions inside fields
Point m_aRealHeight; ///< contains then the position/height of
the cursor
CursorMoveState m_eState;
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 1ad00bdc05ca..a7506ca9a13a 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -2124,11 +2124,11 @@ void SwRootFrame::CalcFrameRects(SwShellCursor )
//ContentRects to Start- and EndFrames.
SwRect aStRect, aEndRect;
pStartFrame->GetCharRect( aStRect, *pStartPos, );
-std::optional pSt2Pos = std::move(aTmpState.m_x2Lines);
+std::unique_ptr pSt2Pos = std::move(aTmpState.m_p2Lines);
aTmpState.m_nCursorBidiLevel = pEndFrame->IsRightToLeft() ? 1 : 0;
pEndFrame->GetCharRect( aEndRect, *pEndPos, );
-std::optional pEnd2Pos = std::move(aTmpState.m_x2Lines);
+std::unique_ptr pEnd2Pos = std::move(aTmpState.m_p2Lines);
SwRect aStFrame ( pStartFrame->UnionFrame( true ) );
aStFrame.Intersection( pStartFrame->GetPaintArea() );
@@ -2145,7 +2145,7 @@ void SwRootFrame::CalcFrameRects(SwShellCursor )
// If there's no doubleline portion involved or start and end are both
// in the same doubleline portion, all works fine, but otherwise
// we need the following...
-if( (!pSt2Pos && !pEnd2Pos) && ( !pSt2Pos || !pEnd2Pos ||
+if( pSt2Pos != pEnd2Pos && ( !pSt2Pos || !pEnd2Pos ||
pSt2Pos->aPortion != pEnd2Pos->aPortion ) )
{
// If we have a start(end) position inside a doubleline portion
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index b120d17399a7..a4cab82d92b1 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -307,10 +307,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition ,
{
if ( pFrame->IsRightToLeft() )
{
-if( pCMS->m_b2Lines && pCMS->m_x2Lines)
+if( pCMS->m_b2Lines && pCMS->m_p2Lines)
{
-pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aLine );
-pFrame->SwitchLTRtoRTL( pCMS->m_x2Lines->aPortion );
+pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aLine );
+pFrame->SwitchLTRtoRTL( pCMS->m_p2Lines->aPortion );
}
}
@@ -327,10 +327,10 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const
SwPosition ,
pCMS->m_aRealHeight.Y() );
}
}
-if( pCMS->m_b2Lines && pCMS->m_x2Lines)
+if( pCMS->m_b2Lines && pCMS->m_p2Lines)
{
-pFrame->SwitchHorizontalToVertical( pCMS->m_x2Lines->aLine
);
-pFrame->SwitchHorizontalToVertical(
pCMS->m_x2Lines->aPortion );
+pFrame->SwitchHorizontalToVertical( pCMS->m_p2Lines->aLine
);
+
[Libreoffice-bugs] [Bug 147046] Tool Bar Appearance Customization in 4k res
https://bugs.documentfoundation.org/show_bug.cgi?id=147046 --- Comment #1 from Dale --- This is still an issue in 7.3.1. It's quite annoying how the Menus disappear on the left side when choosing the darker Personalization colors. It also makes it difficult to find a toolbar icon set that works when the left half of the toolbars/menus stay light gray no matter what Personalization color is chosen. Any updates? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147046] Tool Bar Appearance Customization in 4k res
https://bugs.documentfoundation.org/show_bug.cgi?id=147046 Dale changed: What|Removed |Added Attachment #178870|Menu color bifurcation whne |Menu color bifurcation when description|using 4K display|using 4K display and ||Personalization color Attachment #178870|LibreOffice_7.3.1_Meny-Tool |LibreOffice_7.3.1_Menu-Tool filename|bar_Personalization_4K_Scre |bar_Personalization_4K_Scre |en.JPG |en.JPG -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 86395] Allow sorting of bookmarks in the navigator in two ways: alphabetically and by order in document
https://bugs.documentfoundation.org/show_bug.cgi?id=86395 --- Comment #18 from ricky.t...@gmail.com --- "three sort choices"; When reverse order options are generally proposed, the overall number of options is double of non-reverse sort options. Then in the present context, four sort choices would be produced. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 117497] [META] Colibre icons
https://bugs.documentfoundation.org/show_bug.cgi?id=117497 Bug 117497 depends on bug 146545, which changed state. Bug 146545 Summary: [Enhancement] Add "Colibre (dark)" icon style https://bugs.documentfoundation.org/show_bug.cgi?id=146545 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147905] LibreOffice Calc 7.3.1: PROPER function in long table leads to wrong capitalization
https://bugs.documentfoundation.org/show_bug.cgi?id=147905 --- Comment #12 from Commit Notification --- Noel Grandin committed a patch related to this issue. It has been pushed to "libreoffice-7-3": https://git.libreoffice.org/core/commit/2eed1c83d0026d0af3e7363da9a90b5e99e69b88 tdf#147905 calc PROPER function doesn't like mulithreading It will be available in 7.3.3. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147905] LibreOffice Calc 7.3.1: PROPER function in long table leads to wrong capitalization
https://bugs.documentfoundation.org/show_bug.cgi?id=147905 Commit Notification changed: What|Removed |Added Whiteboard|target:7.4.0|target:7.4.0 target:7.3.3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-ux-advise] [Bug 147973] Special character preview control: Show the font’s baseline
https://bugs.documentfoundation.org/show_bug.cgi?id=147973 Heiko Tietze changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Heiko Tietze --- *** This bug has been marked as a duplicate of bug 90848 *** -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-bugs] [Bug 147973] Special character preview control: Show the font’s baseline
https://bugs.documentfoundation.org/show_bug.cgi?id=147973 Heiko Tietze changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Heiko Tietze --- *** This bug has been marked as a duplicate of bug 90848 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 90848] Include a font baseline in symbol preview in Special Character dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=90848 --- Comment #3 from Heiko Tietze --- *** Bug 147973 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 109232] [META] Special character dialog and toolbar group button bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=109232 Bug 109232 depends on bug 147973, which changed state. Bug 147973 Summary: Special character preview control: Show the font’s baseline https://bugs.documentfoundation.org/show_bug.cgi?id=147973 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 113596] Default name of XLSX print ranges is displayed as _xlnm.Print_Area
https://bugs.documentfoundation.org/show_bug.cgi?id=113596 --- Comment #9 from Ortiz Carrier --- Out West coffee is small-batch roasted to maximize flavor: Loring Smart Roasters are the most efficient roasting equipment in the industry. The coffee roasting process used is 80% more efficient and generates 80% less toxic emissions than traditional roasters. Exceptionally precise roasting of the beans ensures the quality of the coffee produced. Our outwestcoffee is packaged by hand. Visit our website: https://outwestcoffee.net/ -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102495] [META] KDE VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Michael Weghorn changed: What|Removed |Added Depends on||147639 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=147639 [Bug 147639] Incorrect zoom (except for menubar) on enabling fractional scaling on KDE Wayland -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147639] Incorrect zoom (except for menubar) on enabling fractional scaling on KDE Wayland
https://bugs.documentfoundation.org/show_bug.cgi?id=147639 Michael Weghorn changed: What|Removed |Added Blocks||102495 CC||m.wegh...@posteo.de Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=102495 [Bug 102495] [META] KDE VCL backend bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147977] New: Share Spreadsheet menu is not discoverable in Help
https://bugs.documentfoundation.org/show_bug.cgi?id=147977 Bug ID: 147977 Summary: Share Spreadsheet menu is not discoverable in Help Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Documentation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: mikekagan...@hotmail.com CC: olivier.hal...@libreoffice.org Calc has a Share Spreadsheet feature [1] with respective menu item under Tools. However, neither respective menu documentation lists it [2], nor typing "share" into its search box gives any hits. [1] https://help.libreoffice.org/latest/en-US/text/shared/guide/collab.html?=CALC [2] https://help.libreoffice.org/latest/en-US/text/scalc/main0106.html?DbPAR=CALC -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147708] Writer crashes trying to open file with 3000 pages
https://bugs.documentfoundation.org/show_bug.cgi?id=147708 Mike Kaganski changed: What|Removed |Added OS|All |Windows (All) Keywords||bibisectRequest, regression Status|NEEDINFO|NEW Blocks||105469 --- Comment #6 from Mike Kaganski --- No repro using Version: 7.3.1.3 / LibreOffice Community Build ID: 30(Build:3) CPU threads: 4; OS: Linux 5.13; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US Ubuntu package version: 1:7.3.1~rc3-0ubuntu0.20.04.1~lo1 Calc: threaded Repro using Version: 7.3.1.3 (x64) / LibreOffice Community Build ID: a69ca51ded25f3eefd52d7bf9a5fad8c90b87951 CPU threads: 12; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: ru-RU (ru_RU); UI: en-US Calc: CL and using Version: 7.4.0.0.alpha0+ (x64) / LibreOffice Community Build ID: 69656132a00491b96da3a898c350f11e9619da64 CPU threads: 12; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: cs-CZ (ru_RU); UI: en-US Calc: CL Caused by GDI objects limit (tries to create more than 10 000 GDI objects, mostly bitmaps and DC - about 50/50% each). The problem is each page break being manual, and each manual page break trying to draw its own bitmap creating the control (see SwPageBreakWin). Another problem is creating two GDI objects per each control, halving maximal total object count. No repro using Version: 7.0.0.3 (x64) Build ID: 8061b3e9204bef6b321a21033174034a5e2ea88e CPU threads: 12; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: ru-RU (ru_RU); UI: en-US Calc: CL which means something changed (maybe a little bit, like a difference between and 10001; or maybe much - needs a bibisect). Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=105469 [Bug 105469] [META] Bugs leaking/hitting limit for GDI objects in Windows -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 105469] [META] Bugs leaking/hitting limit for GDI objects in Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=105469 Mike Kaganski changed: What|Removed |Added Depends on||147708 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=147708 [Bug 147708] Writer crashes trying to open file with 3000 pages -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147961] Crash: Typing "++" and press Enter (AutoCorrect Create Table)
https://bugs.documentfoundation.org/show_bug.cgi?id=147961 Commit Notification changed: What|Removed |Added Whiteboard|target:7.4.0|target:7.4.0 target:7.3.3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 61914] [META] Start Center bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=61914 Bug 61914 depends on bug 146232, which changed state. Bug 146232 Summary: Poor look of lock overlay on encrypted files in Start Center with Colibre https://bugs.documentfoundation.org/show_bug.cgi?id=146232 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
