[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - 2 commits - configure.ac wsd/DocumentBroker.cpp
configure.ac |2 +-
wsd/DocumentBroker.cpp |5 -
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 19d05057fa660d2189a769ae053e0b1aa57af872
Author: Samuel Mehrbrodt
AuthorDate: Tue Sep 8 08:13:11 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Sep 8 08:42:26 2020 +0200
Release 6.2.12.0
Change-Id: I552114d06222705e77cb9c266887b5ae80583af8
diff --git a/configure.ac b/configure.ac
index ea556501b..092eb9b06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [6.2.11.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [6.2.12.0], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit ccb6581fbaf7d5b9591598fbd7b1bd15f0a7436f
Author: Samuel Mehrbrodt
AuthorDate: Tue Sep 8 08:41:31 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Sep 8 08:42:26 2020 +0200
Consider save successful also when doc changed in storage
Ported from master fix 8c602e179e8afe44f2a1fe513bdc7640cd57ed2a
Change-Id: Iaf52e950cc635d625c1415754b9d411d0a009927
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 3c3ca28bc..83f942b5d 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -833,7 +833,10 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId,
assert(_storage && _tileCache);
StorageBase::SaveResult storageSaveResult =
_storage->saveLocalFileToStorage(auth, saveAsPath, saveAsFilename);
-_lastStorageSaveSuccessful = storageSaveResult.getResult() ==
StorageBase::SaveResult::OK;
+// Storage save is considered successful when either storage returns OK or
the document on the storage
+// was changed and it was used to overwrite local changes
+_lastStorageSaveSuccessful = storageSaveResult.getResult() ==
StorageBase::SaveResult::OK ||
+ storageSaveResult.getResult() ==
StorageBase::SaveResult::DOC_CHANGED;
if (storageSaveResult.getResult() == StorageBase::SaveResult::OK)
{
if (!isSaveAs)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source svx/source
avmedia/source/gstreamer/gstplayer.cxx |2 --
svx/source/sidebar/media/MediaPlaybackPanel.cxx |1 -
2 files changed, 3 deletions(-)
New commits:
commit 5989ffe70942af036974b70c9e0ecd67978c6cc6
Author: Martin van Zijl
AuthorDate: Wed Jul 1 07:42:29 2020 +1200
Commit: Noel Grandin
CommitDate: Tue Sep 8 08:27:13 2020 +0200
tdf#34759 fix media player pausing when pressing time slider
Change-Id: I196549f168d67895510a239640c492cfc421fb07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97644
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 9511be54b5ae..932e1dd1c6e1 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -684,8 +684,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
GST_SEEK_FLAG_FLUSH,
GST_SEEK_TYPE_SET, gst_position,
GST_SEEK_TYPE_NONE, 0 );
-if( !isPlaying() )
-gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
SAL_INFO( "avmedia.gstreamer", AVVERSION "seek to: " << gst_position << "
ns original: " << fTime << " s" );
}
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index b62eb3292b91..2b2cd5d10ab8 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -133,7 +133,6 @@ IMPL_LINK_NOARG( MediaPlaybackPanel, VolumeSlideHdl,
weld::Scale&, void)
IMPL_LINK_NOARG( MediaPlaybackPanel, SeekHdl, weld::Scale&, void)
{
MediaItem aItem(SID_AVMEDIA_TOOLBOX);
-aItem.setState( MediaState::Pause );
double nTime = 0;
if (mpMediaItem)
nTime = mxTimeSlider->get_value() * mpMediaItem->getDuration() /
AVMEDIA_TIME_RANGE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/caret.hxx | 13 ++---
starmath/inc/cursor.hxx|3 +--
starmath/source/cursor.cxx | 17 ++---
starmath/source/view.cxx | 16
4 files changed, 17 insertions(+), 32 deletions(-)
New commits:
commit 5267b6c04eed2662726bb90899eb40414779fcb3
Author: Luke Dixon
AuthorDate: Tue Sep 8 01:37:23 2020 +0100
Commit: Noel Grandin
CommitDate: Tue Sep 8 08:17:59 2020 +0200
starmath: stop change to caret pos graph when moving after brace
Currently, the code that moves the cursor after the brace changes the
current caret pos instead of moving to the next pos. Because of this, we
end up with one missing graph pos and a duplicate graph pos. This can be
seen by moving to the end of a brace body, pressing the key for the
closing brace and then pressing left and right to move in and out of the
brace.
This fix uses the existing code that sets the cursor position to the
next element in the graph instead of changing the cursor pos directly.
It also marks the caret pos as const to suggest not changing the caret
pos inside a graph entry.
Change-Id: I5492e54f1bddbfc90036f29698982fd8696f5e88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102214
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index 327ee1d6ed16..c0e5c4f5fca0 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -103,15 +103,14 @@ private:
/** An entry in SmCaretPosGraph */
struct SmCaretPosGraphEntry{
-SmCaretPosGraphEntry(SmCaretPos pos,
- SmCaretPosGraphEntry* left,
- SmCaretPosGraphEntry* right) {
-CaretPos = pos;
-Left = left;
-Right = right;
+SmCaretPosGraphEntry(SmCaretPos pos, SmCaretPosGraphEntry* left,
SmCaretPosGraphEntry* right)
+: CaretPos{pos}
+, Left{left}
+, Right{right}
+{
}
/** Caret position */
-SmCaretPos CaretPos;
+const SmCaretPos CaretPos;
/** Entry to the left visually */
SmCaretPosGraphEntry* Left;
/** Entry to the right visually */
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 236485d5e04c..47218e490865 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -184,8 +184,7 @@ public:
/** Draw the caret */
void Draw(OutputDevice& pDev, Point Offset, bool isCaretVisible);
-bool IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode**
ppBraceNode) const;
-void MoveAfterBracket(SmBraceNode* pBraceNode);
+bool IsAtTailOfBracket(SmBracketType eBracketType) const;
private:
friend class SmDocShell;
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 5e69b5876a45..c476bd41228e 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1327,7 +1327,8 @@ void SmCursor::RequestRepaint(){
}
}
-bool SmCursor::IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode**
ppBraceNode) const {
+bool SmCursor::IsAtTailOfBracket(SmBracketType eBracketType) const
+{
const SmCaretPos pos = GetPosition();
if (!pos.IsValid()) {
return false;
@@ -1391,23 +1392,9 @@ bool SmCursor::IsAtTailOfBracket(SmBracketType
eBracketType, SmBraceNode** ppBra
return false;
}
-if (ppBraceNode) {
-*ppBraceNode = pBraceNode;
-}
-
return true;
}
-void SmCursor::MoveAfterBracket(SmBraceNode* pBraceNode)
-{
-mpPosition->CaretPos.pSelectedNode = pBraceNode;
-mpPosition->CaretPos.nIndex = 1;
-mpAnchor->CaretPos.pSelectedNode = pBraceNode;
-mpAnchor->CaretPos.nIndex = 1;
-RequestRepaint();
-}
-
-
/// SmNodeListParser
SmNode* SmNodeListParser::Parse(SmNodeList* list){
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 19274324ada7..dd967232723b 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -490,7 +490,6 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt)
default:
{
sal_Unicode code = rKEvt.GetCharCode();
-SmBraceNode* pBraceNode = nullptr;
if(code == ' ') {
rCursor.InsertElement(BlankElement);
@@ -506,13 +505,14 @@ void SmGraphicWindow::KeyInput(const KeyEvent& rKEvt)
rCursor.InsertElement(FactorialElement);
}else if(code == '%') {
rCursor.InsertElement(PercentElement);
-}else if(code == ')' &&
rCursor.IsAtTailOfBracket(SmBracketType::Round, &pBraceNode)) {
-rCursor.MoveAfterBracket(pBraceNode);
-}else if(code == ']' &&
rCursor.IsAtTailOfBracket(SmBracketType::Square, &pBraceNode)) {
-rCursor.MoveAfterBracket(pBraceNode);
-}else if(code == '}' &&
rCursor.IsAtTailOfBracket(SmBracketType::Curly, &pBraceNode)) {
-rCursor.MoveAfter
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/pdfwriter_impl.cxx | 17 ++---
vcl/source/gdi/pdfwriter_impl.hxx |4 ++--
2 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 18fb42136ffccaf9057db62b2eb7aa48bd4cfdd3
Author: Stephan Bergmann
AuthorDate: Mon Sep 7 22:19:55 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Sep 8 08:15:47 2020 +0200
Simplify PDFWriterImpl::appendLiteralStringEncrypt, taking std::string_view
Change-Id: If2a0a9abbc8951ce64b89659f455edd280893860
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102205
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 4d2e94540614..e955bb9b7842 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
@@ -1521,30 +1522,24 @@ inline void
PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString& rInSt
rOutBuffer.append( ">" );
}
-inline void PDFWriterImpl::appendLiteralStringEncrypt( OStringBuffer const &
rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
+inline void PDFWriterImpl::appendLiteralStringEncrypt( std::string_view
rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
{
rOutBuffer.append( "(" );
-sal_Int32 nChars = rInString.getLength();
+sal_Int32 nChars = rInString.size();
//check for encryption, if ok, encrypt the string, then convert with
appndLiteralString
if( m_aContext.Encryption.Encrypt() )
{
m_vEncryptionBuffer.resize(nChars);
//encrypt the string in a buffer, then append it
enableStringEncryption( nInObjectNumber );
-rtl_cipher_encodeARCFOUR( m_aCipher, rInString.getStr(), nChars,
m_vEncryptionBuffer.data(), nChars );
+rtl_cipher_encodeARCFOUR( m_aCipher, rInString.data(), nChars,
m_vEncryptionBuffer.data(), nChars );
appendLiteralString(
reinterpret_cast(m_vEncryptionBuffer.data()), nChars, rOutBuffer );
}
else
-appendLiteralString( rInString.getStr(), nChars , rOutBuffer );
+appendLiteralString( rInString.data(), nChars , rOutBuffer );
rOutBuffer.append( ")" );
}
-inline void PDFWriterImpl::appendLiteralStringEncrypt( const OString&
rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
-{
-OStringBuffer aBufferString( rInString );
-appendLiteralStringEncrypt( aBufferString, nInObjectNumber, rOutBuffer);
-}
-
void PDFWriterImpl::appendLiteralStringEncrypt( const OUString& rInString,
const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding
nEnc )
{
OString aBufferString( OUStringToOString( rInString, nEnc ) );
@@ -5188,7 +5183,7 @@ sal_Int32 PDFWriterImpl::emitOutputIntent()
aLine.append( " 0 obj\n"
"<>\nendobj\n\n" );
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index b5d86a2d2486..e4ef7177b9c3 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -795,8 +796,7 @@ i12626
void appendUnicodeTextStringEncrypt( const OUString& rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer );
void appendLiteralStringEncrypt( const OUString& rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc =
RTL_TEXTENCODING_ASCII_US );
-void appendLiteralStringEncrypt( const OString& rInString, const sal_Int32
nInObjectNumber, OStringBuffer& rOutBuffer );
-void appendLiteralStringEncrypt( OStringBuffer const & rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer );
+void appendLiteralStringEncrypt( std::string_view rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer );
/* creates fonts and subsets that will be emitted later */
void registerGlyph(const GlyphItem* pGlyph, const PhysicalFontFace* pFont,
const std::vector& rCodeUnits, sal_uInt8& nMappedGlyph, sal_Int32&
nMappedFontObject);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/bibliography/bibmod.cxx |7 --- extensions/source/bibliography/bibprop.hxx |7 --- 2 files changed, 14 deletions(-) New commits: commit c4c7bfb006dbaa6502130dc62cb34ca78f33f791 Author: Stephan Bergmann AuthorDate: Mon Sep 7 22:16:54 2020 +0200 Commit: Stephan Bergmann CommitDate: Tue Sep 8 08:16:06 2020 +0200 Remove some unused const variables Change-Id: Ib27249e9d4c9c7669a2766ec501e02652199c670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102202 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 9fab0c7362ae..3ae8a473a9f8 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -92,12 +92,5 @@ BibConfig* BibModul::GetConfig() const OUStringLiteral FM_PROP_LABEL = u"Label"; const OUStringLiteral FM_PROP_CONTROLSOURCE = u"DataField"; const OUStringLiteral FM_PROP_NAME = u"Name"; -const OUStringLiteral FM_PROP_FORMATKEY = u"FormatKey"; -const OUStringLiteral FM_PROP_EDITMODE = u"RecordMode"; -const OUStringLiteral FM_PROP_CURSORSOURCETYPE = u"DataSelectionType"; -const OUStringLiteral FM_PROP_CURSORSOURCE = u"DataSelection"; -const OUStringLiteral FM_PROP_DATASOURCE = u"DataSource"; -const OUStringLiteral FM_PROP_VALUE = u"Value"; -const OUStringLiteral FM_PROP_TEXT = u"Text"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibprop.hxx b/extensions/source/bibliography/bibprop.hxx index 327ae8ddc7f2..5e670bcc6fa9 100644 --- a/extensions/source/bibliography/bibprop.hxx +++ b/extensions/source/bibliography/bibprop.hxx @@ -24,13 +24,6 @@ extern const OUStringLiteral FM_PROP_LABEL; extern const OUStringLiteral FM_PROP_NAME; extern const OUStringLiteral FM_PROP_CONTROLSOURCE; -extern const OUStringLiteral FM_PROP_FORMATKEY; -extern const OUStringLiteral FM_PROP_VALUE; -extern const OUStringLiteral FM_PROP_EDITMODE; -extern const OUStringLiteral FM_PROP_DATASOURCE; -extern const OUStringLiteral FM_PROP_CURSORSOURCE; -extern const OUStringLiteral FM_PROP_CURSORSOURCETYPE; -extern const OUStringLiteral FM_PROP_TEXT; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - loleaflet/js loleaflet/src
loleaflet/js/toolbar.js |3 ++-
loleaflet/src/layer/marker/Cursor.js |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ec165df75aa7c8f3b8fef9cc82cd0db23d4f1a78
Author: Samuel Mehrbrodt
AuthorDate: Thu Sep 3 16:25:21 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Sep 8 08:09:44 2020 +0200
fix username formatting
Inspired by bc0920178aef2bcb7affe989fa79309fe131aec4
Change-Id: Ie82bccaf371b4c200c906125548eb24008e84c61
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102006
Reviewed-by: Michael Meeks
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 6ace95b08..78636e39a 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -2303,10 +2303,11 @@ function setupToolbar(e) {
});
map.on('removeview', function(e) {
+ var username = this.escapeHtml(e.username);
$('#tb_toolbar-down_item_userlist')
.w2overlay({
class: 'loleaflet-font',
- html: userLeftPopupMessage.replace('%user',
e.username),
+ html: userLeftPopupMessage.replace('%user',
username),
style: 'padding: 5px'
});
clearTimeout(userPopupTimeout);
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index 592658dca..6514fc4f2 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -81,7 +81,7 @@ L.Cursor = L.Layer.extend({
if (this.options.header) {
this._cursorHeader = L.DomUtil.create('div',
'leaflet-cursor-header', this._container);
- this._cursorHeader.innerHTML = this.options.headerName;
+ this._cursorHeader.textContent =
this.options.headerName;
clearTimeout(this._blinkTimeout);
this._blinkTimeout = setTimeout(L.bind(function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/skia vcl/source
vcl/inc/driverblocklist.hxx |4 +++-
vcl/skia/SkiaHelper.cxx |3 ++-
vcl/source/helper/driverblocklist.cxx | 12 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 9db379b0b7dded5e9a4523ce48dac928979aab70
Author: Stephan Bergmann
AuthorDate: Mon Sep 7 22:21:36 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Sep 8 07:33:19 2020 +0200
Simplify GetVendorNameFromId, returning std::string_view
Change-Id: Ida709a432a1892494a767da3979afdc3ee4477b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102206
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/inc/driverblocklist.hxx b/vcl/inc/driverblocklist.hxx
index f28dc418383a..a417d19ff543 100644
--- a/vcl/inc/driverblocklist.hxx
+++ b/vcl/inc/driverblocklist.hxx
@@ -12,6 +12,8 @@
#include
#include
+
+#include
#include
namespace DriverBlocklist
@@ -36,7 +38,7 @@ const int DeviceVendorMax = VendorMicrosoft + 1;
/// Returns vendor for the given vendor ID, or VendorAll if not known.
VCL_DLLPUBLIC DeviceVendor GetVendorFromId(uint32_t id);
-VCL_DLLPUBLIC OUStringLiteral GetVendorNameFromId(uint32_t id);
+VCL_DLLPUBLIC std::string_view GetVendorNameFromId(uint32_t id);
// The rest should be private (only for the unittest).
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 8ba1e06f2463..5bf8c04cff6a 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -32,6 +32,7 @@ bool isVCLSkiaEnabled() { return false; }
#include
#include
#include
+#include
#include
#include
@@ -64,7 +65,7 @@ static OUString versionAsString(uint32_t version)
+ OUString::number(version & 0xfff);
}
-static OUStringLiteral vendorAsString(uint32_t vendor)
+static std::string_view vendorAsString(uint32_t vendor)
{
return DriverBlocklist::GetVendorNameFromId(vendor);
}
diff --git a/vcl/source/helper/driverblocklist.cxx
b/vcl/source/helper/driverblocklist.cxx
index 8b2ca1ffa0c1..6bcee982015f 100644
--- a/vcl/source/helper/driverblocklist.cxx
+++ b/vcl/source/helper/driverblocklist.cxx
@@ -157,20 +157,20 @@ DeviceVendor GetVendorFromId(uint32_t id)
}
}
-OUStringLiteral GetVendorNameFromId(uint32_t id)
+std::string_view GetVendorNameFromId(uint32_t id)
{
switch (id)
{
case 0x8086:
-return u"Intel";
+return "Intel";
case 0x10de:
-return u"Nvidia";
+return "Nvidia";
case 0x1002:
-return u"AMD";
+return "AMD";
case 0x1414:
-return u"Microsoft";
+return "Microsoft";
default:
-return u"?";
+return "?";
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e58fbb757f3b97d43dd57d32a0752c06bbc7766c
Author: Tor Lillqvist
AuthorDate: Tue Sep 8 00:21:12 2020 +0300
Commit: Tor Lillqvist
CommitDate: Tue Sep 8 07:07:03 2020 +0200
Use PRODUCTNAME_WITHOUT_SPACES for SDKDIRNAME
Change-Id: I2e3e45ffba563dc1b13b3b66346debd9690d0abe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102211
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 85a722cb0410..d4e6caa84aae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -692,7 +692,7 @@ darwin*|macos*) # macOS
_os=Darwin
INSTROOTBASESUFFIX=/$PRODUCTNAME_WITHOUT_SPACES.app
INSTROOTCONTENTSUFFIX=/Contents
-SDKDIRNAME=${PRODUCTNAME}${PRODUCTVERSION}_SDK
+SDKDIRNAME=${PRODUCTNAME_WITHOUT_SPACES}${PRODUCTVERSION}_SDK
# See comment above the case "$host_os"
LINKFLAGSSHL="-dynamiclib -single_module"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/clipparam.hxx |2 -
sc/inc/document.hxx |4 +-
sc/qa/unit/data/ods/validation-copypaste.ods |binary
sc/qa/unit/subsequent_export-test.cxx| 39 +++
sc/source/core/tool/compiler.cxx | 21 ++
5 files changed, 63 insertions(+), 3 deletions(-)
New commits:
commit a3b4831208da615789bd1e2d5660dd130807f504
Author: Serge Krot
AuthorDate: Fri Jul 10 11:09:35 2020 +0200
Commit: Eike Rathke
CommitDate: Tue Sep 8 01:19:58 2020 +0200
tdf#108673 XLSX: Don't export invalid sheet references in cell validation
Change-Id: Id9d88f5e34f3017516f693505df4c3ce82b1890f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98479
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index ee9422bc27db..575a04526763 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -27,7 +27,7 @@
* This struct stores general clipboard parameters associated with a
* ScDocument instance created in clipboard mode.
*/
-struct ScClipParam
+struct SC_DLLPUBLIC ScClipParam
{
enum Direction { Unspecified, Column, Row };
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 69e0b06a6cab..6917d6c47a74 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1566,7 +1566,7 @@ public:
SCTAB nTab, InsertDeleteFlags
nDelFlag);
void DeleteAreaTab(const ScRange& rRange,
InsertDeleteFlags nDelFlag);
-void CopyToClip( const ScClipParam& rClipParam,
ScDocument* pClipDoc,
+SC_DLLPUBLIC voidCopyToClip( const ScClipParam& rClipParam,
ScDocument* pClipDoc,
const ScMarkData* pMarks, bool
bKeepScenarioFlags,
bool bIncludeObjects );
@@ -1617,7 +1617,7 @@ public:
/** If pDestRanges is given it overrides rDestRange, rDestRange in this
case is the overall encompassing range. */
-voidCopyFromClip( const ScRange& rDestRange, const
ScMarkData& rMark,
+SC_DLLPUBLIC void CopyFromClip( const ScRange& rDestRange, const
ScMarkData& rMark,
InsertDeleteFlags nInsFlag,
ScDocument* pRefUndoDoc,
ScDocument* pClipDoc,
diff --git a/sc/qa/unit/data/ods/validation-copypaste.ods
b/sc/qa/unit/data/ods/validation-copypaste.ods
new file mode 100644
index ..55f8d823b88b
Binary files /dev/null and b/sc/qa/unit/data/ods/validation-copypaste.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index efe44fc22f2b..8c7654c881eb 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -43,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
@@ -244,6 +245,7 @@ public:
void testTdf126177XLSX();
void testCommentTextVAlignment();
void testCommentTextHAlignment();
+void testValidationCopyPaste();
void testXltxExport();
void testRotatedImageODS();
@@ -402,6 +404,7 @@ public:
CPPUNIT_TEST(testTdf126177XLSX);
CPPUNIT_TEST(testCommentTextVAlignment);
CPPUNIT_TEST(testCommentTextHAlignment);
+CPPUNIT_TEST(testValidationCopyPaste);
CPPUNIT_TEST(testXltxExport);
CPPUNIT_TEST(testRotatedImageODS);
@@ -4809,6 +4812,42 @@ void ScExportTest::testTdf91634XLSX()
xDocSh->DoClose();
}
+void ScExportTest::testValidationCopyPaste()
+{
+ScDocShellRef xDocSh = loadDoc("validation-copypaste.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+ScDocument& rSrcDoc = xDocSh->GetDocument();
+
+// Copy B1 from src doc to clip
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+ScRange aSrcRange(1, 0, 1);
+ScClipParam aClipParam(aSrcRange, false);
+ScMarkData aMark(rSrcDoc.GetSheetLimits());
+aMark.SetMarkArea(aSrcRange);
+rSrcDoc.CopyToClip(aClipParam, &aClipDoc, &aMark, false, false);
+
+// Create second document, paste B1 from clip
+ScDocShell* pShell2
+= new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS
+ | SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
+pShell2->DoInitNew();
+ScDocument& rDestDoc = pShell2->GetDocument();
+ScRange aDstRange(1, 0, 0);
+ScMarkData aMark2(rDestDoc.GetSheetLimits());
+aMark2.SetMarkArea(aDstRange);
+rDestDoc.CopyFromClip(aDstRange, aMark2, InsertDeleteFlags::ALL, nullptr,
&aClipDoc);
+
+// save as XLSX
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*pShell2), FORMAT_XLSX);
+
+// check validation
+xmlDocUniquePtr pDoc
+= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/textsh1.cxx | 17 - 1 file changed, 17 deletions(-) New commits: commit 36bd42e1e57604731fafd556331010578f9233fa Author: Tamás Zolnai AuthorDate: Mon Sep 7 16:49:29 2020 +0200 Commit: Tamás Zolnai CommitDate: Mon Sep 7 22:15:42 2020 +0200 tdf#136471: Applying a spell checker suggestion adds the result .. also to the autocorrect replacement list Change-Id: I68d055fd55ffae210fff59ada1b925cdf7b34fb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102193 Tested-by: Tamás Zolnai Reviewed-by: Tamás Zolnai diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index c8c2ecfa9ffc..2a4ff0a32f2e 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1565,23 +1565,6 @@ void SwTextShell::Execute(SfxRequest &rReq) rWrtSh.Replace(aTmp, false); -/* #102505# EndAction/EndUndo moved down since insertion - of temporary auto correction is now undoable two and - must reside in the same undo group.*/ - -// record only if it's NOT already present in autocorrection -SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect(); - -OUString aOrigWord( bGrammar ? OUString() : xSpellAlt->getWord() ) ; -OUString aNewWord( sApplyText ); -SvxPrepareAutoCorrect( aOrigWord, aNewWord ); - -if (xSpellAlt.is()) -pACorr->PutText( aOrigWord, aNewWord, LanguageTag( xSpellAlt->getLocale() ).getLanguageType() ); - -/* #102505# EndAction/EndUndo moved down since insertion - of temporary auto correction is now undoable two and - must reside in the same undo group.*/ rWrtSh.EndAction(); rWrtSh.EndUndo(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang filter/source framework/inc framework/source xmlhelp/source
compilerplugins/clang/singlevalfields.could-be-bool.results |2 compilerplugins/clang/singlevalfields.results | 138 filter/source/xsltdialog/xmlfilterjar.cxx |3 filter/source/xsltdialog/xmlfilterjar.hxx |3 framework/inc/xml/saxnamespacefilter.hxx|4 framework/source/fwe/xml/saxnamespacefilter.cxx |8 xmlhelp/source/cxxhelp/inc/tvread.hxx |1 xmlhelp/source/cxxhelp/provider/databases.cxx | 17 - xmlhelp/source/cxxhelp/provider/databases.hxx |2 xmlhelp/source/treeview/tvread.cxx | 11 10 files changed, 124 insertions(+), 65 deletions(-) New commits: commit db37d8b625807103c95326286ff085f79bf3d971 Author: Noel Grandin AuthorDate: Mon Sep 7 15:27:11 2020 +0200 Commit: Noel Grandin CommitDate: Mon Sep 7 22:15:23 2020 +0200 loplugin:singlevalfields Change-Id: Ib3c8dc4e98ca46026ec9a8171bae4066bcec7b22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102176 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results b/compilerplugins/clang/singlevalfields.could-be-bool.results index 43891ddc59f8..50576deb04e7 100644 --- a/compilerplugins/clang/singlevalfields.could-be-bool.results +++ b/compilerplugins/clang/singlevalfields.could-be-bool.results @@ -1,4 +1,4 @@ -chart2/source/view/inc/PlottingPositionHelper.hxx:206 +chart2/source/view/inc/PlottingPositionHelper.hxx:205 chart::PolarPlottingPositionHelper m_fRadiusOffset double connectivity/source/inc/dbase/dindexnode.hxx:120 diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results index dc00798c88b6..54d8292cf9d3 100644 --- a/compilerplugins/clang/singlevalfields.results +++ b/compilerplugins/clang/singlevalfields.results @@ -10,31 +10,31 @@ avmedia/source/framework/soundhandler.hxx:114 basctl/source/basicide/baside2.hxx:83 basctl::EditorWindow aHighlighter 0 -basctl/source/inc/dlged.hxx:132 +basctl/source/inc/dlged.hxx:131 basctl::DlgEditor aMarkIdle basctl DlgEditor Mark -binaryurp/source/proxy.hxx:81 +binaryurp/source/proxy.hxx:80 binaryurp::Proxy references_ 1 -binaryurp/source/writerstate.hxx:41 +binaryurp/source/writerstate.hxx:40 binaryurp::WriterState typeCache 256 -binaryurp/source/writerstate.hxx:43 +binaryurp/source/writerstate.hxx:42 binaryurp::WriterState oidCache 256 -binaryurp/source/writerstate.hxx:45 +binaryurp/source/writerstate.hxx:44 binaryurp::WriterState tidCache 256 -bridges/inc/bridge.hxx:90 +bridges/inc/bridge.hxx:89 bridges::cpp_uno::shared::Bridge nRef 1 -bridges/inc/cppinterfaceproxy.hxx:83 +bridges/inc/cppinterfaceproxy.hxx:82 bridges::cpp_uno::shared::CppInterfaceProxy nRef 1 -bridges/inc/unointerfaceproxy.hxx:84 +bridges/inc/unointerfaceproxy.hxx:83 bridges::cpp_uno::shared::UnoInterfaceProxy nRef 1 -bridges/source/jni_uno/jni_bridge.h:53 +bridges/source/jni_uno/jni_bridge.h:52 jni_uno::Bridge m_ref 1 bridges/source/jni_uno/jni_uno2java.cxx:391 @@ -55,19 +55,19 @@ canvas/inc/rendering/irendermodule.hxx:37 chart2/source/controller/dialogs/DataBrowser.cxx:209 chart::impl::SeriesHeader m_aUpdateDataTimer UpdateDataTimer -chart2/source/controller/inc/ChartController.hxx:378 +chart2/source/controller/inc/ChartController.hxx:377 chart::ChartController m_aLifeTimeManager 0 -chart2/source/controller/inc/TitleDialogData.hxx:34 +chart2/source/controller/inc/TitleDialogData.hxx:33 chart::TitleDialogData aPossibilityList 7 -chart2/source/controller/inc/TitleDialogData.hxx:35 +chart2/source/controller/inc/TitleDialogData.hxx:34 chart::TitleDialogData aExistenceList 7 -chart2/source/controller/inc/TitleDialogData.hxx:36 +chart2/source/controller/inc/TitleDialogData.hxx:35 chart::TitleDialogData aTextList 7 -chart2/source/model/main/DataPoint.hxx:108 +chart2/source/model/main/DataPoint.hxx:107 chart::DataPoint m_bNoParentPropAllowed 0 comphelper/source/misc/threadpool.cxx:40 @@ -112,10 +112,10 @@ cppu/source/uno/copy.hxx:39 cui/source/inc/acccfg.hxx:100 SfxAcceleratorConfigPage m_aUpdateDataTimer UpdateDataTimer -cui/source/inc/AdditionsDialog.hxx:58 +cui/source/inc/AdditionsDialog.hxx:69 AdditionsDialog m_aSearchDataTimer SearchDataTimer -cui/source/inc/cfg.hxx:375 +cui/source/inc/cfg.hxx:371 SvxConfigPage m_aUpdateDataTimer UpdateDataTimer cui/source/inc/linkdlg.hxx:46 @@ -178,6 +178,12 @@ filter/source/msfilter/msdffimp.cxx:2630 filter/source/msfilter/viscache.hxx:30 Impl_OlePres nFormat 3 +filter/source/xsltdialog/xmlfilterjar.hxx:47 +XMLFilterJarHelper sVndSunStarPackage +vnd.sun.star.Package: +framework/inc/xml/saxnamespacefilter.hxx:74 +framework::SaxName
Re: CONTRIBUTION TO OPEN SOURCE
Priyansh Nama kirjoitti 7.9.2020 klo 21.39: Hey, I would like to contribute in your organization. In case you want to contribute by working on the codebase, see https://wiki.documentfoundation.org/Development/GetInvolved Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/qt5
vcl/inc/qt5/Qt5AccessibleWidget.hxx |4 +++-
vcl/qt5/Qt5AccessibleWidget.cxx |9 +
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 4461d49c6cfce22c2c96185b0a1d07bfe9709268
Author: Michael Weghorn
AuthorDate: Mon Sep 7 20:08:57 2020 +0200
Commit: Michael Weghorn
CommitDate: Mon Sep 7 21:15:05 2020 +0200
tdf#136323 qt5: Remember accessible object
'QAccessibleCache::insert' from the Qt library has a
'Q_ASSERT' checking that the corresponding 'QObject' for
which the 'QAccessibleInterface' provides information
is actually the same as the object passed as a parameter:
QAccessible::Id QAccessibleCache::insert(QObject *object,
QAccessibleInterface *iface) const
{
// ...
QObject *obj = iface->object();
-> Q_ASSERT(object == obj);
However, 'Qt5AccessibleWidget::object' so far was always returning
'nullptr', triggering this assert when using a Qt version
not built with 'QT_NO_DEBUG'.
To fix this, remember and return the object as needed.
Change-Id: I4015b4c37aa8a073b02465df580a7235884e6cf3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102196
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/inc/qt5/Qt5AccessibleWidget.hxx
b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
index 2cd4840c6dfa..aacaba9a80c8 100644
--- a/vcl/inc/qt5/Qt5AccessibleWidget.hxx
+++ b/vcl/inc/qt5/Qt5AccessibleWidget.hxx
@@ -41,7 +41,8 @@ class Qt5AccessibleWidget final : public QObject,
Q_OBJECT
public:
-Qt5AccessibleWidget(const
css::uno::Reference xAccessible);
+Qt5AccessibleWidget(const
css::uno::Reference xAccessible,
+QObject* pObject);
QWindow* window() const override;
int childCount() const override;
int indexOfChild(const QAccessibleInterface* child) const override;
@@ -137,6 +138,7 @@ public:
private:
css::uno::Reference m_xAccessible;
css::uno::Reference
getAccessibleContextImpl() const;
+QObject* m_pObject;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index ccca1cd2072f..9933444d9092 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -59,8 +59,9 @@ using namespace css::accessibility;
using namespace css::beans;
using namespace css::uno;
-Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference
xAccessible)
+Qt5AccessibleWidget::Qt5AccessibleWidget(const Reference
xAccessible, QObject* pObject)
: m_xAccessible(xAccessible)
+, m_pObject(pObject)
{
Reference xContext =
xAccessible->getAccessibleContext();
Reference xBroadcaster(xContext, UNO_QUERY);
@@ -699,7 +700,7 @@ bool Qt5AccessibleWidget::isValid() const
return xAc.is();
}
-QObject* Qt5AccessibleWidget::object() const { return nullptr; }
+QObject* Qt5AccessibleWidget::object() const { return m_pObject; }
void Qt5AccessibleWidget::setText(QAccessible::Text /* t */, const QString& /*
text */) {}
@@ -722,13 +723,13 @@ QAccessibleInterface*
Qt5AccessibleWidget::customFactory(const QString& classnam
vcl::Window* pWindow = pWidget->frame().GetWindow();
if (pWindow)
-return new Qt5AccessibleWidget(pWindow->GetAccessible());
+return new Qt5AccessibleWidget(pWindow->GetAccessible(), object);
}
if (classname == QLatin1String("Qt5XAccessible") && object)
{
Qt5XAccessible* pXAccessible = dynamic_cast(object);
if (pXAccessible && pXAccessible->m_xAccessible.is())
-return new Qt5AccessibleWidget(pXAccessible->m_xAccessible);
+return new Qt5AccessibleWidget(pXAccessible->m_xAccessible,
object);
}
return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: How to enable Skia on Linux ?
Luboš Luňák wrote > ... > Just for the record, while the above works, it's not the proper way to do > it, > as it skips the wrapper script, and it needlessly forces Skia. The proper > way > would be > SAL_USE_VCLPLUGIN=gen SAL_ENABLESKIA=1 ./soffice I confirm it works indeed! Thank you! Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc78ae850eb3e1753febf3e9a2a559fcf206824c Author: Andrea Gelmini AuthorDate: Mon Sep 7 18:48:06 2020 +0200 Commit: Julien Nabet CommitDate: Mon Sep 7 20:38:45 2020 +0200 Fix typo Change-Id: Ie584ee9bece01ea92f5cc9f21a402ae9e8319710 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102189 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 0d7335b76aac..70c4f2ab561e 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -2415,7 +2415,7 @@ void VclMetafileProcessor2D::processPrimitive2DOnPixelProcessor( mpOutputDevice->DrawBitmapEx(aRectLogic.TopLeft(), aRectLogic.GetSize(), aBmContent); // aBufferProcessor dtor pops state off pBufferDevice pushed on by its ctor, let -// pBufferDevice live past aBufferProcessor scope to avoid warnigns +// pBufferDevice live past aBufferProcessor scope to avoid warnings } pBufferDevice.disposeAndClear(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CONTRIBUTION TO OPEN SOURCE
Hey, I would like to contribute in your organization. Sent from Mail for Windows 10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b2d27cd470b49f05f50dc11c4f2514b5a23bfc1b Author: Christian Lohmaier AuthorDate: Mon Sep 7 19:38:48 2020 +0200 Commit: Gerrit Code Review CommitDate: Mon Sep 7 19:38:48 2020 +0200 Update git submodules * Update translations from branch 'libreoffice-7-0' to ef96ef3b0ec7c8ab41e66ef699eb3b7b0ff59c03 - update translations for 7-0 and force-fix errors using pocheck Change-Id: I9e06cb7ebd382546645ac29a6b54068c544a6407 diff --git a/translations b/translations index b68c6e941c1a..ef96ef3b0ec7 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit b68c6e941c1a9dadab2c8425ecc67b033aeeec83 +Subproject commit ef96ef3b0ec7c8ab41e66ef699eb3b7b0ff59c03 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source embedserv/source extensions/source fpicker/source hwpfilter/source i18npool/source include/rtl sal/osl sal/qa sc/source sfx2/source shell/source svl/source
basic/source/runtime/methods.cxx |2
embedserv/source/embed/ed_ioleobject.cxx |4
extensions/source/ole/unoobjw.cxx |2
fpicker/source/win32/VistaFilePickerImpl.cxx |6
hwpfilter/source/hwpreader.cxx|6
i18npool/source/localedata/localedata.cxx | 124 +-
include/rtl/ustring.hxx | 49 ++-
sal/osl/w32/file_dirvol.cxx |2
sal/osl/w32/procimpl.cxx |2
sal/osl/w32/socket.cxx|2
sal/qa/osl/file/osl_File.cxx |4
sal/qa/osl/security/osl_Security.cxx |4
sc/source/core/tool/compiler.cxx |2
sfx2/source/doc/guisaveas.cxx |2
shell/source/win32/simplemail/smplmailclient.cxx |2
svl/source/svdde/ddedata.cxx |2
svl/source/svdde/ddesvr.cxx |4
sw/source/filter/ww8/ww8par.cxx |4
sw/source/uibase/dochdl/swdtflvr.cxx |2
tools/source/fsys/fileutil.cxx|2
vcl/source/font/font.cxx |2
vcl/win/gdi/salfont.cxx |6
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2
23 files changed, 139 insertions(+), 98 deletions(-)
New commits:
commit c927aab29ebfff1ce3ac0b2f27ae343025a9890c
Author: Stephan Bergmann
AuthorDate: Sat Sep 5 21:45:38 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 7 19:19:14 2020 +0200
Make the OUString ctors taking raw sal_Unicode pointer/non-const array
explicit
...and in turn add OUString::operator = and OUString::operator +=
overloads that take a std::u16string_view. Without making the ctors
explicit,
the operator overloads would have caused ambiguities when called with raw
sal_Unicode pointers/non-const arrays, as those can convert to both
OUString and
to std::u16string_view.
But the std::u16string_view operator overloads will generally be useful when
changing OUStringLiteral similarly to
4b9e440c51be3e40326bc90c33ae69885bfb51e4
"Turn OStringLiteral into a consteval'ed, static-refcound rtl_String", at
which
point many existing uses of OUStringLiteral will be replaced with uses of
std::u16string_view.
Implementing this change turned up a need for an operator = overload for
OUStringNumber, which has thus been added. No such need turned up for a
corresponding operator += overload, but which can easily be added when the
need
arises.
It also revealed that the operator == overloads between an OUString and a
raw
sal_Unicode pointer/non-const array were implemented rather inefficiently,
creating a temporary OUString from the raw argument. Those have been
improved.
Preceding commits have already taken care of many dubious or simply
unnecessary
implicit uses of the now-explicit OUString ctors. This commit makes
explicit
the few remaining reasonable uses. (And in some cases needed to change
variable
initialization syntax from using parentheses to using curly braces, to
avoid the
most vexing parse issue. And needed to explicitly add OUString ctors from
char16 const[2] string literal lvalues in a conditional expression in
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx that are only
necessary
because MSVC apparently still insists on doing array-to-pointer decay
there.)
All of this only affects LIBO_INTERNAL_ONLY.
Change-Id: I7ce31162e9be1c3ff3c0bd184a34b535ec56be9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102098
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 7fcf5cecd40a..91c279d477b4 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -414,7 +414,7 @@ void SbRtl_CurDir(StarBASIC * pBasic, SbxArray & rPar, bool
bWrite)
_set_thread_local_invalid_parameter_handler(handler);
if ( ok )
{
-rPar.Get32(0)->PutString( o3tl::toU(pBuffer) );
+rPar.Get32(0)->PutString( OUString(o3tl::toU(pBuffer)) );
}
else
{
diff --git a/embedserv/source/embed/ed_ioleobject.cxx
b/embedserv/source/embed/ed_ioleobject.cxx
index a84b1c2bdedd..08032e9c8b2b 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -45,8 +45,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
EmbedDocument_Impl::SetHostNames( LPCOLESTR sz
// the code should be ignored for links
if ( !m_aFileName.getLength() )
{
-m_pDocHolder->setTitle(o3tl::toU(szContainerObj));
-m_pDocHolder->setContainerName(o3tl::toU(szContainer
[Libreoffice-commits] core.git: filter/qa filter/source
filter/qa/unit/data/shape-nographic.odp |binary
filter/qa/unit/svg.cxx | 19 +++
filter/source/svg/svgexport.cxx |3 ++-
filter/source/svg/svgwriter.cxx |5 -
4 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit fbcdbfef8664430e15b9429187b58dede992accf
Author: Miklos Vajna
AuthorDate: Mon Sep 7 17:00:44 2020 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 7 18:59:05 2020 +0200
SVG export: fix failure on trying to read graphic of a 3D shape
Regression from commit 8fc1b60f62c213a0476f3acc9f89cd5eccbf335d (sw SVG
export: try to reuse original bitmap data for JPG and PNG bitmaps,
2020-02-27), which generalized the code that tries to get the original
bitmap of shapes for performance reasons. Originally this worked with
SdrGrafObj, but now we try every XShape which has a Graphic property.
Add the missing check, so shapes without a graphic property just miss
the fast path, but doesn't fail the entire SVG export.
Change-Id: I6b20083110f3269337b9df6a23bd193cc6f7d13b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102187
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/filter/qa/unit/data/shape-nographic.odp
b/filter/qa/unit/data/shape-nographic.odp
new file mode 100644
index ..43186d614986
Binary files /dev/null and b/filter/qa/unit/data/shape-nographic.odp differ
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 5dcb1af0eb90..792964cb00d9 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -160,6 +160,25 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest,
testSemiTransparentText)
assertXPath(pXmlDoc,
"//svg:text[2]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity]", 0);
}
+CPPUNIT_TEST_FIXTURE(SvgFilterTest, testShapeNographic)
+{
+// Load a document containing a 3D shape.
+load("shape-nographic.odp");
+
+// Export to SVG.
+uno::Reference xStorable(getComponent(),
uno::UNO_QUERY_THROW);
+SvMemoryStream aStream;
+uno::Reference xOut = new
utl::OOutputStreamWrapper(aStream);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("impress_svg_Export");
+aMediaDescriptor["OutputStream"] <<= xOut;
+
+// Without the accompanying fix in place, this test would have failed with:
+// An uncaught exception of type com.sun.star.io.IOException
+// - SfxBaseModel::impl_store failed: 0xc10(Error Area:Io
Class:Write Code:16)
+xStorable->storeToURL("private:stream",
aMediaDescriptor.getAsConstPropertyValueList());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 615c60004c2b..dea16cf90d1f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -59,6 +59,7 @@
#include
#include
#include
+#include
#include
@@ -608,7 +609,7 @@ bool SVGFilter::implExportImpressOrDraw( const Reference<
XOutputStream >& rxOSt
{
delete mpSVGDoc;
mpSVGDoc = nullptr;
-OSL_FAIL( "Exception caught" );
+SAL_WARN("filter.svg", "Exception caught");
}
if( nullptr != pSdrModel )
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index ba6bdfd534cd..4a35b01e9dfd 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2758,7 +2758,10 @@ void GetGraphicFromXShape(const
css::uno::Reference* pShap
}
uno::Reference xGraphic;
-xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+if (xPropertySet->getPropertySetInfo()->hasPropertyByName("Graphic"))
+{
+xPropertySet->getPropertyValue("Graphic") >>= xGraphic;
+}
rGraphic= Graphic(xGraphic);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang framework/source include/vcl svtools/source vcl/inc vcl/source xmloff/source
compilerplugins/clang/constantparam.bitmask.results |4 compilerplugins/clang/constantparam.booleans.results | 338 +++ compilerplugins/clang/constantparam.constructors.results | 76 +-- compilerplugins/clang/constantparam.numbers.results | 190 framework/source/uielement/resourcemenucontroller.cxx|6 include/vcl/image.hxx|2 svtools/source/misc/imagemgr.cxx |2 vcl/inc/image.h |3 vcl/source/image/Image.cxx |8 vcl/source/image/ImplImage.cxx |9 xmloff/source/chart/SchXMLParagraphContext.cxx |5 xmloff/source/chart/SchXMLParagraphContext.hxx |3 12 files changed, 321 insertions(+), 325 deletions(-) New commits: commit af1e773c19db58de55939355bf0069e35d2a7789 Author: Noel Grandin AuthorDate: Mon Sep 7 15:13:37 2020 +0200 Commit: Noel Grandin CommitDate: Mon Sep 7 18:19:57 2020 +0200 loplugin:constantparam Change-Id: I83722d99fa0d5919a7e878d32311dbb6de1c6714 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102175 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/constantparam.bitmask.results b/compilerplugins/clang/constantparam.bitmask.results index 17b57d32bf66..0e08530d201c 100644 --- a/compilerplugins/clang/constantparam.bitmask.results +++ b/compilerplugins/clang/constantparam.bitmask.results @@ -1,7 +1,7 @@ -codemaker/source/javamaker/classfile.hxx:153 +codemaker/source/javamaker/classfile.hxx:152 void codemaker::javamaker::ClassFile::ClassFile(enum codemaker::javamaker::ClassFile::AccessFlags,const class rtl::OString &,const class rtl::OString &,const class rtl::OString &) enum codemaker::javamaker::ClassFile::AccessFlags accessFlags setBits=0x1 -codemaker/source/javamaker/classfile.hxx:168 +codemaker/source/javamaker/classfile.hxx:167 void codemaker::javamaker::ClassFile::addField(enum codemaker::javamaker::ClassFile::AccessFlags,const class rtl::OString &,const class rtl::OString &,unsigned short,const class rtl::OString &) enum codemaker::javamaker::ClassFile::AccessFlags accessFlags setBits=0x1 dbaccess/source/filter/xml/xmlExport.hxx:165 diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results index 99d80d4ab8a3..a850a26c9653 100644 --- a/compilerplugins/clang/constantparam.booleans.results +++ b/compilerplugins/clang/constantparam.booleans.results @@ -10,7 +10,7 @@ basctl/source/basicide/moduldlg.hxx:103 void basctl::LibDialog::EnableReference(_Bool) _Bool b 0 -basctl/source/inc/scriptdocument.hxx:89 +basctl/source/inc/scriptdocument.hxx:88 void basctl::ScriptDocument::ScriptDocument(enum basctl::ScriptDocument::SpecialDocument) enum basctl::ScriptDocument::SpecialDocument _eType 0 @@ -22,11 +22,11 @@ basegfx/source/polygon/b3dpolygon.cxx:77 void (anonymous namespace)::CoordinateDataArray3D::CoordinateDataArray3D(unsigned int) unsigned int nCount 0 -basic/source/inc/runtime.hxx:324 +basic/source/inc/runtime.hxx:323 void SbiRuntime::StepRESUME(unsigned int) unsigned int 1 -basic/source/inc/runtime.hxx:355 +basic/source/inc/runtime.hxx:354 _Bool SbiRuntime::IsMissing(class SbxVariable *,unsigned short) unsigned short 1 @@ -62,51 +62,51 @@ canvas/source/cairo/cairo_canvashelper.hxx:248 void cairocanvas::CanvasHelper::useStates(const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,_Bool) _Bool setColor 1 -canvas/source/vcl/spritecanvashelper.hxx:45 +canvas/source/vcl/spritecanvashelper.hxx:44 void vclcanvas::SpriteCanvasHelper::init(const class std::shared_ptr &,class vclcanvas::SpriteCanvas &,class canvas::SpriteRedrawManager &,_Bool,_Bool) -_Bool bProtect +_Bool bHaveAlpha 0 -canvas/source/vcl/spritecanvashelper.hxx:45 +canvas/source/vcl/spritecanvashelper.hxx:44 void vclcanvas::SpriteCanvasHelper::init(const class std::shared_ptr &,class vclcanvas::SpriteCanvas &,class canvas::SpriteRedrawManager &,_Bool,_Bool) -_Bool bHaveAlpha +_Bool bProtect 0 chart2/qa/extras/chart2dump/chart2dump.cxx:98 void Chart2DumpTest::Chart2DumpTest(_Bool) _Bool bDumpMode 0 -chart2/qa/extras/chart2export.cxx:424 +chart2/qa/extras/chart2export.cxx:429 void checkCommonTrendline(const class com::sun::star::uno::Reference &,double,double,_Bool,double,_Bool,_Bool) _Bool aExpectedShowEquation 1 -chart2/qa/extras/charttest.hxx:239 +chart2/qa/extras/charttest.hxx:238 class com::sun::star::uno::Reference getPivotChartDocFromSheet(int,const class com::sun::star::uno::Reference &) int nSheet 1 -chart2/qa/extras/charttest.hxx:245 +chart2/qa/extras/charttest.hxx:244 class co
[Libreoffice-commits] online.git: common/Seccomp.cpp
common/Seccomp.cpp |4 1 file changed, 4 insertions(+) New commits: commit 215a76e213f2c8bcdd099578e506a122e48752d2 Author: Hillwood Yang AuthorDate: Sat Sep 5 17:46:04 2020 +0800 Commit: Michael Meeks CommitDate: Mon Sep 7 18:19:55 2020 +0200 Support ppc64 Change-Id: I28c44b6ccc58cd49cc9c45e19e92047cabcc185d Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102071 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp index 1b05f290c..1307e4911 100644 --- a/common/Seccomp.cpp +++ b/common/Seccomp.cpp @@ -52,6 +52,10 @@ # define AUDIT_ARCH_NR AUDIT_ARCH_ARM # define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.arm_##_reg) # define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, r7) +#elif defined(__powerpc64__) +# define AUDIT_ARCH_NR AUDIT_ARCH_PPC64 +# define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg]) +# define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0) #else # error "Platform does not support seccomp filtering yet - unsafe." #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source compilerplugins/clang
chart2/source/inc/ModifyListenerCallBack.hxx |4 +--
compilerplugins/clang/unnecessaryvirtual-dead.results |6 +---
compilerplugins/clang/unnecessaryvirtual.results | 24 +-
3 files changed, 11 insertions(+), 23 deletions(-)
New commits:
commit b0b0162656fbfe502ace2e02df7e58afa4ccc6b1
Author: Noel Grandin
AuthorDate: Mon Sep 7 14:49:24 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 7 18:18:57 2020 +0200
loplugin:unnecessaryvirtual
Change-Id: I596ef2603560f521386e273b6f0fb2f672db56d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102171
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx
b/chart2/source/inc/ModifyListenerCallBack.hxx
index f53f10fbb9ad..e9167079e982 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -33,12 +33,12 @@ without becoming a XModifyListener yourself
class ModifyListenerCallBack_impl;
-class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack
+class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack final
{
public:
explicit ModifyListenerCallBack( const Link& rCallBack );
-virtual ~ModifyListenerCallBack();
+~ModifyListenerCallBack();
void startListening( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyBroadcaster >& xBroadcaster );
SAL_DLLPRIVATE void stopListening();
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results
b/compilerplugins/clang/unnecessaryvirtual-dead.results
index 7f23e8490075..e43137eaec81 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -8,15 +8,13 @@ canvas/inc/base/graphicdevicebase.hxx:318
void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class
rtl::OUString &,const class com::sun::star::uno::Reference &,)
include/basegfx/utils/unopolypolygon.hxx:94
void basegfx::unotools::UnoPolyPolygon::modifying()const
-include/vcl/toolkit/treelistbox.hxx:512
-void SvTreeListBox::PreparePaint(class OutputDevice &,class
SvTreeListEntry &,)
sc/source/core/opencl/formulagroupcl.cxx:1069
void sc::opencl::(anonymous
namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class
std::__cxx11::basic_stringstream &,)
-slideshow/source/engine/animationfactory.cxx:593
+slideshow/source/engine/animationfactory.cxx:616
void slideshow::internal::(anonymous
namespace)::GenericAnimation::prefetch()
vcl/inc/salframe.hxx:145
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
-vcl/inc/salinst.hxx:199
+vcl/inc/salinst.hxx:200
void SalInstance::releaseMainThread()
vcl/inc/salmenu.hxx:81
void SalMenu::RemoveMenuBarButton(unsigned short,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results
b/compilerplugins/clang/unnecessaryvirtual.results
index 57fadbf8b7f0..9280ca91b736 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -206,13 +206,15 @@ canvas/inc/base/spritecanvasbase.hxx:162
void canvas::SpriteCanvasBase::moveSprite(const class rtl::Reference &,const class basegfx::B2DPoint &,const class basegfx::B2DPoint
&,const class basegfx::B2DVector &,)
canvas/inc/base/spritecanvasbase.hxx:174
void canvas::SpriteCanvasBase::updateSprite(const class
rtl::Reference &,const class basegfx::B2DPoint &,const
class basegfx::B2DRange &,)
-canvas/inc/rendering/icolorbuffer.hxx:44
+canvas/inc/rendering/icolorbuffer.hxx:43
void canvas::IColorBuffer::~IColorBuffer()
canvas/inc/rendering/irendermodule.hxx:59
void canvas::IRenderModule::~IRenderModule()
canvas/inc/rendering/isurface.hxx:34
void canvas::ISurface::~ISurface()
-chart2/source/inc/WeakListenerAdapter.hxx:57
+chart2/source/inc/ModifyListenerCallBack.hxx:41
+void chart::ModifyListenerCallBack::~ModifyListenerCallBack()
+chart2/source/inc/WeakListenerAdapter.hxx:56
void chart::WeakListenerAdapter::disposing(const struct
com::sun::star::lang::EventObject &,)
extensions/source/dbpilots/unoautopilot.hxx:81
class cppu::IPropertyArrayHelper *
dbp::OUnoAutoPilot::createArrayHelper()const
@@ -296,18 +298,6 @@ include/vcl/customweld.hxx:42
class rtl::OUString weld::CustomWidgetController::GetHelpText()const
include/vcl/toolkit/dialog.hxx:96
void Dialog::set_content_area(class VclBox *,)
-include/vcl/toolkit/treelistbox.hxx:417
-void SvTreeListBox::SelectHdl()
-include/vcl/toolkit/treelistbox.hxx:418
-void SvTreeListBox::DeselectHdl()
-include/vcl/toolkit/treelistbox.hxx:419
-_Bool SvTreeListBox::DoubleClickHdl()
-include/vcl/toolkit/treelistbox.hxx:512
-void SvTreeListBox::PreparePaint(class OutputDevice &,class
SvTreeListEntry &,)
-include/vcl/toolkit/treelistbox.hxx:584
-void SvTreeListBox::CheckButtonHdl()
-include/vcl/toolkit/treelistbox.hxx:677
-class VclPtr SvTreeLis
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - setup_native/scripts
setup_native/scripts/osx_install_languagepack.applescript | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit d6667aec86718cc4b843a69658fcc83203d66734
Author: Christian Lohmaier
AuthorDate: Mon Sep 7 18:14:03 2020 +0200
Commit: Christian Lohmaier
CommitDate: Mon Sep 7 18:14:03 2020 +0200
tdf#134607 workaround – mac langpack: don't verify target location
for some reason the commands used don't work for some users
Change-Id: Iecd5ffdfcb5c7d8cd5c4202fed0906ebf1ef68f9
diff --git a/setup_native/scripts/osx_install_languagepack.applescript
b/setup_native/scripts/osx_install_languagepack.applescript
index 8ad55396766a..3b4a116fb122 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -125,12 +125,13 @@ else
end if
-- now only check whether the path is really from [PRODUCTNAME]
-try
- do shell script "mdls --raw --name kMDItemDisplayName --name
kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep
'[PRODUCTNAME] [PRODUCTVERSION]'"
-on error
- display dialog (choice as string) & appInvalid buttons {InstallLabel}
default button 1 with icon 0
- return 3 --wrong target-directory
-end try
+-- FIXME: https://bugs.documentfoundation.org/show_bug.cgi?id=134607
+-- try
+-- do shell script "mdls --raw --name kMDItemDisplayName --name
kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 | fgrep
'[PRODUCTNAME] [PRODUCTVERSION]'"
+-- on error
+-- display dialog (choice as string) & appInvalid buttons {InstallLabel}
default button 1 with icon 0
+-- return 3 --wrong target-directory
+-- end try
(*
display dialog startInstall buttons {AbortLabel, InstallLabel} default button 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source compilerplugins/clang xmloff/source
chart2/source/inc/ModifyListenerCallBack.hxx|4
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 58
-
compilerplugins/clang/unusedfields.readonly.results | 10 -
compilerplugins/clang/unusedfields.untouched.results| 64
+++---
compilerplugins/clang/unusedfields.writeonly.results| 46
+++
xmloff/source/chart/transporttypes.hxx |4
6 files changed, 81 insertions(+), 105 deletions(-)
New commits:
commit f446ebf4ad419c114cae903a04159ccf78755faa
Author: Noel Grandin
AuthorDate: Mon Sep 7 14:55:22 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 7 18:19:16 2020 +0200
loplugin:unusedfields
Change-Id: Id1b1c07ddcacca8eef8af71890d9392f29b6be6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102172
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx
b/chart2/source/inc/ModifyListenerCallBack.hxx
index e9167079e982..f53f10fbb9ad 100644
--- a/chart2/source/inc/ModifyListenerCallBack.hxx
+++ b/chart2/source/inc/ModifyListenerCallBack.hxx
@@ -33,12 +33,12 @@ without becoming a XModifyListener yourself
class ModifyListenerCallBack_impl;
-class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack final
+class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack
{
public:
explicit ModifyListenerCallBack( const Link& rCallBack );
-~ModifyListenerCallBack();
+virtual ~ModifyListenerCallBack();
void startListening( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XModifyBroadcaster >& xBroadcaster );
SAL_DLLPRIVATE void stopListening();
diff --git
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 55cdaa2dee90..ec951eca363b 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -20,21 +20,23 @@ basegfx/source/polygon/b2dtrapezoid.cxx:205
basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator
maFirstStackBlock class basegfx::B2DPoint [32]
basegfx/source/polygon/b2dtrapezoid.cxx:257
basegfx::trapezoidhelper::(anonymous namespace)::TrapezoidSubdivider
maPoints std::vector
-basic/qa/cppunit/basictest.hxx:28
+basic/qa/cppunit/basictest.hxx:27
MacroSnippet maDll class BasicDLL
-binaryurp/source/unmarshal.hxx:87
+binaryurp/source/unmarshal.hxx:86
binaryurp::Unmarshal buffer_ com::sun::star::uno::Sequence
-binaryurp/source/writer.hxx:148
+binaryurp/source/writer.hxx:147
binaryurp::Writer state_ struct binaryurp::WriterState
-canvas/source/tools/surfaceproxy.hxx:105
+canvas/source/tools/surfaceproxy.hxx:104
canvas::SurfaceProxy mpPageManager canvas::PageManagerSharedPtr
-canvas/source/vcl/impltools.hxx:115
+canvas/source/vcl/impltools.hxx:114
vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard
-chart2/source/controller/accessibility/AccessibleChartShape.hxx:79
+chart2/source/controller/accessibility/AccessibleChartShape.hxx:78
chart::AccessibleChartShape m_aShapeTreeInfo
::accessibility::AccessibleShapeTreeInfo
-chart2/source/controller/inc/dlg_View3D.hxx:44
+chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:68
+chart::ThreeD_SceneIllumination_TabPage m_aModelChangeListener class
chart::ModifyListenerCallBack
+chart2/source/controller/inc/dlg_View3D.hxx:43
chart::View3DDialog m_aControllerLocker class chart::ControllerLockHelper
-chart2/source/controller/inc/RangeSelectionListener.hxx:63
+chart2/source/controller/inc/RangeSelectionListener.hxx:62
chart::RangeSelectionListener m_aControllerLockGuard class
chart::ControllerLockGuardUNO
connectivity/source/commontools/RowFunctionParser.cxx:372
connectivity::(anonymous namespace)::ExpressionGrammar::definition
unaryFunction ::boost::spirit::classic::rule
@@ -136,7 +138,7 @@ cui/source/inc/AdditionsDialog.hxx:57
AdditionInfo sReleaseVersion class rtl::OUString
cui/source/inc/AdditionsDialog.hxx:94
AdditionsDialog m_sTag class rtl::OString
-cui/source/inc/cfgutil.hxx:241
+cui/source/inc/cfgutil.hxx:233
SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
cui/source/inc/cuitabarea.hxx:224
SvxAreaTabPage maFixed_ChangeType enum ChangeType
@@ -174,8 +176,6 @@ dbaccess/source/core/dataaccess/connection.hxx:102
dbaccess::OConnection m_nInAppend std::atomic
dbaccess/source/core/inc/databasecontext.hxx:85
dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
- class AllSettings &
drawinglayer/inc/texture/texture3d.hxx:57
drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
drawinglayer/inc/texture/texture3d.hxx:59
@@ -238,14 +238,14 @@ include/sfx2/msg.hxx:133
SfxType2 aAttrib struct Sfx
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e7da22a157037fc96330914ab52f43eea27a8f0f Author: Christian Lohmaier AuthorDate: Mon Sep 7 18:12:07 2020 +0200 Commit: Gerrit Code Review CommitDate: Mon Sep 7 18:12:07 2020 +0200 Update git submodules * Update translations from branch 'master' to 14a72851d401d86cf9fd72a5e139ab87eb0f47d1 - update translations for master and force-fix errors using pocheck Change-Id: I95203f89a4148dd4f91a2a438c5c9811ac2dbe44 diff --git a/translations b/translations index 6990b2c53807..14a72851d401 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 6990b2c53807ca4ce972b4c894a5eecc683d67a7 +Subproject commit 14a72851d401d86cf9fd72a5e139ab87eb0f47d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/sfx2 xmlsecurity/source xmlsecurity/uiconfig
include/sfx2/strings.hrc |4 ++--
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 15 ++-
xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |4 ++--
3 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit ab9edc7394ad266f8810372901f411ba998f4290
Author: Miklos Vajna
AuthorDate: Wed Sep 2 12:37:18 2020 +0200
Commit: Caolán McNamara
CommitDate: Mon Sep 7 17:58:58 2020 +0200
xmlsecurity: avoid saying OK when the signature is partial
That's reserved for valid signatures (digest match, certificate
validates and the signature covers the whole document).
Also avoid "invalid" in the dialog when the digest matches and the
signature is just incomplete.
This now uses wording which is closer to Acrobat and also uses the same
wording on the infobar and in the dialog.
(cherry picked from commit e76d021ac44e7bf4de05899dc2694a96470bc707)
Change-Id: I26e4781d555b65cf29aa8df2232e286917235dc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102186
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d9f8289c12a5..d7c6635b793e 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -285,8 +285,8 @@
#define STR_READONLY_SIGN NC_("STR_READONLY_SIGN", "Sign
Document")
#define STR_SIGNATURE_BROKENNC_("STR_SIGNATURE_BROKEN",
"This document has an invalid signature.")
#define STR_SIGNATURE_INVALID NC_("STR_SIGNATURE_INVALID",
"The signature was valid, but the document has been modified")
-#define STR_SIGNATURE_NOTVALIDATED
NC_("STR_SIGNATURE_NOTVALIDATED", "The signature is OK, but the certificate
could not be validated.")
-#define STR_SIGNATURE_PARTIAL_OK
NC_("STR_SIGNATURE_PARTIAL_OK", "The signature is OK, but the document is only
partially signed.")
+#define STR_SIGNATURE_NOTVALIDATED
NC_("STR_SIGNATURE_NOTVALIDATED", "At least one signature has problems: the
certificate could not be validated.")
+#define STR_SIGNATURE_PARTIAL_OK
NC_("STR_SIGNATURE_PARTIAL_OK", "At least one signature has problems: the
document is only partially signed.")
#define STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK
NC_("STR_SIGNATURE_NOTVALIDATED_PARTIAL_OK", "The certificate could not be
validated and the document is only partially signed.")
#define STR_SIGNATURE_OKNC_("STR_SIGNATURE_OK", "This
document is digitally signed and the signature is valid.")
#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW",
"Show Signatures")
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index ff5161fb2754..ef67c7167c04 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -531,6 +531,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
size_t nInfos =
maSignatureManager.getCurrentSignatureInformations().size();
size_t nValidSigs = 0, nValidCerts = 0;
bool bAllNewSignatures = true;
+bool bSomePartial = false;
if( nInfos )
{
@@ -607,7 +608,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
{
if (maSignatureManager.getStore().is())
{
-// XML based.
+// ZIP based.
bSigValid =
DocumentSignatureHelper::checkIfAllFilesAreSigned(
aElementsToBeVerified, rInfo, mode);
}
@@ -619,6 +620,10 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
if( bSigValid )
nValidSigs++;
+else
+{
+bSomePartial = true;
+}
}
OUString sImage;
@@ -672,8 +677,8 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
bool bShowInvalidState = nInfos && !bAllSigsValid;
-m_xSigsInvalidImg->set_visible( bShowInvalidState );
-m_xSigsInvalidFI->set_visible( bShowInvalidState );
+m_xSigsInvalidImg->set_visible( bShowInvalidState && !bSomePartial);
+m_xSigsInvalidFI->set_visible( bShowInvalidState && !bSomePartial);
bool bShowNotValidatedState = nInfos && bAllSigsValid && !bAllCertsValid;
@@ -682,8 +687,8 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
//bAllNewSignatures is always true if we are not in document mode
bool bShowOldSignature = nInfos && bAllSigsValid && bAllCertsValid &&
!bAllNewSignatures;
-m_xSigsOldSignatureImg->set_visible(bShowOldSignature);
-m_xSigsOldSignatureFI->set_visible(bShowOldSignature);
+m_xSigsOldSignatureImg->set_visible(bShowOldSignature || bSomePartial);
+m_xSigsOldSignatureFI->set_visible(bShowOl
Re: CODE/LOOL macro execution
Hi Jakub, On 02/09/2020 20:56, Jakub Kościelak wrote: > I know this is a developers list, but it's the best place to ask ;-) > > Can I execute macros in documents in CODE/LOOL ? Yes; but its disabled by default. Its not entirely clear that the APIs we have are suited for collaborative editing - particularly these long running dialog 'Execute' methods that pile up stack frames. So - depends on your macro really. HTH, Michael. -- michael.me...@collabora.com <><, GM Collabora Productivity Hangout: mejme...@gmail.com, Skype: mmeeks (M) +44 7795 666 147 - timezone usually UK / Europe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf135949_anchoredBeforeBreak.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |7 +++
writerfilter/source/dmapper/DomainMapper.cxx |1 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx|5 +
writerfilter/source/dmapper/DomainMapper_Impl.hxx|2 ++
5 files changed, 15 insertions(+)
New commits:
commit 23b26103b3f79e578261fab7f11372c857c7de5e
Author: Justin Luth
AuthorDate: Fri Sep 4 19:11:51 2020 +0300
Commit: Miklos Vajna
CommitDate: Mon Sep 7 17:40:59 2020 +0200
tdf#135949 writerfilter: don't bRemove if anchoredObjects
Surprised it took so long to find an example of an
anchored object on the empty paragraph.
I considered making a more useful function,
but I didn't want to return a pointer,
and my skills and understanding aren't good enough
to intelligently return an empty vector reference,
so I just left it as I first created it.
It seems a bit silly to make a bool function
just for this, but nothing returns anything
that I wanted to use. So I just made a
perfect-fit function for my unique need here.
I would have preferred to create a potentially
re-useable and flexible function...
Change-Id: I8c2527403cd8059223d4bc610b10243656b1db3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102060
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135949_anchoredBeforeBreak.docx
b/sw/qa/extras/ooxmlexport/data/tdf135949_anchoredBeforeBreak.docx
new file mode 100644
index ..6b61be383dab
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf135949_anchoredBeforeBreak.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 95770433a6ab..2b49b47dbfd2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -389,6 +389,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf132149_pgBreak,
"tdf132149_pgBreak.odt")
//CPPUNIT_ASSERT(getXPathContent(pDump,
"//page[5]/body/txt").startsWith("Lorem ipsum"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf135949_anchoredBeforeBreak,
"tdf135949_anchoredBeforeBreak.docx")
+{
+xmlDocUniquePtr pDump = parseLayoutDump();
+//The picture was shown on page 2, because the empty paragraph before the
page break was removed
+assertXPath(pDump, "//page[1]/body/txt/anchored/fly", 1);
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf129452_excessBorder,
"tdf129452_excessBorder.docx")
{
uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 38f8a493db09..b3faa5682ab6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3511,6 +3511,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
&& !m_pImpl->GetIsDummyParaAddedForTableInSection()
&& !( pSectionContext &&
pSectionContext->GetBreakType() != -1 && pContext &&
pContext->isSet(PROP_BREAK_TYPE) )
&& !m_pImpl->GetIsPreviousParagraphFramed()
+&& !m_pImpl->HasTopAnchoredObjects()
&& !m_pImpl->IsParaWithInlineObject());
const bool bNoNumbering = bRemove || (!m_pImpl->GetParaChanged()
&& m_pImpl->GetParaSectpr() && bSingleParagraph);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 77d7ce21a0dd..e7b571de687b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -734,6 +734,11 @@ FieldContextPtr const &
DomainMapper_Impl::GetTopFieldContext()
return m_aFieldStack.back();
}
+bool DomainMapper_Impl::HasTopAnchoredObjects() const
+{
+return !m_aTextAppendStack.empty() &&
!m_aTextAppendStack.top().m_aAnchoredObjects.empty();
+}
+
void DomainMapper_Impl::InitTabStopFromStyle( const uno::Sequence<
style::TabStop >& rInitTabStops )
{
OSL_ENSURE(m_aCurrentTabStops.empty(), "tab stops already initialized");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 54a0f6c7ac25..33ec662c5feb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -710,6 +710,8 @@ public:
css::uno::Reference const & GetTopTextAppend();
FieldContextPtr const & GetTopFieldContext();
+bool HasTopAnchoredObjects() const;
+
FontTablePtr const & GetFontTable()
{
if(!m_pFontTable)
___
Libreoffice-commits mailing list
l
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 10a6583fa96843457ae7aec21a9847a4cb62b16a
Author: Caolán McNamara
AuthorDate: Mon Sep 7 15:05:16 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 7 17:27:50 2020 +0200
fix warning of OutputDevice::Push calls != OutputDevice::Pop calls
Change-Id: I8f6a3756d48b1727f9ac64c2e162be148e1c61d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102183
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 1498ddae3158..0d7335b76aac 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2413,8 +2413,11 @@ void
VclMetafileProcessor2D::processPrimitive2DOnPixelProcessor(
aBufferProcessor.process({ aRef });
const BitmapEx aBmContent(pBufferDevice->GetBitmapEx(Point(),
aSizePixel));
mpOutputDevice->DrawBitmapEx(aRectLogic.TopLeft(),
aRectLogic.GetSize(), aBmContent);
-pBufferDevice.disposeAndClear();
+
+// aBufferProcessor dtor pops state off pBufferDevice pushed on by its
ctor, let
+// pBufferDevice live past aBufferProcessor scope to avoid warnigns
}
+pBufferDevice.disposeAndClear();
}
} // end of namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4bcac651292961889bb708ecaad3b194758c58e Author: Miklos Vajna AuthorDate: Mon Sep 7 11:07:09 2020 +0200 Commit: Miklos Vajna CommitDate: Mon Sep 7 17:01:48 2020 +0200 Android: re-enable pdfium This was disabled by accident at some stage, the original commit b6f9eeb9b5c0e29ca655185dc299ebd4a2c092d7 (external: bundle pdfium, 2017-02-08) did have Android enabled back then. Change-Id: Ia875ba6c663d74e6c9061f4ffe814bc124431abe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102155 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/configure.ac b/configure.ac index 02d9f81bb551..85a722cb0410 100644 --- a/configure.ac +++ b/configure.ac @@ -11151,7 +11151,7 @@ AC_SUBST([ENABLE_DCONF]) # pdf import? AC_MSG_CHECKING([whether to build the PDF import feature]) ENABLE_PDFIMPORT= -if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then +if test $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_pdfimport" = yes \); then AC_MSG_RESULT([yes]) ENABLE_PDFIMPORT=TRUE AC_DEFINE(HAVE_FEATURE_PDFIMPORT) @@ -11177,7 +11177,7 @@ dnl Check for poppler dnl === ENABLE_POPPLER= AC_MSG_CHECKING([whether to build Poppler]) -if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_poppler" = yes; then +if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" = "TRUE" -a $_os != Android \) -o "$enable_poppler" = yes; then AC_MSG_RESULT([yes]) ENABLE_POPPLER=TRUE AC_DEFINE(HAVE_FEATURE_POPPLER) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rtl
include/rtl/string.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0cf956017477ad4f6aaae413eb434ab9b870725d
Author: Stephan Bergmann
AuthorDate: Mon Sep 7 15:10:56 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 7 16:58:51 2020 +0200
Avoid dangling pData when constructing OUString from temporary
OUStringLiteral
...afer 4b9e440c51be3e40326bc90c33ae69885bfb51e4 "Turn OStringLiteral into a
consteval'ed, static-refcound rtl_String"
Change-Id: I8afab29e9b7477c8a6c519b61d1fd6b3c21589e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102174
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index ca1fd99b7fba..3a95b807c3a0 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -299,6 +299,7 @@ public:
*/
template OString(OStringLiteral const & literal):
pData(const_cast(reinterpret_cast(&literal))) {}
+template OString(OStringLiteral &&) = delete;
/// @endcond
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/uiconfig
basctl/uiconfig/basicide/ui/basicmacrodialog.ui |5 ++ basctl/uiconfig/basicide/ui/breakpointmenus.ui | 17 +- basctl/uiconfig/basicide/ui/managebreakpoints.ui | 39 --- basctl/uiconfig/basicide/ui/modulepage.ui| 10 + basctl/uiconfig/basicide/ui/newlibdialog.ui |5 ++ 5 files changed, 70 insertions(+), 6 deletions(-) New commits: commit 9c55e725a45b027fade9084c0d9b82178fa1a04f Author: Olivier Hallot AuthorDate: Mon Sep 7 09:41:53 2020 -0300 Commit: Christian Lohmaier CommitDate: Mon Sep 7 16:48:00 2020 +0200 tdf#118148 Extended tips for HC2/sbasic Change-Id: I878c1108757b6637e221b39c50ecf21477edb534 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102169 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index 7c2a37248d31..674e34492acd 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -410,6 +410,11 @@ True True True + + +Creates a new library. + + False diff --git a/basctl/uiconfig/basicide/ui/breakpointmenus.ui b/basctl/uiconfig/basicide/ui/breakpointmenus.ui index 58437b045fc3..db09c4a97cb7 100644 --- a/basctl/uiconfig/basicide/ui/breakpointmenus.ui +++ b/basctl/uiconfig/basicide/ui/breakpointmenus.ui @@ -1,5 +1,5 @@ - + @@ -10,6 +10,11 @@ True False Manage Breakpoints... + + +Specifies the options for breakpoints. + + @@ -22,6 +27,11 @@ False _Active True + + +Activates or deactivates the current breakpoint. + + @@ -36,6 +46,11 @@ False _Properties... True + + +Specifies the options for breakpoints. + + diff --git a/basctl/uiconfig/basicide/ui/managebreakpoints.ui b/basctl/uiconfig/basicide/ui/managebreakpoints.ui index 56227ae982bf..99bc5dc99119 100644 --- a/basctl/uiconfig/basicide/ui/managebreakpoints.ui +++ b/basctl/uiconfig/basicide/ui/managebreakpoints.ui @@ -1,5 +1,5 @@ - + @@ -18,9 +18,6 @@ 0 0 dialog - - - False @@ -38,6 +35,11 @@ True True True + + +Creates a breakpoint on the line number specified. + + False @@ -53,6 +55,11 @@ True True True + + +Deletes the selected breakpoint. + + False @@ -143,6 +150,11 @@ True 0 True + + +Activates or deactivates the current breakpoint. + + 0 @@ -174,7 +186,6 @@ False 0 False -False @@ -202,6 +213,11 @@ True True True + + +Enter the line number for a new breakpoint, then click New. + + 0 @@ -224,6 +240,11 @@ True True True + + +Specify the number of loops to perform before the breakpoint takes effect. + + 1 @@ -279,5 +300,13 @@ cancel help + + + + + +Specifies the options for breakpoints. + + diff --git a/basctl/uiconfig/basicide/ui/modulepage.ui b/basctl/uiconfig/basicide/u
[Libreoffice-commits] core.git: config_host/config_skia.h.in
config_host/config_skia.h.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee4d7d11503fc4a93269a32dd1bf43d0ab3160e6 Author: Luboš Luňák AuthorDate: Fri Aug 28 11:55:57 2020 +0200 Commit: Luboš Luňák CommitDate: Mon Sep 7 16:20:34 2020 +0200 fix typo in enabling Skia's SK_RELEASE Although this was probably harmless, as Skia by default decides this based on NDEBUG, if not explicitly set. Change-Id: I46f0d336cdb940d2214c67bdb461cb4f8d9140f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102164 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in index 4c1c169c800d..ba3d3c6c0a07 100644 --- a/config_host/config_skia.h.in +++ b/config_host/config_skia.h.in @@ -56,7 +56,7 @@ are the same. #else -#define DSK_RELEASE +#define SK_RELEASE #endif // DBG_UTIL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css | 40 +++
loleaflet/src/control/Control.JSDialogBuilder.js | 13 +--
2 files changed, 50 insertions(+), 3 deletions(-)
New commits:
commit 2c535d564b3a5fa859e9db12711e66f0f2a97138
Author: Szymon Kłos
AuthorDate: Thu Aug 13 12:19:55 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 16:19:16 2020 +0200
mobile-wizard: style radio buttons
Change-Id: Iee03b7fceada0ab1166ba35438da50b178a99ce7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100652
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102180
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index a83108951..9d5f3434a 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -794,6 +794,46 @@ div#mobile-wizard-content .spinfieldcontainer
.spinfieldimage.disabled {
top: -20px;
width: 16px;
}
+
+#mobile-wizard input[type=radio]:disabled{
+ border: 2px solid #ddd;
+ box-shadow: none;
+}
+#mobile-wizard input[type=radio]{
+ border-radius: 50%;
+ appearance: none;
+ width: 24px;
+ height: 24px;
+ margin: 10px 20px 10px 0px !important;
+ float: right;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ -o-appearance: none;
+ appearance: none;
+ border: 2px solid #aaa;
+ outline: none;
+ box-shadow: #0015 0px 0px 2px 1px;
+}
+#mobile-wizard input[type=radio]:checked{
+ background: url(images/lc_ok_white.svg) no-repeat center;
+ background-color: #0b87e7;
+ border: 2px solid #0b87e7;
+ outline: none;
+ box-shadow: none;
+}
+#mobile-wizard input[type=radio]:checked:disabled{
+ background-color: #ddd !important;
+ border: 2px solid #ddd !important;
+}
+#mobile-wizard input[type=radio]:before{
+ width: 20px;
+ height: 20px;
+}
+#mobile-wizard input[type=radio]:after{
+ top: -20px;
+ width: 16px;
+}
+
#enablecontour + label{
line-height: 44px;
vertical-align: baseline;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 81648ee86..a0e5a39f8 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -801,10 +801,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
},
_radiobuttonControl: function(parentContainer, data, builder) {
- var radiobutton = L.DomUtil.createWithId('input', data.id,
parentContainer);
+ var container = L.DomUtil.createWithId('div', data.id +
'-container', parentContainer);
+ L.DomUtil.addClass(container, 'radiobutton');
+
+ var radiobutton = L.DomUtil.createWithId('input', data.id,
container);
radiobutton.type = 'radio';
- var radiobuttonLabel = L.DomUtil.create('label', '',
parentContainer);
+ var radiobuttonLabel = L.DomUtil.create('label', '', container);
radiobuttonLabel.innerHTML = builder._cleanText(data.text);
radiobuttonLabel.for = data.id;
commit 9560a5b02146b234b69c61c0bdf89ac0fc72a7b4
Author: Szymon Kłos
AuthorDate: Tue Aug 11 11:32:14 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 16:19:11 2020 +0200
mobile-wizard: improve calc shape shadow panel
- use listboxes
- reduce input to make space for -/+ controls
- working color selector
Change-Id: Ia9df4fbc09132474985d169d7b0d55985461ec2b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100472
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102179
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index dbfa4dbe4..81648ee86 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1434,7 +1434,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
data.id === 'fontsizecombobox' ||
data.id === 'fontsize' ||
data.id === 'FontBox' ||
- data.id === 'rotation') {
+ data.id === 'rotation' ||
+ data.id === 'LB_ANGLE' ||
+ data.id === 'LB_DISTANCE') {
builder._listboxControl(parentContainer, data, builder);
} else if (data.id === 'searchterm' ||
data.id === 'replaceterm') {
@@ -1807,6 +1809,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
builder.map['stateChangeHandler'].setItemValu
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarpossize.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 49c8656eaf18dbbcfdcfb178c9407ea61c206ec4 Author: Caolán McNamara AuthorDate: Mon Sep 7 13:50:07 2020 +0100 Commit: Caolán McNamara CommitDate: Mon Sep 7 16:07:20 2020 +0200 there is no valign of 'top', maybe 'start' is what's wanted here Change-Id: Ia260a1420291f4811aa6fbf3beae57184462db7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102170 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui index 5595e37aa2cd..92a0c9ebcc92 100644 --- a/svx/uiconfig/ui/sidebarpossize.ui +++ b/svx/uiconfig/ui/sidebarpossize.ui @@ -458,7 +458,7 @@ Edit Chart True True -top +start True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08d5190682039e5a885c11c8c40f2be811f32078 Author: Andras Timar AuthorDate: Fri Sep 4 12:23:04 2020 +0200 Commit: Jan Holesovsky CommitDate: Mon Sep 7 16:05:28 2020 +0200 Bump version to 7.0.1.1 Change-Id: Ibd8b1d53c18884c29de0789af4b4df9bf481245a Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102040 Tested-by: Jan Holesovsky Reviewed-by: Jan Holesovsky diff --git a/configure.ac b/configure.ac index d9065f5b2..95e02b76f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([loolwsd], [7.0.0.2], [libreoffice@lists.freedesktop.org]) +AC_INIT([loolwsd], [7.0.1.1], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/dllmgr-none.cxx |6 ++
basic/source/runtime/dllmgr.hxx |2 ++
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 85232a2e5711e811bdba615f541c08ed10045ee5
Author: Arnaud Versini
AuthorDate: Sun Sep 6 15:49:57 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 7 15:27:51 2020 +0200
BASIC : no need for a DLL manager impl on non windows systems
Change-Id: I4bee1ec99b69b42b7eea540b04511cbafe5fbd0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102106
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/basic/source/runtime/dllmgr-none.cxx
b/basic/source/runtime/dllmgr-none.cxx
index 7ca7e5131e3e..bce18495b3bb 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -32,8 +32,6 @@
#include "dllmgr.hxx"
-struct SbiDllMgr::Impl {};
-
namespace {
// Overcome the mess of Currency vs. custom types etc.
@@ -107,8 +105,8 @@ ErrCode SbiDllMgr::Call(
void SbiDllMgr::FreeDll(SAL_UNUSED_PARAMETER OUString const &) {}
-SbiDllMgr::SbiDllMgr(): impl_(new Impl) {}
+SbiDllMgr::SbiDllMgr() = default;
-SbiDllMgr::~SbiDllMgr() {}
+SbiDllMgr::~SbiDllMgr() = default;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index ce79c54797f3..08927843a98d 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -42,9 +42,11 @@ public:
void FreeDll(OUString const & library);
private:
+#ifdef _WIN32
struct Impl;
std::unique_ptr< Impl > impl_;
+#endif
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/skia
vcl/inc/skia/salbmp.hxx | 12 vcl/skia/salbmp.cxx |2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) New commits: commit 76babdeaf2e419d2aa21d674160a4575691a536a Author: Luboš Luňák AuthorDate: Sat Sep 5 14:11:43 2020 +0200 Commit: Luboš Luňák CommitDate: Mon Sep 7 15:22:11 2020 +0200 improve debug for erased SkiaSalBitmap Change-Id: I1e1edafc7b9daf5748e22846ca5807613f779b2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102167 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx index f834478be51a..d2599d3e98b5 100644 --- a/vcl/inc/skia/salbmp.hxx +++ b/vcl/inc/skia/salbmp.hxx @@ -121,10 +121,14 @@ private: return stream << "(null)"; // I/i - has SkImage (on GPU/CPU), // A/a - has alpha SkImage (on GPU/CPU) -return stream << static_cast(bitmap) << " " << bitmap->GetSize() << "/" - << (bitmap->mImage ? (bitmap->mImage->isTextureBacked() ? "I" : "i") : "") - << (bitmap->mAlphaImage ? (bitmap->mAlphaImage->isTextureBacked() ? "A" : "a") - : ""); +stream << static_cast(bitmap) << " " << bitmap->GetSize() << "/"; +if (bitmap->mImage) +stream << (bitmap->mImage->isTextureBacked() ? "I" : "i"); +if (bitmap->mAlphaImage) +stream << (bitmap->mAlphaImage->isTextureBacked() ? "A" : "a"); +if (bitmap->mEraseColorSet) +stream << "E" << bitmap->mEraseColor; +return stream; } BitmapPalette mPalette; diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx index ec91417cdf1b..83b807e87b15 100644 --- a/vcl/skia/salbmp.cxx +++ b/vcl/skia/salbmp.cxx @@ -204,12 +204,14 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode nMode) if (!mBuffer) return nullptr; assert(mPixelsSize == mSize); +assert(!mEraseColorSet); break; case BitmapAccessMode::Read: EnsureBitmapData(); if (!mBuffer) return nullptr; assert(mPixelsSize == mSize); +assert(!mEraseColorSet); break; case BitmapAccessMode::Info: break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/skia
vcl/inc/skia/gdiimpl.hxx |1 +
vcl/skia/gdiimpl.cxx | 12
2 files changed, 13 insertions(+)
New commits:
commit acb47f7aaaec14baccc0f3233670044e72342d29
Author: Luboš Luňák
AuthorDate: Sat Sep 5 10:59:25 2020 +0200
Commit: Luboš Luňák
CommitDate: Mon Sep 7 15:21:41 2020 +0200
do not queue up too many Skia image drawing operations (tdf#136369)
The document tries to draw a larger number of tiny bitmaps,
which results in Skia trying to allocate many tiny GPU images,
which slows it down (something quadratic there?) and it may
eventually run out of memory. So force a flush if there are
too many such operations unflushed.
This is somewhat similar to what was done in the past by
ad3580df085b3a3d66eb73cae997ea5ca178ccc1 .
Change-Id: Ib0309ea9c7ac6c80d69ceed2922e885a2aa7f2d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102166
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index 32beae036d5f..9405bc39ade2 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -325,6 +325,7 @@ protected:
double transparency;
};
LastPolyPolygonInfo mLastPolyPolygonInfo;
+int mPendingOperationsToFlush;
};
#endif
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index cb0f9b47ecf8..17fcbf092335 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -255,6 +255,7 @@ SkiaSalGraphicsImpl::SkiaSalGraphicsImpl(SalGraphics&
rParent, SalGeometryProvid
, mFillColor(SALCOLOR_NONE)
, mXorMode(false)
, mFlush(new SkiaFlushIdle(this))
+, mPendingOperationsToFlush(0)
{
}
@@ -389,6 +390,15 @@ void SkiaSalGraphicsImpl::preDraw()
void SkiaSalGraphicsImpl::postDraw()
{
scheduleFlush();
+// Skia (at least when using Vulkan) queues drawing commands and executes
them only later.
+// But tdf#136369 leads to creating and queueing many tiny bitmaps, which
makes
+// Skia slow, and may make it even run out of memory. So force a flush if
such
+// a problematic operation has been performed too many times without a
flush.
+if (mPendingOperationsToFlush > 1000)
+{
+mSurface->flushAndSubmit();
+mPendingOperationsToFlush = 0;
+}
SkiaZone::leave(); // matched in preDraw()
}
@@ -454,6 +464,7 @@ void SkiaSalGraphicsImpl::flushDrawing()
if (mXorMode)
applyXor();
mSurface->flushAndSubmit();
+mPendingOperationsToFlush = 0;
}
bool SkiaSalGraphicsImpl::setClipRegion(const vcl::Region& region)
@@ -1550,6 +1561,7 @@ void SkiaSalGraphicsImpl::drawImage(const SalTwoRect&
rPosAry, const sk_spdrawImageRect(aImage, aSourceRect, aDestinationRect,
&aPaint);
addXorRegion(aDestinationRect);
+++mPendingOperationsToFlush; // tdf#136369
postDraw();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/unocommands.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 185b3573291cb5bf7b96a3ca3868620242055050
Author: Thais Vieira
AuthorDate: Fri Sep 4 07:50:28 2020 -0300
Commit: Tor Lillqvist
CommitDate: Mon Sep 7 15:21:22 2020 +0200
Loleaflet: fix menu entry
replacing 'Select...' to 'Select Table'
to it be consistent with the pattern.
Change-Id: I2724db65242588aa5d7aa6d375690ac3f478f209
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102048
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index b23b92e16..655424700 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -269,7 +269,7 @@ var unoCommandsArray = {
SearchDialog:{global:{menu:_('Find & Rep~lace...'),},},
SelectAll:{global:{menu:_('Select ~All'),},},
SelectBackground:{presentation:{menu:_('Set Background Image...'),},},
-
SelectTable:{presentation:{menu:_('~Select...'),},text:{menu:_('~Table'),},},
+ SelectTable:{presentation:{menu:_('~Select
Table'),},text:{menu:_('~Table'),},},
SendToBack:{global:{menu:_('~Send to Back'),},},
SetAnchorAtChar:{text:{menu:_('To ~Character'),},},
SetAnchorToCell:{spreadsheet:{menu:_('To ~Cell'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/gdiimpl.cxx | 92 +--
1 file changed, 24 insertions(+), 68 deletions(-)
New commits:
commit 717ce6838b7ef0add1f9a9655e2b8c0bf60203f0
Author: Luboš Luňák
AuthorDate: Sat Sep 5 07:05:16 2020 +0200
Commit: Luboš Luňák
CommitDate: Mon Sep 7 15:19:32 2020 +0200
avoid temporary SkImage when merging bitmaps in Skia (tdf#136244)
The original idea was to create a temporary SkImage in order to first
merge the bitmap and its alpha bitmap, otherwise scaling already
while merging them could introduce artefacts because of smoothscaling
the alpha. But SkShader use blends the bitmap and alpha values
before the scaling, so this is actually not necessary.
Change-Id: I4e351611e3c33530dd5326c542b0a191955b5109
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102068
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 61f843dee609..652fea88f38e 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1391,31 +1391,6 @@ void SkiaSalGraphicsImpl::invert(sal_uInt32 nPoints,
const SalPoint* pPointArray
bool SkiaSalGraphicsImpl::drawEPS(long, long, long, long, void*, sal_uInt32) {
return false; }
-static void drawBitmapToCanvas(const SkiaSalBitmap& bitmap, SkCanvas* canvas,
const SkPaint& paint)
-{
-if (bitmap.PreferSkShader())
-{
-SkPaint paint2(paint);
-paint2.setShader(bitmap.GetSkShader());
-canvas->drawPaint(paint2);
-}
-else
-canvas->drawImage(bitmap.GetSkImage(), 0, 0, &paint);
-}
-
-static void drawAlphaBitmapToCanvas(const SkiaSalBitmap& bitmap, SkCanvas*
canvas,
-const SkPaint& paint)
-{
-if (bitmap.PreferSkShader())
-{
-SkPaint paint2(paint);
-paint2.setShader(bitmap.GetAlphaSkShader());
-canvas->drawPaint(paint2);
-}
-else
-canvas->drawImage(bitmap.GetAlphaSkImage(), 0, 0, &paint);
-}
-
// Create SkImage from a bitmap and possibly an alpha mask (the usual VCL
one-minus-alpha),
// with the given target size. Result will be possibly cached, unless disabled.
sk_sp SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap&
bitmap,
@@ -1477,54 +1452,35 @@ sk_sp
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
assert(image->width() == targetSize.Width() && image->height() ==
targetSize.Height());
return image;
}
-// Combine bitmap + alpha bitmap into one temporary bitmap with alpha.
-// If scaling is needed, first apply the alpha, then scale, otherwise the
scaling might affect the alpha values.
-if (alphaBitmap && targetSize != bitmap.GetSize())
+sk_sp tmpSurface = SkiaHelper::createSkSurface(targetSize);
+if (!tmpSurface)
+return nullptr;
+SkCanvas* canvas = tmpSurface->getCanvas();
+SkAutoCanvasRestore autoRestore(canvas, true);
+SkPaint paint;
+if (targetSize != bitmap.GetSize())
{
-sk_sp mergedSurface =
SkiaHelper::createSkSurface(bitmap.GetSize());
-if (!mergedSurface)
-return nullptr;
-SkPaint paint;
-paint.setBlendMode(SkBlendMode::kSrc); // copy as is, including alpha
-drawBitmapToCanvas(bitmap, mergedSurface->getCanvas(), paint);
-paint.setBlendMode(SkBlendMode::kDstOut); // VCL alpha is
one-minus-alpha
-drawAlphaBitmapToCanvas(*alphaBitmap, mergedSurface->getCanvas(),
paint);
-sk_sp scaledSurface =
SkiaHelper::createSkSurface(targetSize);
-if (!scaledSurface)
-return nullptr;
-paint.setBlendMode(SkBlendMode::kSrc); // copy as is, including alpha
+SkMatrix matrix;
+matrix.set(SkMatrix::kMScaleX, 1.0 * targetSize.Width() /
bitmap.GetSize().Width());
+matrix.set(SkMatrix::kMScaleY, 1.0 * targetSize.Height() /
bitmap.GetSize().Height());
+canvas->concat(matrix);
paint.setFilterQuality(kHigh_SkFilterQuality);
-scaledSurface->getCanvas()->drawImageRect(
-mergedSurface->makeImageSnapshot(),
-SkRect::MakeXYWH(0, 0, bitmap.GetSize().Width(),
bitmap.GetSize().Height()),
-SkRect::MakeXYWH(0, 0, targetSize.Width(), targetSize.Height()),
&paint);
-image = scaledSurface->makeImageSnapshot();
}
-else // No alpha or no scaling, scale directly.
+if (alphaBitmap != nullptr)
{
-sk_sp tmpSurface = SkiaHelper::createSkSurface(targetSize);
-if (!tmpSurface)
-return nullptr;
-SkCanvas* canvas = tmpSurface->getCanvas();
-SkAutoCanvasRestore autoRestore(canvas, true);
-SkPaint paint;
-if (targetSize != bitmap.GetSize())
-{
-SkMatrix matrix;
-matrix.set(SkMatrix::kMScaleX, 1.0 * targetSize.Width() /
bitmap.GetSize().Width());
-matrix.set(SkMatrix::kMScaleY, 1.0 * targetSize.Height() /
bitmap.GetSize
[Libreoffice-commits] core.git: vcl/inc vcl/skia
vcl/inc/skia/utils.hxx |1 +
vcl/skia/SkiaHelper.cxx |5 ++---
vcl/skia/gdiimpl.cxx|3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a8a7df6de6b48a03589ac9b66b490875eab19b75
Author: Luboš Luňák
AuthorDate: Sat Sep 5 09:10:40 2020 +0200
Commit: Luboš Luňák
CommitDate: Mon Sep 7 15:19:55 2020 +0200
increase Skia image cache size to 64MiB (tdf#136244)
16MiB was enough to hold just one 2000x2000 image, which is almost
the usual screen size.
Change-Id: I8fd02101cd2a18ddb89500d555d5c2f051fdb81f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102069
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx
index 8a104e066090..fc2567ac4e32 100644
--- a/vcl/inc/skia/utils.hxx
+++ b/vcl/inc/skia/utils.hxx
@@ -56,6 +56,7 @@ VCL_DLLPUBLIC void
void addCachedImage(const OString& key, sk_sp image);
sk_sp findCachedImage(const OString& key);
void removeCachedImage(sk_sp image);
+constexpr int MAX_CACHE_SIZE = 4 * 2000 * 2000 * 4; // 4x 2000px 32bpp images,
64MiB
#ifdef DBG_UTIL
void prefillSurface(sk_sp& surface);
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index de0fd94be79c..8ba1e06f2463 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -472,13 +472,12 @@ void addCachedImage(const OString& key, sk_sp
image)
imageCache->push_front({ key, image, size });
imageCacheSize += size;
SAL_INFO("vcl.skia.trace", "addcachedimage " << image << " :" << size <<
"/" << imageCacheSize);
-const int MAX_CACHE_SIZE = 4 * 1000 * 1000 * 4; // 4x 1000px 32bpp images,
16MiB
while (imageCacheSize > MAX_CACHE_SIZE)
{
assert(!imageCache->empty());
imageCacheSize -= imageCache->back().size;
-SAL_INFO("vcl.skia.trace",
- "least used removal " << image << ":" <<
imageCache->back().size);
+SAL_INFO("vcl.skia.trace", "least used removal " <<
imageCache->back().image << ":"
+ <<
imageCache->back().size);
imageCache->pop_back();
}
}
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 652fea88f38e..f5374b773028 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1436,6 +1436,9 @@ sk_sp
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
return image;
}
}
+// Do not cache the result if it would take most of the cache and thus get
evicted soon.
+if (targetSize.Width() * targetSize.Height() * 4 >
SkiaHelper::MAX_CACHE_SIZE * 0.7)
+return image;
OString key;
OStringBuffer keyBuf;
keyBuf.append(targetSize.Width())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/gdiimpl.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 93a7f074d3bdcb293fe2e6410c0401056f6c860f
Author: Luboš Luňák
AuthorDate: Sat Sep 5 09:13:31 2020 +0200
Commit: Luboš Luňák
CommitDate: Mon Sep 7 15:20:15 2020 +0200
tweak not caching overly large Skia images (tdf#136244)
If the image is way too oversized, it doesn't matter it's being
scaled down.
Change-Id: I148cd6b95953abb9fcbb5ea8dd19cadaa513e573
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102070
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index f5374b773028..cb0f9b47ecf8 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1422,17 +1422,18 @@ sk_sp
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
// Since the problem is mainly the cost of upscaling and then the size
of the resulting bitmap,
// compute a ratio of how much this is going to be scaled up, how much
this is larger than
// the drawing area, and then refuse to cache if it's too much.
-const double upscaleRatio = 1.0 * targetSize.Width() /
bitmap.GetSize().Width()
-* targetSize.Height() /
bitmap.GetSize().Height();
+const double upscaleRatio
+= std::max(1.0, 1.0 * targetSize.Width() / bitmap.GetSize().Width()
+* targetSize.Height() /
bitmap.GetSize().Height());
const double oversizeRatio = 1.0 * targetSize.Width() /
drawAreaSize.Width()
* targetSize.Height() /
drawAreaSize.Height();
const double ratio = upscaleRatio * oversizeRatio;
-if (ratio > 10)
+if (ratio > 4)
{
SAL_INFO("vcl.skia.trace", "mergecachebitmaps("
- << this << "): not caching
upscaling, ratio:" << ratio
- << ", " << bitmap.GetSize() << "->"
<< targetSize
- << " in " << drawAreaSize);
+ << this << "): not caching, ratio:"
<< ratio << ", "
+ << bitmap.GetSize() << "->" <<
targetSize << " in "
+ << drawAreaSize);
return image;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/gdiimpl.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 23762a704133051184850fc711e44bc9a112f59a
Author: Luboš Luňák
AuthorDate: Sat Sep 5 07:03:52 2020 +0200
Commit: Luboš Luňák
CommitDate: Mon Sep 7 15:19:17 2020 +0200
limit draw size by clip region size, not whole size
If the graphics area is clipped to a smaller size, use that
as the maximum size that would be drawn, not the whole graphics
area.
Change-Id: I8892e62ca83fb4de4d58edffb1783eccfbd39dc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102067
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 8c8eee3e3f88..61f843dee609 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1435,10 +1435,11 @@ sk_sp
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
if (bitmap.GetSize().Width() < 100 && bitmap.GetSize().Height() < 100
&& targetSize.Width() < 100 && targetSize.Height() < 100)
return image;
-// In some cases (tdf#134237) the draw size may be very large. In that
case it's
+// In some cases (tdf#134237) the target size may be very large. In that
case it's
// better to rely on Skia to clip and draw only the necessary, rather than
prepare
// a very large image only to not use most of it.
-if (targetSize.Width() > GetWidth() || targetSize.Height() > GetHeight())
+const Size drawAreaSize = mClipRegion.GetBoundRect().GetSize();
+if (targetSize.Width() > drawAreaSize.Width() || targetSize.Height() >
drawAreaSize.Height())
{
// This is a bit tricky. The condition above just checks that at least
a part of the resulting
// image will not be used (it's larger then our drawing area). But
this may often happen
@@ -1448,15 +1449,15 @@ sk_sp
SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma
// the drawing area, and then refuse to cache if it's too much.
const double upscaleRatio = 1.0 * targetSize.Width() /
bitmap.GetSize().Width()
* targetSize.Height() /
bitmap.GetSize().Height();
-const double oversizeRatio
-= 1.0 * targetSize.Width() / GetWidth() * targetSize.Height() /
GetHeight();
+const double oversizeRatio = 1.0 * targetSize.Width() /
drawAreaSize.Width()
+ * targetSize.Height() /
drawAreaSize.Height();
const double ratio = upscaleRatio * oversizeRatio;
if (ratio > 10)
{
SAL_INFO("vcl.skia.trace", "mergecachebitmaps("
<< this << "): not caching
upscaling, ratio:" << ratio
<< ", " << bitmap.GetSize() << "->"
<< targetSize
- << " in " << Size(GetWidth(),
GetHeight()));
+ << " in " << drawAreaSize);
return image;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5504f14e95bfb57c3d2d4bd47010f0ec433631b7 Author: Thais Vieira AuthorDate: Fri Sep 4 08:21:28 2020 -0300 Commit: Tor Lillqvist CommitDate: Mon Sep 7 15:13:26 2020 +0200 Loleaflet:fix menu entry replacing the 'Select...' to 'Select Table' to it be consistent with the pattern. Change-Id: I17ce12fb6dd51256d68c735b7934e4e2bf643fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102044 Reviewed-by: Tor Lillqvist Tested-by: Jenkins CollaboraOffice diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 542b1208f00e..c8ca15e3f650 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2055,7 +2055,7 @@ Select Table - ~Select... + ~Select Table Select Table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/uielement/menubarmanager.hxx|4 +
framework/source/uielement/menubarmanager.cxx | 37 +-
framework/source/uielement/resourcemenucontroller.cxx | 11 +++--
3 files changed, 30 insertions(+), 22 deletions(-)
New commits:
commit f1a7b8275e9c301bbfa3a7a0df3a5209ca3cff62
Author: Maxim Monastirsky
AuthorDate: Mon Sep 7 11:59:25 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Mon Sep 7 15:10:31 2020 +0200
Pass correct module id and dispatch provider to the window menu
This matters in a merged menu bar (e.g. insert chart), where the
Window menu belongs to the container rather than to the embedded
object. (Same as for the File menu, see also commit
94a7a71b070d3911b39d1026ba266768b71ba8a6 - "MenuBarManager:
Actually use xPopupMenuDispatchProvider".)
Change-Id: Ia502674b778554378546f5629ea44bbb17c830ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102158
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/inc/uielement/menubarmanager.hxx
b/framework/inc/uielement/menubarmanager.hxx
index 67f5d95dd87c..9cb47eedc7d3 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -162,7 +162,9 @@ class MenuBarManager final :
static void MergeAddonMenus( Menu* pMenuBar, const
MergeMenuInstructionContainer&, const OUString& aModuleIdentifier );
MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId );
-bool CreatePopupMenuController( MenuItemHandler*
pMenuItemHandler );
+bool CreatePopupMenuController( MenuItemHandler*
pMenuItemHandler,
+const css::uno::Reference<
css::frame::XDispatchProvider >& rDispatchProvider,
+const OUString&
rModuleIdentifier );
void AddMenu(MenuBarManager* pSubMenuManager,const
OUString& _sItemCommand,sal_uInt16 _nItemId);
sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu*
_pMenu,sal_uInt16 _nIndex) const;
void SetHdl();
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 6bcee628e1df..46e32ae1f2a2 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -43,7 +43,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -683,7 +683,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
m_xPopupMenuControllerFactory->hasController(
menuItemHandler->aMenuItemURL, m_aModuleIdentifier ) )
{
if( xMenuItemDispatch.is() ||
menuItemHandler->aMenuItemURL != ".uno:RecentFileList" )
-bPopupMenu =
CreatePopupMenuController(menuItemHandler.get());
+bPopupMenu =
CreatePopupMenuController(menuItemHandler.get(), m_xDispatchProvider,
m_aModuleIdentifier);
}
else if ( menuItemHandler->xPopupMenuController.is() )
{
@@ -880,7 +880,9 @@ OUString MenuBarManager::RetrieveLabelFromCommand(const
OUString& rCmdURL)
return vcl::CommandInfoProvider::GetMenuLabelForCommand(aProperties);
}
-bool MenuBarManager::CreatePopupMenuController( MenuItemHandler*
pMenuItemHandler )
+bool MenuBarManager::CreatePopupMenuController( MenuItemHandler*
pMenuItemHandler,
+const css::uno::Reference<
css::frame::XDispatchProvider >& rDispatchProvider,
+const OUString&
rModuleIdentifier )
{
OUString aItemCommand( pMenuItemHandler->aMenuItemURL );
@@ -888,10 +890,12 @@ bool MenuBarManager::CreatePopupMenuController(
MenuItemHandler* pMenuItemHandle
if ( !m_xPopupMenuControllerFactory.is() )
return false;
-Sequence< Any > aSeq( 3 );
-aSeq[0] <<= comphelper::makePropertyValue( "ModuleIdentifier",
m_aModuleIdentifier );
-aSeq[1] <<= comphelper::makePropertyValue( "Frame", m_xFrame );
-aSeq[2] <<= comphelper::makePropertyValue( "InToolbar", !m_bHasMenuBar );
+auto aSeq( comphelper::InitAnyPropertySequence( {
+{ "DispatchProvider", makeAny(rDispatchProvider) },
+{ "ModuleIdentifier", makeAny(rModuleIdentifier) },
+{ "Frame", makeAny(m_xFrame) },
+{ "InToolbar", makeAny(!m_bHasMenuBar) }
+} ) );
Reference< XPopupMenuController > xPopupMenuController(
m_xPopupMenuControllerFactory->createInstanceWithArgumentsAndContext(
@@ -992,8 +996,14 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
pMenu->SetHelpCommand( nItemId, "" );
}
+// Retrieve
[Libreoffice-commits] core.git: sc/source
sc/source/ui/cctrl/tbzoomsliderctrl.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 00cffc20e40b2412c7e9867eed24c9834504e24f Author: Noel Grandin AuthorDate: Mon Sep 7 13:28:33 2020 +0200 Commit: Noel Grandin CommitDate: Mon Sep 7 15:04:17 2020 +0200 tdf#135181 Calc print preview zoom slider print preview not transparent (gen) Change-Id: I7244f429194145df99a4b52fce144c6ec45f3b61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102168 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index f03b789e8020..37335bbca80a 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -397,9 +397,11 @@ void ScZoomSlider::DoPaint(vcl::RenderContext& rRenderContext) Size aSliderWindowSize(GetOutputSizePixel()); tools::Rectangle aRect(Point(0, 0), aSliderWindowSize); -ScopedVclPtrInstance< VirtualDevice > pVDev(rRenderContext); -pVDev->SetBackground(Wallpaper(COL_TRANSPARENT)); +ScopedVclPtrInstance< VirtualDevice > pVDev(rRenderContext, DeviceFormat::DEFAULT, DeviceFormat::BITMASK); pVDev->SetOutputSizePixel(aSliderWindowSize); +pVDev->SetFillColor( COL_TRANSPARENT ); +pVDev->SetLineColor( COL_TRANSPARENT ); +pVDev->DrawRect( aRect ); tools::Rectangle aSlider = aRect; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests kit/ChildSession.cpp loleaflet/src test/UnitSession.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp
cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js|8 -
cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js |8 -
cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js | 12 +-
kit/ChildSession.cpp | 10 +-
loleaflet/src/core/Socket.js |3
loleaflet/src/layer/tile/TileLayer.js|2
test/UnitSession.cpp | 16 +--
wsd/DocumentBroker.cpp | 27
++
wsd/DocumentBroker.hpp |9 ++
wsd/LOOLWSD.cpp | 45
+++---
10 files changed, 85 insertions(+), 55 deletions(-)
New commits:
commit 70827c372c31f5d11dc9578269cdd850eee639ef
Author: Szymon Kłos
AuthorDate: Thu Sep 3 11:34:13 2020 +0200
Commit: Michael Meeks
CommitDate: Mon Sep 7 15:00:20 2020 +0200
Simplify download process
Use hash to identify download and pass that to the client.
This allows us to reduce parameters for download requests.
DocBroker maps download ids to URL in the file system.
Change-Id: I254d4f0ccaf3cff9f038a817c8162510ae228bc5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101992
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
index 7b71b3c16..19d49cdab 100644
--- a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
@@ -69,7 +69,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.pdf');
+ .should('contain', 'download');
});
it('Download as ODS', function() {
@@ -85,7 +85,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.ods');
+ .should('contain', 'download');
});
it('Download as XLS', function() {
@@ -101,7 +101,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.xls');
+ .should('contain', 'download');
});
it('Download as XLSX', function() {
@@ -117,7 +117,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.xlsx');
+ .should('contain', 'download');
});
it('Undo/redo.', function() {
diff --git
a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
index 73c58ee13..92d3e6dbc 100644
--- a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
@@ -80,7 +80,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.pdf');
+ .should('contain', 'download');
});
it('Download as ODP', function() {
@@ -96,7 +96,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.odp');
+ .should('contain', 'download');
});
it('Download as PPT', function() {
@@ -112,7 +112,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.ppt');
+ .should('contain', 'download');
});
it('Download as PPTX', function() {
@@ -128,7 +128,7 @@ describe('Trigger hamburger menu options.', function() {
cy.get('iframe')
.should('have.attr', 'data-src')
- .should('contain', 'document.pptx');
+ .should('contain', 'download');
});
it('Undo/redo.', function() {
diff --git
a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spe
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf132271.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3
writerfilter/source/dmapper/PropertyMap.cxx | 81 ++
4 files changed, 91 insertions(+), 1 deletion(-)
New commits:
commit 288db6eb47fbbd2b3ca34ffea0686d8ed8ed9be9
Author: László Németh
AuthorDate: Mon Sep 7 09:48:45 2020 +0200
Commit: László Németh
CommitDate: Mon Sep 7 14:32:51 2020 +0200
tdf#132271 DOCX: import change tracking in floating tables
Change-Id: If892a16875ef16015639aacf8359d15c953fb1d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102149
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132271.docx
b/sw/qa/extras/ooxmlexport/data/tdf132271.docx
new file mode 100644
index ..202bfdda2ba0
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132271.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index a80b76a21223..c36b399f4352 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -971,6 +971,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894,
"tdf125894.docx")
assertXPath(pXmlDoc, "//w:ins");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132271, "tdf132271.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+// import change tracking in floating tables
+assertXPath(pXmlDoc, "//w:del", 2);
+assertXPath(pXmlDoc, "//w:ins", 2);
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx")
{
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ec83a7c2d5f9..77d7ce21a0dd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2633,7 +2633,8 @@ void
DomainMapper_Impl::CreateRedline(uno::Reference const& xR
uno::Reference < text::XRedline > xRedline( xRange,
uno::UNO_QUERY_THROW );
xRedline->makeRedline( sType, aRedlineProperties );
}
-else
+// store frame and (possible floating) table redline data for
restoring them after frame conversion
+if (m_bIsActualParagraphFramed || (hasTableManager() &&
getTableManager().isInTable()))
{
aFramedRedlines.push_back( uno::makeAny(xRange) );
aFramedRedlines.push_back( uno::makeAny(sType) );
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 578738175238..4e08279a8427 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -45,8 +45,11 @@
#include
#include
#include
+#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -1371,15 +1374,93 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
rInfo.m_nBreakType = m_nBreakType;
if ( FloatingTableConversion( rDM_Impl, rInfo ) )
{
+std::vector aFramedRedlines =
rDM_Impl.aFramedRedlines;
try
{
+// convert redline ranges to cursor movement and character
length
+std::vector redPos, redLen;
+std::vector redCell;
+OUString sTableName;
+for( size_t i = 0; i < aFramedRedlines.size(); i+=3)
+{
+uno::Reference xCell;
+uno::Reference< text::XTextRange > xRange;
+aFramedRedlines[i] >>= xRange;
+uno::Reference< beans::XPropertySet > xRangeProperties;
+if ( xRange.is() )
+{
+xRangeProperties.set( xRange, uno::UNO_QUERY_THROW );
+
+const uno::Sequence aRangeProperties
+=
xRangeProperties->getPropertySetInfo()->getProperties();
+
+for (const beans::Property& rProperty :
aRangeProperties)
+{
+const OUString& rKey = rProperty.Name;
+uno::Any aValue =
xRangeProperties->getPropertyValue(rKey);
+if ( rKey == "TextTable" )
+{
+uno::Reference xTable;
+aValue >>= xTable;
+uno::Reference
xTableProperties(xTable, uno::UNO_QUERY);
+
xTableProperties->getPropertyValue("TableName") >>= sTableName;
+}
+else if ( rKey == "Cell" )
+{
+ OUSt
[Libreoffice-commits] core.git: include/vcl
include/vcl/window.hxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 33d1e38baf86378d34fd59e7a86c59ec8e16973c
Author: Noel Grandin
AuthorDate: Mon Sep 7 11:00:58 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 7 14:11:57 2020 +0200
copy docs to InvalidateFlags
from InvalidateStyle.idl, so I don't have to keep jumping around to
figure out what this means
Change-Id: Iee7d5f2a83afba075f15c44a36a5b4a8def04724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102160
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 4723c1d69921..bb2d7355b0d8 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -212,12 +212,19 @@ namespace o3tl
enum class InvalidateFlags
{
NONE = 0x,
+/** The child windows are invalidated, too. */
Children = 0x0001,
+/** The child windows are not invalidated. */
NoChildren = 0x0002,
+/** The invalidated area is painted with the background color/pattern. */
NoErase = 0x0004,
+/** The invalidated area is updated immediately. */
Update = 0x0008,
+/** The parent window is invalidated, too. */
Transparent = 0x0010,
+/** The parent window is not invalidated. */
NoTransparent= 0x0020,
+/** The area is invalidated regardless of overlapping child windows. */
NoClipChildren = 0x4000,
};
namespace o3tl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 277bf7c7c768093372931b1a84dc0d9a3695d5a9
Author: Szymon Kłos
AuthorDate: Mon Sep 7 12:52:50 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 13:58:21 2020 +0200
notebookar: make loading spinners less distractive
Change-Id: I44d0e11d5f828b221b31d496ac4994134fb7d955
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102165
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index a6121768e..6bc396b55 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -683,7 +683,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
.ui-drawing-area-loader
{
border: 5px solid #f3f3f3;
- border-top: 5px solid #3498db;
+ border-top: 5px solid #d6d6d6;
border-radius: 50%;
width: 20px;
height: 20px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.NotebookbarImpress.js | 22
loleaflet/src/control/Control.NotebookbarWriter.js | 22
2 files changed, 44 insertions(+)
New commits:
commit f279b174b235ff9b17534918635cffd217a4d3fe
Author: Szymon Kłos
AuthorDate: Mon Sep 7 12:31:08 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 13:56:33 2020 +0200
notebookbar: add insert comment in the insert tab
Change-Id: I7a68390c716858ad18f578d26f996bfc05eedacd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102161
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js
b/loleaflet/src/control/Control.NotebookbarImpress.js
index d1fff1c5a..dddc7b4ef 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -2164,6 +2164,28 @@ L.Control.NotebookbarImpress =
L.Control.NotebookbarWriter.extend({
],
'vertical': 'false'
},
+
{
+
'id':
'Insert-Section-Annotation',
+
'type':
'container',
+
'text':
'',
+
'enabled': 'true',
+
'children': [
+
{
+
'id': 'SectionBottom15',
+
'type': 'toolbox',
+
'text': '',
+
'enabled': 'true',
+
'children': [
+
{
+
'type': 'bigtoolitem',
+
'text': _UNO('.uno:InsertAnnotation', 'presentation'),
+
'command': '.uno:InsertAnnotation'
+
}
+
]
+
}
+
buttons in infobars, "pressed" state
tdf#97926 (9e3ba7c3036c4d21e01d6f75ed29a1e8c4208141) added a uno api to insert infobars with optional buttons which can dispatch commands. much earlier commits ca36bcc05d7159fd4cd8e3489fdf4b4551b696d6 and b34eab5996c52269360d166815ef15a250627c48 added features that when a button is associated with a command then that the button is disabled if the command is disabled and shown pressed if the associated FeatureStateEvent has a bool state. I'm exploring using native buttons in the infobar and the pressed-state is problematic for me, "toggle" buttons can be set in a pressed state, but "normal" buttons typically not. Do we know if it is an expected feature of a button in an infobar that it should be down depressed in some circumstance, and if it is, is there an example of a command which has a bool state. Trying some things like .uno:SpellOnline or .uno:Bold which look sort of toggleable just show void for rEvent.State in PushButton::statusChanged ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source sw/qa sw/source writerfilter/source
oox/source/token/properties.txt |1 +
oox/source/vml/vmlshape.cxx |1 +
sw/qa/extras/ooxmlexport/data/tdf135665.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 13 +
sw/source/core/unocore/unoframe.cxx |8 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
6 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 4b7ee7bd61f78be60211cc72ba36da987191266e
Author: Daniel Arato (NISZ)
AuthorDate: Wed Sep 2 15:46:56 2020 +0200
Commit: László Németh
CommitDate: Mon Sep 7 13:11:44 2020 +0200
tdf#135665 DOCX: import tight wrap setting of VML shapes
The wrap setting that OOXML calls "tight" and LibreOffice calls
"contour" (== true) was not supported by the import code, only
the export.
Change-Id: I48739ffaad48e28df05fd87a9b51a14238dc47e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101932
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 46200bf221ff..d50cd4bb124d 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -509,6 +509,7 @@ SubViewSize
Subtotals
Suffix
Surround
+SurroundContour
SwapXAndYAxis
Symbol
SymbolColor
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 85ad112bcfae..f8a4c9000e66 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -588,6 +588,7 @@ static void lcl_setSurround(PropertySet& rPropSet, const
ShapeTypeModel& rTypeMo
nSurround = css::text::WrapTextMode_NONE;
rPropSet.setProperty(PROP_Surround, static_cast(nSurround));
+rPropSet.setProperty(PROP_SurroundContour, aWrapType == "tight");
}
static void lcl_SetAnchorType(PropertySet& rPropSet, const ShapeTypeModel&
rTypeModel, const GraphicHelper& rGraphicHelper)
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135665.docx
b/sw/qa/extras/ooxmlexport/data/tdf135665.docx
new file mode 100644
index ..2400a1c1a46c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135665.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 4e39a5af0297..95770433a6ab 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -513,6 +513,19 @@ DECLARE_OOXMLIMPORT_TEST(TestTdf135653, "tdf135653.docx")
CPPUNIT_ASSERT_EQUAL_MESSAGE("OLE bg color does not match!",
aExpectedColor, aFillColor);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf135665, "tdf135665.docx")
+{
+uno::Reference xOLEProps1(getShape(1),
uno::UNO_QUERY_THROW);
+uno::Reference xOLEProps2(getShape(2),
uno::UNO_QUERY_THROW);
+bool bSurroundContour1 = false;
+bool bSurroundContour2 = false;
+xOLEProps1->getPropertyValue("SurroundContour") >>= bSurroundContour1;
+xOLEProps2->getPropertyValue("SurroundContour") >>= bSurroundContour2;
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("OLE tight wrap setting not imported
correctly", true, bSurroundContour1);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("OLE tight wrap setting not imported
correctly", false, bSurroundContour2);
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testAtPageShapeRelOrientation,
"rotated_shape.fodt")
{
// invalid combination of at-page anchor and horizontal-rel="paragraph"
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 2d122992d840..5d7b86fc37e0 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -752,15 +752,19 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
bRet &= aSh.PutValue(*pShTr, MID_SHADOW_TRANSPARENCE);
rToSet.Put(aSh);
}
-const ::uno::Any* pSur = nullptr;
+const ::uno::Any* pSur = nullptr;
GetProperty(RES_SURROUND, MID_SURROUND_SURROUNDTYPE, pSur);
+const ::uno::Any* pSurCont = nullptr;
+GetProperty(RES_SURROUND, MID_SURROUND_CONTOUR, pSurCont);
const ::uno::Any* pSurAnch = nullptr;
GetProperty(RES_SURROUND, MID_SURROUND_ANCHORONLY, pSurAnch);
if(pSur || pSurAnch)
{
SwFormatSurround aSrnd ( rFromSet.Get ( RES_SURROUND ) );
if(pSur)
-bRet &= static_cast(aSrnd).PutValue(*pSur,
MID_SURROUND_SURROUNDTYPE );
+bRet &= static_cast(aSrnd).PutValue(*pSur,
MID_SURROUND_SURROUNDTYPE);
+if(pSurCont)
+bRet &= static_cast(aSrnd).PutValue(*pSurCont,
MID_SURROUND_CONTOUR);
if(pSurAnch)
bRet &= static_cast(aSrnd).PutValue(*pSurAnch,
MID_SURROUND_ANCHORONLY);
rToSet.Put(aSrnd);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0347453d6704..ec83a7c2d5f9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/Do
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl
include/vcl/layout.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 571e8062e38ed60839e9a6eae65b6bd72c46e091
Author: Szymon Kłos
AuthorDate: Mon Sep 7 12:45:51 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 13:04:27 2020 +0200
jsdialog: export tooltip for drawing areas
Change-Id: I22a4eb9a74a81bbd2a26d5bae6b875a78a63acf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102163
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 736f653c7665..d1f675a3be07 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -809,6 +809,7 @@ public:
::comphelper::Base64::encode(aBuffer, aSeq);
aTree.put("image", aBuffer.makeStringAndClear());
}
+aTree.put("text", GetQuickHelpText());
return aTree;
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 83436de3965dc5b208f65477b841bd727ef73a21
Author: Szymon Kłos
AuthorDate: Mon Sep 7 12:44:55 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 13:00:05 2020 +0200
notebookbar: add tooltip to drawingarea widget
Change-Id: Ic0988de264a2782e4f777d8f11236f7b70f9bc72
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102162
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index c4323d791..dbfa4dbe4 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1572,6 +1572,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
var image = L.DomUtil.create('img',
builder.options.cssClass + ' ui-drawing-area', container);
image.src = data.image.replace('\\', '');
image.id = data.id;
+ image.alt = data.text;
+ image.title = data.text;
+ $(image).tooltip();
if (data.loading && data.loading === 'true') {
var loaderContainer = L.DomUtil.create('div',
'ui-drawing-area-loader-container', container);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2f47a1fb74ce73d4b9ef49aaf02e3b0750fd0a79
Author: Stephan Bergmann
AuthorDate: Mon Sep 7 10:55:35 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 7 12:53:34 2020 +0200
Android apparently needs -lm in LIBXML_LIBS for --without-system-libxml2
After a574bb602031f0d1febb059c7dc9d1c4937271c6 "external/redland: Honour
LIBXML_CFLAGS/LIBS in raptor's configure", ExternalProject_raptor started to
fail on Android with
> configure: error: libxml2 is not available - please get it from
http://xmlsoft.org/
due to
> configure:11263: checking for xmlCreatePushParserCtxt
> configure:11263:
.../android-ndk/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin/clang
-target aarch64-linux-android21 -no-canonical-prefixes -ffunction-sections
-fdata-sections -Qunused-arguments -o conftest -O -fvisibility=hidden
-I.../workdir/UnpackedTarball/libxml2/include conftest.c
-L.../workdir/UnpackedTarball/libxml2/.libs -lxml2 >&5
> .../workdir/UnpackedTarball/libxml2/.libs/libxml2.a(xpath.o): In function
`xmlXPathFormatNumber':
> xpath.c:(.text.xmlXPathFormatNumber+0x3d4): undefined reference to `log10'
> .../workdir/UnpackedTarball/libxml2/.libs/libxml2.a(xpath.o): In function
`xmlXPathStringEvalNumber':
> xpath.c:(.text.xmlXPathStringEvalNumber+0x3e0): undefined reference to
`pow'
> xpath.c:(.text.xmlXPathStringEvalNumber+0x69c): undefined reference to
`pow'
> .../workdir/UnpackedTarball/libxml2/.libs/libxml2.a(xpath.o): In function
`xmlXPathModValues':
> xpath.c:(.text.xmlXPathModValues+0x144): undefined reference to `fmod'
> .../workdir/UnpackedTarball/libxml2/.libs/libxml2.a(xpath.o): In function
`xmlXPathCompNumber':
> xpath.c:(.text.xmlXPathCompNumber+0x394): undefined reference to `pow'
> xpath.c:(.text.xmlXPathCompNumber+0x62c): undefined reference to `pow'
> clang: error: linker command failed with exit code 1 (use -v to see
invocation)
in workdir/UnpackedTarball/raptor/config.log, and the old way of
unconditionally
re-determining LIBXML_LIBS in workdir/UnpackedTarball/raptor/configure via
`$XML_CONFIG --libs` had set it to
>
-L/data/sbergman/lo-android-aarch64/core/workdir/UnpackedTarball/libxml2/.libs
-lxml2 -lm
which differs from the value hardcoded in configure.ac in the trailing
"-lm".
Change-Id: Ifc4a70e014a826a38ad92125b6851d40e15c3c7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102154
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/configure.ac b/configure.ac
index de64c5db4b40..02d9f81bb551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8845,6 +8845,9 @@ else
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
else
LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
+if test "$_os" = Android; then
+LIBXML_LIBS="$LIBXML_LIBS -lm"
+fi
fi
BUILD_TYPE="$BUILD_TYPE LIBXML2"
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Mon, 2020-09-07 at 12:00 +0200, Luboš Luňák wrote: > On Friday 04 of September 2020, Caolán McNamara wrote: > > There is one import crasher that turns up fairly consistently that > > looks like a possible threaded calculation problem > > > > bt: > > https://dev-builds.libreoffice.org/crashtest/12a7a3d57d3dcf222b13fa9143c377 > > 36f8ea3d0b/backtraces/task565-core.backtrace.txt > > > > source document: > > https://bugs.documentfoundation.org/attachment.cgi?id=51878 > > https://gerrit.libreoffice.org/c/core/+/102156 handles that. > > > On manually opening it I can't reproduce locally, > > Calc crashers often need Ctrl+Shift+F9 to force a full recalc. ah yes, that does make ScFormulaCell::MaybeInterpret assert on !pDocument->IsThreadedGroupCalcInProgress() ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/ChartController_Window.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit c10d5854b5427ad1bfffc00e77a9306c99c78c63
Author: Balazs Varga
AuthorDate: Thu Sep 3 14:53:19 2020 +0200
Commit: László Németh
CommitDate: Mon Sep 7 12:45:01 2020 +0200
tdf#136430 Fix chart crash trying to move data labels
with arrow keys.
Change-Id: I357c320406d9f044b12b1289aa0f88045001c283
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102002
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 9e00bf784550..a7b6ee840b55 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1765,6 +1765,12 @@ bool ChartController::impl_moveOrResizeObject(
{
bool bResult = false;
bool bNeedResize = ( eType == CENTERED_RESIZE_OBJECT );
+ObjectType eObjectType = ObjectIdentifier::getObjectType(rCID);
+
+/*TODO: Move data label objects with arrow-keys,
+in that case we have to use CustomLabelPosition instead of
RelativePosition!*/
+if( eObjectType == OBJECTTYPE_DATA_LABEL )
+return bResult;
uno::Reference< frame::XModel > xChartModel( getModel() );
uno::Reference< beans::XPropertySet > xObjProp(
@@ -1824,7 +1830,6 @@ bool ChartController::impl_moveOrResizeObject(
if( bNeedResize )
eActionType = ActionDescriptionProvider::ActionType::Resize;
-ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID );
UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription(
eActionType, ObjectNameProvider::getName( eObjectType )),
m_xUndoManager );
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/inc sw/source
sw/inc/doc.hxx|2 ++
sw/source/core/doc/doc.cxx|5 +
sw/source/core/doc/docnew.cxx | 22 ++
3 files changed, 29 insertions(+)
New commits:
commit f3d2a591db8b14d5d83ec6f7e7d4273b44f0a354
Author: Miklos Vajna
AuthorDate: Fri Sep 4 16:51:59 2020 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 7 12:32:26 2020 +0200
sw: default to UI locale when language is missing
This means that when extras/source/shellnew/soffice.odt is opened, it'll
always match the user's language. The same was already working in Calc
and Impress.
Conflicts:
sw/source/core/doc/docnew.cxx
Change-Id: Ic1afc82d7b59f1bd32815586f756e7e8408e5c6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102150
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 83f89c88db79..e110052bed2b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1647,6 +1647,8 @@ public:
/// Returns true if no dictionary can be found for any content
bool IsDictionaryMissing() { return meDictionaryMissing ==
MissingDictionary::True; }
+void SetLanguage(const LanguageType eLang, const sal_uInt16 nId);
+
private:
// Copies master header to left / first one, if necessary - used by
ChgPageDesc().
void CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader
&rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 59ea8ea19672..d1f4725250d8 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -127,6 +127,7 @@
#include
#include
#include
+#include
#include
/* @@@MAINTAINABILITY-HORROR@@@
@@ -1839,5 +1840,9 @@ void SwDoc::SetMissingDictionaries( bool bIsMissing )
meDictionaryMissing = MissingDictionary::False;
};
+void SwDoc::SetLanguage(const LanguageType eLang, const sal_uInt16 nId)
+{
+mpAttrPool->SetPoolDefaultItem(SvxLanguageItem(eLang, nId));
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 4d36e33b50d4..dd8e87042ef2 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -120,6 +121,9 @@
#include
#include
+#include
+#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::document;
@@ -376,6 +380,24 @@ SwDoc::SwDoc()
}
mnRsidRoot = mnRsid;
+if (!utl::ConfigManager::IsFuzzing())
+{
+// Make sure that in case the document language is not set, then we
don't return
+// LANGUAGE_DONTKNOW, but the UI locale.
+const SvtLinguConfig aLinguConfig;
+SvtLinguOptions aOptions;
+aLinguConfig.GetOptions(aOptions);
+LanguageType eLang =
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage,
+
i18n::ScriptType::LATIN);
+SetLanguage(eLang, RES_CHRATR_LANGUAGE);
+eLang =
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK,
+
i18n::ScriptType::ASIAN);
+SetLanguage(eLang, RES_CHRATR_CJK_LANGUAGE);
+eLang =
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL,
+
i18n::ScriptType::COMPLEX);
+SetLanguage(eLang, RES_CHRATR_CTL_LANGUAGE);
+}
+
getIDocumentState().ResetModified();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/ipdf/pdfread.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 49da32af187f28166fd62205d797bf9aa9ec2ace
Author: Stephan Bergmann
AuthorDate: Mon Sep 7 10:52:53 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 7 12:19:34 2020 +0200
Confine findAnnotations to HAVE_FEATURE_PDFIUM
Otherwise e.g. Android builds would fail with
> vcl/source/filter/ipdf/pdfread.cxx:231:77: error: no member named
'PDFiumPage' in namespace 'vcl::pdf'
> std::vector
findAnnotations(std::unique_ptr& pPage,
>
~~^
etc.
Regression apparently introduced with
6d275917944c274a22620c2c19880eb8e94f2558
"extract PDF import for annotations to a separate function".
Change-Id: I364d8d3f30c7eeaa933bfe6aebaf4cad35c20d2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102153
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index 1dde06491ea1..d89283e902ac 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -226,6 +226,7 @@ bool ImportPDF(SvStream& rStream, Graphic& rGraphic)
return true;
}
+#if HAVE_FEATURE_PDFIUM
namespace
{
std::vector
findAnnotations(std::unique_ptr& pPage,
@@ -275,6 +276,7 @@ std::vector
findAnnotations(std::unique_ptr&
rGraphics)
{
___
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/excel/excrecds.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 101fc9fea871c71813c541bd790962d0c06e5753
Author: Caolán McNamara
AuthorDate: Mon Sep 7 09:31:46 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 7 12:17:04 2020 +0200
crashtesting: failure on export of tdf123353-1.xlsx to xls
since...
commit 487df0c8f307500029b06c89985a1148ebc784b5
Date: Tue Sep 1 13:55:25 2020 +0200
tdf#123353 XLSX export: fix lost AutoFilter on empty cells
Change-Id: I5ef156cd9fe371b0b04b9308a0aa0887ac57713f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102152
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/excel/excrecds.cxx
b/sc/source/filter/excel/excrecds.cxx
index 945748ba9dca..7e495d21b17e 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -650,11 +650,18 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry&
rEntry )
{
const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
-if (GetOutput() != EXC_OUTPUT_BINARY && rItems.empty())
+if (rItems.empty())
{
-meType = BlankValue;
-return false;
+if (GetOutput() != EXC_OUTPUT_BINARY)
+{
+// tdf#123353 XLSX export
+meType = BlankValue;
+return false;
+}
+// XLS export
+return true;
}
+
if (GetOutput() != EXC_OUTPUT_BINARY && rItems.size() > 1)
{
AddMultiValueEntry(rEntry);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to enable Skia on Linux ?
On Monday 31 of August 2020, Miklos Vajna wrote: > On Mon, Aug 31, 2020 at 02:06:09AM -0700, julien2412 wrote: > > I build LO from master sources on pc Debian x86-64. To try to retrieve > > some debug info for Skia related bugtracker, I added > > "--enable-skia=debug" on my autogen.input, then runned "make clean && > > make". > > However, I can't succeed in enabling Skia on Linux. > > It's disabled by default on Linux, at runtime. Try: > > SAL_USE_VCLPLUGIN=gen SAL_FORCESKIA=1 ./soffice.bin > > For more info, see vcl/README.vars, Lubos wrote a section on Skia there. Just for the record, while the above works, it's not the proper way to do it, as it skips the wrapper script, and it needlessly forces Skia. The proper way would be SAL_USE_VCLPLUGIN=gen SAL_ENABLESKIA=1 ./soffice -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/css loleaflet/README
loleaflet/README |3 ++-
loleaflet/css/toolbar.css |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8123e4e26f9f691802ccd34e976543d790ae30b9
Author: Pranam Lashkari
AuthorDate: Tue Aug 25 05:23:30 2020 +0530
Commit: Pedro Silva
CommitDate: Mon Sep 7 12:00:45 2020 +0200
leaflet: menu options gets hidden behinde the statusbar
problems:
the main menu obscures the submenu,
the file name box / pencil obscures the submenu,
the submenu is hidden behind the status bar.
Change-Id: I8c3d08c9291c76c5b487e248ccbaf58410e3b54c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101302
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Pedro Silva
diff --git a/loleaflet/README b/loleaflet/README
index bdbf1..8cdbcdc1f 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -379,7 +379,8 @@ Z-index values:
---
menu items
---
-1000 main-menu(desktop-only), toolbar-down
+1000 main-menu(desktop-only)
+0 toolbar-down
1050 closebuttonwrapper (not being used currently)
---
on the top
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 5bb402afb..6494a7e19 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -16,7 +16,7 @@
padding: 0;
position: fixed;
bottom: 0;
- z-index: 1000;
+ z-index: 0;
border-top: 1px solid #bb;
}
#toolbar-down *{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Friday 04 of September 2020, Caolán McNamara wrote: > There is one import crasher that turns up fairly consistently that > looks like a possible threaded calculation problem > > bt: > https://dev-builds.libreoffice.org/crashtest/12a7a3d57d3dcf222b13fa9143c377 >36f8ea3d0b/backtraces/task565-core.backtrace.txt > > source document: > https://bugs.documentfoundation.org/attachment.cgi?id=51878 https://gerrit.libreoffice.org/c/core/+/102156 handles that. > On manually opening it I can't reproduce locally, Calc crashers often need Ctrl+Shift+F9 to force a full recalc. -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source vcl/unx
sc/source/ui/dbgui/filtdlg.cxx | 19 ---
vcl/unx/gtk3/gtk3gtkinst.cxx | 15 +--
2 files changed, 21 insertions(+), 13 deletions(-)
New commits:
commit 64db723b2047cf566b652c11c94d9d589df0b930
Author: Caolán McNamara
AuthorDate: Mon Sep 7 09:06:01 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 7 11:55:51 2020 +0200
Related: tdf#136455 use insert_vector for bulk insert
and insert backwards which is a little faster
Change-Id: Ie72d08bb6e869b2d8fe86ae5526706d051233939
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102151
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index ff1f87137095..2b0d5618a92c 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -438,14 +438,14 @@ void ScFilterDlg::UpdateValueList( size_t nList )
const sal_Int32 nFieldSelPos = maFieldLbArr[nList-1]->get_active();
OUString aCurValue = pValList->get_active_text();
-pValList->clear();
-pValList->append_text(aStrNotEmpty);
-pValList->append_text(aStrEmpty);
+std::unique_ptr xWaiter;
+std::vector aEntries;
+aEntries.emplace_back(aStrNotEmpty);
+aEntries.emplace_back(aStrEmpty);
-if ( nFieldSelPos )
+if (nFieldSelPos)
{
-weld::WaitObject aWaiter(m_xDialog.get()); // even if only the
list box has content
-
+xWaiter.reset(new weld::WaitObject(m_xDialog.get())); // even
if only the list box has content
SCCOL nColumn = theQueryData.nCol1 +
static_cast(nFieldSelPos) - 1;
EntryList* pList = nullptr;
if (!m_EntryLists.count(nColumn))
@@ -504,13 +504,10 @@ void ScFilterDlg::UpdateValueList( size_t nList )
assert(pList);
-pValList->freeze();
for (const auto& rEntry : pList->maFilterEntries)
-{
-pValList->append_text(rEntry.GetString());
-}
-pValList->thaw();
+aEntries.emplace_back(rEntry.GetString());
}
+pValList->insert_vector(aEntries, false);
pValList->set_entry_text(aCurValue);
}
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5230dcf92a88..8a15f98530d7 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -14551,14 +14551,25 @@ public:
virtual void insert_vector(const std::vector& rItems,
bool bKeepExisting) override
{
freeze();
+
+int nInsertionPoint;
if (!bKeepExisting)
+{
clear();
+nInsertionPoint = 0;
+}
+else
+nInsertionPoint = get_count();
+
GtkTreeIter iter;
-for (const auto& rItem : rItems)
+// tdf#125241 inserting backwards is faster
+for (auto aI = rItems.rbegin(); aI != rItems.rend(); ++aI)
{
-insert_row(GTK_LIST_STORE(m_pTreeModel), iter, -1,
rItem.sId.isEmpty() ? nullptr : &rItem.sId,
+const auto& rItem = *aI;
+insert_row(GTK_LIST_STORE(m_pTreeModel), iter, nInsertionPoint,
rItem.sId.isEmpty() ? nullptr : &rItem.sId,
rItem.sString, rItem.sImage.isEmpty() ? nullptr :
&rItem.sImage, nullptr);
}
+
thaw();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools unotools/source
include/unotools/accessiblestatesethelper.hxx |4
unotools/source/accessibility/accessiblestatesethelper.cxx | 133 +++--
2 files changed, 38 insertions(+), 99 deletions(-)
New commits:
commit 54cbe9458033f50d9f608b1462d65e8514cbb636
Author: Arnaud Versini
AuthorDate: Sun Sep 6 19:01:24 2020 +0200
Commit: Arnaud Versini
CommitDate: Mon Sep 7 11:20:09 2020 +0200
UNOTOOLS : simplify AccessibleStateSetHelper by not using an impl class
Change-Id: Iae7a028d2845d8b0bef2aefdce2ae00fa7f5660f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102110
Tested-by: Jenkins
Reviewed-by: Arnaud Versini
diff --git a/include/unotools/accessiblestatesethelper.hxx
b/include/unotools/accessiblestatesethelper.hxx
index e8277f648903..140375503fb1 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -26,8 +26,6 @@
#include
#include
-class AccessibleStateSetHelperImpl;
-
//= XAccessibleStateSet helper classes
//... namespace utl ...
@@ -134,7 +132,7 @@ private:
/// Mutex guarding this object.
::osl::Mutex maMutex;
/// The implementation of this helper interface.
-std::unique_ptr mpHelperImpl;
+sal_uInt64 maStates;
};
}
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx
b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 9a180a4677ad..cec1f6bcd615 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -28,110 +28,32 @@ using namespace ::utl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
-class AccessibleStateSetHelperImpl
+namespace
{
-public:
-AccessibleStateSetHelperImpl();
-AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl);
-
-/// @throws uno::RuntimeException
-bool IsEmpty () const;
-/// @throws uno::RuntimeException
-bool Contains (sal_Int16 aState) const;
-/// @throws uno::RuntimeException
-uno::Sequence GetStates() const;
-/// @throws uno::RuntimeException
-void AddState(sal_Int16 aState);
-/// @throws uno::RuntimeException
-void RemoveState(sal_Int16 aState);
-
-inline void AddStates( const sal_Int64 _nStates );
-
-private:
-sal_uInt64 maStates;
-};
-
-AccessibleStateSetHelperImpl::AccessibleStateSetHelperImpl()
-: maStates(0)
-{
-}
-
-AccessibleStateSetHelperImpl::AccessibleStateSetHelperImpl(const
AccessibleStateSetHelperImpl& rImpl)
-: maStates(rImpl.maStates)
-{
-}
-
-inline bool AccessibleStateSetHelperImpl::IsEmpty () const
-{
-return maStates == 0;
-}
-
-inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const
-{
-DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
-sal_uInt64 aTempBitSet(1);
-aTempBitSet <<= aState;
-return ((aTempBitSet & maStates) != 0);
-}
-
-inline uno::Sequence AccessibleStateSetHelperImpl::GetStates() const
-{
-uno::Sequence aRet(BITFIELDSIZE);
-sal_Int16* pSeq = aRet.getArray();
-sal_Int16 nStateCount(0);
-for (sal_Int16 i = 0; i < BITFIELDSIZE; ++i)
-if (Contains(i))
-{
-*pSeq = i;
-++pSeq;
-++nStateCount;
-}
-aRet.realloc(nStateCount);
-return aRet;
-}
-
-inline void AccessibleStateSetHelperImpl::AddStates( const sal_Int64 _nStates )
-{
-maStates |= _nStates;
+bool lcl_contains(sal_uInt64 aStates, sal_uInt64 aState)
+{
+DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
+sal_uInt64 aTempBitSet(1);
+aTempBitSet <<= aState;
+return ((aTempBitSet & aStates) != 0);
+}
}
-
-inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState)
-{
-DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
-sal_uInt64 aTempBitSet(1);
-aTempBitSet <<= aState;
-maStates |= aTempBitSet;
-}
-
-inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
-{
-DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small");
-sal_uInt64 aTempBitSet(1);
-aTempBitSet <<= aState;
-aTempBitSet = ~aTempBitSet;
-maStates &= aTempBitSet;
-}
-
//= internal
AccessibleStateSetHelper::AccessibleStateSetHelper ()
-: mpHelperImpl(new AccessibleStateSetHelperImpl)
+: maStates(0)
{
}
AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64
_nInitialStates )
-: mpHelperImpl(new AccessibleStateSetHelperImpl)
+: maStates(_nInitialStates)
{
-mpHelperImpl->AddStates( _nInitialStates );
}
AccessibleStateSetHelper::AccessibleStateSetHelper (const
AccessibleStateSetHelper& rHelper)
-: cppu::WeakImplHelper(rHelper)
+: cppu::WeakImplHelper(rHelper),
+ maStates(rHelper.maStates)
{
-if (rHel
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/source
sd/source/ui/animations/CustomAnimationPane.cxx | 15 +++
sd/source/ui/animations/CustomAnimationPane.hxx |3 +++
2 files changed, 18 insertions(+)
New commits:
commit 9bcb2e2f56d6a2fd9290300a0bb2d2f776780264
Author: Caolán McNamara
AuthorDate: Sun Sep 6 20:24:20 2020 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Sep 7 11:06:48 2020 +0200
tdf#136474 wait until mouse grab is dropped to trigger selection callback
Change-Id: I495b90b9661c32ad3ec71c2a2455d1576fb8f918
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102116
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index a55f93beecbc..37ab3c36c4f1 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -145,6 +145,7 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent,
ViewShellBase& rBase,
, mxMFStartDelay(m_xBuilder->weld_metric_spin_button("delay_value",
FieldUnit::SECOND))
, mxCBAutoPreview(m_xBuilder->weld_check_button("auto_preview"))
, mxPBPlay(m_xBuilder->weld_button("play"))
+, maIdle("sd idle treeview select")
, mnLastSelectedAnimation(-1)
, mnPropertyType(nPropertyTypeNone)
, mnCurvePathPos(-1)
@@ -180,6 +181,9 @@ void CustomAnimationPane::initialize()
mxMFStartDelay->connect_value_changed( LINK(this, CustomAnimationPane,
DelayModifiedHdl) );
mxMFStartDelay->connect_focus_out(LINK( this, CustomAnimationPane,
DelayLoseFocusHdl));
+maIdle.SetPriority(TaskPriority::DEFAULT);
+maIdle.SetInvokeHandler(LINK(this, CustomAnimationPane, SelectionHandler));
+
maStrModify = mxFTEffect->get_label();
// get current controller and initialize listeners
@@ -2073,6 +2077,17 @@ IMPL_LINK_NOARG(CustomAnimationPane, DelayLoseFocusHdl,
weld::Widget&, void)
IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, weld::TreeView&, void)
{
+maIdle.Start();
+}
+
+IMPL_LINK_NOARG(CustomAnimationPane, SelectionHandler, Timer*, void)
+{
+if (mxLBAnimation->has_grab()) // tdf#136474 try again later
+{
+maIdle.Start();
+return;
+}
+
int nSelected = mxLBAnimation->get_selected_index();
// tdf#99137, the selected entry may also be a subcategory title, so not
an effect
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx
b/sd/source/ui/animations/CustomAnimationPane.hxx
index 078bb5e69efe..94b543dcd298 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -113,6 +113,7 @@ private:
DECL_LINK( DelayLoseFocusHdl, weld::Widget&, void );
DECL_LINK( UpdateAnimationLB, weld::ComboBox&, void );
DECL_LINK( AnimationSelectHdl, weld::TreeView&, void );
+DECL_LINK( SelectionHandler, Timer*, void );
void implControlHdl(const weld::Widget* pControl);
private:
@@ -142,6 +143,8 @@ private:
std::unique_ptr mxCBAutoPreview;
std::unique_ptr mxPBPlay;
+Idle maIdle;
+
OUStringmaStrModify;
OUStringmaStrProperty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/fontsubs.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ac9c80ab08515ee2eab56293e24a5ed96ba06e5b
Author: Julien Nabet
AuthorDate: Mon Sep 7 09:50:45 2020 +0200
Commit: Julien Nabet
CommitDate: Mon Sep 7 11:07:00 2020 +0200
tdf#136534: Font replacement table loads existing rule incorrectly
Regression from cd384e2d31f74223948ea70d8aa3c318d3ceeb50
author Caolán McNamara 2020-06-05 16:11:39 +0100
committer Caolán McNamara 2020-06-08 20:21:35
+0200
commit cd384e2d31f74223948ea70d8aa3c318d3ceeb50 (patch)
tree49ae5191c2bd4b13c3cd547951933fbc37cda0fa
/cui/source/options/fontsubs.cxx
parent c3669c8bd62ecf5eaa6b5e95289825bc11b2688a (diff)
rework treeview initial toggle button col to be like expander col
cause this assumption is baked into the vcl one making it hard
to adapt remaining cases
Change-Id: I31854211be5f558b51f345af6a11c471a9bd120d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102148
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index d0bb9ffac941..b067aaf05f80 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -326,8 +326,8 @@ void SvxFontSubstTabPage::SelectHdl(const weld::Widget*
pWin)
if (m_xCheckLB->count_selected_rows() == 1)
{
int nRow = m_xCheckLB->get_selected_index();
-m_xFont1CB->set_entry_text(m_xCheckLB->get_text(nRow, 3));
-m_xFont2CB->set_entry_text(m_xCheckLB->get_text(nRow, 4));
+m_xFont1CB->set_entry_text(m_xCheckLB->get_text(nRow, 2));
+m_xFont2CB->set_entry_text(m_xCheckLB->get_text(nRow, 3));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx
vcl/unx/generic/fontmanager/fontconfig.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a194b7169727edfdad6936facb910f11d0d2d6f9 Author: Caolán McNamara AuthorDate: Fri Sep 4 19:38:52 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Sep 7 11:05:08 2020 +0200 rhbz#1875377 if sort order is equivalent keep order fontconfig presents there are two fonts in fedora 32/33 for regular Cantarell /usr/share/fonts/cantarell/Cantarell-Regular.otf and /usr/share/fonts/cantarell/Cantarell-VF.otf where VF is the Variable Font version. The Cantarell-Regular ones has a CFF table and export to pdf creates a font subset that works perfectly fine. The VF one does not have a CFF table and the fallback case doesn't work for pdf export. Both have the same version, use a stable sort to retain their relative order that fontconfig presents so we use the Cantarell-Regular version we would see if we didn't sort by version at all. Change-Id: I750006b980810fc59e0a152d42ae17f29f46e3b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101971 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 75343a41b771..94bf77a85428 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -212,7 +212,7 @@ FcFontSet* FontCfgWrapper::getFontSet() addFontSet( FcSetSystem ); addFontSet( FcSetApplication ); - ::std::sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont()); + std::stable_sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont()); } return m_pFontSet; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx
vcl/unx/generic/fontmanager/fontconfig.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 519d253c5525b732c624cb68495ace6eb77fa41f Author: Caolán McNamara AuthorDate: Fri Sep 4 19:38:52 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Sep 7 11:04:39 2020 +0200 rhbz#1875377 if sort order is equivalent keep order fontconfig presents there are two fonts in fedora 32/33 for regular Cantarell /usr/share/fonts/cantarell/Cantarell-Regular.otf and /usr/share/fonts/cantarell/Cantarell-VF.otf where VF is the Variable Font version. The Cantarell-Regular ones has a CFF table and export to pdf creates a font subset that works perfectly fine. The VF one does not have a CFF table and the fallback case doesn't work for pdf export. Both have the same version, use a stable sort to retain their relative order that fontconfig presents so we use the Cantarell-Regular version we would see if we didn't sort by version at all. Change-Id: I750006b980810fc59e0a152d42ae17f29f46e3b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101970 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index dea4cd548949..a87c2c21094c 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -213,7 +213,7 @@ FcFontSet* FontCfgWrapper::getFontSet() addFontSet( FcSetSystem ); addFontSet( FcSetApplication ); - ::std::sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont()); + std::stable_sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont()); } return m_pFontSet; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
On Thu, 2020-09-03 at 15:34 +0200, Noel Grandin wrote: > fixed my crasher with commit 12a7a3d57d3dcf222b13fa9143c37736f8ea3d0b which worked fine, but ooo53770-1.odt now asserts about : in an attribute name and the input content.xml does (presumably incorrectly) have style:style:use-optional-row-height in it ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/dpage.hxx |4 +--
sw/source/core/docnode/section.cxx | 28 ++---
sw/source/core/draw/dpage.cxx | 30 +++
sw/source/core/edit/acorrect.cxx | 24 +-
sw/source/core/inc/frminf.hxx |8 +++---
sw/source/core/text/frminf.cxx | 48 ++---
6 files changed, 70 insertions(+), 72 deletions(-)
New commits:
commit eacb86d332563a5651793f1aaa687528736a7bfb
Author: Miklos Vajna
AuthorDate: Mon Sep 7 09:10:03 2020 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 7 10:51:52 2020 +0200
sw: prefix members of PaMIntoCursorShellRing, SwDPage, ...
... SwIntrnlSectRefLink and SwTextFrameInfo
See tdf#94879 for motivation.
Change-Id: Iecf5a06b020488fae6f209133bcaed016feeb44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102142
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index a599a462d2bb..f144663ebac9 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -32,8 +32,8 @@ class SwDPage final : public FmFormPage, public SdrObjUserCall
SwDPage &operator=(const SwDPage&) = delete;
SwDPage(const SwDPage&) = delete;
-std::unique_ptr pGridLst;
-SwDoc* pDoc;
+std::unique_ptr m_pGridLst;
+SwDoc* m_pDoc;
public:
explicit SwDPage(SwDrawModel& rNewModel, bool bMasterPage);
diff --git a/sw/source/core/docnode/section.cxx
b/sw/source/core/docnode/section.cxx
index 51067dbd21d0..3fe5129b4215 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -69,11 +69,12 @@ namespace {
class SwIntrnlSectRefLink : public SwBaseLink
{
-SwSectionFormat& rSectFormat;
+SwSectionFormat& m_rSectFormat;
+
public:
-SwIntrnlSectRefLink( SwSectionFormat& rFormat, SfxLinkUpdateMode
nUpdateType )
-: SwBaseLink( nUpdateType, SotClipboardFormatId::RTF ),
-rSectFormat( rFormat )
+SwIntrnlSectRefLink(SwSectionFormat& rFormat, SfxLinkUpdateMode
nUpdateType)
+: SwBaseLink(nUpdateType, SotClipboardFormatId::RTF)
+, m_rSectFormat(rFormat)
{}
virtual void Closed() override;
@@ -1172,8 +1173,8 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk,
SwSectionNode& rSectNd )
::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged(
const OUString& rMimeType, const uno::Any & rValue )
{
-SwSectionNode* pSectNd = rSectFormat.GetSectionNode();
-SwDoc* pDoc = rSectFormat.GetDoc();
+SwSectionNode* pSectNd = m_rSectFormat.GetSectionNode();
+SwDoc* pDoc = m_rSectFormat.GetDoc();
SotClipboardFormatId nDataFormat = SotExchange::GetFormatIdFromMimeType(
rMimeType );
@@ -1443,14 +1444,14 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk,
SwSectionNode& rSectNd )
void SwIntrnlSectRefLink::Closed()
{
-SwDoc* pDoc = rSectFormat.GetDoc();
+SwDoc* pDoc = m_rSectFormat.GetDoc();
if( pDoc && !pDoc->IsInDtor() )
{
// Advise says goodbye: mark the Section as not protected
// and change the Flag
const SwSectionFormats& rFormats = pDoc->GetSections();
for( auto n = rFormats.size(); n; )
-if( rFormats[ --n ] == &rSectFormat )
+if (rFormats[--n] == &m_rSectFormat)
{
SwViewShell* pSh =
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
SwEditShell* pESh = pDoc->GetEditShell();
@@ -1460,7 +1461,7 @@ void SwIntrnlSectRefLink::Closed()
else
pSh->StartAction();
-SwSectionData aSectionData(*rSectFormat.GetSection());
+SwSectionData aSectionData(*m_rSectFormat.GetSection());
aSectionData.SetType( SectionType::Content );
aSectionData.SetLinkFileName( OUString() );
aSectionData.SetProtectFlag( false );
@@ -1472,7 +1473,7 @@ void SwIntrnlSectRefLink::Closed()
pDoc->UpdateSection( n, aSectionData );
// Make all Links within the Section visible again
-SwSectionNode* pSectNd = rSectFormat.GetSectionNode();
+SwSectionNode* pSectNd = m_rSectFormat.GetSectionNode();
if( pSectNd )
SwSection::MakeChildLinksVisible( *pSectNd );
@@ -1578,14 +1579,11 @@ void SwSection::BreakLink()
SetLinkFilePassword( OUString() );
}
-const SwNode* SwIntrnlSectRefLink::GetAnchor() const
-{
-return rSectFormat.GetSectionNode();
-}
+const SwNode* SwIntrnlSectRefLink::GetAnchor() const { return
m_rSectFormat.GetSectionNode(); }
bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd ) const
{
-SwStartNode* pSttNd = rSectFormat.GetSectionNode();
+SwStartNode* pSttNd = m_rSectFormat.GetSectionNode();
return pSttNd &&
nStt
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source
sw/source/uibase/sidebar/TableEditPanel.cxx |6 ++
sw/source/uibase/sidebar/TableEditPanel.hxx |2 ++
2 files changed, 8 insertions(+)
New commits:
commit 17d06055d213e907b966081690d5977a91ae69f7
Author: Szymon Kłos
AuthorDate: Mon Sep 7 09:40:29 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 10:33:09 2020 +0200
Hide InsertFormula in Writer online
Change-Id: I5875559b46d242434b8e47f214e7f7f7a4a3db6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102146
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx
b/sw/source/uibase/sidebar/TableEditPanel.cxx
index a657feb8718c..a57311c5cf40 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
@@ -116,6 +117,10 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
{
get(m_pRowHeightEdit, "rowheight");
get(m_pColumnWidthEdit, "columnwidth");
+get(m_pMiscToolbar, "misc");
+
+if (comphelper::LibreOfficeKit::isActive())
+
m_pMiscToolbar->HideItem(m_pMiscToolbar->GetItemId(".uno:InsertFormula"));
InitRowHeightToolitem();
InitColumnWidthToolitem();
@@ -151,6 +156,7 @@ void TableEditPanel::dispose()
{
m_pRowHeightEdit.clear();
m_pColumnWidthEdit.clear();
+m_pMiscToolbar.clear();
m_aRowHeightController.dispose();
m_aColumnWidthController.dispose();
m_aInsertRowsBeforeController.dispose();
diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx
b/sw/source/uibase/sidebar/TableEditPanel.hxx
index 13ae11b5dd99..4088d0a7a433 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.hxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.hxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
namespace sw
{
@@ -49,6 +50,7 @@ private:
VclPtr m_pRowHeightEdit;
VclPtr m_pColumnWidthEdit;
+VclPtr<::sfx2::sidebar::SidebarToolBox> m_pMiscToolbar;
::sfx2::sidebar::ControllerItem m_aRowHeightController;
::sfx2::sidebar::ControllerItem m_aColumnWidthController;
::sfx2::sidebar::ControllerItem m_aInsertRowsBeforeController;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Notebookbar.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 7ab27b78370a55a8c8cbb11828a2091bcdc36a3d
Author: Szymon Kłos
AuthorDate: Mon Sep 7 09:51:04 2020 +0200
Commit: Szymon Kłos
CommitDate: Mon Sep 7 10:33:15 2020 +0200
Notebookbar: don't add multiple shortcut bars in the DOM
Change-Id: Ic537ac7181174cfbbc9c7e3da6336d51a0f188ef
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102147
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index ac2ce11f4..cb7d9a173 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -78,6 +78,7 @@ L.Control.Notebookbar = L.Control.extend({
$('.root-container.notebookbar').remove();
$('.ui-tabs.notebookbar').remove();
$('.notebookbar-scroll-wrapper').remove();
+ $('.notebookbar-shortcuts-bar').remove();
},
loadTab: function(tabJSON) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/vlc/wrapper/SymbolLoader.hxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit aebfaf13f20e6a106a024b38a671474debd5346a
Author: Stephan Bergmann
AuthorDate: Sun Sep 6 21:55:18 2020 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 7 10:22:49 2020 +0200
Use plain char osl_getAsciiFunctionSymbol
Change-Id: I932675efaeb1072602775115fc368bbba7bfd2b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102134
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index 5bbdf18580a8..3c67b82f15c3 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -19,7 +19,7 @@
#include
#include
-#define SYM_MAP(a) { u ## #a, reinterpret_cast(&a) }
+#define SYM_MAP(a) { #a, reinterpret_cast(&a) }
namespace avmedia::vlc::wrapper
{
@@ -27,7 +27,7 @@ typedef void (*SymbolFunc) (void);
struct ApiMap
{
-OUStringLiteral symName;
+char const * symName;
SymbolFunc *refValue;
};
@@ -70,8 +70,8 @@ struct ApiMap
{
for (size_t i = 0; i < N; ++i)
{
-SymbolFunc aMethod =
reinterpret_cast(osl_getFunctionSymbol
-( aModule, OUString( pMap[ i ].symName ).pData ));
+SymbolFunc aMethod =
reinterpret_cast(osl_getAsciiFunctionSymbol
+( aModule, pMap[ i ].symName ));
if ( !aMethod )
{
SAL_WARN("avmedia", "Cannot load method " << pMap[ i
].symName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - basic/qa basic/source
basic/qa/cppunit/test_scanner.cxx | 17 +
basic/source/comp/scanner.cxx |3 ++-
2 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit cc17346d682d85b6c083d76cae2d55dcc022e58f
Author: Andreas Heinisch
AuthorDate: Sun Sep 6 09:26:47 2020 +0200
Commit: Xisco Fauli
CommitDate: Mon Sep 7 10:11:42 2020 +0200
tdf#136032 - abort scan of a string beginning with a hashtag
Abort scan of a string beginning with a hashtag, if a comma is found.
Otherwise, the compiler raises a syntax error. If
the string ends with a hashtag too, it will be parsed later checking for
a date literal.
Change-Id: I078a2302f5c65206367a00fbc584ffa7b9ede031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102099
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
(cherry picked from commit 11292d1cc405e7c3b9e1f374cc7581a63a54b994)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101973
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index f1cae3fcd492..068006128b7c 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -46,6 +46,7 @@ namespace
void testDataType();
void testHexOctal();
void testTdf103104();
+void testTdf136032();
// Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(ScannerTest);
@@ -62,6 +63,7 @@ namespace
CPPUNIT_TEST(testDataType);
CPPUNIT_TEST(testHexOctal);
CPPUNIT_TEST(testTdf103104);
+CPPUNIT_TEST(testTdf136032);
// End of test suite definition
CPPUNIT_TEST_SUITE_END();
@@ -1141,6 +1143,21 @@ namespace
CPPUNIT_ASSERT_EQUAL(cr, symbols[3].text);
}
+ void ScannerTest::testTdf136032()
+ {
+std::vector symbols;
+sal_Int32 errors;
+
+// tdf#136032 - abort scan of a string beginning with a hashtag,
+// if a comma/whitespace is found. Otherwise, the compiler raises a syntax
error.
+symbols = getSymbols("Print #i,\"A#B\"", errors);
+CPPUNIT_ASSERT_EQUAL(size_t(5), symbols.size());
+CPPUNIT_ASSERT_EQUAL(0u, static_cast(errors));
+symbols = getSymbols("Print #i, \"A#B\"", errors);
+CPPUNIT_ASSERT_EQUAL(size_t(5), symbols.size());
+CPPUNIT_ASSERT_EQUAL(0u, static_cast(errors));
+ }
+
// Put the test suite in the registry
CPPUNIT_TEST_SUITE_REGISTRATION(ScannerTest);
} // namespace
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 5d93f5362510..0647a72edfff 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -251,7 +251,8 @@ bool SbiScanner::NextSym()
do
{
nLineTempIdx++;
-} while (nLineTempIdx < aLine.getLength() &&
!BasicCharClass::isWhitespace(aLine[nLineTempIdx]) && aLine[nLineTempIdx] !=
'#');
+} while (nLineTempIdx < aLine.getLength() &&
!BasicCharClass::isWhitespace(aLine[nLineTempIdx])
+&& aLine[nLineTempIdx] != '#' && aLine[nLineTempIdx] != ',');
// leave it if it is a date literal - it will be handled later
if (nLineTempIdx >= aLine.getLength() || aLine[nLineTempIdx] != '#')
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit c48b021357f4e657291d12fbaa5a2d1a6471ce9b
Author: Caolán McNamara
AuthorDate: Sun Sep 6 21:00:48 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 7 10:09:15 2020 +0200
tdf#136455 unused ComboBox menu listening to GtkListStore and slowing
inserts
Since tdf#131120 we don't use the original ComboBox menu, but it's still
listening to additions to the ListStore and slowing things down (tdf#136455)
Change-Id: Ie2383e1a4b28f0787559132d93236df5c641cb06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102135
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index ab92be3f3c27..5230dcf92a88 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -14279,6 +14279,21 @@ private:
return true;
}
+// Since tdf#131120 we don't use the original ComboBox menu, but it's still
+// listening to additions to the ListStore and slowing things down
(tdf#136455)
+void destroy_unused_menu()
+{
+AtkObject* pAtkObj = gtk_combo_box_get_popup_accessible(m_pComboBox);
+if (!pAtkObj)
+return;
+if (!GTK_IS_ACCESSIBLE(pAtkObj))
+return;
+GtkWidget* pWidget =
gtk_accessible_get_widget(GTK_ACCESSIBLE(pAtkObj));
+if (!pWidget)
+return;
+gtk_widget_destroy(pWidget);
+}
+
public:
GtkInstanceComboBox(GtkBuilder* pComboBuilder, GtkComboBox* pComboBox,
GtkInstanceBuilder* pBuilder, bool bTakeOwnership)
:
GtkInstanceContainer(GTK_CONTAINER(gtk_builder_get_object(pComboBuilder,
"box")), pBuilder, bTakeOwnership)
@@ -14420,6 +14435,8 @@ public:
gtk_overlay_add_overlay(m_pOverlay, GTK_WIDGET(m_pOverlayButton));
g_signal_connect(m_pOverlayButton, "leave-notify-event",
G_CALLBACK(signalOverlayButtonCrossing), this);
g_signal_connect(m_pOverlayButton, "enter-notify-event",
G_CALLBACK(signalOverlayButtonCrossing), this);
+
+destroy_unused_menu();
}
virtual int get_active() const override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationPane.cxx | 15 +++
sd/source/ui/animations/CustomAnimationPane.hxx |3 +++
2 files changed, 18 insertions(+)
New commits:
commit 78389969a8f38edf4c13f0b070b4471c02f1d858
Author: Caolán McNamara
AuthorDate: Sun Sep 6 20:24:20 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 7 10:08:29 2020 +0200
tdf#136474 wait until mouse grab is dropped to trigger selection callback
Change-Id: I495b90b9661c32ad3ec71c2a2455d1576fb8f918
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102112
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index f7bfc28fca55..1cff8f00ef1c 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -145,6 +145,7 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent,
ViewShellBase& rBase,
, mxMFStartDelay(m_xBuilder->weld_metric_spin_button("delay_value",
FieldUnit::SECOND))
, mxCBAutoPreview(m_xBuilder->weld_check_button("auto_preview"))
, mxPBPlay(m_xBuilder->weld_button("play"))
+, maIdle("sd idle treeview select")
, mnLastSelectedAnimation(-1)
, mnPropertyType(nPropertyTypeNone)
, mnCurvePathPos(-1)
@@ -180,6 +181,9 @@ void CustomAnimationPane::initialize()
mxMFStartDelay->connect_value_changed( LINK(this, CustomAnimationPane,
DelayModifiedHdl) );
mxMFStartDelay->connect_focus_out(LINK( this, CustomAnimationPane,
DelayLoseFocusHdl));
+maIdle.SetPriority(TaskPriority::DEFAULT);
+maIdle.SetInvokeHandler(LINK(this, CustomAnimationPane, SelectionHandler));
+
maStrModify = mxFTEffect->get_label();
// get current controller and initialize listeners
@@ -2073,6 +2077,17 @@ IMPL_LINK_NOARG(CustomAnimationPane, DelayLoseFocusHdl,
weld::Widget&, void)
IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, weld::TreeView&, void)
{
+maIdle.Start();
+}
+
+IMPL_LINK_NOARG(CustomAnimationPane, SelectionHandler, Timer*, void)
+{
+if (mxLBAnimation->has_grab()) // tdf#136474 try again later
+{
+maIdle.Start();
+return;
+}
+
int nSelected = mxLBAnimation->get_selected_index();
// tdf#99137, the selected entry may also be a subcategory title, so not
an effect
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx
b/sd/source/ui/animations/CustomAnimationPane.hxx
index 078bb5e69efe..94b543dcd298 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -113,6 +113,7 @@ private:
DECL_LINK( DelayLoseFocusHdl, weld::Widget&, void );
DECL_LINK( UpdateAnimationLB, weld::ComboBox&, void );
DECL_LINK( AnimationSelectHdl, weld::TreeView&, void );
+DECL_LINK( SelectionHandler, Timer*, void );
void implControlHdl(const weld::Widget* pControl);
private:
@@ -142,6 +143,8 @@ private:
std::unique_ptr mxCBAutoPreview;
std::unique_ptr mxPBPlay;
+Idle maIdle;
+
OUStringmaStrModify;
OUStringmaStrProperty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - xmlsecurity/source
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e1cfc9cd1b42d17db92e820d4c4c21cb4e8533e5
Author: Miklos Vajna
AuthorDate: Mon Aug 31 13:34:17 2020 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 7 09:51:37 2020 +0200
xmlsecurity: fix infobar vs signature dialog inconsistency
The infobar mentioned if a signature is partial, but the dialog just has
a bool UI for signatures. Then present "good, but partial" as "bad".
(cherry picked from commit 3ba1144cb96c710e665ffb3ada26fb6a48a03472)
Change-Id: I698190aa77702000b11d635bd038d9c9a91614ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101844
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102145
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index d90bd33f9cfa..ff5161fb2754 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -605,8 +605,17 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
if ( bSigValid )
{
-bSigValid = DocumentSignatureHelper::checkIfAllFilesAreSigned(
- aElementsToBeVerified, rInfo, mode);
+if (maSignatureManager.getStore().is())
+{
+// XML based.
+bSigValid =
DocumentSignatureHelper::checkIfAllFilesAreSigned(
+ aElementsToBeVerified, rInfo, mode);
+}
+else
+{
+// Assume PDF.
+bSigValid = !rInfo.bPartialDocumentSignature;
+}
if( bSigValid )
nValidSigs++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 529 commits - accessibility/inc accessibility/source animations/source avmedia/inc avmedia/source basctl/inc basctl/source basegfx/s
Rebased ref, commits from common ancestor:
commit 18b1560f4c921b4fcced3b4879a3b714f355f6b9
Author: Tomaž Vajngerl
AuthorDate: Tue Sep 1 16:29:15 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Sep 7 09:47:13 2020 +0200
sc: move FilterFloatingWindow and FilterListBox out of gridwin.cxx
Change-Id: Ic6e4bb2be86f8c89ac1e5386eb78fe17036b4cc5
diff --git a/sc/source/ui/inc/FilterFloatingWindow.hxx
b/sc/source/ui/inc/FilterFloatingWindow.hxx
new file mode 100644
index ..71c13c62c864
--- /dev/null
+++ b/sc/source/ui/inc/FilterFloatingWindow.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include
+
+class ScFilterFloatingWindow : public FloatingWindow
+{
+private:
+bool m_bGridHadMouseCaptured;
+
+public:
+ScFilterFloatingWindow(vcl::Window* pParent);
+virtual ~ScFilterFloatingWindow() override;
+virtual void dispose() override;
+
+bool MouseWasCaptured() const { return m_bGridHadMouseCaptured; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/FilterListBox.hxx
b/sc/source/ui/inc/FilterListBox.hxx
new file mode 100644
index ..e65c72ae1107
--- /dev/null
+++ b/sc/source/ui/inc/FilterListBox.hxx
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include
+#include
+
+enum class ScFilterBoxMode
+{
+DataSelect,
+Scenario
+};
+
+class ScFilterListBox final : public InterimItemWindow
+{
+private:
+std::unique_ptr xTreeView;
+VclPtr pGridWin;
+SCCOL nCol;
+SCROW nRow;
+bool bInit;
+bool bCancelled;
+sal_uLong nSel;
+ScFilterBoxMode eMode;
+ImplSVEvent* nAsyncSelectHdl;
+
+DECL_LINK(SelectHdl, weld::TreeView&, bool);
+DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(AsyncSelectHdl, void*, void);
+
+public:
+ScFilterListBox(vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol,
SCROW nNewRow,
+ScFilterBoxMode eNewMode);
+virtual ~ScFilterListBox() override;
+virtual void dispose() override;
+
+weld::TreeView& get_widget() { return *xTreeView; }
+
+SCCOL GetCol() const { return nCol; }
+SCROW GetRow() const { return nRow; }
+ScFilterBoxMode GetMode() const { return eMode; }
+void EndInit();
+bool IsInInit() const { return bInit; }
+void SetCancelled() { bCancelled = true; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 8bdee8a55190..dc66b6ad3092 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -31,6 +31,9 @@
#include
#include
+#include
+#include
+
namespace editeng {
struct MisspellRanges;
}
@@ -46,7 +49,6 @@ struct ScTableInfo;
class ScDPObject;
class ScDPFieldButton;
class ScOutputData;
-class ScFilterListBox;
class SdrObject;
class SdrEditView;
class ScNoteMarker;
@@ -82,8 +84,6 @@ struct SpellCallbackInfo;
// predefines
namespace sdr::overlay { class OverlayObjectList; }
-class ScFilterFloatingWindow;
-
class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, public
DropTargetHelper, public DragSourceHelper
{
// ScFilterListBox is always used for select
[Libreoffice-commits] core.git: .git-hooks/README
.git-hooks/README |6 ++ 1 file changed, 6 insertions(+) New commits: commit 933dd275aafe3b3c7a76019de4878d222f0ebae6 Author: Juergen Funk AuthorDate: Fri Sep 4 11:07:15 2020 +0200 Commit: Thorsten Behrens CommitDate: Mon Sep 7 09:30:52 2020 +0200 Info git-hook for GIT for Windows when you using git for windows (faster) then the git-hooks not work with "ln", it needs "mklink" from windows Change-Id: I15981f44293186efd3fbaa5c1a044348034cef28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102032 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/.git-hooks/README b/.git-hooks/README index 56ac97496e86..93b00ee01c3b 100644 --- a/.git-hooks/README +++ b/.git-hooks/README @@ -3,6 +3,11 @@ Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to tr To install manually, run: cd .git/hooks && ln -s ../../.git-hooks/* ./ + +When you using GIT for Windows, you need Windows links +Open a Dos-Box with admin rights then + cd .git/hooks + FOR /F " usebackq " %i IN (`dir /b ..\..\.git-hooks`) DO mklink %i ..\..\.git-hooks\%i There are two groups of these hooks: client side and server side. @@ -13,3 +18,4 @@ The server-side hooks: are for Git server operations such as receiving pushed commits. See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ] + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/inc sw/qa sw/source
sw/inc/doc.hxx |2 +
sw/qa/core/doc/data/locale-independent-template.odt |binary
sw/qa/core/doc/doc.cxx | 22
sw/source/core/doc/doc.cxx |5
sw/source/core/doc/docnew.cxx | 22
5 files changed, 51 insertions(+)
New commits:
commit 94ebfe7ae7ba7608d2db6359f7a77328781f37d1
Author: Miklos Vajna
AuthorDate: Fri Sep 4 16:51:59 2020 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 7 09:07:52 2020 +0200
sw: default to UI locale when language is missing
This means that when extras/source/shellnew/soffice.odt is opened, it'll
always match the user's language. The same was already working in Calc
and Impress.
Conflicts:
sw/source/core/doc/docnew.cxx
Change-Id: Ic1afc82d7b59f1bd32815586f756e7e8408e5c6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102052
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index cc06333cc51b..fab3d74159f6 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1654,6 +1654,8 @@ public:
/// Returns true if no dictionary can be found for any content
bool IsDictionaryMissing() const { return meDictionaryMissing ==
MissingDictionary::True; }
+void SetLanguage(const LanguageType eLang, const sal_uInt16 nId);
+
private:
// Copies master header to left / first one, if necessary - used by
ChgPageDesc().
void CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader
&rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
diff --git a/sw/qa/core/doc/data/locale-independent-template.odt
b/sw/qa/core/doc/data/locale-independent-template.odt
new file mode 100644
index ..d2a8dc274c6c
Binary files /dev/null and
b/sw/qa/core/doc/data/locale-independent-template.odt differ
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index 80f338042281..d30cbe47cc3b 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
#include
#include
@@ -102,6 +103,27 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testNumDownIndent)
// - Actual : B
// i.e. pressing at the start of the paragraph did not change the
layout.
CPPUNIT_ASSERT_EQUAL(OUString("\tB"), pTextNode->GetText());
+ErrorRegistry::Reset();
+}
+
+CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testLocaleIndependentTemplate)
+{
+SwDoc* pDoc = createDoc("locale-independent-template.odt");
+SwDocShell* pDocShell = pDoc->GetDocShell();
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+SfxItemSet aSet(pWrtShell->GetAttrPool(), { { RES_CHRATR_LANGUAGE,
RES_CHRATR_LANGUAGE } });
+pWrtShell->GetCurAttr(aSet);
+const SvxLanguageItem* pItem = aSet.GetItem(RES_CHRATR_LANGUAGE);
+CPPUNIT_ASSERT(pItem);
+LanguageType eLang = pItem->GetValue();
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1033 (LANGUAGE_ENGLISH_US)
+// - Actual : 1023 (LANGUAGE_DONTKNOW)
+// i.e. the status bar and the format -> character dialog didn't fall back
to the UI locale when
+// an explicit language was not set for the document.
+CPPUNIT_ASSERT_EQUAL(LANGUAGE_ENGLISH_US, eLang);
+ErrorRegistry::Reset();
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 246ffc1a5c8a..5773a60d3d2a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -93,6 +93,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1845,5 +1846,9 @@ void SwDoc::SetMissingDictionaries( bool bIsMissing )
meDictionaryMissing = MissingDictionary::True;
};
+void SwDoc::SetLanguage(const LanguageType eLang, const sal_uInt16 nId)
+{
+mpAttrPool->SetPoolDefaultItem(SvxLanguageItem(eLang, nId));
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index f3e7aa8e1ea6..70e5b1507950 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -98,6 +99,9 @@
#include
#include
+#include
+#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::document;
@@ -355,6 +359,24 @@ SwDoc::SwDoc()
}
mnRsidRoot = mnRsid;
+if (!utl::ConfigManager::IsFuzzing())
+{
+// Make sure that in case the document language is not set, then we
don't return
+// LANGUAGE_DONTKNOW, but the UI locale.
+const SvtLinguConfig aLinguConfig;
+SvtLinguOptions aOptions;
+aLinguConfig.GetOptions(aOptions);
+LanguageType eLang =
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage,
+
