[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7527afeb305bb01340461f6fddf6d13a5acca3e3
Author: Tor Lillqvist
AuthorDate: Wed Mar 17 09:14:44 2021 +0200
Commit: Tor Lillqvist
CommitDate: Mon May 17 09:25:07 2021 +0200
Don't use the macOS system German spelling dictionary for Swiss German
The system German dictionary accepts 'ß' which is not used in Swiss
Standard German but completely replaced with 'ss'. We assume that the
LibreOffice German dictionary is installed, too. It has correct
spelling for de_CH.
It would be good if we knew in the macosxspell code whether the
LibreOffice German dictionary installed, and act correspondingly. But
figuring that out seems more complicated than what I am willing to
spend on this for now.
Change-Id: I380d7734cea34a2408d9ed20a8c3d9efe6a8fea2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115690
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 874f14bc0f19..b4a206ada437 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -131,8 +131,9 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
}
else if ([pLangStr isEqualToString:@"de"])
{
+// Not de_CH and de_LI, though. They need separate
dictionaries.
const std::vector aDE
-{ @"AT", @"BE", @"CH", @"DE", @"LI", @"LU" };
+{ @"AT", @"BE", @"DE", @"LU" };
for (auto c: aDE)
{
pLangStr = [@"de_" stringByAppendingString: c];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Trouble with unittests testDmlTextshape and testDmlTextshapeB
Hi Regina, On Sun, May 16, 2021 at 08:03:18PM +0200, Regina Henschel wrote: > May I remove the positioning parts from these unittests? If the test fails and your manual testing confirms that this is a poor test and not badness caught by the test, then it sounds reasonable to adjust the test. In case that is possible, I would recommend adjusting the test, not removing it, to avoid decreasing the test coverage. You can also comment there, noting that a given asserted value is not ideal, and what would be the ideal instead. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 921f770d8980dc0dbc70efee0db872e329f99565
Author: Caolán McNamara
AuthorDate: Sat May 15 20:52:44 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon May 17 09:43:46 2021 +0200
gtk4: put cancel at start of GtkHeaderBar
Change-Id: I606a7467529fbe9921702476d2aa4277a0b19580
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115666
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 68d539eaf6b0..82a506ebc74b 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17883,6 +17883,21 @@ bool ConvertTree(const
Reference& xNode)
// turn parent tag of into
css::uno::Reference xTypeEnd =
xDoc->createAttribute("type");
xTypeEnd->setValue("end");
+
+for
(css::uno::Reference xObjectCandidate =
xTitleChild->getFirstChild();
+ xObjectCandidate.is();
+ xObjectCandidate =
xObjectCandidate->getNextSibling())
+{
+if
(xObjectCandidate->getNodeName() == "object")
+{
+
css::uno::Reference xObjectMap =
xObjectCandidate->getAttributes();
+
css::uno::Reference xObjectId =
xObjectMap->getNamedItem("id");
+if (xObjectId->getNodeValue()
== "cancel")
+
xTypeEnd->setValue("start");
+break;
+}
+}
+
xChildElem->setAttributeNode(xTypeEnd);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/autofilterbuffer.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 6e0d2738a5df0e16ebf343f44ef858aa81c18ab8
Author: Caolán McNamara
AuthorDate: Sun May 16 20:26:15 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon May 17 09:44:05 2021 +0200
cid#1484878 Uninitialized scalar field
Change-Id: If7ed90b34a44f73e35080d4967618af3c215b50b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115682
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx
b/sc/source/filter/oox/autofilterbuffer.cxx
index 6e205a032b24..8eb24f231bd4 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -404,6 +404,7 @@ ApiFilterSettings Top10Filter::finalizeImport()
ColorFilter::ColorFilter(const WorkbookHelper& rHelper)
: FilterSettingsBase(rHelper)
+, mbIsBackgroundColor(false)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/inc/wrtsh.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9836a4796a3afacd96dff4be53dc4db527fbd3dd
Author: Caolán McNamara
AuthorDate: Sun May 16 20:28:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon May 17 09:44:25 2021 +0200
cid#1484879 Uninitialized pointer field
Change-Id: I8ad6984faa52aa262a78bc9e9a47c9b19d30214e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115683
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 3e7b5d7eaf89..1a094aebf91b 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -660,7 +660,7 @@ inline bool SwWrtShell::Is_FnDragEQBeginDrag() const
class MakeAllOutlineContentTemporarilyVisible
{
private:
-SwWrtShell* m_pWrtSh;
+SwWrtShell* m_pWrtSh = nullptr;
bool m_bDone = false;
public:
static sal_uInt32 nLock;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/viewsh.hxx | 12 -
sw/source/core/unocore/unotbl.cxx | 11 -
sw/source/core/view/viewsh.cxx | 28 +-
sw/source/filter/ascii/ascatr.cxx | 43 +---
sw/source/filter/ascii/parasc.cxx | 232
sw/source/uibase/docvw/FrameControlsManager.cxx |1
6 files changed, 163 insertions(+), 164 deletions(-)
New commits:
commit 49fd5ed7f040eaa2352b2e684c1349f42db3ac66
Author: Caolán McNamara
AuthorDate: Sun May 16 20:40:03 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon May 17 09:45:25 2021 +0200
cid#1484877 Unchecked dynamic_cast
Change-Id: I17e93665482a401bb9ffe489f0f9d35302675adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115686
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 9b6cbdf2a8db..1da032330d57 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -209,6 +209,7 @@ void
SwFrameControlsManager::SetOutlineContentVisibilityButton(const SwContentFr
}
SwOutlineContentVisibilityWin* pWin =
dynamic_cast(pControl->GetWindow());
+assert(pWin != nullptr);
pWin->Set();
if (pWin->GetSymbol() == ButtonSymbol::SHOW)
commit 44c5a8977aa77d99abc0c179a4f5b9df55c17ec6
Author: Miklos Vajna
AuthorDate: Mon May 17 09:00:36 2021 +0200
Commit: Miklos Vajna
CommitDate: Mon May 17 09:45:14 2021 +0200
sw: prefix members of SwASCIIParser, SwASC_AttrIter, ...
... SwTableProperties_Impl and SwViewShell
See tdf#94879 for motivation.
Change-Id: I7c8fe1f95d9ff1dbd7b9980845ff7fdfb36d1e26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115691
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 27d29e9f65f0..4800cadcf9ba 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -97,7 +97,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring
std::unique_ptr m_xReplaceBmp; ///< replaced display of still
loaded images
std::unique_ptr m_xErrorBmp; ///< error display of missed
images
-static bool mbLstAct;// true if EndAction of last Shell
+static bool sbLstAct;// true if EndAction of last Shell
// i.e. if the EndActions of the other
// Shells on the document are through.
@@ -163,8 +163,8 @@ class SW_DLLPUBLIC SwViewShell : public
sw::Ring
SAL_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
protected:
-static ShellResource* mpShellRes; ///< Resources for the Shell.
-static vcl::DeleteOnDeinit< std::shared_ptr > mpCareDialog;
///< Avoid this window.
+static ShellResource* spShellRes; ///< Resources for the Shell.
+static vcl::DeleteOnDeinit< std::shared_ptr > spCareDialog;
///< Avoid this window.
SwRect maVisArea; ///< The modern version of
VisArea.
tools::RectanglemaLOKVisibleArea;///< The visible area in the
LibreOfficeKit client.
@@ -339,7 +339,7 @@ public:
void SetWin(vcl::Window* win) { mpWin = win; }
void SetOut(vcl::RenderContext* pOut) { mpOut = pOut; }
-static bool IsLstEndAction() { return SwViewShell::mbLstAct; }
+static bool IsLstEndAction() { return SwViewShell::sbLstAct; }
// Change of all page descriptors.
void ChgAllPageOrientation( Orientation eOri );
@@ -430,13 +430,13 @@ public:
const SwAccessibilityOptions* GetAccessibilityOptions() const { return
mpAccOptions.get();}
-static void SetShellRes( ShellResource* pRes ) { mpShellRes =
pRes; }
+static void SetShellRes( ShellResource* pRes ) { spShellRes =
pRes; }
static ShellResource* GetShellRes();
static weld::Window* CareChildWin(SwViewShell const & rVSh);
static void SetCareDialog(const std::shared_ptr&
rNew);
static weld::Window* GetCareDialog(SwViewShell const & rVSh)
- { return (*mpCareDialog.get()) ?
mpCareDialog.get()->get() : CareChildWin(rVSh); }
+ { return (*spCareDialog.get()) ?
spCareDialog.get()->get() : CareChildWin(rVSh); }
SfxViewShell *GetSfxViewShell() const { return mpSfxViewShell; }
void SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell =
pNew; }
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index 395b6864318a..0e2cff68a5b5 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1761,7 +1761,8 @@ namespace {
class SwTableProperties_Impl
{
-SwUnoCursorHelper::SwAnyMapHelper aAnyMap;
+SwUnoCursorHelper::SwAnyMapHelper m_aAnyMap;
+
public:
SwTableProperties_I
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/svapp.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit fd6bdd1a3ec7925b7208a0341248e09b02800795
Author: Noel Grandin
AuthorDate: Sun May 16 21:12:42 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 10:02:40 2021 +0200
fix leak when LOK not active
Change-Id: I7124adfdc4e877fc63805956b3d0c087b1ffb5f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115681
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1f4f6e9e9de6..963a2a2f9457 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -322,13 +322,13 @@ void Application::notifyWindow(vcl::LOKWindowId
/*nLOKWindowId*/,
void Application::libreOfficeKitViewCallback(int nType, const char* pPayload)
const
{
-if (!comphelper::LibreOfficeKit::isActive())
-return;
-
-if (m_pCallback)
+if (!comphelper::LibreOfficeKit::isActive() || !m_pCallback)
{
-m_pCallback(nType, pPayload, m_pCallbackData);
+free(static_cast(const_cast(pPayload)));
+return;
}
+
+m_pCallback(nType, pPayload, m_pCallbackData);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/writer/exp/txtparai.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b9496faebcdf8827864636803101c6a9a88b6155 Author: Miklos Vajna AuthorDate: Mon May 17 09:35:25 2021 +0200 Commit: Miklos Vajna CommitDate: Mon May 17 10:13:20 2021 +0200 EPUB export: make sure txtparai.hxx is self-contained txtparai.hxx was the first include in txtparai.cxx to make sure the header is self-contained, restore that. (Ignoring sal/config.h.) Change-Id: I430e1bef12191e15f416381cd8d83c503b284851 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115692 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx index da9c0f28e530..101546c39e35 100644 --- a/writerperfect/source/writer/exp/txtparai.cxx +++ b/writerperfect/source/writer/exp/txtparai.cxx @@ -9,10 +9,10 @@ #include -#include - #include "txtparai.hxx" +#include + #include "XMLFootnoteImportContext.hxx" #include "XMLTextFrameContext.hxx" #include "xmlimp.hxx" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit cfb9fb3c8ab861e53306f1a2362784446abe903a Author: Caolán McNamara AuthorDate: Sun May 16 20:38:21 2021 +0100 Commit: Caolán McNamara CommitDate: Mon May 17 10:33:47 2021 +0200 cid#1465676 Unchecked return value presumably unchecked return is ok in this case Change-Id: I2aee2714e924d496ea54b2b02019dd12becc1c71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115685 Tested-by: Jenkins Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx index d511812f4278..23e836a96a24 100644 --- a/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx +++ b/sw/source/uibase/docvw/OutlineContentVisibilityWin.cxx @@ -111,8 +111,8 @@ void SwOutlineContentVisibilityWin::Set() SwWrtShell& rSh = GetEditWin()->GetView().GetWrtShell(); const SwOutlineNodes& rOutlineNodes = rSh.GetNodes().GetOutLineNds(); - rOutlineNodes.Seek_Entry(static_cast(const_cast(pTextNode)), - &m_nOutlinePos); + (void)rOutlineNodes.Seek_Entry(static_cast(const_cast(pTextNode)), + &m_nOutlinePos); // set symbol displayed on button bool bVisible = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: binaryurp/source
binaryurp/source/unmarshal.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d8d15656817a58a5e9c6a6ebc88038ba4e5ef865
Author: Noel Grandin
AuthorDate: Sun May 16 13:17:22 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 10:39:05 2021 +0200
small perf improvement in readMemberValues
Change-Id: I5d5973401a87b69dd54721d16ed19e227a6c2ac6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115674
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx
index d307c81cc0b5..4263edf8c91c 100644
--- a/binaryurp/source/unmarshal.cxx
+++ b/binaryurp/source/unmarshal.cxx
@@ -437,6 +437,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription
const & type) {
return BinaryAny(type, &p);
}
std::vector< BinaryAny > as;
+as.reserve(n);
for (sal_uInt32 i = 0; i != n; ++i) {
as.push_back(readValue(ctd));
}
@@ -477,6 +478,7 @@ void Unmarshal::readMemberValues(
css::uno::TypeDescription(&ctd->pBaseTypeDescription->aBase),
values);
}
+values->reserve(values->size() + ctd->nMembers);
for (sal_Int32 i = 0; i != ctd->nMembers; ++i) {
values->push_back(
readValue(css::uno::TypeDescription(ctd->ppTypeRefs[i])));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/CommandDispatch.cxx | 29 ++
chart2/source/controller/main/CommandDispatch.hxx |3 +-
2 files changed, 11 insertions(+), 21 deletions(-)
New commits:
commit dd5666a0425935f2389811abf750f435411e3fe0
Author: Noel Grandin
AuthorDate: Sun May 16 21:34:35 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 10:39:20 2021 +0200
fix leak in CommandDispatch
Change-Id: I0249b18fd40f4f5ef95e2101286dc25782c42eb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115684
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/main/CommandDispatch.cxx
b/chart2/source/controller/main/CommandDispatch.cxx
index 22e0a52c204f..ed6370a5228b 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -26,25 +26,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-namespace
-{
-template< class Map >
-void lcl_DisposeAndClearAndDeleteAllMapElements(
-Map & rMap,
-const Reference< uno::XInterface > & xEventSource )
-{
-for( const auto& rElement : rMap )
-{
-if( rElement.second )
-{
-rElement.second->disposeAndClear( xEventSource );
-delete rElement.second;
-}
-}
-}
-
-} // anonymous namespace
-
namespace chart
{
@@ -65,7 +46,15 @@ void CommandDispatch::initialize()
/// is called when this is disposed
void SAL_CALL CommandDispatch::disposing()
{
-lcl_DisposeAndClearAndDeleteAllMapElements( m_aListeners, static_cast<
cppu::OWeakObject* >( this ));
+Reference< uno::XInterface > xEventSource(static_cast< cppu::OWeakObject*
>( this ));
+for( auto& rElement : m_aListeners )
+{
+if( rElement.second )
+{
+rElement.second->disposeAndClear( xEventSource );
+rElement.second.reset();
+}
+}
m_aListeners.clear();
}
diff --git a/chart2/source/controller/main/CommandDispatch.hxx
b/chart2/source/controller/main/CommandDispatch.hxx
index 1c7295186038..37de7c59c119 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::util { class XURLTransformer; }
@@ -120,7 +121,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer;
-typedef std::map< OUString, ::comphelper::OInterfaceContainerHelper2* >
+typedef std::map< OUString,
std::unique_ptr<::comphelper::OInterfaceContainerHelper2> >
tListenerMap;
tListenerMap m_aListeners;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 11 commits - external/coinmp external/liborcus external/libwpd external/python3 include/o3tl odk/build-examples_common.mk sfx2/source
external/coinmp/UnpackedTarball_coinmp.mk|
2
external/coinmp/configure-exit.patch |
33
external/coinmp/register.patch |
369 ++
external/liborcus/UnpackedTarball_liborcus.mk|
1
external/liborcus/include.patch.0|
30
external/libwpd/UnpackedTarball_libwpd.mk|
1
external/libwpd/include.patch|
10
external/python3/0001-remove-long-double-from-ctypes-value-union.patch.1 |
34
external/python3/UnpackedTarball_python3.mk |
1
include/o3tl/lru_map.hxx |
2
odk/build-examples_common.mk |
2
sfx2/source/doc/objstor.cxx |
33
solenv/gbuild/platform/com_GCC_defs.mk |
8
13 files changed, 523 insertions(+), 3 deletions(-)
New commits:
commit 9d5b6de63d80d528c292913c582376e0d9ad7f97
Author: Michael Stahl
AuthorDate: Fri Jul 10 14:30:34 2020 +0200
Commit: Michael Stahl
CommitDate: Mon May 17 10:22:59 2021 +0200
tdf#134582 sfx2: when storing, set Version on embedded object storage
This previously wasn't needed because there was only one version for
which it was checked (1.2) but since commit
a541cd91951eca15e40764244b34c72b347f9f26 there's a second version so
when loading an existing embedded object in one version and storing it
in another, the Version must be updated so the attribute in
META-INF/manifest.xml matches the one in content.xml.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98521
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 519d96fd8b83ef4c61576d87b58f97b7e6e6e3c6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98459
Reviewed-by: Thorsten Behrens
(cherry picked from commit a24a4cc1838e3a2d55261a8edf6cb63186f4c38f)
(cherry picked from commit 2976392800739d38d5f84f1f8242701c526b29e1)
Change-Id: Ic2fc303c6f6bc254050d531d578029377976ecb5
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b865ce456b7d..36f58416a9e9 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -986,6 +986,39 @@ bool SfxObjectShell::DoSave()
pImpl->bIsSaving = true;
+if (IsOwnStorageFormat(*GetMedium()))
+{
+SvtSaveOptions::ODFSaneDefaultVersion nDefVersion =
SvtSaveOptions::ODFSVER_012;
+if (!utl::ConfigManager::IsFuzzing())
+{
+SvtSaveOptions aSaveOpt;
+nDefVersion = aSaveOpt.GetODFSaneDefaultVersion();
+}
+uno::Reference const
xProps(GetMedium()->GetStorage(), uno::UNO_QUERY);
+assert(xProps.is());
+if (nDefVersion >= SvtSaveOptions::ODFSVER_012) // property exists
only since ODF 1.2
+{
+try // tdf#134582 set Version on embedded objects as they
+{ // could have been loaded with a different/old version
+#if 0
+// not on old branch
+if (SvtSaveOptions::ODFSVER_013 <= nDefVersion)
+{
+xProps->setPropertyValue("Version",
uno::makeAny(ODFVER_013_TEXT));
+}
+else
+#endif
+{
+xProps->setPropertyValue("Version",
uno::makeAny(ODFVER_012_TEXT));
+}
+}
+catch (uno::Exception&)
+{
+DBG_UNHANDLED_EXCEPTION("sfx.doc" /*,
"SfxObjectShell::DoSave"*/);
+}
+}
+}
+
uno::Sequence< beans::NamedValue > aEncryptionData;
if ( IsPackageStorageFormat_Impl( *GetMedium() ) )
{
commit 6ccb5f0cd44293730c6604184683ac6165f8b055
Author: Michael Stahl
AuthorDate: Fri May 14 20:37:23 2021 +0200
Commit: Michael Stahl
CommitDate: Mon May 17 10:18:13 2021 +0200
python3: fix segfault importing ctypes
on this line: CFUNCTYPE(c_int)(lambda:None)
python segfaults when compiled with GCC 11.
│ 0x7f7e53a5d64c call 0x7f7e53a5c3d0
│
│ 0x7f7e53a5d651 mov%rax,%r13
│
│ 0x7f7e53a5d654 test %rax,%rax
│
│ 0x7f7e53a5d657 je 0x7f7e53a5d990
│
│ 0x7f7e53a5d65d mov0x88(%rsp),%rax
│
│ 0x7f7e53a5d665 movq %r15,%xmm0
│
│ 0x7f7e53a5d66
[Libreoffice-commits] core.git: solenv/sanitizers
solenv/sanitizers/ui/cui.suppr |6 -- 1 file changed, 6 deletions(-) New commits: commit 89613ba316f271d3d742757692d5c3d802a39c0a Author: Caolán McNamara AuthorDate: Mon May 17 09:01:57 2021 +0100 Commit: Caolán McNamara CommitDate: Mon May 17 12:53:34 2021 +0200 remove some unused suppressions Change-Id: I0e427fe61eb1986de7118561c7efc4a5eabeb868 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115693 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr index f7c838a8a349..e89be13ed7ef 100644 --- a/solenv/sanitizers/ui/cui.suppr +++ b/solenv/sanitizers/ui/cui.suppr @@ -117,7 +117,6 @@ cui/uiconfig/ui/iconchangedialog.ui://GtkLabel[@id='label1'] orphan-label cui/uiconfig/ui/iconselectordialog.ui://GtkLabel[@id='noteLabel'] orphan-label cui/uiconfig/ui/tipofthedaydialog.ui://GtkLabel[@id='lbTitle'] orphan-label cui/uiconfig/ui/tipofthedaydialog.ui://GtkLabel[@id='lbText'] orphan-label -cui/uiconfig/ui/fileextcheckdialog.ui://GtkLabel[@id='lbText'] orphan-label cui/uiconfig/ui/insertfloatingframe.ui://GtkLabel[@id='label6'] orphan-label cui/uiconfig/ui/insertfloatingframe.ui://GtkLabel[@id='label7'] orphan-label cui/uiconfig/ui/insertfloatingframe.ui://GtkLabel[@id='widthlabel'] orphan-label @@ -130,11 +129,6 @@ cui/uiconfig/ui/lineendstabpage.ui://GtkLabel[@id='FI_TIP'] orphan-label cui/uiconfig/ui/linestyletabpage.ui://GtkSpinButton[@id='NUM_FLD_2'] no-labelled-by cui/uiconfig/ui/linestyletabpage.ui://GtkSpinButton[@id='MTR_FLD_LENGTH_2'] no-labelled-by cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='helpmacro'] orphan-label -cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='helptoolbar'] orphan-label -cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='libraryft'] orphan-label -cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='categoryft'] orphan-label -cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='macronameft'] orphan-label -cui/uiconfig/ui/macroselectordialog.ui://GtkLabel[@id='commandsft'] orphan-label cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='searchlabel'] orphan-label cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='leftfunctionlabel'] orphan-label cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='scopelabel'] orphan-label ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/textanimtabpage.ui | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) New commits: commit eafad0719f50e34dadf9a32c2fb24cf00047f6eb Author: Caolán McNamara AuthorDate: Mon May 17 10:43:29 2021 +0100 Commit: Caolán McNamara CommitDate: Mon May 17 12:53:54 2021 +0200 tdf#142303 connect adjustments to spinbuttons missing since commit 87e21946fa9a81c403a146d03579691537c1352c Date: Sat Aug 17 20:41:26 2013 -0300 Convert text animations tab page to widget UI Change-Id: I8eba96030a1f5060ba60166d462130eb2cef1298 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115694 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui index ea01ffd107c2..fc2673e773c7 100644 --- a/cui/uiconfig/ui/textanimtabpage.ui +++ b/cui/uiconfig/ui/textanimtabpage.ui @@ -13,9 +13,9 @@ 10 -300 -1 -50 +3 +50 +500 True @@ -351,10 +351,11 @@ True start True +True +adjustmentCOUNT -True Enter the number of times that you want the animation effect to repeat. @@ -422,10 +423,11 @@ True start True +True +adjustmentAMOUNT -True Enter the number of increments by which to scroll the text. @@ -493,10 +495,11 @@ True start True +True +adjustmentDELAY -True Enter the amount of time to wait before repeating the effect. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 349
+-
1 file changed, 184 insertions(+), 165 deletions(-)
New commits:
commit c8cf2e0e088b74afa52564945a9c005b3b86bf7e
Author: Julien Nabet
AuthorDate: Fri May 14 13:25:48 2021 +0200
Commit: Julien Nabet
CommitDate: Mon May 17 12:56:05 2021 +0200
Directly initialize maps in ADatabaseMetaDataResultSet.cxx
Change-Id: I40d88f6b538c1c38589b8cadc8c174ffa6754940
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115599
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index caa4dd800324..95358ed6df5c 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -780,7 +780,6 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue(
void ODatabaseMetaDataResultSet::setProceduresMap()
{
-
for(sal_Int32 i=1;i<4;i++)
m_aColMapping.push_back(i);
m_aColMapping.push_back(5);
@@ -789,10 +788,12 @@ void ODatabaseMetaDataResultSet::setProceduresMap()
m_aColMapping.push_back(6);
m_aColMapping.push_back(4);
-::std::map aMap;
-aMap[DB_PT_UNKNOWN] = ProcedureResult::UNKNOWN;
-aMap[DB_PT_PROCEDURE] = ProcedureResult::NONE;
-aMap[DB_PT_FUNCTION]= ProcedureResult::RETURN;
+::std::map aMap
+{
+{DB_PT_UNKNOWN, ProcedureResult::UNKNOWN},
+{DB_PT_PROCEDURE, ProcedureResult::NONE},
+{DB_PT_FUNCTION, ProcedureResult::RETURN}
+};
m_aValueRange[4] = aMap;
rtl::Reference pMetaData = new
ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
@@ -854,52 +855,53 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
m_aColMapping.push_back(7);
m_aColMapping.push_back(11);
-::std::map aMap;
-aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty);
-aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt);
-aMap[adSmallInt]= ADOS::MapADOType2Jdbc(adSmallInt);
-aMap[adInteger] = ADOS::MapADOType2Jdbc(adInteger);
-aMap[adBigInt] = ADOS::MapADOType2Jdbc(adBigInt);
-aMap[adUnsignedTinyInt] = ADOS::MapADOType2Jdbc(adUnsignedTinyInt);
-aMap[adUnsignedSmallInt]= ADOS::MapADOType2Jdbc(adUnsignedSmallInt);
-aMap[adUnsignedInt] = ADOS::MapADOType2Jdbc(adUnsignedInt);
-aMap[adUnsignedBigInt] = ADOS::MapADOType2Jdbc(adUnsignedBigInt);
-aMap[adSingle] = ADOS::MapADOType2Jdbc(adSingle);
-aMap[adDouble] = ADOS::MapADOType2Jdbc(adDouble);
-aMap[adCurrency]= ADOS::MapADOType2Jdbc(adCurrency);
-aMap[adDecimal] = ADOS::MapADOType2Jdbc(adDecimal);
-aMap[adNumeric] = ADOS::MapADOType2Jdbc(adNumeric);
-aMap[adBoolean] = ADOS::MapADOType2Jdbc(adBoolean);
-aMap[adError] = ADOS::MapADOType2Jdbc(adError);
-aMap[adUserDefined] = ADOS::MapADOType2Jdbc(adUserDefined);
-aMap[adVariant] = ADOS::MapADOType2Jdbc(adVariant);
-aMap[adIDispatch] = ADOS::MapADOType2Jdbc(adIDispatch);
-aMap[adIUnknown]= ADOS::MapADOType2Jdbc(adIUnknown);
-aMap[adGUID]= ADOS::MapADOType2Jdbc(adGUID);
-aMap[adDate]= ADOS::MapADOType2Jdbc(adDate);
-aMap[adDBDate] = ADOS::MapADOType2Jdbc(adDBDate);
-aMap[adDBTime] = ADOS::MapADOType2Jdbc(adDBTime);
-aMap[adDBTimeStamp] = ADOS::MapADOType2Jdbc(adDBTimeStamp);
-aMap[adBSTR]= ADOS::MapADOType2Jdbc(adBSTR);
-aMap[adChar]= ADOS::MapADOType2Jdbc(adChar);
-aMap[adVarChar] = ADOS::MapADOType2Jdbc(adVarChar);
-aMap[adLongVarChar] = ADOS::MapADOType2Jdbc(adLongVarChar);
-aMap[adWChar] = ADOS::MapADOType2Jdbc(adWChar);
-aMap[adVarWChar]= ADOS::MapADOType2Jdbc(adVarWChar);
-aMap[adLongVarWChar]= ADOS::MapADOType2Jdbc(adLongVarWChar);
-aMap[adBinary] = ADOS::MapADOType2Jdbc(adBinary);
-aMap[adVarBinary] = ADOS::MapADOType2Jdbc(adVarBinary);
-aMap[adLongVarBinary] = ADOS::MapADOType2Jdbc(adLongVarBinary);
-aMap[adChapter] = ADOS::MapADOType2Jdbc(adChapter);
-aMap[adFileTime]= ADOS::MapADOType2Jdbc(adFileTime);
-aMap[adPropVariant] = ADOS::MapADOType2Jdbc(adPropVariant);
-aMap[adVarNumeric] = ADOS::MapADOType2Jdbc(adVarNumeric);
-
+::std::map aMap {
+{adEmpty,ADOS::MapADOType2Jdbc(adEmpty)},
+{adTinyInt, ADOS::MapADOType2Jdbc(adTinyInt)},
+{adSmallInt, ADOS::MapADOType2Jdbc(adSmallInt)},
+{adInteger, ADOS::MapADOType2Jdbc(adInteger)},
+{adBigInt, ADOS::MapADOType2Jdbc(adBigInt)},
+{adUnsignedTinyInt, ADOS::MapADOType2Jdbc(adUnsignedTinyInt)},
+{adUnsignedSmallInt, ADOS::MapADOType2Jdbc(adU
[Libreoffice-commits] core.git: basctl/source canvas/source canvas/workben chart2/source compilerplugins/clang cppcanvas/qa cppcanvas/source dbaccess/source desktop/source editeng/source forms/source
basctl/source/basicide/baside2b.cxx |8 basctl/source/basicide/baside3.cxx |2 basctl/source/basicide/layout.cxx |4 basctl/source/dlged/dlged.cxx |4 basctl/source/dlged/dlgedfunc.cxx | 18 basctl/source/dlged/dlgedobj.cxx|2 basctl/source/dlged/dlgedview.cxx |2 canvas/source/cairo/cairo_canvas.cxx|2 canvas/source/cairo/cairo_spritecanvas.cxx |2 canvas/source/cairo/cairo_spritedevicehelper.cxx|2 canvas/source/directx/dx_canvas.cxx |1 canvas/source/vcl/canvas.cxx|1 canvas/source/vcl/outdevholder.hxx |1 canvas/source/vcl/spritecanvashelper.cxx|4 canvas/source/vcl/windowoutdevholder.hxx|4 canvas/workben/canvasdemo.cxx |4 chart2/source/controller/accessibility/AccessibleTextHelper.cxx |2 chart2/source/controller/main/ChartController.cxx |2 chart2/source/controller/main/ChartController_Window.cxx| 12 chart2/source/controller/main/ChartWindow.cxx |4 compilerplugins/clang/vclwidgets.cxx| 12 cppcanvas/qa/unit/test.cxx |2 cppcanvas/source/wrapper/vclfactory.cxx |2 dbaccess/source/ui/app/AppView.cxx |2 dbaccess/source/ui/querydesign/JoinTableView.cxx|2 dbaccess/source/ui/querydesign/TableWindow.cxx |2 desktop/source/splash/splash.cxx|6 editeng/source/editeng/editeng.cxx |6 editeng/source/editeng/impedit.cxx |8 editeng/source/editeng/impedit2.cxx |2 editeng/source/editeng/impedit3.cxx |3 editeng/source/uno/unoviwou.cxx |4 forms/source/richtext/richtextimplcontrol.cxx |6 framework/source/helper/vclstatusindicator.cxx |2 include/sfx2/LokControlHandler.hxx |4 include/svtools/brwbox.hxx |4 include/toolkit/awt/vclxwindow.hxx | 10 include/vcl/outdev.hxx |5 include/vcl/toolbox.hxx |2 include/vcl/toolkit/ivctrl.hxx |2 include/vcl/window.hxx | 179 - qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java |3 reportdesign/source/ui/inc/UITools.hxx |2 reportdesign/source/ui/misc/UITools.cxx |2 reportdesign/source/ui/report/DesignView.cxx|2 reportdesign/source/ui/report/EndMarker.cxx |4 reportdesign/source/ui/report/FixedTextColor.cxx|2 reportdesign/source/ui/report/FormattedFieldBeautifier.cxx |2 reportdesign/source/ui/report/ReportController.cxx |6 reportdesign/source/ui/report/ReportSection.cxx |2 reportdesign/source/ui/report/ScrollHelper.cxx |2 reportdesign/source/ui/report/SectionView.cxx |4 reportdesign/source/ui/report/StartMarker.cxx |2 reportdesign/source/ui/report/dlgedfunc.cxx |8 sc/source/ui/Accessibility/AccessibleEditObject.cxx |2 sc/source/ui/app/scmod.cxx |2 sc/source/ui/drawfunc/fuconpol.cxx |6 sc/source/ui/drawfunc/fudraw.cxx|4 sc/source/ui/drawfunc/fusel.cxx |2 sc/source/ui/drawfunc/futext.cxx| 10 sc/source/ui/drawfunc/futext2.cxx |2 sc/source/ui/unoobj/viewuno.cxx |4 sc/source/ui/view/colrowba.cxx |4 sc/source/ui/view/drawview.cxx |2 sc/source/ui/view/gridwin.cxx | 26 sc/source/ui/view/gridwin2.cxx |4 sc/source/ui/view/gridwin3.cxx |2 sc/source/ui/view/gridwin4.cxx | 10 sc/source/ui/view/gridwin5.cx
[Libreoffice-commits] core.git: sc/CppunitTest_sc_ucalc_copypaste.mk sc/Module_sc.mk sc/qa
sc/CppunitTest_sc_ucalc_copypaste.mk | 14
sc/Module_sc.mk |1
sc/qa/unit/helper/qahelper.cxx | 16
sc/qa/unit/helper/qahelper.hxx |2
sc/qa/unit/ucalc.cxx | 7019 ---
sc/qa/unit/ucalc.hxx | 157
sc/qa/unit/ucalc_copypaste.cxx | 6928 ++
7 files changed, 7139 insertions(+), 6998 deletions(-)
New commits:
commit a78770c1935cabaafbb1d0bec258095b8899d25d
Author: Xisco Fauli
AuthorDate: Mon May 17 12:14:50 2021 +0200
Commit: Xisco Fauli
CommitDate: Mon May 17 13:49:23 2021 +0200
sc_ucalc: move copypaste tests to their own module
in order to split sc_ucalc monster into smaller
modules
While at it, fix the clang-format issues in
sc/qa/unit/ucalc_copypaste.cxx
Change-Id: Ifd3af351f4b880da29e1f48c4852ac65fcd3276e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115696
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/CppunitTest_sc_ucalc_copypaste.mk
b/sc/CppunitTest_sc_ucalc_copypaste.mk
new file mode 100644
index ..933b020081ad
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc_copypaste.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call sc_ucalc_test,_copypaste))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 9cc25d6052ea..94880fb19a72 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sc_ucalc) \
CppunitTest_sc_ucalc_condformat \
+ CppunitTest_sc_ucalc_copypaste \
CppunitTest_sc_ucalc_pivottable \
CppunitTest_sc_ucalc_sharedformula \
CppunitTest_sc_ucalc_sort \
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index ec8119d7a3f5..46196f9c28f4 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -979,6 +979,22 @@ void pasteOneCellFromClip(ScDocument* pDestDoc, const
ScRange& rDestRange, ScDoc
rDestRange.aEnd.Col(), rDestRange.aEnd.Row());
}
+ScDocShell* findLoadedDocShellByName(std::u16string_view rName)
+{
+ScDocShell* pShell =
static_cast(SfxObjectShell::GetFirst(checkSfxObjectShell,
false));
+while (pShell)
+{
+SfxMedium* pMedium = pShell->GetMedium();
+if (pMedium)
+{
+OUString aName = pMedium->GetName();
+if (aName == rName)
+return pShell;
+}
+pShell = static_cast(SfxObjectShell::GetNext(*pShell,
checkSfxObjectShell, false));
+}
+return nullptr;
+}
bool insertRangeNames(
ScDocument* pDoc, ScRangeName* pNames, const RangeNameDef* p, const
RangeNameDef* pEnd)
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index c7e3c0790e16..4d9986dd7373 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -252,7 +252,7 @@ SCQAHELPER_DLLPUBLIC ScUndoPaste*
createUndoPaste(ScDocShell& rDocSh, const ScRa
SCQAHELPER_DLLPUBLIC void pasteOneCellFromClip(ScDocument* pDestDoc, const
ScRange& rDestRange,
ScDocument* pClipDoc,
InsertDeleteFlags eFlags =
InsertDeleteFlags::ALL);
-
+SCQAHELPER_DLLPUBLIC ScDocShell* findLoadedDocShellByName(std::u16string_view
rName);
SCQAHELPER_DLLPUBLIC ScRange insertRangeData(ScDocument* pDoc, const
ScAddress& rPos,
const std::vector>& rData);
SCQAHELPER_DLLPUBLIC bool insertRangeNames(ScDocument* pDoc, ScRangeName*
pNames, const RangeNameDef* p,
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 340d2112e898..5b34c2a073fb 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -18,7 +18,6 @@
#include
#include
-#include
#include
#include
#include
@@ -137,20 +136,6 @@ void Test::tearDown()
BootstrapFixture::tearDown();
}
-static ScMF lcl_getMergeFlagOfCell(const ScDocument& rDoc, SCCOL nCol, SCROW
nRow, SCTAB nTab)
-{
-const SfxPoolItem& rPoolItem = rDoc.GetPattern(nCol, nRow,
nTab)->GetItem(ATTR_MERGE_FLAG);
-const ScMergeFlagAttr& rMergeFlag = static_cast(rPoolItem);
-return rMergeFlag.GetValue();
-}
-
-static ScAddress lcl_getMergeSizeOfCell(const ScDocument& rDoc, SCCOL nCol,
SCROW nRow, SCTAB nTab)
-{
-const SfxPoolItem& rPoolItem = rDoc.GetPattern(nCol, nRow,
nT
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx |1 +
sc/inc/document.hxx |1 +
sc/source/core/data/column4.cxx | 32
sc/source/core/data/document.cxx | 14 ++
sc/source/ui/docshell/docfunc.cxx |6 +-
5 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit 6aec5d5a3a26bd973e46b6c593373e2f03f51a37
Author: Noel Grandin
AuthorDate: Sun May 16 13:16:52 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 14:29:06 2021 +0200
small perf improvement in checking for note
Change-Id: Ib92e04da47d910662eb765c9c68b561647570ecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115673
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 197dc17d4134..58374fe37d28 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -621,6 +621,7 @@ public:
ScPostIt* GetCellNote( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow
);
const ScPostIt* GetCellNote( sc::ColumnBlockConstPosition& rBlockPos,
SCROW nRow ) const;
void DeleteCellNotes( sc::ColumnBlockPosition& rBlockPos, SCROW nRow1,
SCROW nRow2, bool bForgetCaptionOwnership );
+bool HasCellNote(SCROW nStartRow, SCROW nEndRow) const;
bool HasCellNotes() const;
void SetCellNote( SCROW nRow, std::unique_ptr pNote);
bool IsNotesEmptyBlock(SCROW nStartRow, SCROW nEndRow) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e129897941a2..a40324f63cd2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1234,6 +1234,7 @@ public:
void SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab,
std::unique_ptr pNote);
SC_DLLPUBLIC boolHasNote(const ScAddress& rPos) const;
bool HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab)
const;
+bool HasNote(SCTAB nTab, SCCOL nStartCol, SCROW
nStartRow, SCCOL nEndCol, SCROW nEndRow) const;
SC_DLLPUBLIC boolHasColNotes(SCCOL nCol, SCTAB nTab) const;
SC_DLLPUBLIC boolHasTabNotes(SCTAB nTab) const;
bool HasNotes() const;
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 827b9d76831b..54213f2cd582 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -767,6 +767,38 @@ void ScColumn::GetNotesInRange(SCROW nStartRow, SCROW
nEndRow,
std::for_each(it, ++itEnd, NoteEntryCollector(rNotes, nTab, nCol,
nStartRow, nEndRow));
}
+bool ScColumn::HasCellNote(SCROW nStartRow, SCROW nEndRow) const
+{
+std::pair aStartPos =
+maCellNotes.position(nStartRow);
+if (aStartPos.first == maCellNotes.end())
+// Invalid row number.
+return false;
+
+std::pair aEndPos =
+maCellNotes.position(nEndRow);
+
+for (sc::CellNoteStoreType::const_iterator it = aStartPos.first; it !=
aEndPos.first; ++it)
+{
+if (it->type != sc::element_type_cellnote)
+continue;
+size_t nTopRow = it->position;
+sc::cellnote_block::const_iterator blockIt =
sc::cellnote_block::begin(*(it->data));
+sc::cellnote_block::const_iterator blockItEnd =
sc::cellnote_block::end(*(it->data));
+size_t nOffset = 0;
+if(nTopRow < o3tl::make_unsigned(nStartRow))
+{
+std::advance(blockIt, nStartRow - nTopRow);
+nOffset = nStartRow - nTopRow;
+}
+
+if (blockIt != blockItEnd && nTopRow + nOffset <=
o3tl::make_unsigned(nEndRow))
+return true;
+}
+
+return false;
+}
+
void ScColumn::GetUnprotectedCells( SCROW nStartRow, SCROW nEndRow,
ScRangeList& rRangeList ) const
{
SCROW nTmpStartRow = nStartRow, nTmpEndRow = nEndRow;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a0690931540c..29ce6fa3c77a 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6596,6 +6596,20 @@ bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB
nTab) const
return pNote != nullptr;
}
+bool ScDocument::HasNote(SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL
nEndCol, SCROW nEndRow) const
+{
+const ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return false;
+
+nStartCol = pTab->ClampToAllocatedColumns(nStartCol);
+nEndCol = pTab->ClampToAllocatedColumns(nEndCol);
+for (SCCOL nCol = nStartCol; nCol < nEndCol; ++nCol)
+if (pTab->aCol[nCol].HasCellNote(nStartRow, nEndRow))
+return true;
+return false;
+}
+
bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab) const
{
if (!ValidCol(nCol))
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 3a26bffadfa6..f98350f0963c 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4977,11 +4977,7 @@ bool ScDocFunc::MergeCells( const ScCellMergeOption&
rOpti
[Libreoffice-commits] core.git: vcl/qa vcl/source
vcl/qa/cppunit/pdfexport/data/pdf-image-rotate-180.pdf |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 67 +
vcl/source/gdi/pdfwriter_impl.cxx | 53 -
3 files changed, 99 insertions(+), 21 deletions(-)
New commits:
commit d7d43cf460d66354a40ffa3b34c0f9efcd42d0be
Author: Miklos Vajna
AuthorDate: Mon May 17 13:51:31 2021 +0200
Commit: Miklos Vajna
CommitDate: Mon May 17 15:24:57 2021 +0200
vcl PDF export: fix re-exporting PDF images with arbitrary page-level
rotation
Building on top of commit bd520b177637d4b7d9d93733103cff17a3c91b0a (vcl
PDF export: fix re-exporting PDF images with page-level rotation,
2019-11-06), this was already working for 90 degrees, now generalize
this to work with 180 degrees as well.
Change-Id: I5a5d51662399814d5554d7c2cb86a6c9a2974012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115705
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/vcl/qa/cppunit/pdfexport/data/pdf-image-rotate-180.pdf
b/vcl/qa/cppunit/pdfexport/data/pdf-image-rotate-180.pdf
new file mode 100644
index ..981ca32061cd
Binary files /dev/null and
b/vcl/qa/cppunit/pdfexport/data/pdf-image-rotate-180.pdf differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 8e089ded9d95..a3575e415d4f 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -2794,6 +2794,73 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testPdfUaMetadata)
CPPUNIT_ASSERT_EQUAL(OString("1"), aPdfUaPart);
}
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testPdfImageRotate180)
+{
+// Create an empty document.
+mxComponent = loadFromDesktop("private:factory/swriter");
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference xText = xTextDocument->getText();
+uno::Reference xCursor = xText->createTextCursor();
+
+// Insert the PDF image.
+uno::Reference xFactory(mxComponent,
uno::UNO_QUERY);
+uno::Reference xGraphicObject(
+xFactory->createInstance("com.sun.star.text.TextGraphicObject"),
uno::UNO_QUERY);
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"pdf-image-rotate-180.pdf";
+xGraphicObject->setPropertyValue("GraphicURL", uno::makeAny(aURL));
+uno::Reference xShape(xGraphicObject, uno::UNO_QUERY);
+xShape->setSize(awt::Size(1000, 1000));
+uno::Reference xTextContent(xGraphicObject,
uno::UNO_QUERY);
+xText->insertTextContent(xCursor->getStart(), xTextContent,
/*bAbsorb=*/false);
+
+// Save as PDF.
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Parse the export result.
+SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);
+maMemory.WriteStream(aFile);
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+std::unique_ptr pPdfDocument
+= pPDFium->openDocument(maMemory.GetData(), maMemory.GetSize());
+CPPUNIT_ASSERT(pPdfDocument);
+CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount());
+
+// Make sure that the page -> form -> form has a child image.
+std::unique_ptr pPdfPage =
pPdfDocument->openPage(/*nIndex=*/0);
+CPPUNIT_ASSERT(pPdfPage);
+CPPUNIT_ASSERT_EQUAL(1, pPdfPage->getObjectCount());
+std::unique_ptr pPageObject =
pPdfPage->getObject(0);
+CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFPageObjectType::Form,
pPageObject->getType());
+// 2: white background and the actual object.
+CPPUNIT_ASSERT_EQUAL(2, pPageObject->getFormObjectCount());
+std::unique_ptr pFormObject =
pPageObject->getFormObject(1);
+CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFPageObjectType::Form,
pFormObject->getType());
+CPPUNIT_ASSERT_EQUAL(1, pFormObject->getFormObjectCount());
+
+// Check if the inner form object (original page object in the pdf image)
has the correct
+// rotation.
+std::unique_ptr pInnerFormObject =
pFormObject->getFormObject(0);
+CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFPageObjectType::Form,
pInnerFormObject->getType());
+CPPUNIT_ASSERT_EQUAL(1, pInnerFormObject->getFormObjectCount());
+std::unique_ptr pImage =
pInnerFormObject->getFormObject(0);
+CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFPageObjectType::Image,
pImage->getType());
+basegfx::B2DHomMatrix aMat = pInnerFormObject->getMatrix();
+basegfx::B2DTuple aScale;
+basegfx::B2DTuple aTranslate;
+double fRotate = 0;
+double fShearX = 0;
+aMat.decompose(aScale, aTranslate, fRotate, fShearX);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: -1
+// - Actual : 1
+// i.e. the 180 degrees rotation didn't happen (via a combination of
horizontal + vertical
+//
[Libreoffice-commits] core.git: svl/source
svl/source/crypto/cryptosign.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c781776f3c79bbe3175b1452d26c79ebb931a500
Author: Noel Grandin
AuthorDate: Mon May 17 12:49:11 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 15:42:31 2021 +0200
dont leak NSS Arena in svl::crypto::Signing::Sign
Change-Id: I0c94c4f6035c1346468bbe78e94faea0cc714da8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115699
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index f2dffc4d76b7..70696dafce50 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1290,6 +1291,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
cms_output.data = nullptr;
cms_output.len = 0;
PLArenaPool *arena = PORT_NewArena(1);
+const ::comphelper::ScopeGuard aScopeGuard(
+[&arena]() mutable { free(arena); } );
NSSCMSEncoderContext *cms_ecx;
// Possibly it would work to even just pass NULL for the password callback
function and its
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in Repository.mk solenv/gbuild
Repository.mk | 12 +++- config_host.mk.in |1 + solenv/gbuild/gbuild.mk |1 + 3 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 4a09f57c132c7957eb922063500964e2fd1bf5a5 Author: Armin Le Grand (Allotropia) AuthorDate: Mon May 17 15:56:44 2021 +0200 Commit: Armin Le Grand (Allotropia) CommitDate: Mon May 17 15:58:40 2021 +0200 Wasm strip: remove UcpHelp Change-Id: I0900835c9b155571f524b5d9fd1b4227bc0670f3 diff --git a/Repository.mk b/Repository.mk index f4f1dd0964ea..7a58afee5cf9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -23,9 +23,14 @@ $(eval $(call gb_Helper_register_executables,NONE, \ )) endif +ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE) $(eval $(call gb_Helper_register_executables,NONE, \ HelpIndexer \ HelpLinker \ +)) +endif + +$(eval $(call gb_Helper_register_executables,NONE, \ bestreversemap \ cfgex \ concat-deps \ @@ -633,6 +638,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ )) endif +ifneq ($(DENABLE_WASM_STRIP_UCPHELP),TRUE) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ + ucpchelp1 \ +)) +endif + $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ $(if $(filter WNT,$(OS)),avmediawin) \ @@ -669,7 +680,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(WITH_WEBDAV),ucpdav1) \ ucpfile1 \ ucpftp1 \ - ucpchelp1 \ ucphier1 \ ucppkg1 \ unopkgapp \ diff --git a/config_host.mk.in b/config_host.mk.in index 39ed1b11e259..48a55d6b9a2c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -211,6 +211,7 @@ export ENABLE_WASM_STRIP_CANVAS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_CLUCENE=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@ +export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@ export ENABLE_WERROR=@ENABLE_WERROR@ export ENDIANNESS=@ENDIANNESS@ export EPM=@EPM@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 376048a06399..017b2e6d600d 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -232,6 +232,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CANVAS gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CLUCENE gb_GLOBALDEFS += -DENABLE_WASM_STRIP_DBACCESS gb_GLOBALDEFS += -DENABLE_WASM_STRIP_ACCESSIBILITY +gb_GLOBALDEFS += -DENABLE_WASM_STRIP_UCPHELP endif ifeq ($(gb_ENABLE_DBGUTIL),$(true)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: emfio/source sd/uiconfig starmath/inc sw/source
emfio/source/reader/mtftools.cxx |2 +-
sd/uiconfig/sdraw/ui/drawprinteroptions.ui |4 ++--
starmath/inc/smediteng.hxx |2 +-
sw/source/core/crsr/swcrsr.cxx |2 +-
sw/source/uibase/shells/basesh.cxx |2 +-
sw/source/uibase/wrtsh/wrtsh1.cxx |4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 817b438ef587d79350963738619d8669dffbccd7
Author: Andrea Gelmini
AuthorDate: Sat May 15 11:38:37 2021 +0200
Commit: Andrea Gelmini
CommitDate: Mon May 17 16:07:53 2021 +0200
Fix typos
Change-Id: I4be77bf074f93fc978e34e5ba4c4693896e4c467
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115645
Tested-by: Jenkins
Reviewed-by: Julien Nabet
Reviewed-by: Olivier Hallot
Reviewed-by: Andrea Gelmini
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index a5634386729f..f7db5b29ff14 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -1346,7 +1346,7 @@ namespace emfio
// tdf#142014 By default the stroke is made with hairline. If width is
bigger, we need to use PolyLineAction
if ( bStroke )
{
-// bFill is drawing hairstyle line. So we need to to draw it only
when the width is different than 0
+// bFill is drawing hairstyle line. So we need to draw it only
when the width is different than 0
if ( !bFill || maLineStyle.aLineInfo.GetWidth() || (
maLineStyle.aLineInfo.GetStyle() == LineStyle::Dash ) )
{
sal_uInt16 i, nCount = maPathObj.Count();
diff --git a/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
index 7dada95c1d30..819b8e5669f1 100644
--- a/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
+++ b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
@@ -227,7 +227,7 @@
originalsize
-Specifies whether to
scale down objects that are beyond the margins of the current printer so they
fit on the paper in the printer.
+Specifies whether to
scale down objects that are beyond the margins of the current printer so they
fit on the paper in the printer.
@@ -249,7 +249,7 @@
originalsize
-Prints a large
format document, such as a poster or banner, by distributing the document page
across multiple sheets of paper. The distribution option calculates how many
sheets of paper are needed. You can then piece together the sheets.
+Prints a large
format document, such as a poster or banner, by distributing the document page
across multiple sheets of paper. The distribution option calculates how many
sheets of paper are needed. You can then piece together the sheets.
diff --git a/starmath/inc/smediteng.hxx b/starmath/inc/smediteng.hxx
index c3d3d576467e..29902361b585 100644
--- a/starmath/inc/smediteng.hxx
+++ b/starmath/inc/smediteng.hxx
@@ -53,7 +53,7 @@ private:
ESelection m_aAllSelection;
/**
- * Finds the ESelection wich contains all the text.
+ * Finds the ESelection which contains all the text.
*/
void updateAllESelection();
};
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 69388177ab28..847a019cf1b9 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1808,7 +1808,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt,
sal_uInt16 nMode,
// the document. When the cursor is at the end of the visible
document and
// right arrow key is pressed Move fails after moving the
cursor to the
// end of the document model, which doesn't have a node frame
and causes
-// wierd numbers to be displayed in the statusbar page number
count. Left
+// weird numbers to be displayed in the statusbar page number
count. Left
// arrow, when in this state, causes a crash without
RestoredSavePos() added here.
RestoreSavePos();
break;
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 5942e7cc7340..b8e2cf281c67 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -202,7 +202,7 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq)
if (rSh.IsEndPara())
{
SwNodeIndex aIdx(rSh.GetCursor()->GetNode());
-// disallow if this is am outline node having folded
content
+// disallow if this is an outline node having folded
content
bool bVisible = true;
aIdx.GetNode().GetTextNode()->GetAttrOu
[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk|2 +-
offapi/com/sun/star/sheet/FilterFieldType.idl | 10 +-
offapi/com/sun/star/sheet/FilterFieldValue.idl |2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 5c682a5e24337ac022fb3eba585583b16718d246
Author: Samuel Mehrbrodt
AuthorDate: Mon May 17 13:19:59 2021 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon May 17 16:24:46 2021 +0200
Fix types and order
Change-Id: Icd98c02a3bdc361423f668173bf6feb5f5b11e4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115703
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 3abfc388ba95..4180c1194eff 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3421,8 +3421,8 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet,\
FillDirection \
FillMode \
FilterConnection \
- FilterFieldValue \
FilterFieldType \
+ FilterFieldValue \
FilterOperator \
FilterOperator2 \
FormulaLanguage \
diff --git a/offapi/com/sun/star/sheet/FilterFieldType.idl
b/offapi/com/sun/star/sheet/FilterFieldType.idl
index 0a5113c7a075..59a9807379e6 100644
--- a/offapi/com/sun/star/sheet/FilterFieldType.idl
+++ b/offapi/com/sun/star/sheet/FilterFieldType.idl
@@ -18,19 +18,19 @@ module com { module sun { module star { module sheet {
constants FilterFieldType
{
/** Filter by numeric value */
- const short NUMERIC = 0;
+ const long NUMERIC = 0;
/** Filter by string value */
- const short STRING = 1;
+ const long STRING = 1;
/** Filter by date */
- const short DATE = 2;
+ const long DATE = 2;
/** Filter by text color */
- const short TEXT_COLOR = 3;
+ const long TEXT_COLOR = 3;
/** Filter by background color */
- const short BACKGROUND_COLOR = 4;
+ const long BACKGROUND_COLOR = 4;
};
}; }; }; };
diff --git a/offapi/com/sun/star/sheet/FilterFieldValue.idl
b/offapi/com/sun/star/sheet/FilterFieldValue.idl
index 12e9b8ba62e8..a8930ee0f6ac 100644
--- a/offapi/com/sun/star/sheet/FilterFieldValue.idl
+++ b/offapi/com/sun/star/sheet/FilterFieldValue.idl
@@ -45,7 +45,7 @@ struct FilterFieldValue
@see com::sun::star::sheet::FilterFieldType
@since LibreOffice 7.2
*/
-short FilterType;
+long FilterType;
/** The color which is used for filtering
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zformat.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit def94a6b50f02682c3f04ce3171665c703c47b2c
Author: Eike Rathke
AuthorDate: Mon May 17 15:59:00 2021 +0200
Commit: Eike Rathke
CommitDate: Mon May 17 17:15:32 2021 +0200
Resolves: tdf#128314 Use GenitiveMonths name also if comma is following
So 'D ,' works the same as 'D '.
Change-Id: Id910c67174260401b9c37672f189d550480793a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115708
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index fd1776bb1cd9..648034f9352a 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3237,9 +3237,9 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
genitive case if the day follows the month, and partitive case if the day
precedes the month. If there is no day of month the nominative case (noun)
is returned. Also if the month is immediately preceded or followed by a
-literal string other than space the nominative name is used, this prevents
-duplicated casing for \t\a and such in documents imported from (e.g.
-Finnish) Excel or older LibO/OOo releases.
+literal string other than space and not followed by a comma, the nominative
+name is used, this prevents duplicated casing for \t\a and such in
+documents imported from (e.g. Finnish) Excel or older LibO/OOo releases.
*/
// IDEA: instead of eCodeType pass the index to nTypeArray and restrict
@@ -3276,9 +3276,11 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int &
io_nState, const ImpSvNumFor& r
case NF_KEY_M:
if ((i < nCount-1 &&
rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
- rInfo.sStrArray[i+1][0] != ' ') ||
+ // Literal following, not space nor comma.
+ rInfo.sStrArray[i+1][0] != ' ' && rInfo.sStrArray[i+1][0]
!= ',') ||
(i > 0 && rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING &&
((nLen = rInfo.sStrArray[i-1].getLength()) > 0) &&
+ // Literal preceding, not space.
rInfo.sStrArray[i-1][nLen-1] != ' '))
{
io_nState = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/jsdialogs' - 51 commits - basctl/source bin/ui-converter-skeleton.py chart2/source chart2/uiconfig comphelper/source cui/source cui/uiconfig editeng/sou
Rebased ref, commits from common ancestor:
commit c8755727de8771377c0a3b2434195c354d1f4b8e
Author: Caolán McNamara
AuthorDate: Thu Mar 4 17:22:14 2021 +
Commit: Szymon Kłos
CommitDate: Mon May 17 17:36:28 2021 +0200
remove intermediate containers in sidebars
tested extension sidebars of:
a) Wollmux extension sidebars
b) Analog Clock Extension demo
https://wiki.openoffice.org/wiki/Sidebar_for_Developers#Example:_Analog_Clock_Extension
Change-Id: If9729e20526681928137989f01a8ae733a9b0cb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 3ae73588075c..b5bde521d031 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -20,12 +20,11 @@
#include "Chart2PanelFactory.hxx"
#include
-#include
-#include
#include
#include
#include
#include
+#include
#include "ChartElementsPanel.hxx"
#include "ChartTypePanel.hxx"
@@ -62,8 +61,11 @@ Reference SAL_CALL
ChartPanelFactory::createUIElement (
Reference xParentWindow
(aArguments.getOrDefault("ParentWindow", Reference()));
Reference xController
(aArguments.getOrDefault("Controller", Reference()));
-VclPtr pParentWindow =
VCLUnoHelper::GetWindow(xParentWindow);
-if ( ! xParentWindow.is() || pParentWindow==nullptr)
+weld::Widget* pParent(nullptr);
+if (weld::TransportAsXWindow* pTunnel =
dynamic_cast(xParentWindow.get()))
+pParent = pTunnel->getWidget();
+
+if (!pParent)
throw RuntimeException(
"PanelFactory::createUIElement called without ParentWindow",
nullptr);
@@ -82,35 +84,27 @@ Reference SAL_CALL
ChartPanelFactory::createUIElement (
"ChartPanelFactory::createUIElement called without valid
ChartController",
nullptr);
-VclPtr pPanel;
+std::unique_ptr xPanel;
if (rsResourceURL.endsWith("/ElementsPanel"))
-pPanel = ChartElementsPanel::Create( pParentWindow, xFrame,
pController );
+xPanel = ChartElementsPanel::Create( pParent, pController );
else if (rsResourceURL.endsWith("/TypePanel"))
-{
-//pPanel = ChartTypePanel::Create( pParentWindow, xFrame,
pController );
-VclPtrInstance ppPanel(pParentWindow, xFrame,
pController);
-xElement = sfx2::sidebar::SidebarPanelBase::Create(
-rsResourceURL,
-xFrame,
-ppPanel,
-css::ui::LayoutSize(-1,-1,-1));
-}
+xPanel = std::make_unique(pParent, pController);
else if (rsResourceURL.endsWith("/SeriesPanel"))
-pPanel = ChartSeriesPanel::Create(pParentWindow, xFrame,
pController);
+xPanel = ChartSeriesPanel::Create(pParent, pController);
else if (rsResourceURL.endsWith("/AxisPanel"))
-pPanel = ChartAxisPanel::Create(pParentWindow, xFrame,
pController);
+xPanel = ChartAxisPanel::Create(pParent, pController);
else if (rsResourceURL.endsWith("/ErrorBarPanel"))
-pPanel = ChartErrorBarPanel::Create(pParentWindow, xFrame,
pController);
+xPanel = ChartErrorBarPanel::Create(pParent, pController);
else if (rsResourceURL.endsWith("/AreaPanel"))
-pPanel = ChartAreaPanel::Create(pParentWindow, xFrame,
pController);
+xPanel = ChartAreaPanel::Create(pParent, xFrame, pController);
else if (rsResourceURL.endsWith("/LinePanel"))
-pPanel = ChartLinePanel::Create(pParentWindow, xFrame,
pController);
+xPanel = ChartLinePanel::Create(pParent, xFrame, pController);
-if (pPanel)
+if (xPanel)
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
-pPanel,
+std::move(xPanel),
css::ui::LayoutSize(-1,-1,-1));
}
catch (const css::uno::RuntimeException &)
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index e1fdc3299e59..36fd21204b62 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -256,8 +256,8 @@ private:
}
-VclPtr ChartAreaPanel::Create(
-vcl::Window* pParent,
+std::unique_ptr ChartAreaPanel::Create(
+weld::Widget* pParent,
const css::uno::Reference& rxFrame,
ChartController* pController)
{
@@ -266,11 +266,10 @@ VclPtr ChartAreaPanel::Create(
if (!rxFrame.is())
throw css::lang::IllegalArgumentException("no XFrame given to
ChartAxisPanel::Create", nullptr, 1);
-
[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in external/Module_external.mk RepositoryExternal.mk solenv/bin solenv/gbuild writerperfect/Library_wpftwriter.mk writerperfect/s
RepositoryExternal.mk |2
config_host.mk.in |1
external/Module_external.mk |7 ++-
solenv/bin/native-code.py |4 -
solenv/gbuild/gbuild.mk |1
writerperfect/Library_wpftwriter.mk | 20 -
writerperfect/source/writer/wpftwriter.component |8 ---
writerperfect/source/writer/wpftwriter.extended.component | 29 ++
8 files changed, 58 insertions(+), 14 deletions(-)
New commits:
commit 640d53e1e7c11d15ad7bfa48e0425198c21c3e35
Author: Armin Le Grand (Allotropia)
AuthorDate: Mon May 17 17:43:49 2021 +0200
Commit: Armin Le Grand (Allotropia)
CommitDate: Mon May 17 17:43:49 2021 +0200
Wasm optional EPUB removal
Change-Id: Ia7c50b7e66ac2398303c4a26cf169bee94aec57c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8cfd50971a0e..c7c530294aa9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1903,6 +1903,7 @@ endef
gb_ExternalProject__use_epubgen :=
else # !SYSTEM_EPUBGEN
+ifneq ($(ENABLE_WASM_STRIP_EPUB),TRUE)
define gb_LinkTarget__use_epubgen
$(call gb_LinkTarget_set_include,$(1),\
@@ -1920,6 +1921,7 @@ $(call
gb_ExternalProject_use_external_project,$(1),libepubgen)
endef
+endif # ENABLE_WASM_STRIP_EPUB
endif # SYSTEM_EPUBGEN
ifneq ($(SYSTEM_REVENGE),)
diff --git a/config_host.mk.in b/config_host.mk.in
index 48a55d6b9a2c..0312597f6757 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -212,6 +212,7 @@ export ENABLE_WASM_STRIP_CLUCENE=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_EPUB=@ENABLE_WASM_STRIP@
export ENABLE_WERROR=@ENABLE_WERROR@
export ENDIANNESS=@ENDIANNESS@
export EPM=@EPM@
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6828ad3a0317..6d015590587e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -19,6 +19,12 @@ $(eval $(call gb_Module_add_moduledirs,external,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_EPUB),TRUE)
+$(eval $(call gb_Module_add_moduledirs,external,\
+ $(call gb_Helper_optional,EPUBGEN,libepubgen) \
+))
+endif
+
$(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XMLSEC,xmlsec) \
$(call gb_Helper_optional,ABW,libabw) \
@@ -40,7 +46,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,EBOOK,libebook) \
$(call gb_Helper_optional,EPM,epm) \
$(call gb_Helper_optional,EPOXY,epoxy) \
- $(call gb_Helper_optional,EPUBGEN,libepubgen) \
$(call gb_Helper_optional,ETONYEK,libetonyek) \
$(call gb_Helper_optional,EXPAT,expat) \
$(call gb_Helper_optional,FIREBIRD,firebird) \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a1ea83bf70e5..e8ef67571c7a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -677,7 +677,7 @@ writer_factory_list = [
writer_constructor_list = [
# basic/util/sb.component
-("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if
HAVE_FEATURE_SCRIPTING"),
+("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
# filter/source/textfilterdetect/textfd.component
"com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation",
@@ -698,7 +698,7 @@ writer_constructor_list = [
"com_sun_star_comp_Writer_RtfFilter_get_implementation",
"com_sun_star_comp_Writer_WriterFilter_get_implementation",
# writerperfect/source/writer/wpftwriter.component
-"com_sun_star_comp_Writer_EPUBExportFilter_get_implementation",
+("com_sun_star_comp_Writer_EPUBExportFilter_get_implementation", "#ifndef
ENABLE_WASM_STRIP_EPUB"),
]
desktop_factory_list = [
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 017b2e6d600d..beccae4cbbf5 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -233,6 +233,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CLUCENE
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_DBACCESS
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_ACCESSIBILITY
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_UCPHELP
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_EPUB
endif
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
diff --git a/writerperfect/Library_wpftwriter.mk
b/writerperfect/Library_wpftwriter.mk
index 8993cca31490..516e96770c3c 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -26,6 +26,10 @@ $(eval $(call gb_Library_set_include,wpftwriter,\
$(eval $(call
gb_Library_set_componentfile,wpftwriter,writerperfect/source/writer/wpftwr
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx | 30 +
sc/qa/unit/ucalc_copypaste.cxx | 112 +
sc/qa/unit/ucalc_formula.cxx | 62 +---
sc/qa/unit/ucalc_sharedformula.cxx |2
sc/qa/unit/ucalc_sort.cxx | 10 ---
5 files changed, 15 insertions(+), 201 deletions(-)
New commits:
commit 9bbf8057d9d92857aa3c693c1387589ad378695d
Author: Xisco Fauli
AuthorDate: Mon May 17 13:41:27 2021 +0200
Commit: Xisco Fauli
CommitDate: Mon May 17 17:46:39 2021 +0200
sc_ucalc: use DoLoad instead of DoInitNew
In 145b2d8ee131dca592a41f7b26341a542a23845b
I wrongly assumed that the formula options have to be reset
back to default after using them.
Later, I realized that was not the reason why some tests didn't
fail when executed individually but failed when the module
was executed as a whole.
After some investigation, it turned out the problem was caused
by DoInitNew changing the defaults separators.
Why? I don't know, but using DoLoad seems to fix this problem
This change revealed that Test::testMatrixConditionalBooleanResult,
Test::testFormulaWizardSubformula and Test::testTdf93415
were relying on other tests and failed if executed individually.
Adapt them to use the default separators.
Change-Id: I08c1d88d7c6411592cc9a5779bfaa2b3bb6429ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115704
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5b34c2a073fb..49238a0f4191 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1968,10 +1968,10 @@ void Test::testMatrixConditionalBooleanResult()
// boolean and numeric results in an unformatted area.
ScMarkData aMark(m_pDoc->GetSheetLimits());
aMark.SelectOneTable(0);
-m_pDoc->InsertMatrixFormula( 0,0, 1,0, aMark, "=IF({1,0};TRUE();42)"); //
{TRUE,42}
-m_pDoc->InsertMatrixFormula( 0,1, 1,1, aMark, "=IF({0,1};TRUE();42)"); //
{42,1} aim for {42,TRUE}
-m_pDoc->InsertMatrixFormula( 0,2, 1,2, aMark, "=IF({1,0};42;FALSE())"); //
{42,0} aim for {42,FALSE}
-m_pDoc->InsertMatrixFormula( 0,3, 1,3, aMark, "=IF({0,1};42;FALSE())"); //
{FALSE,42}
+m_pDoc->InsertMatrixFormula( 0,0, 1,0, aMark, "=IF({1;0};TRUE();42)"); //
{TRUE,42}
+m_pDoc->InsertMatrixFormula( 0,1, 1,1, aMark, "=IF({0;1};TRUE();42)"); //
{42,1} aim for {42,TRUE}
+m_pDoc->InsertMatrixFormula( 0,2, 1,2, aMark, "=IF({1;0};42;FALSE())"); //
{42,0} aim for {42,FALSE}
+m_pDoc->InsertMatrixFormula( 0,3, 1,3, aMark, "=IF({0;1};42;FALSE())"); //
{FALSE,42}
CPPUNIT_ASSERT_EQUAL( OUString("TRUE"), m_pDoc->GetString(0,0,0));
CPPUNIT_ASSERT_EQUAL( OUString("42"),m_pDoc->GetString(1,0,0));
@@ -5591,7 +5591,7 @@ void Test::testFormulaWizardSubformula()
ScSimpleFormulaCalculator aFCell1( *m_pDoc, ScAddress(0,0,0), "=B1:B3",
true );
FormulaError nErrCode = aFCell1.GetErrCode();
CPPUNIT_ASSERT( nErrCode == FormulaError::NONE || aFCell1.IsMatrix() );
-CPPUNIT_ASSERT_EQUAL( OUString("{1;#DIV/0!;#NAME?}"),
aFCell1.GetString().getString() );
+CPPUNIT_ASSERT_EQUAL( OUString("{1|#DIV/0!|#NAME?}"),
aFCell1.GetString().getString() );
m_pDoc->SetString(ScAddress(1,0,0), "=NA()"); // B1
m_pDoc->SetString(ScAddress(1,1,0), "2"); // B2
@@ -5599,7 +5599,7 @@ void Test::testFormulaWizardSubformula()
ScSimpleFormulaCalculator aFCell2( *m_pDoc, ScAddress(0,0,0), "=B1:B3",
true );
nErrCode = aFCell2.GetErrCode();
CPPUNIT_ASSERT( nErrCode == FormulaError::NONE || aFCell2.IsMatrix() );
-CPPUNIT_ASSERT_EQUAL( OUString("{#N/A;2;3}"),
aFCell2.GetString().getString() );
+CPPUNIT_ASSERT_EQUAL( OUString("{#N/A|2|3}"),
aFCell2.GetString().getString() );
m_pDoc->DeleteTab(0);
}
@@ -6048,12 +6048,6 @@ void Test::testProtectedSheetEditByRow()
ScDocFunc& rDocFunc = m_xDocShell->GetDocFunc();
m_pDoc->InsertTab(0, "Protected");
-ScFormulaOptions aOldOptions, aNewOptions;
-aOldOptions = SC_MOD()->GetFormulaOptions();
-aNewOptions.SetFormulaSepArg(";");
-aNewOptions.SetFormulaSepArrayCol(";");
-m_xDocShell->SetFormulaOptions(aNewOptions);
-
{
// Remove protected flags from rows 2-5.
ScPatternAttr aAttr(m_pDoc->GetPool());
@@ -6121,9 +6115,6 @@ void Test::testProtectedSheetEditByRow()
CPPUNIT_ASSERT_MESSAGE("row insertion at row 3 should fail.",
!bInserted);
}
-// restore formula options back to default
-m_xDocShell->SetFormulaOptions(aOldOptions);
-
m_pDoc->DeleteTab(1);
m_pDoc->DeleteTab(0);
}
@@ -6133,12 +6124,6 @@ void Test::testProtectedSheetEditByColumn()
ScDocFunc& rDocFunc = m_xDocShell->GetDocFunc();
m_pDoc->InsertTab(0, "Protected");
-ScFormulaOptions aOldOptions, aNewOptions;
-aOldOptions = SC_MOD()->GetFormulaOptions();
-aNewOptions.SetFormulaSepAr
[Libreoffice-commits] core.git: compilerplugins/clang sc/CppunitTest_sc_ucalc_formula.mk sc/CppunitTest_sc_ucalc.mk sc/Module_sc.mk sc/qa
compilerplugins/clang/unusedmethods.results |6 sc/CppunitTest_sc_ucalc.mk | 109 --- sc/CppunitTest_sc_ucalc_formula.mk | 14 sc/Module_sc.mk |1 sc/qa/unit/helper/qahelper.cxx |7 sc/qa/unit/helper/qahelper.hxx |1 sc/qa/unit/ucalc.cxx| 15 sc/qa/unit/ucalc.hxx| 254 sc/qa/unit/ucalc_formula.cxx| 828 +--- 9 files changed, 536 insertions(+), 699 deletions(-) New commits: commit c29f91f3d7a0deb902b900ff07e6c32632b8c958 Author: Xisco Fauli AuthorDate: Fri May 14 12:26:12 2021 +0200 Commit: Xisco Fauli CommitDate: Mon May 17 17:48:19 2021 +0200 sc_ucalc: move formula tests to their own module in order to split sc_ucalc monster into smaller modules Now, we can change CppunitTest_sc_ucalc.mk to use the template - Enable testExternalRefUnresolved on Linux/Mac - Remove testFormulaHashAndTag. it was disabled in f4dc8a869ac49f19c20fc5fa606448e9103726bd < the idea behind the test can't work right now > Change-Id: I864341442ccd321c8ef4f7147db4512bcc7a6b21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115595 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 88857e7f81f2..172eaaec7b09 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -1176,12 +1176,6 @@ sc/qa/unit/helper/qahelper.hxx:155 class std::__cxx11::basic_string, class std::allocator > print(const class ScAddress &) sc/qa/unit/screenshots/screenshots.cxx:325 int main() -sc/qa/unit/ucalc.hxx:151 -void Test::testFormulaHashAndTag() -sc/qa/unit/ucalc.hxx:191 -void Test::testSingleCellCopyColumnLabel() -sc/qa/unit/ucalc.hxx:251 -void Test::testExternalRefUnresolved() sc/source/core/inc/interpre.hxx:71 basic_ostream & sc::operator<<(basic_ostream &,const struct sc::ParamIfsResult &) sc/source/core/opencl/formulagroupcl.cxx:1061 diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 16dfcf0e1d55..16fe696f9b13 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -9,112 +9,7 @@ # #* -$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc)) - -$(eval $(call gb_Library_use_common_precompiled_header,sc_ucalc)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ -sc/qa/unit/ucalc \ -sc/qa/unit/ucalc_formula \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc, \ - sc \ - scqahelper \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ - boost_headers \ -$(call gb_Helper_optional,OPENCL, \ -clew) \ -icu_headers \ -icui18n \ -icuuc \ - libxml2 \ - mdds_headers \ - orcus \ - orcus-parser \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ - $(call gb_Helper_optional,AVMEDIA,avmedia) \ -basegfx \ -comphelper \ -cppu \ -cppuhelper \ -dbtools \ -drawinglayer \ -editeng \ -for \ -forui \ -i18nlangtag \ -i18nutil \ - $(call gb_Helper_optional,OPENCL, \ - opencl) \ -sal \ -salhelper \ -sax \ -sb \ -sfx \ -sot \ -svl \ -svt \ -svx \ -svxcore \ - test \ -tk \ -tl \ -ucbhelper \ - unotest \ -utl \ -vbahelper \ -vcl \ -xo \ -)) - -$(eval $(call gb_CppunitTest_set_include,sc_ucalc,\ --I$(SRCDIR)/sc/source/ui/inc \ --I$(SRCDIR)/sc/source/core/inc \ --I$(SRCDIR)/sc/inc \ -$$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sc_ucalc,\ - udkapi \ - offapi \ - oovbaapi \ -)) - -$(eval $(call gb_CppunitTest_use_custom_headers,sc_ucalc,\ - officecfg/registry \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sc_ucalc)) -$(eval $(call gb_CppunitTest_use_vcl,sc_ucalc)) - -$(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ -configmgr/source/configmgr \ -framework/util/fwk \ -i18npool/source/search/i18nsearch \ -i18npool/util/i18npool \ -sax/source/expatwrap/expwrap \ -scaddins/source/analysis/analysis \ -scaddins/source/datefunc/date \ -scaddins/source/pricing/pricing \ -sfx2/util/sfx \ -ucb/source/core/ucb1 \ -ucb/source/ucp/file/ucpfile1 \ -unoxml/source/service/unoxml \ -uui/util/uui \ -vcl/vcl.common \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\ - -lrt \ -)) -endif - -$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc)) +# empty second argument (i.e. no 1) +$(eval $(call sc_ucalc_test,)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_ucalc_formula.mk b/sc/CppunitTest_sc_ucal
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/tabsh.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4d52d2bc81f9d27472fe368785912a530489d046
Author: Caolán McNamara
AuthorDate: Mon May 17 14:48:20 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon May 17 18:12:11 2021 +0200
tdf#142165 restore a SwShellTableCursor if the orig selection described that
so that we are operating on the same selection that existed when the
dialog was originally launched
we need to avoid the assert of
commit 6db71f70a3b200d4074f6cda8ce445e9861d3296
tdf#140977 drop possible table-cursor before setting the new one
and support the multi-selection of
commit e08b446e46f56e15af58fdd4396afba1a316f9e5
tdf#140257 duplicate entire PaM ring when making copy
and support not scrolling to a different location on changing a table
page break style of
commit 9c61732677d038e32b73fc9fb883aced14c0febf
tdf#135916 just set the target table as selection
and keep making it possible to remove aa page break on a table of
commit 81f91196b98af38e29af451b86c26a893a109abc
tdf#135636 the selection at dialog-launch time is lost by dialog-apply
time
all of which is necessitated by
commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98
lokdialog: Convert the Table -> Properties... to async exec.
Change-Id: Ide5f953e63da46a8750e85d623310af0062b048b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115709
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/shells/tabsh.cxx
b/sw/source/uibase/shells/tabsh.cxx
index 9c73c9923a2d..3eb0e9b6ed4f 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -597,14 +597,18 @@ void SwTableShell::Execute(SfxRequest &rReq)
auto pRequest = std::make_shared(rReq);
rReq.Ignore(); // the 'old' request is not relevant any more
-auto vCursors = CopyPaMRing(*rSh.GetCursor()); // tdf#135636
make a copy to use at later apply
+SwPaM* pCursor = rSh.IsTableMode() ? rSh.GetTableCrs() :
rSh.GetCursor(); // tdf#142165 use table cursor if in table mode
+auto vCursors = CopyPaMRing(*pCursor); // tdf#135636 make a
copy to use at later apply
pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep,
&rBindings, &rSh, vCursors](sal_Int32 nResult){
if (RET_OK == nResult)
{
if (rSh.IsTableMode()) // tdf#140977 drop possible
table-cursor before setting the new one
rSh.TableCursorToCursor();
-rSh.SetSelection(*vCursors->front()); // tdf#135636
set the table selected at dialog launch as current selection
+// tdf#135636 set the table selected at dialog launch
as current selection
+rSh.SetSelection(*vCursors->front()); //
UpdateCursor() will be called which in the case
+ // of a table
selection should recreate a
+ //
SwShellTableCursor
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/uiconfig
cui/uiconfig/ui/textanimtabpage.ui | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) New commits: commit 561cfa00bca1c07778b03474bd5e2452f26c8839 Author: Caolán McNamara AuthorDate: Mon May 17 10:43:29 2021 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon May 17 18:21:57 2021 +0200 tdf#142303 connect adjustments to spinbuttons missing since commit 87e21946fa9a81c403a146d03579691537c1352c Date: Sat Aug 17 20:41:26 2013 -0300 Convert text animations tab page to widget UI Change-Id: I8eba96030a1f5060ba60166d462130eb2cef1298 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115695 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui index d47cb2ec728e..37a4c30150ab 100644 --- a/cui/uiconfig/ui/textanimtabpage.ui +++ b/cui/uiconfig/ui/textanimtabpage.ui @@ -13,9 +13,9 @@ 10 -300 -1 -50 +3 +50 +500 True @@ -364,10 +364,11 @@ True start True +True +adjustmentCOUNT -True Enter the number of times that you want the animation effect to repeat. @@ -436,10 +437,11 @@ True start True +True +adjustmentAMOUNT -True Enter the number of increments by which to scroll the text. @@ -508,10 +510,11 @@ True start True +True +adjustmentDELAY -True Enter the amount of time to wait before repeating the effect. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source
sw/source/uibase/shells/tabsh.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7cfae0ade31a5469331f5b0288e22aed6ec2fcc1
Author: Caolán McNamara
AuthorDate: Mon May 17 14:48:20 2021 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Mon May 17 18:25:09 2021 +0200
tdf#142165 restore a SwShellTableCursor if the orig selection described that
so that we are operating on the same selection that existed when the
dialog was originally launched
we need to avoid the assert of
commit 6db71f70a3b200d4074f6cda8ce445e9861d3296
tdf#140977 drop possible table-cursor before setting the new one
and support the multi-selection of
commit e08b446e46f56e15af58fdd4396afba1a316f9e5
tdf#140257 duplicate entire PaM ring when making copy
and support not scrolling to a different location on changing a table
page break style of
commit 9c61732677d038e32b73fc9fb883aced14c0febf
tdf#135916 just set the target table as selection
and keep making it possible to remove aa page break on a table of
commit 81f91196b98af38e29af451b86c26a893a109abc
tdf#135636 the selection at dialog-launch time is lost by dialog-apply
time
all of which is necessitated by
commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98
lokdialog: Convert the Table -> Properties... to async exec.
Change-Id: Ide5f953e63da46a8750e85d623310af0062b048b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115522
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sw/source/uibase/shells/tabsh.cxx
b/sw/source/uibase/shells/tabsh.cxx
index 036274546d04..549e4e14327c 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -596,14 +596,18 @@ void SwTableShell::Execute(SfxRequest &rReq)
auto pRequest = std::make_shared(rReq);
rReq.Ignore(); // the 'old' request is not relevant any more
-auto vCursors = CopyPaMRing(*rSh.GetCursor()); // tdf#135636
make a copy to use at later apply
+SwPaM* pCursor = rSh.IsTableMode() ? rSh.GetTableCrs() :
rSh.GetCursor(); // tdf#142165 use table cursor if in table mode
+auto vCursors = CopyPaMRing(*pCursor); // tdf#135636 make a
copy to use at later apply
pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep,
&rBindings, &rSh, vCursors](sal_Int32 nResult){
if (RET_OK == nResult)
{
if (rSh.IsTableMode()) // tdf#140977 drop possible
table-cursor before setting the new one
rSh.TableCursorToCursor();
-rSh.SetSelection(*vCursors->front()); // tdf#135636
set the table selected at dialog launch as current selection
+// tdf#135636 set the table selected at dialog launch
as current selection
+rSh.SetSelection(*vCursors->front()); //
UpdateCursor() will be called which in the case
+ // of a table
selection should recreate a
+ //
SwShellTableCursor
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 38 +-
connectivity/source/drivers/file/FDriver.cxx | 24 +++---
connectivity/source/drivers/flat/EDatabaseMetaData.cxx | 38 +-
connectivity/source/drivers/flat/EDriver.cxx | 20 ++---
connectivity/source/drivers/jdbc/JDriver.cxx | 52 +++
5 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit 08ffd34d5274e745a1400c70f94fc297f5ad8569
Author: Julien Nabet
AuthorDate: Sun May 16 20:36:59 2021 +0200
Commit: Julien Nabet
CommitDate: Mon May 17 18:48:35 2021 +0200
Simplify some initializations in connectivity
Change-Id: I980b59f06fb6004ba23279c8364cb0587e7ac8fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115679
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 455bf09e6733..6c798e5a166c 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -1013,25 +1013,25 @@ Reference< XResultSet >
OEvoabDatabaseMetaData::impl_getTypeInfo_throw( )
ODatabaseMetaDataResultSet::ORows tmp(2);
ODatabaseMetaDataResultSet::ORow aRow
{
-{ ODatabaseMetaDataResultSet::getEmptyValue() },
-{ new ORowSetValueDecorator(OUString("VARCHAR")) },
-{ new ORowSetValueDecorator(DataType::VARCHAR) },
-{ new ORowSetValueDecorator(sal_Int32(s_nCHAR_OCTET_LENGTH)) },
-{ ODatabaseMetaDataResultSet::getQuoteValue() },
-{ ODatabaseMetaDataResultSet::getQuoteValue() },
-{ ODatabaseMetaDataResultSet::getEmptyValue() },
-{ ODatabaseMetaDataResultSet::get1Value() },
-{ ODatabaseMetaDataResultSet::get1Value() },
-{ new ORowSetValueDecorator(sal_Int32(ColumnSearch::FULL)) },
-{ ODatabaseMetaDataResultSet::get1Value() },
-{ ODatabaseMetaDataResultSet::get0Value() },
-{ ODatabaseMetaDataResultSet::get0Value() },
-{ ODatabaseMetaDataResultSet::getEmptyValue() },
-{ ODatabaseMetaDataResultSet::get0Value() },
-{ ODatabaseMetaDataResultSet::get0Value() },
-{ ODatabaseMetaDataResultSet::getEmptyValue() },
-{ ODatabaseMetaDataResultSet::getEmptyValue() },
-{ new ORowSetValueDecorator(sal_Int32(10)) }
+ ODatabaseMetaDataResultSet::getEmptyValue() ,
+ new ORowSetValueDecorator(OUString("VARCHAR")) ,
+ new ORowSetValueDecorator(DataType::VARCHAR) ,
+ new ORowSetValueDecorator(sal_Int32(s_nCHAR_OCTET_LENGTH)) ,
+ ODatabaseMetaDataResultSet::getQuoteValue() ,
+ ODatabaseMetaDataResultSet::getQuoteValue() ,
+ ODatabaseMetaDataResultSet::getEmptyValue() ,
+ ODatabaseMetaDataResultSet::get1Value() ,
+ ODatabaseMetaDataResultSet::get1Value() ,
+ new ORowSetValueDecorator(sal_Int32(ColumnSearch::FULL)) ,
+ ODatabaseMetaDataResultSet::get1Value() ,
+ ODatabaseMetaDataResultSet::get0Value() ,
+ ODatabaseMetaDataResultSet::get0Value() ,
+ ODatabaseMetaDataResultSet::getEmptyValue() ,
+ ODatabaseMetaDataResultSet::get0Value() ,
+ ODatabaseMetaDataResultSet::get0Value() ,
+ ODatabaseMetaDataResultSet::getEmptyValue() ,
+ ODatabaseMetaDataResultSet::getEmptyValue() ,
+ new ORowSetValueDecorator(sal_Int32(10))
};
tmp.push_back(aRow);
diff --git a/connectivity/source/drivers/file/FDriver.cxx
b/connectivity/source/drivers/file/FDriver.cxx
index f536df64039d..5c251a402b5b 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -104,47 +104,47 @@ Sequence< DriverPropertyInfo > SAL_CALL
OFileDriver::getPropertyInfo( const OUSt
std::vector< DriverPropertyInfo > aDriverInfo
{
- { DriverPropertyInfo(
+ {
"CharSet"
,"CharSet of the database."
,false
,OUString()
-,Sequence< OUString >())
+,Sequence< OUString >()
},
- { DriverPropertyInfo(
+ {
"Extension"
,"Extension of the file format."
,false
,".*"
-,Sequence< OUString >())
+,Sequence< OUString >()
},
- { DriverPropertyInfo(
+ {
"ShowDeleted"
,"Display inactive records."
,false
,"0"
-,aBoolean)
+,aBoolean
},
- { DriverPropertyInfo(
+ {
[Libreoffice-commits] core.git: 2 commits - i18npool/inc i18npool/source sccomp/source
i18npool/inc/transliteration_Ignore.hxx |3 ++-
i18npool/source/transliteration/ignoreDiacritics_CTL.cxx |4 ++--
sccomp/source/solver/CoinMPSolver.cxx|1 +
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 192d7614b41dfeff4e6a507243f3a2948589ba8b
Author: Noel Grandin
AuthorDate: Mon May 17 12:40:48 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 19:43:56 2021 +0200
don't leak on error path in Coin solver
Change-Id: Ice460975511dbdfcfcde9a829283d2abac14c263
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115698
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sccomp/source/solver/CoinMPSolver.cxx
b/sccomp/source/solver/CoinMPSolver.cxx
index bd12c85c4fc4..35ebf1fd19b2 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -326,6 +326,7 @@ void SAL_CALL CoinMPSolver::solve()
}
catch (const CoinError& e)
{
+CoinUnloadProblem(hProb);
throw std::runtime_error(e.message());
}
}
commit 901b05e9fc852333824b6e58d0a30834b1211acd
Author: Noel Grandin
AuthorDate: Mon May 17 13:07:22 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 19:43:49 2021 +0200
don't leak ICU transliterator
Change-Id: Ib2c09c6c63b94d078ddde15585caa59710953bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115702
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/i18npool/inc/transliteration_Ignore.hxx
b/i18npool/inc/transliteration_Ignore.hxx
index 838c48d53803..854dbfeb5cac 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -21,6 +21,7 @@
#include "transliteration_commonclass.hxx"
#include
+#include
namespace i18nutil { class oneToOneMapping; }
@@ -91,7 +92,7 @@ TRANSLITERATION_IGNORE(Kashida_CTL)
class ignoreDiacritics_CTL final : public transliteration_Ignore
{
-icu::Transliterator* m_transliterator;
+std::unique_ptr m_transliterator;
public:
ignoreDiacritics_CTL();
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index ada76a735b80..5980f8e8d2f7 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -23,8 +23,8 @@ ignoreDiacritics_CTL::ignoreDiacritics_CTL()
implementationName =
"com.sun.star.i18n.Transliteration.ignoreDiacritics_CTL";
UErrorCode nStatus = U_ZERO_ERROR;
-m_transliterator = icu::Transliterator::createInstance("NFD; [:M:] Remove;
NFC",
-UTRANS_FORWARD, nStatus);
+m_transliterator.reset( icu::Transliterator::createInstance("NFD; [:M:]
Remove; NFC",
+UTRANS_FORWARD, nStatus) );
if (U_FAILURE(nStatus))
m_transliterator = nullptr;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/crypto/cryptosign.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 47ecc718e466db4d3976b697002f5d0a34b1a885
Author: Noel Grandin
AuthorDate: Mon May 17 19:42:05 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 20:23:20 2021 +0200
fix some leaks in Signing
Change-Id: I1104e0611dbfbf18858cbae64bfbbbcd03d176f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115717
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 70696dafce50..61e9f6649cd9 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -1223,6 +1223,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
aCertID.hashAlgorithm.algorithm.data = nullptr;
aCertID.hashAlgorithm.parameters.data = nullptr;
SECOID_SetAlgorithmID(nullptr, &aCertID.hashAlgorithm, SEC_OID_SHA256,
nullptr);
+comphelper::ScopeGuard aAlgoGuard(
+[&aCertID] () { SECOID_DestroyAlgorithmID(&aCertID.hashAlgorithm,
false); } );
// Write ESSCertIDv2.certHash.
SECItem aCertHashItem;
auto pDerEncoded = reinterpret_cast(aDerEncoded.getArray());
@@ -1273,6 +1275,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
SAL_WARN("svl.crypto", "my_SEC_StringToOID() failed");
return false;
}
+comphelper::ScopeGuard aGuard(
+[&aOidData] () { SECITEM_FreeItem(&aOidData.oid, false); } );
aOidData.offset = SEC_OID_UNKNOWN;
aOidData.desc = "id-aa-signingCertificateV2";
aOidData.mechanism = CKM_SHA_1;
@@ -1292,7 +1296,7 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
cms_output.len = 0;
PLArenaPool *arena = PORT_NewArena(1);
const ::comphelper::ScopeGuard aScopeGuard(
-[&arena]() mutable { free(arena); } );
+[&arena]() mutable { PORT_FreeArena(arena, true); } );
NSSCMSEncoderContext *cms_ecx;
// Possibly it would work to even just pass NULL for the password callback
function and its
@@ -2100,6 +2104,7 @@ bool Signing::Verify(const std::vector&
aData,
}
// Everything went fine
+SECITEM_FreeItem(&aOidData.oid, false);
PORT_Free(pActualResultBuffer);
HASH_Destroy(pHASHContext);
NSS_CMSSignerInfo_Destroy(pCMSSignerInfo);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/vcl vcl/inc vcl/source vcl/unx xmlsecurity/source
cui/source/options/optgenrl.cxx |2
cui/source/options/optinet2.cxx |2
cui/source/tabpages/autocdlg.cxx |2
include/vcl/weld.hxx |2
vcl/inc/salvtables.hxx |2
vcl/source/app/salvtables.cxx|2
vcl/unx/gtk3/gtkinst.cxx | 87 +++
xmlsecurity/source/dialogs/macrosecurity.cxx |8 +-
8 files changed, 74 insertions(+), 33 deletions(-)
New commits:
commit eb510f21572a35c89ae57ca060a02439e572cbd0
Author: Caolán McNamara
AuthorDate: Mon May 17 16:58:17 2021 +0100
Commit: Caolán McNamara
CommitDate: Mon May 17 20:36:25 2021 +0200
gtk4: reenable button
rename label_line_wrap to label_wrap while I'm at it
Change-Id: I3964c4b40d86fb6ef1fd3733088ffd80e57415ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115714
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 6fcef33199c3..66c734af1194 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -315,7 +315,7 @@ void SvxGeneralTabPage::InitCryptography()
{
m_xSigningKeyLB->set_size_request(nMaxWidth, -1);
m_xEncryptionKeyLB->set_size_request(nMaxWidth, -1);
- m_xEncryptToSelfCB->set_label_line_wrap(true);
+ m_xEncryptToSelfCB->set_label_wrap(true);
m_xEncryptToSelfCB->set_size_request(nMaxWidth, -1);
}
}
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index f8648bac62a4..8f33c6a96700 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -496,7 +496,7 @@ SvxSecurityTabPage::SvxSecurityTabPage(weld::Container*
pPage, weld::DialogContr
int nMaxWidth = m_xSavePasswordsCB->get_approximate_digit_width() * 40;
if (aPrefSize.Width() > nMaxWidth)
{
-m_xSavePasswordsCB->set_label_line_wrap(true);
+m_xSavePasswordsCB->set_label_wrap(true);
m_xSavePasswordsCB->set_size_request(nMaxWidth, -1);
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f1f4ee2bd0b1..8c21991be52b 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1914,7 +1914,7 @@
OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(weld::Container* pPage, weld::Dia
int nMaxWidth = m_xCBRemoveList->get_approximate_digit_width() * 40;
if (aPrefSize.Width() > nMaxWidth)
{
-m_xCBRemoveList->set_label_line_wrap(true);
+m_xCBRemoveList->set_label_wrap(true);
m_xCBRemoveList->set_size_request(nMaxWidth, -1);
}
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index e55ca8d6b534..cd8958dd602b 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1381,7 +1381,7 @@ public:
virtual void set_image(const css::uno::Reference&
rImage) = 0;
virtual void set_from_icon_name(const OUString& rIconName) = 0;
virtual OUString get_label() const = 0;
-virtual void set_label_line_wrap(bool wrap) = 0;
+virtual void set_label_wrap(bool wrap) = 0;
void clicked() { signal_clicked(); }
// font size is in points, not pixels, e.g. see Window::[G]etPointFont
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 361d26e3d9fe..207e326e43f5 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1021,7 +1021,7 @@ public:
virtual void set_from_icon_name(const OUString& rIconName) override;
-virtual void set_label_line_wrap(bool wrap) override;
+virtual void set_label_wrap(bool wrap) override;
virtual OUString get_label() const override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 813d74470139..d3b60a55c38f 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2596,7 +2596,7 @@ void SalInstanceButton::set_from_icon_name(const
OUString& rIconName)
m_xButton->SetModeImage(Image(StockImage::Yes, rIconName));
}
-void SalInstanceButton::set_label_line_wrap(bool wrap)
+void SalInstanceButton::set_label_wrap(bool wrap)
{
WinBits nBits = m_xButton->GetStyle();
nBits &= ~WB_WORDBREAK;
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 82a506ebc74b..0ca6d49d504f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3711,7 +3711,6 @@ GdkPixbuf* load_icon_by_name(const OUString& rIconName)
namespace
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
GdkPixbuf* getPixbuf(const css::uno::Reference&
rImage)
{
Image aImage(rImage);
@@ -3733,6 +3732,7 @@ namespace
return load_icon_from_stream(*xMemStm);
}
+#if !GTK_CHECK_VERSION(4, 0, 0)
GdkPixbuf* getPixbuf(const VirtualDevice& rDevice)
{
Size aSize(rDevice.GetOutputSizePixel(
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 870f8bef3c52cca36afe4fcd48c1beec104082cb
Author: Noel Grandin
AuthorDate: Mon May 17 12:55:27 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 20:52:11 2021 +0200
dont leak slot-list in updateSlots
Change-Id: I8882dbd2b5ad7656ec5ff7d47fb2e3dcbcceb5e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115700
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index cf084c7137ad..dd57a28be6da 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -249,8 +249,6 @@ void SecurityEnvironment_NssImpl::updateSlots()
// continue;
// }
addCryptoSlot(pSlot);
-PK11_FreeSlot( pSlot ) ;
-pSlot = nullptr;
if (pSymKey != nullptr)
{
@@ -261,6 +259,8 @@ void SecurityEnvironment_NssImpl::updateSlots()
}// end of if(pSlot != NULL)
}// end of for
+
+PK11_FreeSlotList(soltList);
}
Sequence< Reference < XCertificate > >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/oox oox/qa oox/source
include/oox/drawingml/shape.hxx|4
oox/qa/unit/data/tdf141463_GroupTransform.pptx |binary
oox/qa/unit/shape.cxx | 55 +
oox/source/drawingml/shape.cxx | 234 +++--
4 files changed, 204 insertions(+), 89 deletions(-)
New commits:
commit ac0eb504a38321849b854889598a28d0687196ea
Author: Regina Henschel
AuthorDate: Mon May 10 00:47:13 2021 +0200
Commit: Xisco Fauli
CommitDate: Mon May 17 21:02:27 2021 +0200
tdf#141463 avoid skew in shape group in ooxml import ..
and implement special resize handling for rotation angles larger 45deg.
This solves tdf#93952 and tdf#141953 too.
Change-Id: I798f6d2cea29c4a5285f530e9cf7bb10e7f6c41d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115296
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115715
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index fea94105b65d..6484ae8530c5 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -187,7 +187,7 @@ public:
const basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
ShapeIdMap* pShapeMap = nullptr,
-bool bInGroup = false);
+oox::drawingml::ShapePtr pParentGroupShape =
nullptr);
const css::uno::Reference< css::drawing::XShape > &
getXShape() const { return mxShape; }
@@ -264,7 +264,7 @@ protected:
bool bDoNotInsertEmptyTextBody,
basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
-bool bInGroup = false
+oox::drawingml::ShapePtr pParentGroupShape =
nullptr
);
voidaddChildren(
diff --git a/oox/qa/unit/data/tdf141463_GroupTransform.pptx
b/oox/qa/unit/data/tdf141463_GroupTransform.pptx
new file mode 100644
index ..36c506262333
Binary files /dev/null and b/oox/qa/unit/data/tdf141463_GroupTransform.pptx
differ
diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx
index a57c779d00fd..9d011282ad65 100644
--- a/oox/qa/unit/shape.cxx
+++ b/oox/qa/unit/shape.cxx
@@ -10,6 +10,8 @@
#include
#include
+#include
+#include
#include
#include
#include
@@ -18,6 +20,24 @@
using namespace ::com::sun::star;
+namespace
+{
+/// Gets one child of xShape, which one is specified by nIndex.
+uno::Reference getChildShape(const
uno::Reference& xShape,
+ sal_Int32 nIndex)
+{
+uno::Reference xGroup(xShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xGroup.is());
+
+CPPUNIT_ASSERT(xGroup->getCount() > nIndex);
+
+uno::Reference xRet(xGroup->getByIndex(nIndex),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xRet.is());
+
+return xRet;
+}
+}
+
char const DATA_DIRECTORY[] = "/oox/qa/unit/data/";
/// oox shape tests.
@@ -54,6 +74,41 @@ void OoxShapeTest::load(const OUString& rFileName)
mxComponent = loadFromDesktop(aURL);
}
+CPPUNIT_TEST_FIXTURE(OoxShapeTest, testGroupTransform)
+{
+load(u"tdf141463_GroupTransform.pptx");
+
+uno::Reference
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xGroup(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xShape(getChildShape(xGroup, 0),
uno::UNO_QUERY);
+uno::Reference xPropSet(xShape, uno::UNO_QUERY);
+// Without the accompanying fix in place, this test would have failed in
several properties.
+
+sal_Int32 nAngle;
+xPropSet->getPropertyValue("ShearAngle") >>= nAngle;
+// Failed with - Expected: 0
+// - Actual : -810
+// i.e. the shape was sheared although shearing does not exist in oox
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAngle);
+
+xPropSet->getPropertyValue("RotateAngle") >>= nAngle;
+// Failed with - Expected: 26000 (is in 1/100deg)
+// - Actual : 26481 (is in 1/100deg)
+// 100deg in PowerPoint UI = 360deg - 100deg in LO.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(26000), nAngle);
+
+sal_Int32 nActual = xShape->getSize().Width;
+// The group has ext.cy=288 and chExt.cy=432 resulting in
Y-scale=2/3.
+// The child has ext 288 x 144. Because of rotation angle 80deg,
the Y-scale has to be
+// applied to the width, resulting in 288 * 2/3 = 192EMU = 5333Hmm
+// ToDo: Expected value currently 1 off.
+// Failed with - Expected: 5332
+// - Actual : 5432
+CPPUNIT_ASSERT_EQUAL(sal_Int32(
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/gradient.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 50d8a8c321b17cf5311029467a37e5e163f2bf9c
Author: Noel Grandin
AuthorDate: Mon May 17 20:51:06 2021 +0200
Commit: Noel Grandin
CommitDate: Mon May 17 22:08:12 2021 +0200
fix is_double_buffered_window
after
commit 9090dc1f3b27195f5defd35586ac79357992be21
Date: Mon Jan 18 18:27:19 2021 +0200
split OutputDevice from Window
Change-Id: I495d12f2ce499efbc3a3b4a993066860d22690a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115718
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 3ba80a0cdc2b..1250654d372d 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -441,8 +441,8 @@ void OutputDevice::DrawLinearGradient( const
tools::Rectangle& rRect,
bool OutputDevice::is_double_buffered_window() const
{
-const vcl::Window *pWindow = dynamic_cast(this);
-return pWindow && pWindow->SupportsDoubleBuffering();
+auto pOwnerWindow = GetOwnerWindow();
+return pOwnerWindow && pOwnerWindow->SupportsDoubleBuffering();
}
void OutputDevice::DrawComplexGradient( const tools::Rectangle& rRect,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/devtools/ObjectInspectorTreeHandler.hxx |2 +
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 32 +++
sfx2/uiconfig/ui/developmenttool.ui | 10 -
3 files changed, 34 insertions(+), 10 deletions(-)
New commits:
commit b1c0734ffe0f395757b6e0cea7830d820231afeb
Author: Gülşah Köse
AuthorDate: Mon May 17 00:08:12 2021 +0300
Commit: Gülşah Köse
CommitDate: Mon May 17 23:57:17 2021 +0200
tdf#141677 Make columns sortable
Change-Id: Ib4cb8aaba4c59a7afa347f8010deef41477b77f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115688
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
index a9cf5be3dae6..03188276a4b4 100644
--- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
+++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
@@ -83,6 +83,8 @@ public:
DECL_LINK(NotebookEnterPage, const OString&, void);
DECL_LINK(NotebookLeavePage, const OString&, bool);
+DECL_LINK(HeaderBarClick, int, void);
+
void introspect(css::uno::Reference const&
xInterface);
void dispose();
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 60a81be9ab60..d7d4895e5d6b 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -956,6 +956,15 @@ ObjectInspectorTreeHandler::ObjectInspectorTreeHandler(
mpObjectInspectorWidgets->mpPropertiesTreeView->make_sorted();
mpObjectInspectorWidgets->mpMethodsTreeView->make_sorted();
+mpObjectInspectorWidgets->mpInterfacesTreeView->connect_column_clicked(
+LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
+mpObjectInspectorWidgets->mpServicesTreeView->connect_column_clicked(
+LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
+mpObjectInspectorWidgets->mpPropertiesTreeView->connect_column_clicked(
+LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
+mpObjectInspectorWidgets->mpMethodsTreeView->connect_column_clicked(
+LINK(this, ObjectInspectorTreeHandler, HeaderBarClick));
+
mpObjectInspectorWidgets->mpToolbar->connect_clicked(
LINK(this, ObjectInspectorTreeHandler, ToolbarButtonClicked));
mpObjectInspectorWidgets->mpToolbar->set_item_sensitive("inspect", false);
@@ -1040,6 +1049,29 @@ IMPL_LINK(ObjectInspectorTreeHandler, SelectionChanged,
weld::TreeView&, rTreeVi
mpObjectInspectorWidgets->mpToolbar->set_item_sensitive("inspect",
bHaveNodeWithObject);
}
+static void updateOrder(std::unique_ptr& pTreeView, sal_Int32
nColumn)
+{
+pTreeView->set_sort_column(nColumn);
+
+bool bSortAtoZ = pTreeView->get_sort_order();
+pTreeView->set_sort_order(!bSortAtoZ);
+pTreeView->set_sort_indicator(!bSortAtoZ ? TRISTATE_TRUE : TRISTATE_FALSE,
nColumn);
+}
+
+IMPL_LINK(ObjectInspectorTreeHandler, HeaderBarClick, int, nColumn, void)
+{
+auto rPageId =
mpObjectInspectorWidgets->mpNotebook->get_current_page_ident();
+
+if (rPageId == "object_inspector_interfaces_tab")
+updateOrder(mpObjectInspectorWidgets->mpInterfacesTreeView, nColumn);
+else if (rPageId == "object_inspector_services_tab")
+updateOrder(mpObjectInspectorWidgets->mpServicesTreeView, nColumn);
+else if (rPageId == "object_inspector_properties_tab")
+updateOrder(mpObjectInspectorWidgets->mpPropertiesTreeView, nColumn);
+else if (rPageId == "object_inspector_methods_tab")
+updateOrder(mpObjectInspectorWidgets->mpMethodsTreeView, nColumn);
+}
+
IMPL_LINK(ObjectInspectorTreeHandler, PopupMenuHandler, const CommandEvent&,
rCommandEvent, bool)
{
if (rCommandEvent.GetCommand() != CommandEventId::ContextMenu)
diff --git a/sfx2/uiconfig/ui/developmenttool.ui
b/sfx2/uiconfig/ui/developmenttool.ui
index 58e03b3cf21a..27962e5863e7 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -320,7 +320,6 @@
Name
True
True
-0
@@ -366,7 +365,6 @@
Name
True
True
-0
@@ -421,7 +419,6 @@
Object
True
True
-0
@@ -436,7 +433,6 @@
Value
True
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/developmenttool.ui | 85 +--- 1 file changed, 42 insertions(+), 43 deletions(-) New commits: commit 81d6ed89d1e5268c2ea4ff527f3e6087dc1d8ccd Author: Gülşah Köse AuthorDate: Mon May 17 13:59:25 2021 +0300 Commit: Gülşah Köse CommitDate: Tue May 18 05:39:37 2021 +0200 tdf#142276 Use vertical GtkBox insted of horizontal GtkGrid for the left side. Keep the layout as simple as possible. Change-Id: Ie4e77e76dccd4f0a6f41e646ba819dba161b3cc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115701 Tested-by: Jenkins Reviewed-by: Gülşah Köse diff --git a/sfx2/uiconfig/ui/developmenttool.ui b/sfx2/uiconfig/ui/developmenttool.ui index 27962e5863e7..476f9ed610cf 100644 --- a/sfx2/uiconfig/ui/developmenttool.ui +++ b/sfx2/uiconfig/ui/developmenttool.ui @@ -69,55 +69,14 @@ True - + True False +vertical 6 6 6 6 -True -True - - -200 -True -True -True -True -in - - -True -True -True -True -liststore1 -0 -True - - - - - -True -Object - - - -0 - - - - - - - - -0 -1 - - True @@ -170,6 +129,46 @@ 0 + + +200 +True +True +True +True +in + + +True +True +True +True +liststore1 +0 +True + + + + + +True +Object + + + +0 + + + + + + + + +0 +1 + + False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/codemaker/global.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2b3879c748adb8d48606339cecaf81a12c19f697
Author: Stephan Bergmann
AuthorDate: Mon May 17 17:39:17 2021 +0200
Commit: Stephan Bergmann
CommitDate: Tue May 18 08:29:18 2021 +0200
Use implicit conversion from OStringBuffer to std::string_view
...instead of going via raw `char const *`. (This changes the code's
semantics
if buffer can contain embedded NULs, but it is unlikely that the original
code
using getStr() was even meant to stop comparison at the first embedded NUL.)
Change-Id: I00a0a08b3ba8c318e3b898548ef185efa3f93ef2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115713
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/codemaker/source/codemaker/global.cxx
b/codemaker/source/codemaker/global.cxx
index e302d7c7742c..1b2b11db0f7e 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -119,7 +119,7 @@ OString createFileNameFromType( const OString& destination,
if( nIndex == -1 )
break;
-if (buffer.isEmpty() || std::string_view(".") == buffer.getStr())
+if (buffer.isEmpty() || std::string_view(".") == buffer)
{
buffer.append(token);
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg include/vcl sc/source vcl/inc vcl/osx vcl/qt5 vcl/unx vcl/win vcl/workben
icon-themes/colibre/vcl/res/fatcross.png |binary
icon-themes/colibre_svg/vcl/res/fatcross.svg |1
include/vcl/ptrstyle.hxx |3 +-
sc/source/ui/drawfunc/fudraw.cxx |2 -
sc/source/ui/view/gridwin.cxx|4 +--
sc/source/ui/view/tabview5.cxx |2 -
vcl/inc/bitmaps.hlst |1
vcl/inc/cursor_hotspots.hxx |2 +
vcl/inc/unx/x11_cursors/fatcross_curs.h | 34 +++
vcl/inc/unx/x11_cursors/fatcross_mask.h | 34 +++
vcl/inc/unx/x11_cursors/salcursors.h |2 +
vcl/inc/win/salids.hrc |1
vcl/osx/saldata.cxx |2 +
vcl/qt5/Qt5Data.cxx |5 +++
vcl/unx/generic/app/saldisp.cxx |3 ++
vcl/unx/gtk3/gtkdata.cxx |1
vcl/win/src/fatcross.cur |binary
vcl/win/src/salsrc.rc|1
vcl/win/window/salframe.cxx |4 ++-
vcl/workben/vcldemo.cxx |1
20 files changed, 96 insertions(+), 7 deletions(-)
New commits:
commit 40e85aadbff8eaeba20ee6a39ca669d282d91005
Author: Sarabjot Singh
AuthorDate: Fri Feb 28 22:47:40 2020 +0300
Commit: Heiko Tietze
CommitDate: Tue May 18 08:33:31 2021 +0200
tdf#104169 - Change mouse cursor to FatCross in calc spreadsheet
Added new cursor FatCross to calc. Change mouse cursor to
FatCross while hovering over the spreadsheet in calc instead
of earlier Arrow.
Co-authored-by: Mesut Çifci
Change-Id: I672a058cc702eab0cba6ac953534def915766859
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114679
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/icon-themes/colibre/vcl/res/fatcross.png
b/icon-themes/colibre/vcl/res/fatcross.png
new file mode 100755
index ..bf13fd80b06c
Binary files /dev/null and b/icon-themes/colibre/vcl/res/fatcross.png differ
diff --git a/icon-themes/colibre_svg/vcl/res/fatcross.svg
b/icon-themes/colibre_svg/vcl/res/fatcross.svg
new file mode 100644
index ..e2bed8d22b3e
--- /dev/null
+++ b/icon-themes/colibre_svg/vcl/res/fatcross.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index e2ae0238e301..fa45246a816d 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -116,7 +116,8 @@ enum class PointerStyle
TabSelectSW,
HideWhitespace,
ShowWhitespace,
-LAST = ShowWhitespace,
+FatCross,
+LAST = FatCross,
};
#endif // INCLUDED_VCL_PTRSTYLE_HXX
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 2069bace5936..81057be0feb4 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -59,7 +59,7 @@ void collectUIInformation( const OUString& aevent )
FuDraw::FuDraw(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, const SfxRequest& rReq)
: FuPoor(rViewSh, pWin, pViewP, pDoc, rReq)
-, aNewPointer(PointerStyle::Arrow)
+, aNewPointer(PointerStyle::FatCross)
, aOldPointer(PointerStyle::Arrow)
{
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 166bdd265e09..408034bd74f3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2014,7 +2014,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt
)
rMark.SetMarking(false);
-SetPointer( PointerStyle::Arrow );
+SetPointer( PointerStyle::FatCross );
if (mrViewData.IsFillMode() ||
( mrViewData.GetFillMode() == ScFillMode::MATRIX && rMEvt.IsMod1() ))
@@ -2600,7 +2600,7 @@ void ScGridWindow::MouseMove( const MouseEvent& rMEvt )
bool bAlt = rMEvt.IsMod2();
if (bEditMode) // First has to be
in edit mode!
-SetPointer( PointerStyle::Arrow );
+SetPointer( PointerStyle::FatCross );
else if ( !bAlt && !nButtonDown && ScGlobal::ShouldOpenURL() &&
GetEditUrl(rMEvt.GetPosPixel()) )
SetPointer( PointerStyle::RefHand );
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index fde36dce68cd..af7c3dfb19b7 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -648,7 +648,7 @@ void ScTabView::ResetBrushDocument()
if ( HasPaintBrush() )
{
SetBrushDocument( nullptr, false );
-SetActivePointer( PointerStyle::Arrow ); // switch pointers also
when ended with escape key
+SetActivePointer( PointerStyle::FatCross ); // switch pointers also
when ended with escape key
}
}
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 02e3dea0f540..c370883e26dc 100644
-
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/crashreport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 13c1e3d1e13eb0eabccf29dbd57ae9995b805096
Author: Stephan Bergmann
AuthorDate: Tue May 18 08:01:55 2021 +0200
Commit: Stephan Bergmann
CommitDate: Tue May 18 08:40:35 2021 +0200
loplugin:stringview (--enable-breakpad)
Change-Id: I5d260c2bbb875aa57a7eb8e3f80cfc9fc6376804
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115724
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 84ceabb619bd..6f3d72934d51 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -144,7 +144,7 @@ void CrashReporter::writeCommonInfo()
addKeyValue("BuildID", utl::Bootstrap::getBuildIdData(""), AddItem);
addKeyValue("URL", protocol + "://" + url + "/submit/", AddItem);
-if (proxy_server.aName != OUString())
+if (!proxy_server.aName.isEmpty())
{
addKeyValue("Proxy", proxy_server.aName + ":" +
OUString::number(proxy_server.nPort), AddItem);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac distro-configs/Jenkins distro-configs/LibreOfficeCoverity.conf distro-configs/LibreOfficeHaiku.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/Li
configure.ac|9 - distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf |1 + distro-configs/Jenkins/Linux_dev_master.conf|1 + distro-configs/Jenkins/Linux_rel_master.conf|1 + distro-configs/Jenkins/Linux_ubsan_master.conf |1 + distro-configs/Jenkins/MacOSX_dev_master.conf |1 + distro-configs/Jenkins/MacOSX_rel_master.conf |1 + distro-configs/Jenkins/PerfSuite_Linux.conf |1 + distro-configs/Jenkins/Win32_dev_master.conf|1 + distro-configs/Jenkins/Win32_rel_master.conf|1 + distro-configs/Jenkins/Win64_dev_master.conf|2 ++ distro-configs/Jenkins/Win64_rel_master.conf|1 + distro-configs/Jenkins/android_common.conf |1 + distro-configs/Jenkins/linux_clang_dbgutil_64 |1 + distro-configs/Jenkins/linux_gcc_release_64 |1 + distro-configs/Jenkins/linux_random.conf|1 + distro-configs/Jenkins/macosx_clang_dbgutil |1 + distro-configs/Jenkins/screenshot_linux.conf|1 + distro-configs/Jenkins/screenshot_mac.conf |1 + distro-configs/Jenkins/screenshot_win.conf |1 + distro-configs/Jenkins/windows_msc_dbgutil_32 |1 + distro-configs/LibreOfficeCoverity.conf |1 + distro-configs/LibreOfficeHaiku.conf|3 ++- distro-configs/LibreOfficeMacOSX.conf |1 + distro-configs/LibreOfficeWin32.conf|1 + distro-configs/LibreOfficeWin64.conf|1 + distro-configs/LibreOfficeWinArm64.conf |1 + 27 files changed, 32 insertions(+), 6 deletions(-) New commits: commit b0228e4d39656c487300a607117a9e1c6c14620b Author: Noel Grandin AuthorDate: Sat May 15 12:13:12 2021 +0200 Commit: Noel Grandin CommitDate: Tue May 18 08:47:09 2021 +0200 make --disable-odk the default Because developers (especially new ones) don't need this, or the extra dependencies it tends to trigger Update distro and jenkins configs so that the ones that were building ODK before, are still building it after this. Change-Id: I5dc71e70dc457b7921a146008d7d2317b199caab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115647 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/configure.ac b/configure.ac index 9929416a188e..d7b831435713 100644 --- a/configure.ac +++ b/configure.ac @@ -1433,9 +1433,8 @@ libo_FUZZ_ARG_ENABLE(epm, ) libo_FUZZ_ARG_ENABLE(odk, -AS_HELP_STRING([--disable-odk], -[LibreOffice includes an ODK, office development kit which some packagers may - wish to build without.]) +AS_HELP_STRING([--enable-odk], +[Enable building the Office Development Kit, the part that extensions need to build against]) ) AC_ARG_ENABLE(mpl-subset, @@ -8866,7 +8865,7 @@ AC_SUBST(ENABLE_LWP) dnl === dnl Check for building ODK dnl === -if test "$enable_odk" = no; then +if test "$enable_odk" != yes; then unset DOXYGEN else if test "$with_doxygen" = no; then @@ -8901,7 +8900,7 @@ fi AC_SUBST([DOXYGEN]) AC_MSG_CHECKING([whether to build the ODK]) -if test "$enable_odk" = "" -o "$enable_odk" != "no"; then +if test "$enable_odk" = yes; then AC_MSG_RESULT([yes]) BUILD_TYPE="$BUILD_TYPE ODK" else diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 1f6ac36747de..03f39c46cde8 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -34,3 +34,4 @@ --with-package-format=archive --with-update-config=~/updater.ini --with-jdk-home=/etc/alternatives/java_sdk_11 +--enable-odk diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index f8919a0804fe..dcff6189cd85 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -3,3 +3,4 @@ --with-jdk-home=/etc/alternatives/java_sdk_11 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ +--enable-odk diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 988dff770063..150bf7df1f6e 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -2,3 +2,4 @@ --with-jdk-home=/etc/alternatives/java_sdk_11 CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ +--enable-odk diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf index 86e65772c63a..bfc7465d50ff 100644 --- a/distro-configs/Jenkins/Linux_ubsan_master.conf +++ b/distro-confi
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/dinfdlg.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a7be44be49ddc0a501f31f13e545a921a3dcc5c4
Author: Heiko Tietze
AuthorDate: Mon May 17 16:05:11 2021 +0200
Commit: Heiko Tietze
CommitDate: Tue May 18 08:55:30 2021 +0200
Resolves tdf#142041 - Hyperlink to file location
Follow-up fix to 334838efc12cd1e4a451a8dd7542b93fdaf30bb9
Change-Id: Ic63edcc88401d3db8f3a7737f562deb328485fab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115710
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 19b4529e180b..40bd42c63f6e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
@@ -975,7 +976,9 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
aPath.removeFinalSlash();
OUString aText( aPath.PathToFileName() ); //! (pb) MaxLen?
m_xFileValEd->set_label(aText);
-m_xFileValEd->set_uri("file://" + aText);
+OUString aURLStr;
+osl::FileBase::getFileURLFromSystemPath(aText, aURLStr);
+m_xFileValEd->set_uri(aURLStr);
}
else if (aURL.GetProtocol() != INetProtocol::PrivSoffice)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/toolbar/previewbar.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f96bb05489fc6398be5a6f4c574fab5c2c65bdf5 Author: Gabor Kelemen AuthorDate: Thu May 13 23:24:46 2021 +0200 Commit: Heiko Tietze CommitDate: Tue May 18 08:56:32 2021 +0200 tdf#142252 Reorder navigation commands of Calc Print Preview toolbar Change-Id: Ifd6c1a72b8788a42e47ad9ef83a905d555ef4aa9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115574 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/toolbar/previewbar.xml b/sc/uiconfig/scalc/toolbar/previewbar.xml index 70f4fa79f844..3bccdae2470e 100644 --- a/sc/uiconfig/scalc/toolbar/previewbar.xml +++ b/sc/uiconfig/scalc/toolbar/previewbar.xml @@ -18,10 +18,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> + - - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
