[Libreoffice-commits] core.git: connectivity/source filter/source wizards/com

[Libreoffice Gerrit user]

 connectivity/source/drivers/jdbc/tools.cxx|6 +++---
 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |2 +-
 wizards/com/sun/star/wizards/agenda/TopicsControl.py  |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bc8131987bb59f3e3467385c53be52fc7cfa0908
Author: Andrea Gelmini 
AuthorDate: Fri Sep 7 22:57:09 2018 +0200
Commit: Julien Nabet 
CommitDate: Sat Sep 8 08:53:12 2018 +0200

Fix typos

Change-Id: I75692373028a64ba71899a4fd8c240fa4f2f1c02
Reviewed-on: https://gerrit.libreoffice.org/60172
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/connectivity/source/drivers/jdbc/tools.cxx 
b/connectivity/source/drivers/jdbc/tools.cxx
index 7b651b68fe72..3e0ccc05e3ad 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -81,7 +81,7 @@ java_util_Properties::java_util_Properties( ): 
java_lang_Object( nullptr, nullpt
 if( !t.pEnv )
 return;
 // Turn off Java-Call for the constructor
-// Initialize temperary Variables
+// Initialize temporary Variables
 static const char * const cSignature = "()V";
 jobject tempObj;
 static jmethodID mID(nullptr);
@@ -206,7 +206,7 @@ jobject connectivity::createByteInputStream(const 
css::uno::Reference< css::io::
 if( !t.pEnv || !x.is() )
 return nullptr;
 // Turn off Java-Call for the constructor
-// Initialize temperary variables
+// Initialize temporary variables
 jclass clazz = 
java_lang_Object::findMyClass("java/io/ByteArrayInputStream");
 static jmethodID mID(nullptr);
 if  ( !mID )
@@ -233,7 +233,7 @@ jobject connectivity::createCharArrayReader(const 
css::uno::Reference< css::io::
 if( !t.pEnv || !x.is() )
 return nullptr;
 // Turn off Java-Call for the constructor
-// Initialize temperary Variables
+// Initialize temporary Variables
 jclass clazz = java_lang_Object::findMyClass("java/io/CharArrayReader");
 static jmethodID mID(nullptr);
 if  ( !mID )
diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 6e88a09b9162..92fab9a35a1f 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -2691,7 +2691,7 @@
 
 
 
-
+
 
 
 
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py 
b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index 6b3561003b4c..be49d5d022e5 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -825,7 +825,7 @@ class ControlRow(object):
 self.timebox.Model.Enabled = enabled
 
 '''
-Impelementation of XKeyListener.
+Implementation of XKeyListener.
 Optionally performs the one of the following:
 cursor up, or down, row up or down
 '''
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basctl/source binaryurp/source codemaker/source filter/source package/source registry/source sd/source sw/source ucb/source unoidl/source

[Libreoffice Gerrit user]

 basctl/source/basicide/bastype2.cxx  |3 +--
 binaryurp/source/reader.cxx  |6 ++
 codemaker/source/javamaker/javatype.cxx  |6 ++
 filter/source/textfilterdetect/filterdetect.cxx  |3 +--
 package/source/xstor/xstorage.cxx|6 --
 package/source/zippackage/ZipPackageStream.cxx   |8 +++-
 registry/source/regimpl.cxx  |3 +--
 sd/source/ui/tools/SdGlobalResourceContainer.cxx |5 +
 sw/source/core/crsr/swcrsr.cxx   |6 ++
 ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx |3 +--
 unoidl/source/legacyprovider.cxx |6 +++---
 11 files changed, 17 insertions(+), 38 deletions(-)

New commits:
commit 09978dd1fc18ce1ae707bc9e4ea1d2745ff07b61
Author: Noel Grandin 
AuthorDate: Fri Sep 7 16:07:31 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 8 08:45:51 2018 +0200

clang-tidy bugprone-unused-return-value

In
   OStorage::openEncryptedStream
the lines were marked with a TODO until the TODO comment was removed in
commit 8083b46285fefc4af751e1b00d20b40bea196ea8
Date:   Tue Jun 16 16:15:54 2009 +
CWS-TOOLING: integrate CWS fwk103
Since no-one has "fixed" this intended functionality by now,
I just removed it.

The lines in unoidl/ were introduced by
commit 12353c73868d26690aa4ac008ef5e9f2db8bc12c
Date:   Fri Mar 1 23:23:50 2013 +0100
WIP: Experimental new binary type.rdb format
I assume that not throwing these was just an oversight.

Change-Id: I26fbcce267f2cc1154a30b8259176f59611dfbd8
Reviewed-on: https://gerrit.libreoffice.org/60161
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index 3488e5726150..adc4a3a2d661 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -3142,9 +3142,6 @@ uno::Reference< io::XStream > SAL_CALL 
OStorage::openEncryptedStream(
 throw lang::DisposedException( THROW_WHERE );
 }
 
-if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
-packages::NoEncryptionException();
-
 if ( ( nOpenMode & embed::ElementModes::WRITE ) && 
m_pData->m_bReadOnlyWrap )
 throw io::IOException( THROW_WHERE ); // TODO: access denied
 
@@ -3231,9 +3228,6 @@ uno::Reference< io::XStream > SAL_CALL 
OStorage::cloneEncryptedStream(
 throw lang::DisposedException( THROW_WHERE );
 }
 
-if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE )
-packages::NoEncryptionException();
-
 if ( !aEncryptionData.getLength() )
 throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< 
uno::XInterface >(), 2 );
 
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index eb9462c733f2..b39c08d806d8 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -377,7 +377,7 @@ rtl::Reference< Entity > readEntity(
 base = reader.getSuperTypeName(0).replace('/', '.');
 break;
 default:
-FileFormatException(
+throw FileFormatException(
 key.getRegistryName(),
 ("legacy format: unexpected number "
  + OUString::number(reader.getSuperTypeCount())
@@ -397,7 +397,7 @@ rtl::Reference< Entity > readEntity(
 translateAnnotations(reader.getDocumentation()));
 } else {
 if (reader.getSuperTypeCount() != 0) {
-FileFormatException(
+throw FileFormatException(
 key.getRegistryName(),
 ("legacy format: unexpected number "
  + OUString::number(reader.getSuperTypeCount())
@@ -432,7 +432,7 @@ rtl::Reference< Entity > readEntity(
 for (sal_uInt16 j = 0; j != n; ++j) {
 RTConstValue v(reader.getFieldValue(j));
 if (v.m_type != RT_TYPE_INT32) {
-FileFormatException(
+throw FileFormatException(
 key.getRegistryName(),
 ("legacy format: unexpected type "
  + OUString::number(v.m_type) + " of value of field "
commit 7764ae70b04058a64a3999529e98d1115ba59d1c
Author: Noel Grandin 
AuthorDate: Fri Sep 7 15:47:40 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 8 08:45:41 2018 +0200

clang bugprone-unused-return-value

most of these changes just make the change of ownership when using
std::unique_ptr clearer, but there is one definite leak fix in
PlainTextFilterDetect::detect

Change-Id: I8282a68007222a4fee84004f394bde0cca8569e9
Reviewed-on: https://gerrit.libreoffice.org/60159
Reviewed-b

[Libreoffice-commits] core.git: extras/source

[Libreoffice Gerrit user]

 extras/source/autocorr/lang/tr/DocumentList.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 37d5bf82eae7e6d611879d1132b1f6fdafdeb9ed
Author: Muhammet Kara 
AuthorDate: Fri Sep 7 16:29:08 2018 +0300
Commit: Muhammet Kara 
CommitDate: Sat Sep 8 07:54:50 2018 +0200

[tr][autocorr] Fix erroneous entries

Change-Id: Iaded68785c50833aa998706b6840f86d99ffc17d
Reviewed-on: https://gerrit.libreoffice.org/60155
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index 28440cdce5e2..965e5060e416 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -24,7 +24,7 @@
   
   
   
-  
+  
   
   
   
@@ -104,7 +104,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Google Code-in tasks

[Saurav Chirania]

Hi!

On Fri, 7 Sep 2018 at 17:30, 
wrote:

>
>  * Google Code In for pre university students from 13 to 17 (Thorsten)
>+ https://codein.withgoogle.com/
>+ organizations can apply between Sep/06-17
>+ we need agreement from mentors
>  + official categorization: "Code, Documentation/Training,
> Outreach/Research,
>Quality Assurance, or Design"
>+ we have to prepare a list of bite-sized tasks; needed with the
> application
>

Looks like we already have a list of some tasks which was made in 2015 -

https://wiki.documentfoundation.org/Mentoring_Programs/Task_ideas_for_Google_Code-in

Other tasks which might be used for Code-in -

Build LibreOffice from source code on your machine
Remove copy-paste codes (tdf#39593)
Convert manual tests to automated UI tests (tdf#107501)
Write a blog post explaining any ten reasons why our clang plug-in might
cause a build failure when we upload our code to Jenkins (e.g. unused
variables, unnecessary parentheses, redundant cast, etc.)
Convert tests to python (tdf#97361, tdf#97362)
Include Gerrit link in bibisect log (tdf#84479)

In fact, I feel many other bugs in Bugzilla with keyword topicCleanup can
be used as tasks for GCI.

Regards,
Saurav


>  +
> https://developers.google.com/open-source/gci/resources/example-tasks
>+ mentoring mostly from UX, QA, translation ? (Thorsten)
>  + if you think it is useful & have cycles
>  + can look into the sign-up myself.
> AI:  + discuss in the staff meeting (Sophie, Heiko, Xisco)
>  + deadline is the 17th.
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sd/source

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |   27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)

New commits:
commit 22f49d10c001f9d62e3783872bc7e53a902265a3
Author: Mark Hung 
AuthorDate: Fri Sep 7 06:26:53 2018 +0800
Commit: Mark Hung 
CommitDate: Sat Sep 8 06:04:51 2018 +0200

sd / pptx export: use extracted ooxml node type.

Prefer extracted node type over XAnimationNode->getType(),
as the later has been converted to former and unknown
condition filtered.

As the switch-case statements use ooxml node type now,
all kown node types are handled. Hence returning early
for unkown case isn't necessary and is removed.
That also fix unrestored mpConetxt in 9a9b81c7212f because
of returning early.

Change-Id: I614dcaa5b0ce32b19c396d0eab4499c1d67fa059
Reviewed-on: https://gerrit.libreoffice.org/60139
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index 42cec71e09e1..86fd90362af7 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -1147,35 +1147,32 @@ void PPTXAnimationExport::WriteAnimationNode(const 
NodeContextPtr& pContext)
 SAL_INFO("sd.eppt", "export node type: " << rXNode->getType());
 sal_Int32 xmlNodeType = extractNodeType(rXNode);
 
-if (xmlNodeType == -1)
-return;
-
-switch (rXNode->getType())
+switch (xmlNodeType)
 {
-case AnimationNodeType::ITERATE:
-case AnimationNodeType::PAR:
+case XML_par:
 mpFS->startElementNS(XML_p, xmlNodeType, FSEND);
 WriteAnimationNodeCommonPropsStart();
 mpFS->endElementNS(XML_p, xmlNodeType);
 break;
-case AnimationNodeType::SEQ:
+case XML_seq:
 WriteAnimationNodeSeq();
 break;
-case AnimationNodeType::ANIMATETRANSFORM:
-case AnimationNodeType::ANIMATE:
-case AnimationNodeType::ANIMATEMOTION:
-case AnimationNodeType::ANIMATECOLOR:
-case AnimationNodeType::SET:
+case XML_animScale:
+case XML_animRot:
+case XML_anim:
+case XML_animMotion:
+case XML_animClr:
+case XML_set:
 WriteAnimationNodeAnimate(xmlNodeType);
 break;
-case AnimationNodeType::TRANSITIONFILTER:
+case XML_animEffect:
 WriteAnimationNodeEffect();
 break;
-case AnimationNodeType::COMMAND:
+case XML_cmd:
 WriteAnimationNodeCommand();
 break;
 default:
-SAL_WARN("sd.eppt", "unhandled animation node: " << 
rXNode->getType());
+SAL_WARN("sd.eppt", "export ooxml node type: " << xmlNodeType);
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/map/Map.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d65801299d801eb42549376d9713291226b3cc5c
Author: Jan Holesovsky 
AuthorDate: Fri Sep 7 15:16:26 2018 +0200
Commit: Henry Castro 
CommitDate: Sat Sep 8 02:36:54 2018 +0200

On desktop, focus immediately on startup to get the caret.

Change-Id: Ie33805341740e38bef657fbd7677ef7d0c14cee3
Reviewed-on: https://gerrit.libreoffice.org/60149
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f93606bc2..79d70c5e5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -831,6 +831,9 @@ L.Map = L.Evented.extend({
 
vex.dialogID = -1;
this._startInactiveTimer();
+   if (!L.Browser.mobile) {
+   this.focus();
+   }
return vex.close(id);
}
} else {
@@ -839,6 +842,9 @@ L.Map = L.Evented.extend({
}
 
this._startInactiveTimer();
+   if (!L.Browser.mobile) {
+   this.focus();
+   }
return false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: layout.xml differs from parseDump(...)

[Thorsten Behrens]

Hi Patrick,

Patrick Jaap wrote:
> So, the first one is equal, but the other ones are shifted by 333.
> 
> How can this be caused? Is this a bug?
> 
Looks odd indeed. First thing that comes to mind: layouting continues
asynchronously after the load - perhaps a
Scheduler::ProcessEventsToIdle() helps. See uiwriter.cxx for a few
examples where that is used.

Other than that, all a bit speculative. Any code / patch yet to look
at?

Cheers,

-- Thorsten


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 5 commits - loleaflet/admin loleaflet/debug loleaflet/html loleaflet/js loleaflet/l10n loleaflet/src loolwsd.xml.in wsd/FileServer.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp

[Libreoffice Gerrit user]

 loleaflet/admin/admin.html|8 
 loleaflet/admin/adminAnalytics.html   |8 
 loleaflet/admin/adminHistory.html |8 
 loleaflet/admin/adminSettings.html|8 
 loleaflet/debug/document/admin.html   |2 
 loleaflet/debug/document/adminAnalytics.html  |2 
 loleaflet/debug/document/adminSettings.html   |2 
 loleaflet/html/loleaflet.html.m4  |   18 +
 loleaflet/js/main.js  |3 
 loleaflet/l10n/admin-localizations.json   |  236 +-
 loleaflet/src/core/Socket.js  |2 
 loleaflet/src/layer/tile/TileLayer.js |2 
 loleaflet/src/map/handler/Map.FileInserter.js |2 
 loleaflet/src/map/handler/Map.SlideShow.js|2 
 loolwsd.xml.in|1 
 wsd/FileServer.cpp|   21 +-
 wsd/LOOLWSD.cpp   |   17 +
 wsd/LOOLWSD.hpp   |1 
 18 files changed, 184 insertions(+), 159 deletions(-)

New commits:
commit 5ae112d563a89a94b852edc03a21efdb19fc0cbd
Author: Jan Holesovsky 
AuthorDate: Sat Sep 8 00:10:50 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Sat Sep 8 00:12:20 2018 +0200

ServiceRoot: Fix the admin console (the jwt token generation).

Change-Id: Ic1772692471d29c99d7d68834cddb6b304e721d2

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 517477b2e..e0b475595 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -252,7 +252,7 @@ bool FileServerRequestHandler::isAdminLoggedIn(const 
HTTPRequest& request,
 
 Poco::Net::HTTPCookie cookie("jwt", jwtToken);
 // bundlify appears to add an extra /dist -> dist/dist/admin
-cookie.setPath("/loleaflet/dist/");
+cookie.setPath(LOOLWSD::ServiceRoot + "/loleaflet/dist/");
 cookie.setSecure(LOOLWSD::isSSLEnabled() ||
  LOOLWSD::isSSLTermination());
 response.addCookie(cookie);
commit 7152a8a55c365c94a9756b1fa504ab2836b142d2
Author: Jan Holesovsky 
AuthorDate: Fri Sep 7 23:34:09 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Sat Sep 8 00:12:20 2018 +0200

ServiceRoot: Fix the branding and update the admin console debug URL.

Change-Id: Id10d7a4d99ea993a398467e528e2018cc12d503b

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index a508c4f15..517477b2e 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -619,11 +619,11 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 Poco::replaceInPlace(preprocess, std::string("%VERSION%"), 
std::string(LOOLWSD_VERSION_HASH));
 Poco::replaceInPlace(preprocess, std::string("%SERVICE_ROOT%"), 
LOOLWSD::ServiceRoot);
 
-static const std::string linkCSS("");
-static const std::string scriptJS("");
+static const std::string linkCSS("");
+static const std::string scriptJS("");
 
-std::string brandCSS(Poco::format(linkCSS, std::string(BRANDING)));
-std::string brandJS(Poco::format(scriptJS, std::string(BRANDING)));
+std::string brandCSS(Poco::format(linkCSS, LOOLWSD::ServiceRoot, 
std::string(BRANDING)));
+std::string brandJS(Poco::format(scriptJS, LOOLWSD::ServiceRoot, 
std::string(BRANDING)));
 
 const auto& config = Application::instance().config();
 #if ENABLE_SUPPORT_KEY
@@ -631,8 +631,8 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 SupportKey key(keyString);
 if (!key.verify() || key.validDaysRemaining() <= 0)
 {
-brandCSS = Poco::format(linkCSS, std::string(BRANDING_UNSUPPORTED));
-brandJS = Poco::format(scriptJS, std::string(BRANDING_UNSUPPORTED));
+brandCSS = Poco::format(linkCSS, LOOLWSD::ServiceRoot, 
std::string(BRANDING_UNSUPPORTED));
+brandJS = Poco::format(scriptJS, LOOLWSD::ServiceRoot, 
std::string(BRANDING_UNSUPPORTED));
 }
 #endif
 
@@ -792,13 +792,13 @@ void FileServerRequestHandler::preprocessAdminFile(const 
HTTPRequest& request,co
 if (!FileServerRequestHandler::isAdminLoggedIn(request, response))
 throw Poco::Net::NotAuthenticatedException("Invalid admin login");
 
-static const std::string scriptJS("");
+static const std::string scriptJS("");
 static const std::string footerPage("Key: %s 
  Expiry Date: %s");
 
 const std::string relPath = getRequestPathname(request);
 LOG_DBG("Preprocessing file: " << relPath);
 std::string adminFile = *getUncompressedFile(relPath);
-std::string brandJS(Poco::format(scriptJS, std::string(BRANDING)));
+std::string brandJS(Poco::format(scriptJS, LOOLWSD::ServiceRoot, 
std::string(BRANDING)));
 std::string brandFooter;
 
 #if ENABLE_SUPPORT_KEY
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 7723adb5a..8248d28d8 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -568,6 +568,7 @@ inline std::string getAdminURI(const 
Poco::Util::LayeredConfiguration &config)
 std::ostringstream os

[Libreoffice-commits] core.git: sd/source

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-animations.cxx |   38 +-
 1 file changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 9a9b81c7212fa6a6762246593acf3f1950677a22
Author: Mark Hung 
AuthorDate: Thu Sep 6 05:56:46 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Sep 7 23:57:02 2018 +0200

sd/ pptx export: resolves unhandled node type causing crashes.

found in

http://dev-builds.libreoffice.org/crashtest/1103bddab3f695b61484960523c4c2c0de4f0f91/

https://bz.apache.org/ooo/attachment.cgi?id=49270
https://bz.apache.org/ooo/attachment.cgi?id=44458
https://bz.apache.org/ooo/attachment.cgi?id=54593

Change-Id: If9e19140f2fcffc0b261c1d91a40597684a51917
Reviewed-on: https://gerrit.libreoffice.org/60060
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index b02ccdcc4cb7..42cec71e09e1 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -425,9 +425,10 @@ bool isValidTarget(const Any& rTarget)
 return false;
 }
 
-/// convert animation node type to corresponding ooxml element.
-sal_Int32 convertNodeType(sal_Int16 nType)
+/// extract ooxml node type from a XAnimationNode.
+sal_Int32 extractNodeType(const Reference& rXNode)
 {
+sal_Int16 nType = rXNode->getType();
 sal_Int32 xmlNodeType = -1;
 switch (nType)
 {
@@ -445,9 +446,17 @@ sal_Int32 convertNodeType(sal_Int16 nType)
 xmlNodeType = XML_animMotion;
 break;
 case AnimationNodeType::ANIMATETRANSFORM:
-// could be XML_animScale or XML_animRot based on 
xTransform->getTransformType()
-xmlNodeType = -1;
+{
+Reference xTransform(rXNode, UNO_QUERY);
+if (xTransform.is())
+{
+if (xTransform->getTransformType() == 
AnimationTransformType::SCALE)
+xmlNodeType = XML_animScale;
+else if (xTransform->getTransformType() == 
AnimationTransformType::ROTATE)
+xmlNodeType = XML_animRot;
+}
 break;
+}
 case AnimationNodeType::ANIMATECOLOR:
 xmlNodeType = XML_animClr;
 break;
@@ -1136,7 +1145,10 @@ void PPTXAnimationExport::WriteAnimationNode(const 
NodeContextPtr& pContext)
 const Reference& rXNode = getCurrentNode();
 
 SAL_INFO("sd.eppt", "export node type: " << rXNode->getType());
-sal_Int32 xmlNodeType = convertNodeType(rXNode->getType());
+sal_Int32 xmlNodeType = extractNodeType(rXNode);
+
+if (xmlNodeType == -1)
+return;
 
 switch (rXNode->getType())
 {
@@ -1150,22 +1162,6 @@ void PPTXAnimationExport::WriteAnimationNode(const 
NodeContextPtr& pContext)
 WriteAnimationNodeSeq();
 break;
 case AnimationNodeType::ANIMATETRANSFORM:
-{
-Reference xTransform(rXNode, UNO_QUERY);
-if (xTransform.is())
-{
-if (xTransform->getTransformType() == 
AnimationTransformType::SCALE)
-xmlNodeType = XML_animScale;
-else if (xTransform->getTransformType() == 
AnimationTransformType::ROTATE)
-xmlNodeType = XML_animRot;
-
-WriteAnimationNodeAnimate(xmlNodeType);
-}
-else
-SAL_WARN("sd.eppt",
- "XAnimateTransform not handled: " << 
xTransform->getTransformType());
-}
-break;
 case AnimationNodeType::ANIMATE:
 case AnimationNodeType::ANIMATEMOTION:
 case AnimationNodeType::ANIMATECOLOR:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source

[Libreoffice Gerrit user]

 extras/source/autocorr/lang/tr/DocumentList.xml |   86 
 1 file changed, 43 insertions(+), 43 deletions(-)

New commits:
commit 0fa2a77881d81fd0692eed628b2785a57be60ab7
Author: Muhammet Kara 
AuthorDate: Fri Sep 7 16:23:33 2018 +0300
Commit: Muhammet Kara 
CommitDate: Fri Sep 7 22:48:22 2018 +0200

[tr][autocorr] Consistent capitalizations for Turkish

Change-Id: Icfb6d82f094a4ab743d0ec4f51ddfdda606a731a
Reviewed-on: https://gerrit.libreoffice.org/60152
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index eba1760f1f0d..28440cdce5e2 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -11,37 +11,37 @@
   
   
   
-  
+  
   
   
-  
-  
-  
+  
+  
+  
   
   
-  
+  
   
   
   
-  
-  
+  
+  
   
-  
+  
   
   
   
   
-  
+  
   
-  
+  
   
   
-  
+  
   
   
-  
+  
   
-  
+  
   
   
   
@@ -50,72 +50,72 @@
   
   
   
-  
-  
+  
+  
   
   
   http://"/>
-  
+  
   
   
   
-  
+  
   
   
-  
-  
+  
+  
   
   
   
   
-  
-  
-  
-  
+  
+  
+  
+  
   
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
   
-  
+  
   
   
   
-  
+  
   
-  
-  
+  
+  
   
   
   
-  
+  
   
-  
-  
+  
+  
   
-  
+  
   
   
-  
+  
   
   
   
   
-  
-  
-  
+  
+  
+  
   
   
   
-  
+  
   
   
-  
+  
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dtrans/source onlineupdate/source vcl/opengl vcl/win

[Libreoffice Gerrit user]

 dtrans/source/win32/misc/ImplHelper.cxx|2 -
 onlineupdate/source/update/updater/updater.cxx |   32 -
 vcl/opengl/win/WinDeviceInfo.cxx   |2 -
 vcl/win/app/salinst.cxx|2 -
 vcl/win/window/salframe.cxx|4 +--
 5 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit b18747fcee1ba8744e5cd63791dc9f3eb6848a56
Author: Jan-Marek Glogowski 
AuthorDate: Fri Sep 7 16:09:50 2018 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 7 22:04:50 2018 +0200

Fix some std::unique_ptr array allocs

Found by reviewing the output of and the code around
git grep -n "unique_ptr.*new.*\[.*\]" | grep -v "\[\]"

The onlineupdater code needs a little bit more attention.

Change-Id: I8b70c7da7db60af52bfac12314a21602ede8bfc0
Reviewed-on: https://gerrit.libreoffice.org/60162
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/dtrans/source/win32/misc/ImplHelper.cxx 
b/dtrans/source/win32/misc/ImplHelper.cxx
index 4b98b4850006..f933701ce961 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -95,7 +95,7 @@ OUString getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 
 if ( nResult )
 {
-std::unique_ptr buff( new wchar_t[nResult] );
+std::unique_ptr buff( new wchar_t[nResult] );
 // Now get the actual data
 nResult = GetLocaleInfoW( lcid, lctype, buff.get(), nResult );
 
diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 1782804eff15..a05fd075bd3a 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -1119,8 +1119,8 @@ public:
 void Finish(int status);
 
 private:
-std::unique_ptr mFile;
-std::unique_ptr mRelPath;
+std::unique_ptr mFile;
+std::unique_ptr mRelPath;
 int mSkip;
 };
 
@@ -1247,8 +1247,8 @@ public:
 virtual void Finish(int status);
 
 private:
-std::unique_ptr mDir;
-std::unique_ptr mRelPath;
+std::unique_ptr mDir;
+std::unique_ptr mRelPath;
 int mSkip;
 };
 
@@ -1260,6 +1260,7 @@ RemoveDir::Parse(NS_tchar *line)
 NS_tchar* validPath = get_valid_path(&line, true);
 if (!validPath)
 return PARSE_ERROR;
+
 mRelPath.reset(new NS_tchar[MAXPATHLEN]);
 NS_tstrcpy(mRelPath.get(), validPath);
 
@@ -1371,8 +1372,8 @@ public:
 virtual void Finish(int status);
 
 private:
-std::unique_ptr mFile;
-std::unique_ptr mRelPath;
+std::unique_ptr mFile;
+std::unique_ptr mRelPath;
 bool mAdded;
 ArchiveReader& mArchiveReader;
 };
@@ -1387,7 +1388,6 @@ AddFile::Parse(NS_tchar *line)
 return PARSE_ERROR;
 
 mRelPath.reset(new NS_tchar[MAXPATHLEN]);
-
 NS_tstrcpy(mRelPath.get(), validPath);
 
 mFile.reset(get_full_path(validPath));
@@ -1799,7 +1799,7 @@ public:
 virtual void Finish(int status);
 
 protected:
-std::unique_ptr mTestFile;
+std::unique_ptr mTestFile;
 };
 
 AddIfFile::AddIfFile(ArchiveReader& archiveReader):
@@ -1866,7 +1866,7 @@ public:
 virtual void Finish(int status);
 
 protected:
-std::unique_ptr mTestFile;
+std::unique_ptr mTestFile;
 };
 
 AddIfNotFile::AddIfNotFile(ArchiveReader& archiveReader):
@@ -1933,7 +1933,7 @@ public:
 virtual void Finish(int status);
 
 private:
-std::unique_ptr mTestFile;
+std::unique_ptr mTestFile;
 };
 
 PatchIfFile::PatchIfFile(ArchiveReader& archiveReader):
@@ -2323,7 +2323,7 @@ CopyInstallDirToDestDir()
 #endif
 copy_recursive_skiplist skiplist;
 
-std::unique_ptr pUserProfile(new NS_tchar[MAXPATHLEN]);
+std::unique_ptr pUserProfile(new NS_tchar[MAXPATHLEN]);
 NS_tstrcpy(pUserProfile.get(), gPatchDirPath);
 NS_tchar *slash = (NS_tchar *) NS_tstrrchr(pUserProfile.get(), NS_T('/'));
 if (slash)
@@ -4036,7 +4036,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 
 NS_tsnprintf(searchspec, sizeof(searchspec)/sizeof(searchspec[0]),
  NS_T("%s*"), dirpath);
-std::unique_ptr pszSpec(get_full_path(searchspec));
+std::unique_ptr pszSpec(get_full_path(searchspec));
 
 hFindFile = FindFirstFileW(pszSpec.get(), &finddata);
 if (hFindFile != INVALID_HANDLE_VALUE)
@@ -4116,7 +4116,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 char chars[MAXNAMLEN];
 } ent_buf;
 struct dirent* ent;
-std::unique_ptr searchpath(get_full_path(dirpath));
+std::unique_ptr searchpath(get_full_path(dirpath));
 
 DIR* dir = opendir(searchpath.get());
 if (!dir)
@@ -4206,7 +4206,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 int rv = OK;
 FTS *ftsdir;
 FTSENT *ftsdirEntry;
-std::unique_ptr searchpath(get_full_path(dirpath));
+std::unique_ptr searchpath(get_full_path(dirpath));
 
 // Remove the trailing slash so the paths

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-1' - dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/filter/xml/xmlfilter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7d1612ca3e29dce226700551040ceac1de99299b
Author: Julien Nabet 
AuthorDate: Thu Sep 6 22:02:56 2018 +0200
Commit: Caolán McNamara 
CommitDate: Fri Sep 7 21:32:01 2018 +0200

tdf#119694: read embedded hsqldb file generated before 6.1

Regression from:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=ebb34571c19c5ac939fbf5aed2ab66ee18e298dc
Thank you Drew Jensen for the bibisect!

Change-Id: I9550f61709e8582a52554f578ef043c6551f09f0
Reviewed-on: https://gerrit.libreoffice.org/60117
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 4b5194bd1d0dd893720ec0b311ee215a3168219f)
Reviewed-on: https://gerrit.libreoffice.org/60131
Tested-by: Jenkins
(cherry picked from commit 6e0e3872f30c177559446b2c050b2a6582f257ec)
Reviewed-on: https://gerrit.libreoffice.org/60143
Reviewed-by: Christian Lohmaier 
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index a77db0ecec0f..02fd2fda823e 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -655,6 +655,7 @@ const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() 
const
 { XML_NAMESPACE_OOO,XML_AUTOMATIC_STYLES,   
XML_TOK_CONTENT_AUTOSTYLES  },
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,
XML_TOK_CONTENT_SCRIPTS },
 { XML_NAMESPACE_OFFICE, XML_BODY,   
XML_TOK_CONTENT_BODY},
+{ XML_NAMESPACE_OOO,XML_BODY,   
XML_TOK_CONTENT_BODY},
 XML_TOKEN_MAP_END
 };
 m_pDocContentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

 sw/inc/IDocumentRedlineAccess.hxx   |2 
 sw/qa/extras/uiwriter/data2/tdf119019.docx  |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx |   35 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   13 +
 sw/source/core/doc/DocumentRedlineManager.cxx   |   25 +++
 sw/source/core/inc/DocumentRedlineManager.hxx   |2 
 6 files changed, 77 insertions(+)

New commits:
commit 694a6389e84d5b416cde6dde2d5eaa589a0a6493
Author: László Németh 
AuthorDate: Thu Sep 6 17:21:05 2018 +0200
Commit: László Németh 
CommitDate: Fri Sep 7 20:55:03 2018 +0200

tdf#119019 DOCX track changes: fix invisible delete and insert

during editing in a paragraph with tracked paragraph formatting,
by accepting the old formatting change automatically in the
actual paragraph before text deletion/insertion.

Note: it's not possible to reject paragraph formatting
changes in LO, but showing them is a minimal requirement.
Now they are still visible in change tracking dialog and
by the vertical line before the related paragraphs until
there are no new text deletions and insertions in those
paragraphs.

Change-Id: I526daad8dd96212ac73a10627128553452e4d31c
Reviewed-on: https://gerrit.libreoffice.org/60101
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/inc/IDocumentRedlineAccess.hxx 
b/sw/inc/IDocumentRedlineAccess.hxx
index a68af07fb707..f8b1ee6b1a81 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -205,6 +205,8 @@ public:
 
 virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool 
bCallDelete) = 0;
 
+virtual void AcceptRedlineParagraphFormatting(/*[in]*/const SwPaM& rPam ) 
= 0;
+
 virtual bool RejectRedline(/*[in]*/SwRedlineTable::size_type nPos, 
/*[in]*/bool bCallDelete) = 0;
 
 virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool 
bCallDelete) = 0;
diff --git a/sw/qa/extras/uiwriter/data2/tdf119019.docx 
b/sw/qa/extras/uiwriter/data2/tdf119019.docx
new file mode 100644
index ..d38c9e4ae146
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf119019.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 77398885940c..c2545de641a7 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -25,11 +25,13 @@ public:
 void testTdf101534();
 void testTdf54819();
 void testTdf119571();
+void testTdf119019();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest2);
 CPPUNIT_TEST(testTdf101534);
 CPPUNIT_TEST(testTdf54819);
 CPPUNIT_TEST(testTdf119571);
+CPPUNIT_TEST(testTdf119019);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -130,6 +132,39 @@ void SwUiWriterTest2::testTdf119571()
  getProperty(getParagraph(2), 
"ParaStyleName"));
 }
 
+void SwUiWriterTest2::testTdf119019()
+{
+load(DATA_DIRECTORY, "tdf119019.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Nunc viverra imperdiet enim. Fusce est. 
Vivamus a tellus."),
+ getParagraph(2)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString(""), getRun(getParagraph(2), 
1)->getString());
+// second paragraph has got a tracked paragraph formatting yet
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 1), "RedlineType"));
+
+// delete last word of the second paragraph to remove tracked paragraph 
formatting
+// of this paragraph to track and show word deletion correctly.
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->Down(/*bSelect=*/false);
+pWrtShell->EndPara(/*bSelect=*/false);
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 7, 
/*bBasicCall=*/false);
+rtl::Reference pTransfer = new SwTransferable(*pWrtShell);
+pTransfer->Cut();
+
+// check tracked text deletion
+CPPUNIT_ASSERT_EQUAL(OUString("tellus."), getRun(getParagraph(2), 
3)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString(""), getRun(getParagraph(2), 
2)->getString());
+CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 2), "RedlineType"));
+
+// check removing of tracked paragraph formatting
+CPPUNIT_ASSERT(!hasProperty(getRun(getParagraph(2), 1), "RedlineType"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 788cb61dd7df..52e67c6d0146 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2449,6 +2449,15 @@ bool DocumentContentOperationsManager::Overwrite( co

[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source

[Libreoffice Gerrit user]

 include/vcl/BitmapAlphaClampFilter.hxx|2 +-
 include/vcl/BitmapColorQuantizationFilter.hxx |2 +-
 include/vcl/BitmapConvolutionMatrixFilter.hxx |2 +-
 include/vcl/BitmapDuoToneFilter.hxx   |2 +-
 include/vcl/BitmapEmbossGreyFilter.hxx|2 +-
 include/vcl/BitmapFilter.hxx  |6 +++---
 include/vcl/BitmapGaussianSeparableBlurFilter.hxx |4 ++--
 include/vcl/BitmapMedianFilter.hxx|2 +-
 include/vcl/BitmapMonochromeFilter.hxx|2 +-
 include/vcl/BitmapMosaicFilter.hxx|   10 +++---
 include/vcl/BitmapPopArtFilter.hxx|2 +-
 include/vcl/BitmapSeparableUnsharpenFilter.hxx|2 +-
 include/vcl/BitmapSepiaFilter.hxx |2 +-
 include/vcl/BitmapSimpleColorQuantizationFilter.hxx   |2 +-
 include/vcl/BitmapSmoothenFilter.hxx  |2 +-
 include/vcl/BitmapSobelGreyFilter.hxx |2 +-
 include/vcl/BitmapSolarizeFilter.hxx  |2 +-
 vcl/inc/BitmapColorizeFilter.hxx  |2 +-
 vcl/inc/BitmapDisabledImageFilter.hxx |2 +-
 vcl/inc/BitmapFastScaleFilter.hxx |2 +-
 vcl/inc/BitmapInterpolateScaleFilter.hxx  |2 +-
 vcl/inc/BitmapLightenFilter.hxx   |2 +-
 vcl/inc/BitmapScaleConvolutionFilter.hxx  |2 +-
 vcl/inc/BitmapScaleSuperFilter.hxx|2 +-
 vcl/source/bitmap/BitmapAlphaClampFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapColorQuantizationFilter.cxx   |2 +-
 vcl/source/bitmap/BitmapColorizeFilter.cxx|2 +-
 vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx   |2 +-
 vcl/source/bitmap/BitmapDisabledImageFilter.cxx   |2 +-
 vcl/source/bitmap/BitmapDuoToneFilter.cxx |2 +-
 vcl/source/bitmap/BitmapEmbossGreyFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapFastScaleFilter.cxx   |2 +-
 vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx   |4 ++--
 vcl/source/bitmap/BitmapInterpolateScaleFilter.cxx|2 +-
 vcl/source/bitmap/BitmapLightenFilter.cxx |2 +-
 vcl/source/bitmap/BitmapMedianFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapMonochromeFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapMosaicFilter.cxx  |8 +---
 vcl/source/bitmap/BitmapPopArtFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapScaleConvolutionFilter.cxx|2 +-
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx  |2 +-
 vcl/source/bitmap/BitmapSepiaFilter.cxx   |2 +-
 vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx |2 +-
 vcl/source/bitmap/BitmapSmoothenFilter.cxx|2 +-
 vcl/source/bitmap/BitmapSobelGreyFilter.cxx   |2 +-
 vcl/source/bitmap/BitmapSolarizeFilter.cxx|2 +-
 vcl/source/bitmap/bitmapfilter.cxx|4 ++--
 48 files changed, 59 insertions(+), 61 deletions(-)

New commits:
commit 453fde35bb838febf73bfda0bd981ee270c9b12e
Author: Stephan Bergmann 
AuthorDate: Fri Sep 7 17:39:58 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 7 20:42:59 2018 +0200

BitmapFilter::execute can be const

...after a little tweak to BitmapMosaicFilter

Change-Id: I76b8ffdbf719a9d7960e7f3dafeb3adeb2300ec5
Reviewed-on: https://gerrit.libreoffice.org/60165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/vcl/BitmapAlphaClampFilter.hxx 
b/include/vcl/BitmapAlphaClampFilter.hxx
index 0fc6274b6d4e..39c039cbd02c 100644
--- a/include/vcl/BitmapAlphaClampFilter.hxx
+++ b/include/vcl/BitmapAlphaClampFilter.hxx
@@ -25,7 +25,7 @@ public:
 {
 }
 
-virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
 sal_uInt8 mcThreshold;
diff --git a/include/vcl/BitmapColorQuantizationFilter.hxx 
b/include/vcl/BitmapColorQuantizationFilter.hxx
index e695567a7bc0..170b0d88a471 100644
--- a/include/vcl/BitmapColorQuantizationFilter.hxx
+++ b/include/vcl/BitmapColorQuantizationFilter.hxx
@@ -28,7 +28,7 @@ public:
 {
 }
 
-virtual BitmapEx execute(BitmapEx const& rBitmapEx) override;
+virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
 
 private:
 sal_uInt16 mnNewColorCount;
diff --git a/include/vcl/BitmapConvolutionMatrixFilter.hxx 
b/include/vcl/BitmapConvolutionMatrixFilter.hxx
index cae8c3d8a91c..928eaa9f0aa2 100644
--- a/include/vcl/BitmapConvolutionMatrixFilter.hxx
+++ b/inc

[Libreoffice-commits] core.git: vcl/inc vcl/win

[Libreoffice Gerrit user]

 vcl/inc/win/salgdi.h  |3 ++-
 vcl/inc/win/winlayout.hxx |8 +---
 vcl/win/gdi/salfont.cxx   |   11 ---
 vcl/win/gdi/winlayout.cxx |   26 +-
 4 files changed, 28 insertions(+), 20 deletions(-)

New commits:
commit 7cb3e475f2fb0162c7290414509de4fb8fe57e30
Author: Jan-Marek Glogowski 
AuthorDate: Thu Sep 6 14:04:25 2018 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Sep 7 20:27:01 2018 +0200

WIN add SalGraphics* to WinFontInstance

HFONT lookup in ImplDoSetFont depends on the mbVirDev of the
WinSalGraphics. Since we need too look up HFONTs for SalLayout
without changing the corresponding SalGraphics, add a pointer
to the WinFontInstance.

Change-Id: Idb6573ce7267f0019c2183be47621d0eaef8e57b
Reviewed-on: https://gerrit.libreoffice.org/60093
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 243d2cdc8fc5..9f30f57ecac8 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -170,9 +170,10 @@ private:
 
 bool CacheGlyphs(const GenericSalLayout& rLayout);
 bool DrawCachedGlyphs(const GenericSalLayout& rLayout);
-HFONT ImplDoSetFont(FontSelectPattern const & i_rFont, const 
PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont);
 
 public:
+HFONT ImplDoSetFont(FontSelectPattern const & i_rFont, const 
PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont);
+
 HDC getHDC() const { return mhLocalDC; }
 void setHDC(HDC aNew) { mhLocalDC = aNew; }
 
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 066f7b587f6d..161b3666e06a 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -154,20 +154,22 @@ public:
 GlyphCache& GetGlyphCache() { return maGlyphCache; }
 bool hasHScale() const;
 
-void SetHFONT(const HFONT);
+void SetGraphics(WinSalGraphics*);
+WinSalGraphics* GetGraphics() const { return m_pGraphics; }
+
 HFONT GetHFONT() const { return m_hFont; }
-void SetScale(float fScale) { m_fScale = fScale; }
 float GetScale() const { return m_fScale; }
 
 // Prevent deletion of the HFONT in the WinFontInstance destructor
 // Used for the ScopedFont handling
-void UnsetHFONT() { m_hFont = nullptr; }
+void SetHFONT(HFONT hFont) { m_hFont = hFont; }
 
 private:
 explicit WinFontInstance(const PhysicalFontFace&, const 
FontSelectPattern&);
 
 virtual hb_font_t* ImplInitHbFont() override;
 
+WinSalGraphics *m_pGraphics;
 HFONT m_hFont;
 float m_fScale;
 GlyphCache maGlyphCache;
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index e2734052c9c0..15a95ee98668 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -934,13 +934,10 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, 
int nFallbackLevel)
 HFONT hNewFont = pFontInstance->GetHFONT();
 if (!hNewFont)
 {
-float fFontScale = 1.0;
-hNewFont = ImplDoSetFont(pFont->GetFontSelectPattern(), 
pFont->GetFontFace(), fFontScale, hOldFont);
-mpWinFontEntry[ nFallbackLevel ]->SetHFONT(hNewFont);
-mpWinFontEntry[ nFallbackLevel ]->SetScale(fFontScale);
+pFontInstance->SetGraphics(this);
+hNewFont = pFontInstance->GetHFONT();
 }
-else
-hOldFont = ::SelectFont( getHDC(), hNewFont );
+hOldFont = ::SelectFont(getHDC(), hNewFont);
 
 // keep default font
 if( !mhDefFont )
@@ -1588,7 +1585,7 @@ ScopedFont::ScopedFont(WinSalGraphics & rData): 
m_rData(rData), m_hOrigFont(null
 if (m_rData.mpWinFontEntry[0])
 {
 m_hOrigFont = m_rData.mpWinFontEntry[0]->GetHFONT();
-m_rData.mpWinFontEntry[0]->UnsetHFONT();
+m_rData.mpWinFontEntry[0]->SetHFONT(nullptr);
 }
 }
 
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 3800fcd9adc3..a1d76c8026a4 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -307,13 +307,16 @@ std::unique_ptr 
WinSalGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs
 
 assert(mpWinFontEntry[nFallbackLevel]->GetFontFace());
 
+mpWinFontEntry[nFallbackLevel]->SetGraphics(this);
 GenericSalLayout *aLayout = new 
GenericSalLayout(*mpWinFontEntry[nFallbackLevel]);
 return std::unique_ptr(aLayout);
 }
 
 WinFontInstance::WinFontInstance(const PhysicalFontFace& rPFF, const 
FontSelectPattern& rFSP)
 : LogicalFontInstance(rPFF, rFSP)
+, m_pGraphics(nullptr)
 , m_hFont(nullptr)
+, m_fScale(1.0f)
 {
 }
 
@@ -335,8 +338,12 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/, 
hb_tag_t nTableTag, void* pU
 {
 sal_uLong nLength = 0;
 unsigned char* pBuffer = nullptr;
-HFONT hFont = static_cast(pUserData);
-HDC hDC = GetDC(nullptr);
+WinFontInstance* pFont = static_cast(pUserData);
+HDC hDC = pFont->GetGraphics()->getHDC();
+HFONT hFont = pFont->GetHFONT();
+assert(hDC);
+assert(hF

[Libreoffice-commits] core.git: vcl/inc vcl/win

[Libreoffice Gerrit user]

 vcl/inc/win/salgdi.h|   13 ---
 vcl/win/gdi/salfont.cxx |   55 ++--
 vcl/win/gdi/salgdi.cxx  |6 -
 3 files changed, 17 insertions(+), 57 deletions(-)

New commits:
commit 334df91c6e464fe6434500f63e2fb12438722845
Author: Jan-Marek Glogowski 
AuthorDate: Thu Sep 6 14:00:29 2018 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Sep 7 20:26:18 2018 +0200

WIN drop mhFonts[MAX_FALLBACK]

Everything now uses the HFONT from WinFontInstance, so there
is no need for the additional fallback array.

Change-Id: I15a197b262633569cb95c37689561db5323e1115
Reviewed-on: https://gerrit.libreoffice.org/60092
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 32a104bef88e..243d2cdc8fc5 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -156,19 +156,6 @@ private:
 boolmbScreen : 1;   // is Screen compatible
 HWNDmhWnd;  // Window-Handle, when 
Window-Graphics
 
-/** HFONT lifecycle
- *
- * The HFONT has to be shared between mhFonts and mpWinFontEntry.
- * As mpWinFontEntry is reference counted and just freed in SetFont, the 
HFONT is
- * transferred from mhFonts to the mpWinFontEntry.
- *
- * We need the mhFonts list, as embedded fonts don't have a corresponding 
WinFontInstance
- * so for these there is just the mhFonts entry.
- *
- * The HFONT object can just be assigned to mhFonts _or_ mpWinFontEntry!
- **/
-
-HFONT   mhFonts[ MAX_FALLBACK ];// Font + Fallbacks
 rtl::Reference
 mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the 
most recent font instance
 HRGNmhRegion;   // vcl::Region Handle
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index bed9c7a22376..e2734052c9c0 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -913,22 +913,17 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, 
int nFallbackLevel)
 // return early if there is no new font
 if( !pFont )
 {
-// deselect still active font
-if (mhDefFont)
-{
-::SelectFont(getHDC(), mhDefFont);
-mhDefFont = nullptr;
-}
+if (!mpWinFontEntry[nFallbackLevel].is())
+return;
+
+// select original DC font
+assert(mhDefFont);
+::SelectFont(getHDC(), mhDefFont);
+mhDefFont = nullptr;
+
 // release no longer referenced font handles
 for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
-{
-if( mhFonts[i] )
-{
-::DeleteFont( mhFonts[i] );
-mhFonts[ i ] = nullptr;
-}
 mpWinFontEntry[i] = nullptr;
-}
 return;
 }
 
@@ -953,16 +948,8 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, 
int nFallbackLevel)
 else
 {
 // release no longer referenced font handles
-for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )
-{
-if( mhFonts[i] )
-{
-::DeleteFont( mhFonts[i] );
-mhFonts[i] = nullptr;
-}
-if (i > nFallbackLevel)
-mpWinFontEntry[i] = nullptr;
-}
+for( int i = nFallbackLevel + 1; mpWinFontEntry[i].is() && i < 
MAX_FALLBACK; ++i )
+mpWinFontEntry[i] = nullptr;
 }
 
 // now the font is live => update font face
@@ -973,8 +960,8 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont, 
int nFallbackLevel)
 void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int 
nFallbackLevel )
 {
 // temporarily change the HDC to the font in the fallback level
-assert(!mhFonts[nFallbackLevel] && mpWinFontEntry[nFallbackLevel]);
-const HFONT hOldFont = SelectFont(getHDC(), 
mpWinFontEntry[nFallbackLevel]->GetHFONT());
+rtl::Reference pFontInstance = 
mpWinFontEntry[nFallbackLevel];
+const HFONT hOldFont = SelectFont(getHDC(), pFontInstance->GetHFONT());
 
 wchar_t aFaceName[LF_FACESIZE+60];
 if( GetTextFaceW( getHDC(), SAL_N_ELEMENTS(aFaceName), aFaceName ) )
@@ -985,7 +972,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& 
rxFontMetric, int nFa
 const RawFontData aHheaRawData(getHDC(), nHheaTag);
 const RawFontData aOS2RawData(getHDC(), nOS2Tag);
 
-
rxFontMetric->SetMinKashida(mpWinFontEntry[nFallbackLevel]->GetKashidaWidth());
+rxFontMetric->SetMinKashida(pFontInstance->GetKashidaWidth());
 
 // get the font metric
 OUTLINETEXTMETRICW aOutlineMetric;
@@ -1006,7 +993,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& 
rxFontMetric, int nFa
 rxFontMetric->SetSlant( 0 );
 
 // transformation dependent font metrics
-
rxFontMetric->SetWidth(static_cast(mpWin

[Libreoffice-commits] core.git: include/salhelper salhelper/source

[Libreoffice Gerrit user]

 include/salhelper/simplereferenceobject.hxx |   22 ++
 salhelper/source/simplereferenceobject.cxx  |   15 ---
 2 files changed, 6 insertions(+), 31 deletions(-)

New commits:
commit c5483edae01e4145c80439c5070e0bf2fad51186
Author: Stephan Bergmann 
AuthorDate: Fri Sep 7 10:48:41 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 7 20:07:45 2018 +0200

Drop workaround for old MSVC that no longer appears necessary with MSVC 2017

The comments talk about unspecific "compilation and/or linking errors" with 
MSVC
2008 and 2013, but building with latest MSVC 2017 at least works fine now, 
so
assume the workaround is no longer needed.  (Theoretically, external code 
being
compiled with older MSVC could run into problems now, but lets take that 
risk of
becoming slightly build-time incompatible here.)

Change-Id: I9e20be355c765c3a881502773963a61305eb00f3
Reviewed-on: https://gerrit.libreoffice.org/60135
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/salhelper/simplereferenceobject.hxx 
b/include/salhelper/simplereferenceobject.hxx
index d8f86f52d00a..2745f0d848fd 100644
--- a/include/salhelper/simplereferenceobject.hxx
+++ b/include/salhelper/simplereferenceobject.hxx
@@ -51,8 +51,8 @@ namespace salhelper {
 
 The same problem as with operators new and delete would also be there with
 operators new[] and delete[].  But since arrays of reference-counted
-objects are of no use, anyway, it seems best to simply declare and not
-define (private) operators new[] and delete[].
+objects are of no use, anyway, it seems best to simply
+define operators new[] and delete[] as deleted.
  */
 class SALHELPER_DLLPUBLIC SimpleReferenceObject
 {
@@ -102,23 +102,13 @@ private:
  */
 void operator =(SimpleReferenceObject) SAL_DELETED_FUNCTION;
 
-/// @cond INTERNAL
-
-#ifdef _MSC_VER
-/* We can't now have these private with MSVC2008 at least, it leads to
-   compilation errors in xmloff and other places.
-*/
-protected:
-#endif
-/** not implemented (see general class documentation)
+/** see general class documentation
  */
-static void * operator new[](std::size_t);
+static void * operator new[](std::size_t) SAL_DELETED_FUNCTION;
 
-/** not implemented (see general class documentation)
+/** see general class documentation
  */
-static void operator delete[](void * pPtr);
-
-/// @endcond
+static void operator delete[](void * pPtr) SAL_DELETED_FUNCTION;
 };
 
 }
diff --git a/salhelper/source/simplereferenceobject.cxx 
b/salhelper/source/simplereferenceobject.cxx
index fcf130d9d192..c07c922528a6 100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -59,19 +59,4 @@ void SimpleReferenceObject::operator delete(void * pPtr, 
std::nothrow_t const &)
 #endif // WNT
 }
 
-#ifdef _MSC_VER
-
-/* This operator is supposed to be unimplemented, but that now leads
- * to compilation and/or linking errors with MSVC2008. Problem still
- * there with MSVC2013. As it can be left unimplemented just fine with
- * other compilers, presumably it is never called. So do implement it
- * then to avoid the compilation and/or linking errors, but make it
- * crash intentionally if called.
- */
-void SimpleReferenceObject::operator delete[](void * /* pPtr */)
-{
-abort();
-}
-#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/source

[Libreoffice Gerrit user]

 vcl/source/bitmap/BitmapColorQuantizationFilter.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 91f2b2b88731bd083c6a5218ae4eb35126e4b872
Author: Stephan Bergmann 
AuthorDate: Fri Sep 7 15:25:33 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 7 20:07:17 2018 +0200

Multiple calls of BitmapColorQuantizationFilter::execute

...should probably be independent of each other

Change-Id: I22fb860a5a197d5f3f0f8706782e25d07511a1d9
Reviewed-on: https://gerrit.libreoffice.org/60153
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx 
b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
index 13e88341c0d9..643354515f06 100644
--- a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx
@@ -8,6 +8,10 @@
  *
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -32,10 +36,9 @@ BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx 
const& aBitmapEx)
 Bitmap::ScopedReadAccess pRAcc(aBitmap);
 sal_uInt16 nBitCount;
 
-if (mnNewColorCount > 256)
-mnNewColorCount = 256;
+auto const cappedNewColorCount = std::min(mnNewColorCount, 
sal_uInt16(256));
 
-if (mnNewColorCount < 17)
+if (cappedNewColorCount < 17)
 nBitCount = 4;
 else
 nBitCount = 8;
@@ -104,7 +107,7 @@ BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx 
const& aBitmapEx)
 }
 }
 
-BitmapPalette aNewPal(mnNewColorCount);
+BitmapPalette aNewPal(cappedNewColorCount);
 
 std::qsort(pCountTable.get(), nTotalColors, 
sizeof(PopularColorCount),
[](const void* p1, const void* p2) {
@@ -122,7 +125,7 @@ BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx 
const& aBitmapEx)
return nRet;
});
 
-for (sal_uInt16 n = 0; n < mnNewColorCount; n++)
+for (sal_uInt16 n = 0; n < cappedNewColorCount; n++)
 {
 const PopularColorCount& rPop = pCountTable[n];
 aNewPal[n] = BitmapColor(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 3 commits - sw/source

[Libreoffice Gerrit user]

 sw/source/core/doc/docredln.cxx |2 ++
 sw/source/core/undo/unovwr.cxx  |6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b52423092ce625903fc78d4dada8a04d5b62e5e1
Author: Michael Stahl 
AuthorDate: Fri Sep 7 14:27:46 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 7 14:27:46 2018 +0200

sw: fix usage of wrong string in SwUndoOverwrite::RedoImpl()

At this point the "aDelStr" is in the document, don't use invalid index.

Change-Id: I0aae8839e9669e3a474266a345b54a1e7e6db38f

diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index 359010418053..b6f1721a0524 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -272,7 +272,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & 
rContext)
 {
 rIdx.Assign( pTextNd, nSttContent );
 pCurrentPam->SetMark();
-pCurrentPam->GetMark()->nContent += aInsStr.getLength();
+pCurrentPam->GetMark()->nContent += aDelStr.getLength();
 pDoc->getIDocumentRedlineAccess().DeleteRedline( *pCurrentPam, false, 
USHRT_MAX );
 pCurrentPam->DeleteMark();
 }
commit f7d75be109a09d7b8044bc667fef0361f643049d
Author: Michael Stahl 
AuthorDate: Fri Sep 7 14:27:30 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 7 14:27:30 2018 +0200

sw: convert to assert in SwUndoOverwrite

Change-Id: Iafad5a72922db35d94c836cefc53fb6be50eaaad

diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index d5652ce85e6e..359010418053 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -183,7 +183,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & 
rContext)
 pCurrentPam->DeleteMark();
 pCurrentPam->GetPoint()->nNode = nSttNode;
 SwTextNode* pTextNd = pCurrentPam->GetNode().GetTextNode();
-OSL_ENSURE( pTextNd, "Overwrite not in a TextNode?" );
+assert(pTextNd);
 SwIndex& rIdx = pCurrentPam->GetPoint()->nContent;
 rIdx.Assign( pTextNd, nSttContent );
 
@@ -265,7 +265,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & 
rContext)
 pCurrentPam->DeleteMark();
 pCurrentPam->GetPoint()->nNode = nSttNode;
 SwTextNode* pTextNd = pCurrentPam->GetNode().GetTextNode();
-OSL_ENSURE( pTextNd, "Overwrite not in TextNode?" );
+assert(pTextNd);
 SwIndex& rIdx = pCurrentPam->GetPoint()->nContent;
 
 if( pRedlSaveData )
commit 9aaefb06b5062635fb9bef7c8aef4df2584bff7a
Author: Michael Stahl 
AuthorDate: Fri Sep 7 13:36:02 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 7 13:36:02 2018 +0200

sw: add some asserts in CheckPosition()

This checks stuff but doesn't complain in any way if it fails, so try to
make it useful.

Change-Id: I5d52ea020226f1ffc4fda6533761930ac0d7051d

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 716cdfc6c2d7..7d1903a72df4 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -122,8 +122,10 @@ bool CheckPosition( const SwPosition* pStt, const 
SwPosition* pEnd )
 while( pEndStart && (!pEndStart->IsStartNode() || 
pEndStart->IsSectionNode() ||
 pEndStart->IsTableNode() ) )
 pEndStart = pEndStart->StartOfSectionNode();
+assert(pSttTab == pEndTab);
 if( pSttTab != pEndTab )
 nError = 1;
+assert(pSttTab || pSttStart == pEndStart);
 if( !pSttTab && pSttStart != pEndStart )
 nError |= 2;
 if( nError )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: clang-tidy performance-move-const-arg

[Noel Grandin]

On Fri, 7 Sep 2018 at 14:25, Stephan Bergmann  wrote:

> For my taste, that approach is too tightly tied to a class's current
> implementation details, something that may change over time.  Imagine a
>
>
Yeah, I agree, the particular clang-tidy plugin did not generate useful
results:

revert scheduled with:

https://gerrit.libreoffice.org/#/c/60166/

The reformatting here is an automatic clang thing, which it does when I use
the -fix and -format-style params. But it seems to extend it's formatting
around the nearest decl, so perhaps a little too enthusiastic.

The alternative is that I hand tweak all the changes, which are typically
randomly indented after -fix is done with the code.
Guess I'll be doing that from now on.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/uiconfig include/sfx2 include/vcl sfx2/source sfx2/uiconfig sw/qa sw/uiconfig vcl/source vcl/unx

[Libreoffice Gerrit user]

 cui/uiconfig/ui/patterntabpage.ui|3 -
 cui/uiconfig/ui/transparencytabpage.ui   |   20 
 include/sfx2/mgetempl.hxx|3 -
 include/vcl/weld.hxx |2 
 sfx2/source/dialog/mgetempl.cxx  |   39 +++
 sfx2/uiconfig/ui/managestylepage.ui  |   67 ++-
 sw/qa/uitest/writer_tests2/horizontalLine.py |4 -
 sw/uiconfig/swriter/ui/footnoteareapage.ui   |4 -
 sw/uiconfig/swriter/ui/textgridpage.ui   |1 
 vcl/source/app/salvtables.cxx|   15 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx |   10 
 11 files changed, 79 insertions(+), 89 deletions(-)

New commits:
commit 0593afe5606b6388a705f3e8b19e427fcbf7555b
Author: Caolán McNamara 
AuthorDate: Thu Sep 6 17:32:45 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 7 18:17:44 2018 +0200

just edit Entry to readonly, instead of a shadow ro widget

Change-Id: I28d6d3cceec5224a6b38bd44ec380974cd3bae12
Reviewed-on: https://gerrit.libreoffice.org/60104
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/patterntabpage.ui 
b/cui/uiconfig/ui/patterntabpage.ui
index 1d882b507029..836e9a5ee05f 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -178,9 +178,10 @@
 
   
 True
-False
+True
 start
 start
+GDK_BUTTON_MOTION_MASK 
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | 
GDK_STRUCTURE_MASK
 
   
 Pattern Editor
diff --git a/cui/uiconfig/ui/transparencytabpage.ui 
b/cui/uiconfig/ui/transparencytabpage.ui
index f2c6ff5b77a3..4961059ec762 100644
--- a/cui/uiconfig/ui/transparencytabpage.ui
+++ b/cui/uiconfig/ui/transparencytabpage.ui
@@ -74,7 +74,7 @@
   
 _No transparency
 True
-False
+True
 False
 True
 0
@@ -91,7 +91,7 @@
   
 _Transparency:
 True
-False
+True
 False
 True
 0
@@ -111,7 +111,7 @@
   
 _Gradient
 True
-False
+True
 False
 True
 0
@@ -126,7 +126,7 @@
 
   
 True
-False
+True
 True
 adjustmentPercent
 
@@ -160,7 +160,7 @@
 
   
 True
-False
+True
 True
 adjustmentPercent5
   
@@ -172,7 +172,7 @@
 
   
 True
-False
+True
 True
 adjustmentPercent4
   
@@ -184,7 +184,7 @@
 
   
 True
-False
+True
 True
 adjustmentPercent3
   
@@ -196,7 +196,7 @@
 
   
 True
-False
+True
 True
 adjustmentDegrees
   
@@ -208,7 +208,7 @@
 
   
 True
-False
+True
 True
 adjustmentPercent2
   
@@ -220,7 +220,7 @@
 
   
 True
-False
+True
 True
 adjustmentPercent1
   
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 238d662c33f5..d63b1a05ed0a 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -49,8 +49,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
 OUString aParent;
 SfxStyleSearchBits 

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da8617d69a7b27a3eeb3f26e207ddf1b4de3eeb3
Author: Olivier Hallot 
AuthorDate: Fri Sep 7 10:31:49 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 17:58:55 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Prepare to handle native SVG icons

Today icons are PNG images, if later they become SVG natively...

Change-Id: I42d886257b55b5676767c8b8879a6bf35eb4d5e6
Reviewed-on: https://gerrit.libreoffice.org/60156
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index caa4981835ff..f3124329e336 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit caa4981835ffce40ba409f05435a5ecc08be80b6
+Subproject commit f3124329e336603ba6684e913a61a58e7a202020
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/online_transform.xsl |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f3124329e336603ba6684e913a61a58e7a202020
Author: Olivier Hallot 
AuthorDate: Fri Sep 7 10:31:49 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 17:58:55 2018 +0200

Prepare to handle native SVG icons

Today icons are PNG images, if later they become SVG natively...

Change-Id: I42d886257b55b5676767c8b8879a6bf35eb4d5e6
Reviewed-on: https://gerrit.libreoffice.org/60156
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 70843b4c3..90b8a44a2 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -1089,7 +1089,17 @@
 
 
 
-
+
+
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09b618a03e9ace06a931ec7a868593df5114b498
Author: Olivier Hallot 
AuthorDate: Fri Sep 7 10:43:32 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 17:58:31 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - add image dimension and alt content to icons

some icons miss width and height values.

Change-Id: I4b94a0cf64a29451c96bb8f58729914b2cb576cf
Reviewed-on: https://gerrit.libreoffice.org/60157
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 23f7d53f6e4c..caa4981835ff 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 23f7d53f6e4c2cc1d0c869bd31a35a248a8b0111
+Subproject commit caa4981835ffce40ba409f05435a5ecc08be80b6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/shared/02/1803.xhp   |2 +-
 source/text/simpress/00/0403.xhp |2 +-
 source/text/swriter/00/0004.xhp  |   10 +-
 source/text/swriter/00/0403.xhp  |   10 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit caa4981835ffce40ba409f05435a5ecc08be80b6
Author: Olivier Hallot 
AuthorDate: Fri Sep 7 10:43:32 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 17:58:31 2018 +0200

add image dimension and alt content to icons

some icons miss width and height values.

Change-Id: I4b94a0cf64a29451c96bb8f58729914b2cb576cf
Reviewed-on: https://gerrit.libreoffice.org/60157
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/02/1803.xhp 
b/source/text/shared/02/1803.xhp
index fbcd1443e..f00b0662b 100644
--- a/source/text/shared/02/1803.xhp
+++ b/source/text/shared/02/1803.xhp
@@ -36,7 +36,7 @@
 
   
 
-  Icon
+Automatic Spell Checking 
On/Off
 
 
   Automatic Spell Checking On/Off
diff --git a/source/text/simpress/00/0403.xhp 
b/source/text/simpress/00/0403.xhp
index 6d9ab7194..966a56b6a 100644
--- a/source/text/simpress/00/0403.xhp
+++ b/source/text/simpress/00/0403.xhp
@@ -67,7 +67,7 @@
 
   
 
-   Icon
+ 
Slide Show 
Icon
 
 
   Slide 
Show
diff --git a/source/text/swriter/00/0004.xhp 
b/source/text/swriter/00/0004.xhp
index 78c0e7f7e..dca10d4a2 100644
--- a/source/text/swriter/00/0004.xhp
+++ b/source/text/swriter/00/0004.xhp
@@ -40,7 +40,7 @@
 
 
  
-  Icon
+ Wrap Off 
Icon
  
  
   Wrap 
Off
@@ -56,7 +56,7 @@
 
 
  
-  Icon
+ Wrap On 
Icon
  
  
   Wrap 
On
@@ -72,7 +72,7 @@
 
 
  
-  Icon
+ Wrap Through 
Icon
  
  
   Wrap 
Through
@@ -88,7 +88,7 @@
 
 
  
-  Icon
+ Jump to Previous Script 
Icon
  
  
   Jump to 
Previous Script
@@ -104,7 +104,7 @@
 
 
  
-  Icon
+  Jump to Next Script 
Icon
  
  
   Jump to 
Next Script
diff --git a/source/text/swriter/00/0403.xhp 
b/source/text/swriter/00/0403.xhp
index 86405a094..6bb9631c4 100644
--- a/source/text/swriter/00/0403.xhp
+++ b/source/text/swriter/00/0403.xhp
@@ -34,19 +34,19 @@
 
 
 Choose 
View - Field Shadings 
-Command 
+Command
 Ctrl+F8
 
 
 
 Choose 
View - Field Names 
-Command 
+Command
 Ctrl+F9
 
 
 
 Choose 
View - Formatting Marks 
-Command 
+Command
 Ctrl+F10
 On Standard 
bar, click
 
@@ -55,7 +55,7 @@
 
   
 
-   Icon
+   Formatting Marks 
Icon
 
 
   Formatting Marks
@@ -75,7 +75,7 @@
 
   
 
-   Icon
+ 
Web 
Icon
 
 
   Web
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: qa/createBlogReport.py

[Libreoffice Gerrit user]

 qa/createBlogReport.py |  350 +
 1 file changed, 350 insertions(+)

New commits:
commit 07438263d7b86ab68f4a1ccab060b3733960
Author: Xisco Fauli 
AuthorDate: Fri Sep 7 17:50:37 2018 +0200
Commit: Xisco Fauli 
CommitDate: Fri Sep 7 17:51:27 2018 +0200

QA: new script for blog reports

diff --git a/qa/createBlogReport.py b/qa/createBlogReport.py
new file mode 100755
index 000..99a8246
--- /dev/null
+++ b/qa/createBlogReport.py
@@ -0,0 +1,350 @@
+#!/usr/bin/env python3
+#
+# 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/.
+#
+
+import common
+from datetime import datetime, timedelta
+import argparse
+
+import matplotlib
+import matplotlib.pyplot as plt
+
+lKeywords = ['haveBacktrace', 'regression', 'bisected']
+
+
+def util_create_basic_schema():
+return {
+'id': [],
+'author': {},
+'day': {},
+'difftime': []
+}
+
+def util_create_statList():
+return {
+'created': util_create_basic_schema(),
+'confirmed': util_create_basic_schema(),
+'verified': util_create_basic_schema(),
+'fixed': util_create_basic_schema(),
+'metabug': util_create_basic_schema(),
+'keywords': { k : util_create_basic_schema() for k in lKeywords},
+'people' : {},
+'unconfirmedCount' : {},
+'stat': {'oldest': datetime.now(), 'newest': datetime(2001, 1, 1)}
+}
+
+def util_increase_action(value, rowId, creatorMail, day, difftime=-1):
+value['id'].append(rowId)
+if creatorMail not in value['author']:
+value['author'][creatorMail] = 0
+value['author'][creatorMail] += 1
+
+if day not in value['day']:
+value['day'][day] = 0
+value['day'][day] += 1
+
+if difftime >= 0:
+value['difftime'].append(difftime)
+
+def util_decrease_action(value, creatorMail, day):
+value['id'].pop()
+value['author'][creatorMail] -= 1
+value['day'][day] -= 1
+
+if value['difftime']:
+value['difftime'].pop()
+
+def check_date(xDate, cfg):
+if xDate >= cfg.Date[0] and xDate < cfg.Date[1]:
+return True
+else:
+return False
+
+def daterange(cfg):
+for n in range(int ((cfg.Date[1] - cfg.Date[0]).days)):
+yield cfg.Date[0] + timedelta(n)
+
+def analyze_bugzilla_data(statList, bugzillaData, cfg):
+print("Analyzing bugzilla\n", end="", flush=True)
+
+
+unconfirmedCountPerDay = {}
+fixedBugs = []
+for key, row in bugzillaData['bugs'].items():
+rowId = row['id']
+
+#Ignore META bugs and deletionrequest bugs.
+if not row['summary'].lower().startswith('[meta]') and 
row['component'] != 'deletionrequest':
+creationDate = datetime.strptime(row['creation_time'], 
"%Y-%m-%dT%H:%M:%SZ")
+
+
+#Some old bugs were directly created as NEW, skipping the 
UNCONFIRMED status
+#Use the oldest bug ID in the unconfirmed list
+if rowId >= 89589:
+strDay = creationDate.strftime("%Y-%m-%d")
+if strDay not in unconfirmedCountPerDay:
+unconfirmedCountPerDay[strDay] = 0
+unconfirmedCountPerDay[strDay] += 1
+
+rowStatus = row['status']
+rowResolution = row['resolution']
+
+rowKeywords = row['keywords']
+
+creatorMail = row['creator']
+
+#get information about created bugs in the period of time
+if check_date(creationDate, cfg):
+creationDay = str(creationDate.strftime("%Y-%m-%d"))
+util_increase_action(statList['created'], rowId, creatorMail, 
creationDay)
+
+common.util_check_bugzilla_mail(
+statList, creatorMail, row['creator_detail']['real_name'], 
creationDate, rowId)
+
+isFixed = False
+isConfirmed = False
+isVerified = False
+dayConfirmed = None
+dayVerified = None
+authorConfirmed = None
+authorVerified = None
+for action in row['history']:
+actionMail = action['who']
+actionDate = datetime.strptime(action['when'], 
"%Y-%m-%dT%H:%M:%SZ")
+
+common.util_check_bugzilla_mail(
+statList, actionMail, '', actionDate, rowId)
+
+actionDay = str(actionDate.strftime("%Y-%m-%d"))
+diffTime = (actionDate - creationDate).days
+
+for change in action['changes']:
+
+if change['field_name'] == 'status':
+addedStatus = change['added']
+removedStatus = change['removed']
+
+#See above
+if rowI

RE: Software Quality Testing Users List

[Kayla Justine]

 

 

Hi,

 

I hope you’re doing well.

 

I was wondering if you had a chance to review my previous email that I sent to 
you.

 

Kindly let me know your interest so that i can get back to you with counts and 
pricing available.

 

 Regards,

Kayla| Marketing Analyst

 

From: Kayla Justine [mailto:kayla.justi...@verifiedcounts.com] 
Sent: Thursday, September 06, 2018 12:47 PM
To: 'libreoffice@lists.freedesktop.org'
Subject: Software Quality Testing Users List

 

Hi,

 

I was curious to know if you would be interested in Software Quality Testing 
Users List?

 

We maintain and cover all types of Business database with direct business email 
address (Not Generic).

 

 Let me know your target criteria and we will revert back to you with further 
details.

 

Target Users:

 

Geography:

 

Looking forward to continued success with you.

 

Regards,

Kayla Justine | Marketing Analyst

 

 

Note: If you have any other unique requirement please feel free to share with 
us.   

 

 

To remove from this mailing: reply with subject line as "leave out"

 

 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/shared/01/05040100.xhp |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 23f7d53f6e4c2cc1d0c869bd31a35a248a8b0111
Author: Caolán McNamara 
AuthorDate: Fri Sep 7 10:29:48 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 7 16:43:39 2018 +0200

adapt to merge of namero and namerw

Change-Id: I46883713361bf8107b601e4cc775ef5bce185e3d
Reviewed-on: https://gerrit.libreoffice.org/60138
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/source/text/shared/01/05040100.xhp 
b/source/text/shared/01/05040100.xhp
index 39d4deb14..63b75bba8 100644
--- a/source/text/shared/01/05040100.xhp
+++ b/source/text/shared/01/05040100.xhp
@@ -39,10 +39,9 @@
   
  
   
-
-
+
 Name
-  Displays the name of the selected style. If 
you are creating or modifying a custom style, enter a name for the style. You 
cannot change the name of a predefined style.
+  Displays the name of the selected style. If 
you are creating or modifying a custom style, enter a name for the style. You 
cannot change the name of a predefined style.
 
 AutoUpdate
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/icu helpcontent2

[Libreoffice Gerrit user]

 external/icu/ExternalProject_icu.mk |1 +
 helpcontent2|2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5c1d1c021d98e515574f8bd689c76eaf6c6a3ce
Author: Caolán McNamara 
AuthorDate: Fri Sep 7 10:29:48 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 16:43:39 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - adapt to merge of namero and namerw

Change-Id: I46883713361bf8107b601e4cc775ef5bce185e3d
Reviewed-on: https://gerrit.libreoffice.org/60138
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcontent2 b/helpcontent2
index 991e7f1f76d5..23f7d53f6e4c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 991e7f1f76d5ff87373cdf6e9f74897f36d8c393
+Subproject commit 23f7d53f6e4c2cc1d0c869bd31a35a248a8b0111
commit 0b8f70538040b306ccb0aa0a66e159c1b8005559
Author: Caolán McNamara 
AuthorDate: Fri Sep 7 09:50:09 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 7 16:43:20 2018 +0200

ofz#10100 skip namespace check in icu

fails under oss-fuzz with linker problem

https://github.com/google/oss-fuzz/issues/1789

Change-Id: I5788fca1914c1b795a91d59f7d9271f854b4d464
Reviewed-on: https://gerrit.libreoffice.org/60134
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/icu/ExternalProject_icu.mk 
b/external/icu/ExternalProject_icu.mk
index d52f3e5d3036..f0ce0d3b4c62 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -65,6 +65,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
./configure \
+   ac_cv_namespace_ok=yes \
--disable-layout --disable-samples \
$(if $(CROSS_COMPILING),--disable-tools 
--disable-extras) \
$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx svx/source

[Libreoffice Gerrit user]

 cui/source/inc/chardlg.hxx   |   79 ++---
 cui/source/tabpages/chardlg.cxx  |  579 +--
 cui/uiconfig/ui/effectspage.ui   |  336 +++---
 include/svx/colorbox.hxx |5 
 include/svx/colorwindow.hxx  |1 
 include/svx/fntctrl.hxx  |3 
 svx/source/dialog/fntctrl.cxx|   26 +
 svx/source/tbxctrls/tbcontrl.cxx |   39 ++
 8 files changed, 481 insertions(+), 587 deletions(-)

New commits:
commit 5744597e4d1df2cd9a739f249dbbcae7214a4e23
Author: Caolán McNamara 
AuthorDate: Fri Sep 7 12:37:03 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 7 16:43:01 2018 +0200

weld SvxCharEffectsPage

Change-Id: I067b7a8c93e997fd554558f334a2968bf27965c6
Reviewed-on: https://gerrit.libreoffice.org/60147
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index cee534052568..6a5f2b5c8332 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -200,7 +200,7 @@ public:
 
 // class SvxCharEffectsPage --
 
-class SvxCharEffectsPage : public SvxCharBasePage
+class SvxCharEffectsPage : public CharBasePage
 {
 friend class VclPtr;
 
@@ -210,43 +210,34 @@ private:
 bool   m_bNewFontColor;
 bool   m_bEnableNoneFontColor;
 Color  m_aOrigFontColor;
-VclPtr  m_pFontColorFT;
-VclPtrm_pFontColorLB;
-
-VclPtr  m_pEffectsFT;
-VclPtrm_pEffectsLB;
-
-VclPtr  m_pReliefFT;
-VclPtrm_pReliefLB;
-
-VclPtrm_pOutlineBtn;
-VclPtrm_pShadowBtn;
-VclPtrm_pBlinkingBtn;
-VclPtrm_pHiddenBtn;
-
-VclPtrm_pOverlineLB;
-VclPtr  m_pOverlineColorFT;
-VclPtrm_pOverlineColorLB;
-
-VclPtrm_pStrikeoutLB;
-
-VclPtrm_pUnderlineLB;
-VclPtr  m_pUnderlineColorFT;
-VclPtrm_pUnderlineColorLB;
-
-VclPtr   m_pIndividualWordsBtn;
-
-VclPtr  m_pEmphasisFT;
-VclPtrm_pEmphasisLB;
-
-VclPtr  m_pPositionFT;
-VclPtrm_pPositionLB;
-
-VclPtr  m_pA11yWarningFT;
-
-sal_uInt16  m_nHtmlMode;
-
-SvxCharEffectsPage( vcl::Window* pParent, const 
SfxItemSet& rSet );
+sal_uInt16 m_nHtmlMode;
+bool   m_bUnderlineColorDisabled;
+
+std::unique_ptr m_xFontColorFT;
+std::unique_ptr m_xFontColorLB;
+std::unique_ptr m_xEffectsFT;
+std::unique_ptr m_xEffectsLB;
+std::unique_ptr m_xReliefFT;
+std::unique_ptr m_xReliefLB;
+std::unique_ptr m_xOutlineBtn;
+std::unique_ptr m_xShadowBtn;
+std::unique_ptr m_xBlinkingBtn;
+std::unique_ptr m_xHiddenBtn;
+std::unique_ptr m_xOverlineLB;
+std::unique_ptr m_xOverlineColorFT;
+std::unique_ptr m_xOverlineColorLB;
+std::unique_ptr m_xStrikeoutLB;
+std::unique_ptr m_xUnderlineLB;
+std::unique_ptr m_xUnderlineColorFT;
+std::unique_ptr m_xUnderlineColorLB;
+std::unique_ptr m_xIndividualWordsBtn;
+std::unique_ptr m_xEmphasisFT;
+std::unique_ptr m_xEmphasisLB;
+std::unique_ptr m_xPositionFT;
+std::unique_ptr m_xPositionLB;
+std::unique_ptr m_xA11yWarningFT;
+
+SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet);
 
 voidInitialize();
 voidUpdatePreview_Impl();
@@ -256,12 +247,12 @@ private:
 Color   GetPreviewFontColor(const Color& rColor) const;
 voidEnableNoneFontColor();
 
-void SelectHdl_Impl(ListBox*);
-DECL_LINK(SelectListBoxHdl_Impl, ListBox&, void);
-DECL_LINK(CbClickHdl_Impl, Button*, void);
-DECL_LINK(TristClickHdl_Impl, Button*, void);
-DECL_LINK(UpdatePreview_Impl, ListBox&, void);
-DECL_LINK(ColorBoxSelectHdl_Impl, SvxColorListBox&, void);
+void SelectHdl_Impl(weld::ComboBoxText*);
+DECL_LINK(SelectListBoxHdl_Impl, weld::ComboBoxText&, void);
+DECL_LINK(CbClickHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(TristClickHdl_Impl, weld::ToggleButton&, void);
+DECL_LINK(UpdatePreview_Impl, weld::ComboBoxText&, void);
+DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
 
 public:
 virtual ~SvxCharEffectsPage() override;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 83e3dc17e6e0..2c729da529f6 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1389,46 +1389,46 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& 
aSet)
 }
 // class SvxCharEffectsPage --
 
-SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const 
SfxItemSet& rInSet )
-: SvxCharBasePage(pParent, "EffectsPage

[Libreoffice-commits] online.git: 3 commits - loleaflet/html loleaflet/js loleaflet/Makefile.am loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/Makefile.am|   13 ++-
 loleaflet/html/loleaflet.html.m4 |   41 ++
 loleaflet/js/global.js   |8 +++-
 loleaflet/js/main.js |4 +-
 loleaflet/src/core/Socket.js |   71 ---
 5 files changed, 107 insertions(+), 30 deletions(-)

New commits:
commit 49da3c03a619d2983a96cac531c2fcac79ef9ffd
Author: Tor Lillqvist 
AuthorDate: Fri Sep 7 16:40:18 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Sep 7 17:37:54 2018 +0300

Move a few lines of code into the else branch they are relevant for

Change-Id: If0ce5236f1cd0daae6b213ed19d57820d25206e0

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ed799b3bd..cd6744f08 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -56,17 +56,17 @@ L.Socket = L.Class.extend({
if (map.options.permission) {
map.options.docParams['permission'] = 
map.options.permission;
}
-   var wopiSrc = '';
-   if (map.options.wopiSrc != '') {
-   wopiSrc = '?WOPISrc=' + map.options.wopiSrc + 
'&compat=/ws';
-   }
-
if (this.socket) {
this.close();
}
if (window.ThisIsTheiOSApp) {
this.socket = new FakeWebSocket();
} else {
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc + 
'&compat=/ws';
+   }
+
try {
var websocketURI = map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws' + wopiSrc;
this.socket = new WebSocket(websocketURI);
commit fb7cc57b0fdb3373b9f46c6a0bb1f8c2a22c9c74
Author: Tor Lillqvist 
AuthorDate: Fri Sep 7 16:27:00 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Sep 7 17:37:54 2018 +0300

Work in Progress: Check window.ThisIsTheiOSApp and behave accordingly

First steps to modify behaviour in the app case. No query parameters
or WebSocket messages in that case.

Change-Id: I170d46830bb940c5164af3f62b873672373d8f17

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index f41d80c4f..2ae7c4a49 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -1,3 +1,4 @@
+dnl -*- Mode: HTML -*-x
 changequote([,])dnl
 dnl# foreachq(x, `item_1, item_2, ..., item_n', stmt)
 dnl# quoted list, alternate improved version
@@ -17,6 +18,10 @@ 
define([_foreachq],[ifelse([$#],[3],[],[define([$1],[$4])$2[]$0([$1],[$2],shift(
   var PostMessageReadyListener = function(e) {
 var msg = JSON.parse(e.data);
 if (msg.MessageId === 'Host_PostmessageReady') {
+  if (window.ThisIsTheiOSApp) {
+// Just for debugging to see that we got it
+window.webkit.messageHandlers.lool.postMessage('got 
Host_PostmessageReady!');
+  }
   window.WOPIPostmessageReady = true;
   window.removeEventListener('message', PostMessageReadyListener, false);
 }
@@ -116,18 +121,40 @@ ifelse(IOSAPP,[true],
 
 
 
-  window.host = '%HOST%';
+ifelse(IOSAPP,[true],
+ [window.host = '';
+  window.accessToken = '';
+  window.accessTokenTTL = '';
+  window.accessHeader = '';
+  window.loleafletLogging = 'true';
+  window.outOfFocusTimeoutSecs = 100;
+  window.idleTimeoutSecs = 100;],
+ [window.host = '%HOST%';
   window.accessToken = '%ACCESS_TOKEN%';
   window.accessTokenTTL = '%ACCESS_TOKEN_TTL%';
   window.accessHeader = '%ACCESS_HEADER%';
   window.loleafletLogging = '%LOLEAFLET_LOGGING%';
   window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
-  window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
+  window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;])
 
-ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
-[
-]),
-[
-])dnl
+  
+ifelse(IOSAPP,[true],
+  [window.ThisIsTheiOSApp = true;],
+  [window.ThisIsTheiOSApp = false;]
+)
+  
+
+ifelse(IOSAPP,[true],
+  ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
+  [
+  ]),
+  [
+  ]),
+  ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
+  [
+  ]),
+  [
+  ])
+)dnl
  
 
diff --git a/loleaflet/js/main.js b/loleaflet/js/main.js
index e53a3117f..4f14a26bd 100644
--- a/loleaflet/js/main.js
+++ b/loleaflet/js/main.js
@@ -25,10 +25,10 @@ var revHistoryEnabled = 
getParameterByName('revisionhistory');
 var alwaysActive = getParameterByName('alwaysactive');
 // Loleaflet Debug mode
 var debugMode = getParameterByName('debug');
-if (wopiSrc === '' && filePath === '') {
+if (wopiSrc === '' && filePath === '' && !window.ThisIsTheiOSApp) {
vex.dialog.alert(er

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - configure.ac connectivity/source download.lst

[Libreoffice Gerrit user]

 configure.ac|2 
 connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |   85 
 connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx |7 -
 download.lst|4 
 4 files changed, 73 insertions(+), 25 deletions(-)

New commits:
commit 5c15160445fd62d184f06bdf04677862ab5d2bb4
Author: Andras Timar 
AuthorDate: Fri Sep 7 16:13:54 2018 +0200
Commit: Andras Timar 
CommitDate: Fri Sep 7 16:13:54 2018 +0200

Bump version to 6.0-9

Change-Id: I52427a36808fd47dabf4ba26916f626c7956389e

diff --git a/configure.ac b/configure.ac
index c6161b1a0e1f..07e06abb784c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.0.10.8],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.0.10.9],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 44cef0d785c21f97e9f2b4f089491957301b8063
Author: Tamas Bunth 
AuthorDate: Thu Sep 6 16:58:42 2018 +0200
Commit: Andras Timar 
CommitDate: Fri Sep 7 15:42:59 2018 +0200

mysqlc: ensure cursor is not out of range

when calling getXXX() methods of a simple result set.

Change-Id: I9e018385bb73468ea520b03275232c0982cbcba0
Reviewed-on: https://gerrit.libreoffice.org/60095
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index 9fa2f64613c0..407e927527af 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -75,6 +75,14 @@ std::vector lcl_split(const OUString& rStr, 
sal_Unicode cSeparator)
 }
 }
 
+void OResultSet::checkRowIndex()
+{
+if (m_nRowPosition <= 0 || m_nRowPosition > m_nRowCount)
+{
+throw SQLException("Cursor position out of range", *this, 
rtl::OUString(), 1, Any());
+}
+}
+
 rtl::OUString SAL_CALL OResultSet::getImplementationName()
 {
 return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
@@ -106,6 +114,10 @@ OResultSet::OResultSet(OConnection& rConn, 
OCommonStatement* pStmt, MYSQL_RES* p
 , m_encoding(_encoding)
 {
 fieldCount = mysql_num_fields(pResult);
+
+// it works only if result set is produced via mysql_store_result
+// TODO ensure that
+m_nRowCount = mysql_num_rows(pResult);
 }
 
 void OResultSet::disposing()
@@ -158,6 +170,7 @@ uno::Reference SAL_CALL 
OResultSet::getBinaryStream(sal_Int32 colu
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getBinaryStream",
 *this);
 return nullptr;
@@ -168,6 +181,7 @@ uno::Reference SAL_CALL 
OResultSet::getCharacterStream(sal_Int32 c
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getCharacterStream",
 *this);
@@ -179,6 +193,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -196,6 +211,7 @@ sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -229,6 +245,7 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 Date d; // TODO initialize
 char* dateStr = m_aRow[column - 1];
@@ -268,6 +285,7 @@ double SAL_CALL OResultSet::getDouble(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -285,6 +303,7 @@ float SAL_CALL OResultSet::getFloat(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -317,7 +336,7 @@ sal_Int32 SAL_CALL OResultSet::getRow()
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.

layout.xml differs from parseDump(...)

[Patrick Jaap]

Hi!

I'm trying to write a simple unit test but this time it is confusing.
For my odt-document the layout.xml says:

There are 6 "txt" portions  in the body and "info"->"bounds"->"top" 
values are


top="2269"
top="6022"
top="6502"
top="6882"
top="7262"
top="7642"

In the unit test, I have

    SAL_DEBUG("1:  " << 
parseDump("/root/page/body/txt[1]/infos/bounds", "top").toInt32());
    SAL_DEBUG("2:  " << 
parseDump("/root/page/body/txt[2]/infos/bounds", "top").toInt32());
    SAL_DEBUG("3:  " << 
parseDump("/root/page/body/txt[3]/infos/bounds", "top").toInt32());
    SAL_DEBUG("4:  " << 
parseDump("/root/page/body/txt[4]/infos/bounds", "top").toInt32());
    SAL_DEBUG("5:  " << 
parseDump("/root/page/body/txt[5]/infos/bounds", "top").toInt32());
    SAL_DEBUG("6:  " << 
parseDump("/root/page/body/txt[6]/infos/bounds", "top").toInt32());


which returns

debug:15038:15038: 1: 2269
debug:15038:15038: 2: 5689
debug:15038:15038: 3: 6169
debug:15038:15038: 4: 6549
debug:15038:15038: 5: 6929
debug:15038:15038: 6: 7309


So, the first one is equal, but the other ones are shifted by 333.

How can this be caused? Is this a bug?

Regards,
Patrick




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/vcl sw/source vcl/source

[Libreoffice Gerrit user]

 include/vcl/outdev.hxx  |3 ++-
 sw/source/core/inc/fntcache.hxx |1 +
 sw/source/core/txtnode/fntcache.cxx |9 -
 vcl/source/outdev/text.cxx  |5 +++--
 4 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 2a73c9e04ba9379c0561a7e8d531b5633c46ec52
Author: Miklos Vajna 
AuthorDate: Fri Sep 7 10:43:10 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Sep 7 16:02:49 2018 +0200

sw: less vcl text layout calls in SwFont::GetTextBreak()

Number of GenericSalLayout::LayoutText() calls during "dt" in Writer: 
105
-> 89.

Change-Id: I0f2bb241536209cfccc1d78bed6f54bf5c31e627
Reviewed-on: https://gerrit.libreoffice.org/60133
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 1aa842b46cd5..f015f52488d8 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1174,7 +1174,8 @@ public:
 sal_Int32   GetTextBreak( const OUString& rStr, long 
nTextWidth,
   sal_Int32 nIndex, sal_Int32 nLen 
= -1,
   long nCharExtra = 0,
-  vcl::TextLayoutCache const* = 
nullptr) const;
+  vcl::TextLayoutCache const* = 
nullptr,
+  const SalLayoutGlyphs* pGlyphs = 
nullptr) const;
 sal_Int32   GetTextBreak( const OUString& rStr, long 
nTextWidth,
   sal_Unicode nExtraChar, 
sal_Int32& rExtraCharPos,
   sal_Int32 nIndex, sal_Int32 nLen,
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index ee8a1d2971f7..a7400f03d0d1 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -122,6 +122,7 @@ public:
 sal_uInt16   GetZoom() const { return m_nZoom; }
 sal_uInt16   GetPropWidth() const { return m_nPropWidth; }
 bool IsSymbol() const { return m_bSymbol; }
+std::map& GetTextGlyphs() { return 
m_aTextGlyphs; }
 
 void   DrawText( SwDrawTextInfo &rInf );
 /// determine the TextSize (of the printer)
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index e893e43d1f8e..5f294fe6c7ca 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2483,10 +2483,17 @@ TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo 
const & rInf, long nTextWidth
 *rInf.GetHyphPos() = TextFrameIndex((nHyphPos == -1) ? 
COMPLETE_STRING : nHyphPos);
 }
 else
+{
+SwFntAccess aFntAccess(m_aSub[m_nActual].m_nFontCacheId, 
m_aSub[m_nActual].m_nFontIndex,
+   &m_aSub[m_nActual], rInf.GetShell());
+SwTextGlyphsKey aGlyphsKey{ &rInf.GetOut(), *pTmpText, nTmpIdx, 
nTmpLen };
+SalLayoutGlyphs* pGlyphs
+= lcl_CreateLayout(aGlyphsKey, 
aFntAccess.Get()->GetTextGlyphs()[aGlyphsKey]);
 nTextBreak = TextFrameIndex(rInf.GetOut().GetTextBreak(
  *pTmpText, nTextWidth,
  sal_Int32(nTmpIdx), sal_Int32(nTmpLen),
- nKern, rInf.GetVclCache()));
+ nKern, rInf.GetVclCache(), pGlyphs));
+}
 
 if (bTextReplaced && sal_Int32(nTextBreak) != -1)
 {
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 820df543bc5d..b0243b3395a6 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1394,10 +1394,11 @@ bool OutputDevice::GetTextIsRTL( const OUString& 
rString, sal_Int32 nIndex, sal_
 sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth,
sal_Int32 nIndex, sal_Int32 nLen,
long nCharExtra,
- vcl::TextLayoutCache const*const pLayoutCache) const
+ vcl::TextLayoutCache const*const pLayoutCache,
+ const SalLayoutGlyphs* pGlyphs) const
 {
 std::unique_ptr pSalLayout = ImplLayout( rStr, nIndex, nLen,
-Point(0,0), 0, nullptr, SalLayoutFlags::NONE, pLayoutCache);
+Point(0,0), 0, nullptr, SalLayoutFlags::NONE, pLayoutCache, 
pGlyphs);
 sal_Int32 nRetVal = -1;
 if( pSalLayout )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2aaf5a73dac9f1dc137fba1e5f8536ef9f67ed89
Author: Olivier Hallot 
AuthorDate: Fri Sep 7 06:21:23 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 15:47:33 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Height and width are  attributes

Change-Id: Ia8084ff7029ddd06e450cbf03a7b1fb5efaa7dc7
Reviewed-on: https://gerrit.libreoffice.org/60136
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 975365445280..991e7f1f76d5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 975365445280e10d567dfb0bd8be6e5eb1dfdc46
+Subproject commit 991e7f1f76d5ff87373cdf6e9f74897f36d8c393
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/online_transform.xsl |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 991e7f1f76d5ff87373cdf6e9f74897f36d8c393
Author: Olivier Hallot 
AuthorDate: Fri Sep 7 06:21:23 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 15:47:33 2018 +0200

Height and width are  attributes

Change-Id: Ia8084ff7029ddd06e450cbf03a7b1fb5efaa7dc7
Reviewed-on: https://gerrit.libreoffice.org/60136
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 5e7859b97..70843b4c3 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -1078,18 +1078,15 @@
 
 
 
-
 
 
 
 
 
-
 
 
 
-
-
+
 
 
 
@@ -1205,13 +1202,13 @@
 
 
 
-
+
 
 
-
+
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-1' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 3765 ++--
 1 file changed, 1898 insertions(+), 1867 deletions(-)

New commits:
commit b3ec27dd47f56ecdc1455147f058687986cd4072
Author: Christian Lohmaier 
AuthorDate: Fri Sep 7 15:39:57 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 7 15:46:17 2018 +0200

update credits

Change-Id: I946580363eb272f95694b000d6daa997e761285d
(cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d)
(cherry picked from commit d90b4e2c535ba5f9e60328a128c0c90cc51b7ac9)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c945310ccae..aaa9cf7b6176 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.6.2$Linux_X86_64
 
LibreOffice_project/0c292870b25a325b5ed35f6b45599d2ea4458e772012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.0.3$Linux_X86_64
 
LibreOffice_project/efb621ed25068d70781dc026f7e9c5187a4decd12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   510
+   520
501
-   41965
+   40483
21327
true
true
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 510
- 42464
- 21835
+ 520
+ 40982
+ 21846
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   false
true
false
false
@@ -55,14 +56,10 @@
false
true
true
-   false
-   false
-   false
+   1557161
false

false
-   false
-   false
true
false
false
@@ -72,7 +69,7 @@
false
false
true
-   7902645
+   7975536
false
false
false
@@ -80,13 +77,19 @@
true
true
false
-   true
0
false
-   true
high-resolution
false
+   true
+   false
+   false
+   false
+   true
false
+   false
+   false
+   false

 
  hu
@@ -111,7 +114,6 @@

false
false
-   1557161
false
1
true
@@ -318,16 +320,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -335,30 +337,27 @@
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -399,24 +398,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -476,34 +475,35 @@
   
   
   
-  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
   
@@ -785,9 +785,10 @@
 
 
 
+


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 3765 ++--
 1 file changed, 1898 insertions(+), 1867 deletions(-)

New commits:
commit d90b4e2c535ba5f9e60328a128c0c90cc51b7ac9
Author: Christian Lohmaier 
AuthorDate: Fri Sep 7 15:39:57 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 7 15:43:45 2018 +0200

update credits

Change-Id: I946580363eb272f95694b000d6daa997e761285d
(cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c945310ccae..aaa9cf7b6176 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.6.2$Linux_X86_64
 
LibreOffice_project/0c292870b25a325b5ed35f6b45599d2ea4458e772012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.0.3$Linux_X86_64
 
LibreOffice_project/efb621ed25068d70781dc026f7e9c5187a4decd12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   510
+   520
501
-   41965
+   40483
21327
true
true
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 510
- 42464
- 21835
+ 520
+ 40982
+ 21846
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   false
true
false
false
@@ -55,14 +56,10 @@
false
true
true
-   false
-   false
-   false
+   1557161
false

false
-   false
-   false
true
false
false
@@ -72,7 +69,7 @@
false
false
true
-   7902645
+   7975536
false
false
false
@@ -80,13 +77,19 @@
true
true
false
-   true
0
false
-   true
high-resolution
false
+   true
+   false
+   false
+   false
+   true
false
+   false
+   false
+   false

 
  hu
@@ -111,7 +114,6 @@

false
false
-   1557161
false
1
true
@@ -318,16 +320,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -335,30 +337,27 @@
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -399,24 +398,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -476,34 +475,35 @@
   
   
   
-  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
   
@@ -785,9 +785,10 @@
 
 
 
+


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1050,7 +1051,7 @@

   
 

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-8'

[Libreoffice Gerrit user]

Tag 'cp-6.0-8' created by Andras Timar  at 
2018-09-07 13:43 +

cp-6.0-8

Changes since cp-6.0-7-9:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 3765 ++--
 1 file changed, 1898 insertions(+), 1867 deletions(-)

New commits:
commit 44f55da18947f4721590381683bac6302616b561
Author: Christian Lohmaier 
AuthorDate: Fri Sep 7 15:39:57 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 7 15:41:27 2018 +0200

update credits

Change-Id: I946580363eb272f95694b000d6daa997e761285d
(cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c945310ccae..aaa9cf7b6176 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.6.2$Linux_X86_64
 
LibreOffice_project/0c292870b25a325b5ed35f6b45599d2ea4458e772012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.0.3$Linux_X86_64
 
LibreOffice_project/efb621ed25068d70781dc026f7e9c5187a4decd12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   510
+   520
501
-   41965
+   40483
21327
true
true
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 510
- 42464
- 21835
+ 520
+ 40982
+ 21846
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   false
true
false
false
@@ -55,14 +56,10 @@
false
true
true
-   false
-   false
-   false
+   1557161
false

false
-   false
-   false
true
false
false
@@ -72,7 +69,7 @@
false
false
true
-   7902645
+   7975536
false
false
false
@@ -80,13 +77,19 @@
true
true
false
-   true
0
false
-   true
high-resolution
false
+   true
+   false
+   false
+   false
+   true
false
+   false
+   false
+   false

 
  hu
@@ -111,7 +114,6 @@

false
false
-   1557161
false
1
true
@@ -318,16 +320,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -335,30 +337,27 @@
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -399,24 +398,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -476,34 +475,35 @@
   
   
   
-  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
   
@@ -785,9 +785,10 @@
 
 
 
+


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1050,7 +1051,7 @@

   
 

[Libreoffice-commits] core.git: readlicense_oo/license

[Libreoffice Gerrit user]

 readlicense_oo/license/CREDITS.fodt | 3765 ++--
 1 file changed, 1898 insertions(+), 1867 deletions(-)

New commits:
commit 01b19afeceb417e258df771677c65c36210a7c4d
Author: Christian Lohmaier 
AuthorDate: Fri Sep 7 15:39:57 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 7 15:40:18 2018 +0200

update credits

Change-Id: I946580363eb272f95694b000d6daa997e761285d

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 6c945310ccae..aaa9cf7b6176 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.6.2$Linux_X86_64
 
LibreOffice_project/0c292870b25a325b5ed35f6b45599d2ea4458e772012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.1.0.3$Linux_X86_64
 
LibreOffice_project/efb621ed25068d70781dc026f7e9c5187a4decd12012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   510
+   520
501
-   41965
+   40483
21327
true
true
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 510
- 42464
- 21835
+ 520
+ 40982
+ 21846
  0
  0
  false
@@ -39,6 +39,7 @@

false
false
+   false
true
false
false
@@ -55,14 +56,10 @@
false
true
true
-   false
-   false
-   false
+   1557161
false

false
-   false
-   false
true
false
false
@@ -72,7 +69,7 @@
false
false
true
-   7902645
+   7975536
false
false
false
@@ -80,13 +77,19 @@
true
true
false
-   true
0
false
-   true
high-resolution
false
+   true
+   false
+   false
+   false
+   true
false
+   false
+   false
+   false

 
  hu
@@ -111,7 +114,6 @@

false
false
-   1557161
false
1
true
@@ -318,16 +320,16 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -335,30 +337,27 @@
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -399,24 +398,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -476,34 +475,35 @@
   
   
   
-  
+  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
   
@@ -785,9 +785,10 @@
 
 
 
+


-
+

iVBORw0KGgoNSUhEUgAAATkAAABkCAYAAAD9hkdsAXNSR0IArs4c6QZiS0dE
 
AP8A/wD/oL2nkwlwSFlzAAAOuQAADrkBuAYXvwd0SU1FB9oMChUNCQOjP/4AADYV
 
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1050,7 +1051,7 @@

   
  Credits
-1352 individuals contributed to 
OpenOffice.org (and whose 

[Libreoffice-commits] core.git: extras/source

[Libreoffice Gerrit user]

 extras/source/autocorr/lang/pt/DocumentList.xml |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit bdbaddc5a3836463f8b4795e772be947ed202859
Author: Marco A.G.Pinto 
AuthorDate: Wed Sep 5 06:38:11 2018 +0200
Commit: Andras Timar 
CommitDate: Fri Sep 7 15:30:22 2018 +0200

[pt_PT] Added 21 autocorrect words

Change-Id: I8ca06334d176d5d00f72d448cb92afcc891a7d83
Reviewed-on: https://gerrit.libreoffice.org/60015
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index fcef68a59b6c..0d8401c1c8f5 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -237,6 +237,8 @@
 
 
 
+
+  
 
 
 
@@ -458,6 +460,7 @@
 
 
 
+  
 
 
 
@@ -625,6 +628,7 @@
 
 
 
+  
 
 
 
@@ -1329,6 +1333,9 @@
 
 
 
+
+
+  
 
 
 
@@ -1337,6 +1344,8 @@
 
 
 
+
+  
 
 
 
@@ -1357,6 +1366,7 @@
 
 
 
+  
 
 
 
@@ -1402,6 +1412,8 @@
 
 
 
+
+  
 
 
 
@@ -1431,6 +1443,8 @@
 
 
 
+
+  
 
 
 
@@ -1816,6 +1830,7 @@
 
 
 
+  
 
 
 
@@ -1894,6 +1909,8 @@
 
 
 
+
+  
 
 
 
@@ -1906,6 +1923,8 @@
 
 
 
+
+  
 
 
 
@@ -2230,6 +2249,8 @@
 
 
 
+
+  
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-1' - external/libcmis

[Libreoffice Gerrit user]

 external/libcmis/UnpackedTarball_libcmis.mk |1 
 external/libcmis/xwwwformurlencoded.patch.0 |   59 
 2 files changed, 60 insertions(+)

New commits:
commit 2751f625990bc4d619eb2b0b895f9d510f768a02
Author: Stephan Bergmann 
AuthorDate: Tue Sep 4 16:45:00 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 7 15:20:04 2018 +0200

Properly encode OAuth2 credentials

Reviewed-on: https://gerrit.libreoffice.org/59986
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 33f7485dedea90e0f80c6348fa8ac5f27c5052e0)
Reviewed-on: https://gerrit.libreoffice.org/60016
Reviewed-by: Noel Grandin 

(cherry picked from commit a8a6890957fcc56a967d535ce09b31a428faecea)
Conflicts:
external/libcmis/UnpackedTarball_libcmis.mk

Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5
Reviewed-on: https://gerrit.libreoffice.org/60094
Reviewed-by: Noel Grandin 
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/external/libcmis/UnpackedTarball_libcmis.mk 
b/external/libcmis/UnpackedTarball_libcmis.mk
index 8ce0b03d10c4..7eef5443f149 100644
--- a/external/libcmis/UnpackedTarball_libcmis.mk
+++ b/external/libcmis/UnpackedTarball_libcmis.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \

external/libcmis/libcmis-sharepoint-repository-root.patch \

external/libcmis/libcmis-fix-error-handling.patch \
external/libcmis/c++17.patch.0 \
+   
external/libcmis/xwwwformurlencoded.patch.0 \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/libcmis/xwwwformurlencoded.patch.0 
b/external/libcmis/xwwwformurlencoded.patch.0
new file mode 100644
index ..b9f779cc6e80
--- /dev/null
+++ b/external/libcmis/xwwwformurlencoded.patch.0
@@ -0,0 +1,59 @@
+--- src/libcmis/oauth2-providers.cxx
 src/libcmis/oauth2-providers.cxx
+@@ -26,6 +26,8 @@
+  * instead of those above.
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ 
+@@ -45,6 +47,29 @@
+ #define HTML_PARSE_RECOVER 0
+ #endif
+ 
++namespace {
++
++// See :
++void addXWwwFormUrlencoded(std::string * buffer, std::string const & data) {
++assert(buffer);
++for (string::const_iterator i = data.begin(); i != data.end(); ++i) {
++unsigned char c = static_cast(*i);
++if (c == ' ' || c == '*' || c == '-' || c == '.' || (c >= '0' && c <= 
'9')
++|| (c >= 'A' && c <= 'Z') || c == '_' || (c >= 'a' && c <= 'z'))
++{
++*buffer += static_cast(c);
++} else {
++static const char hex[16] = {
++'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 
'C', 'D', 'E', 'F'};
++*buffer += '%';
++*buffer += hex[c >> 4];
++*buffer += hex[c & 0xF];
++}
++}
++}
++
++}
++
+ string OAuth2Providers::OAuth2Gdrive( HttpSession* session, const string& 
authUrl,
+   const string& username, const string& 
password )
+ {
+@@ -97,7 +120,7 @@
+ return string( );
+ 
+ loginEmailPost += "Email=";
+-loginEmailPost += string( username );
++addXWwwFormUrlencoded(&loginEmailPost, username);
+ 
+ istringstream loginEmailIs( loginEmailPost );
+ string loginEmailRes;
+@@ -119,7 +142,7 @@
+ return string( );
+ 
+ loginPasswdPost += "Passwd=";
+-loginPasswdPost += string( password );
++addXWwwFormUrlencoded(&loginPasswdPost, password);
+ 
+ istringstream loginPasswdIs( loginPasswdPost );
+ string loginPasswdRes;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/map/Map.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2a2281692cd41d0a56a7f92f6574d48119f57346
Author: Jan Holesovsky 
AuthorDate: Fri Sep 7 15:16:26 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Sep 7 15:18:27 2018 +0200

On desktop, focus immediately on startup to get the caret.

Change-Id: Ie33805341740e38bef657fbd7677ef7d0c14cee3
Reviewed-on: https://gerrit.libreoffice.org/60151
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index be298a6df..b5ca2c464 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -835,6 +835,9 @@ L.Map = L.Evented.extend({
 
vex.dialogID = -1;
this._startInactiveTimer();
+   if (!L.Browser.mobile) {
+   this.focus();
+   }
return vex.close(id);
}
} else {
@@ -843,6 +846,9 @@ L.Map = L.Evented.extend({
}
 
this._startInactiveTimer();
+   if (!L.Browser.mobile) {
+   this.focus();
+   }
return false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-1' - download.lst

[Libreoffice Gerrit user]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c18b7b125cad47474d334a2936ea66293986b95f
Author: Thorsten Behrens 
AuthorDate: Wed Sep 5 15:55:29 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 7 15:18:03 2018 +0200

upgrade curl to 7.61.1

Reviewed-on: https://gerrit.libreoffice.org/60042
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d15d3ce697e88e72cec84b5b9b9619a37a8ae7ed)

Conflicts:
download.lst

Change-Id: I4590f5f705dd08c63a1532ce5afa94a3af953f24
Reviewed-on: https://gerrit.libreoffice.org/60054
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 9c4e0303940373a04489557674003f7f6b6e1a59)
Reviewed-on: https://gerrit.libreoffice.org/60140
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 9caade651421..b6eee438214b 100644
--- a/download.lst
+++ b/download.lst
@@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52
 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5
-export CURL_TARBALL := curl-7.60.0.tar.gz
+export CURL_SHA256SUM := 
eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae
+export CURL_TARBALL := curl-7.61.1.tar.gz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-1' - translations

[Libreoffice Gerrit user]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3438fd23e7590474c07b2019d3445c968df3a35d
Author: Christian Lohmaier 
AuthorDate: Fri Sep 7 14:49:50 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 15:06:11 2018 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-1-1'
  - update translations for 6.1.1 rc2

Change-Id: I12d3b01f03cd4d9933da71b598b06214bf652013
(cherry picked from commit f5aa65c58dae559a2fb9dc94bc00e576d1840eb0)

  - Version 6.1.1.1, tag libreoffice-6.1.1.1

Change-Id: I24d29e42094ee80fb3d10d03e2ddbf4085ac4804

diff --git a/translations b/translations
index aa05a744d1f6..d409ea073e7a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit aa05a744d1f62539091693e8042dad277d2fc846
+Subproject commit d409ea073e7a5b5149b116adaf88e8218dfb6274
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx |   85 
 connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx |7 -
 2 files changed, 70 insertions(+), 22 deletions(-)

New commits:
commit ed01dc1a88f95b852f5e42daba71816440466b21
Author: Tamas Bunth 
AuthorDate: Thu Sep 6 16:58:42 2018 +0200
Commit: Tamás Bunth 
CommitDate: Fri Sep 7 15:06:51 2018 +0200

mysqlc: ensure cursor is not out of range

when calling getXXX() methods of a simple result set.

Change-Id: I9e018385bb73468ea520b03275232c0982cbcba0
Reviewed-on: https://gerrit.libreoffice.org/60095
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
index cc3b3fff1258..297fd4cdbd69 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx
@@ -75,6 +75,14 @@ std::vector lcl_split(const OUString& rStr, 
sal_Unicode cSeparator)
 }
 }
 
+void OResultSet::checkRowIndex()
+{
+if (m_nRowPosition <= 0 || m_nRowPosition > m_nRowCount)
+{
+throw SQLException("Cursor position out of range", *this, 
rtl::OUString(), 1, Any());
+}
+}
+
 rtl::OUString SAL_CALL OResultSet::getImplementationName()
 {
 return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet");
@@ -106,6 +114,10 @@ OResultSet::OResultSet(OConnection& rConn, 
OCommonStatement* pStmt, MYSQL_RES* p
 , m_encoding(_encoding)
 {
 fieldCount = mysql_num_fields(pResult);
+
+// it works only if result set is produced via mysql_store_result
+// TODO ensure that
+m_nRowCount = mysql_num_rows(pResult);
 }
 
 void OResultSet::disposing()
@@ -158,6 +170,7 @@ uno::Reference SAL_CALL 
OResultSet::getBinaryStream(sal_Int32 colu
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getBinaryStream",
 *this);
 return nullptr;
@@ -168,6 +181,7 @@ uno::Reference SAL_CALL 
OResultSet::getCharacterStream(sal_Int32 c
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getCharacterStream",
 *this);
@@ -179,6 +193,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -196,6 +211,7 @@ sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -229,6 +245,7 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 Date d; // TODO initialize
 char* dateStr = m_aRow[column - 1];
@@ -268,6 +285,7 @@ double SAL_CALL OResultSet::getDouble(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -285,6 +303,7 @@ float SAL_CALL OResultSet::getFloat(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -317,7 +336,7 @@ sal_Int32 SAL_CALL OResultSet::getRow()
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
-return static_cast(mysql_field_tell(m_pResult));
+return m_nRowPosition;
 }
 
 sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column)
@@ -325,6 +344,7 @@ sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 char* pValue = m_aRow[column - 1];
 if (!pValue)
@@ -353,6 +373,7 @@ uno::Reference SAL_CALL 
OResultSet::getArray(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 checkColumnIndex(column);
+checkRowIndex();
 
 
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getArray", 
*this);
 return nullptr;
@@ -363,6 +384,7 @@ uno::Reference SAL_CALL 
OResultSet::getClob(sal_Int32 column)
 MutexGuard aGuard(m_aMutex);
 checkDisposed(OResult

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - translations

[Libreoffice Gerrit user]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51dce02f417e202f583dbf90582f6e61f8841894
Author: Christian Lohmaier 
AuthorDate: Fri Sep 7 14:49:50 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 15:01:25 2018 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-1'
  - update translations for 6.1.1 rc2

Change-Id: I12d3b01f03cd4d9933da71b598b06214bf652013

diff --git a/translations b/translations
index b90492ac15fc..f5aa65c58dae 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b90492ac15fcc46bdb415c9c2e400f3556168906
+Subproject commit f5aa65c58dae559a2fb9dc94bc00e576d1840eb0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[Libreoffice Gerrit user]

 vcl/headless/svpgdi.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ce4245a73114800972711b789a946575b804cea3
Author: Andrea Gelmini 
AuthorDate: Fri Sep 7 11:27:00 2018 +0200
Commit: Julien Nabet 
CommitDate: Fri Sep 7 14:50:07 2018 +0200

Fix typos

Change-Id: Idf3906894510d671c75c32a787ad315945b2c339
Reviewed-on: https://gerrit.libreoffice.org/60137
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 73b9a1fe24bf..5acd288e8787 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -850,7 +850,7 @@ basegfx::B2DPoint impPixelSnap(
 // special case relative to the also executed LineDraw-Offset of (0.5, 0.5) in
 // DeviceCoordinates: The LineDraw-Offset is applied *after* the snap, so we
 // need the ObjectToDevice transformation *without* that offset here to do the
-// same. The LineDraw-Offset will be appied by the callers using a linear
+// same. The LineDraw-Offset will be applied by the callers using a linear
 // transformation for Cairo now
 // For support of PixelSnapHairline we also need the ObjectToDevice 
transformation
 // and a method (same as in gdiimpl.cxx for Win and Gdiplus). This is needed 
e.g.
@@ -984,7 +984,7 @@ void SvpSalGraphics::drawLine( long nX1, long nY1, long 
nX2, long nY2 )
 basegfx::B2DPolygon aPoly;
 
 // PixelOffset used: To not mix with possible PixelSnap, cannot do
-// directly on coordinates as truied before - despite being already 
'snapped'
+// directly on coordinates as tried before - despite being already 
'snapped'
 // due to being integer. If it would be directly added here, it would be
 // 'snapped' again when !getAntiAliasB2DDraw(), losing the (0.5, 0.5) 
offset
 aPoly.append(basegfx::B2DPoint(nX1, nY1));
@@ -1391,7 +1391,7 @@ bool SvpSalGraphics::drawPolyPolygon(const 
basegfx::B2DPolyPolygon& rPolyPoly, d
 cairo_matrix_init_translate(&aMatrix, 0.5, 0.5);
 cairo_set_matrix(cr, &aMatrix);
 
-// Note: Other methods use applyColor(...) to set the Color. Thst
+// Note: Other methods use applyColor(...) to set the Color. That
 // seems to do some more. Maybe it should be used here, too (?)
 cairo_set_source_rgba(cr, m_aLineColor.GetRed()/255.0,
   m_aLineColor.GetGreen()/255.0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source oox/source sc/qa

[Libreoffice Gerrit user]

 filter/source/msfilter/escherex.cxx   |   13 -
 filter/source/msfilter/msdffimp.cxx   |   14 --
 oox/source/drawingml/shape.cxx|3 +++
 sc/qa/unit/data/xls/hiddenShape.xls   |binary
 sc/qa/unit/subsequent_export-test.cxx |   30 ++
 5 files changed, 53 insertions(+), 7 deletions(-)

New commits:
commit b38065ea941375bf4f78f13314e84f4a875545d9
Author: Aron Budea 
AuthorDate: Mon Sep 3 02:42:44 2018 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 7 14:50:40 2018 +0200

tdf#108691, tdf#119639 Don't print hidden objects in XLS(X)

In Excel hidden drawing objects aren't printed. When not
hidden, printing is controlled by a separate 'Print object'
setting.

Only rely visibility setting for now, but properly:
visible means also printed, hidden means not printed.
Ie. import visible property also as printable, and only
output visible property in XLS(X) formats.

For the future, in XLSX format printability is controlled by
attribute 'fPrintsWithSheet' of element 'clientData', don't
know about XLS, there fUsefPrint/fPrint bits don't appear to
be used anymore (see note in tdf#119639).

Change-Id: I728107b30056f7bf073f2fefddece1bef1eb2e7a
Reviewed-on: https://gerrit.libreoffice.org/59915
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 6bd7638a8cc9..b5951b441f9c 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1255,17 +1255,20 @@ void EscherPropertyContainer::CreateShapeProperties( 
const uno::Reference aXPropSet( rXShape, uno::UNO_QUERY );
 if ( aXPropSet.is() )
 {
-bool bVal = false;
+bool bVisible = false;
+bool bPrintable = false;
 uno::Any aAny;
 sal_uInt32 nShapeAttr = 0;
-if (EscherPropertyValueHelper::GetPropertyValue(aAny, aXPropSet, 
"Visible", true) && (aAny >>= bVal))
+if (EscherPropertyValueHelper::GetPropertyValue(aAny, aXPropSet, 
"Visible", true) && (aAny >>= bVisible))
 {
-if ( !bVal )
+if ( !bVisible )
 nShapeAttr |= 0x20002;  // set fHidden = true
 }
-if (EscherPropertyValueHelper::GetPropertyValue(aAny, aXPropSet, 
"Printable", true) && (aAny >>= bVal))
+// This property (fPrint) isn't used in Excel anymore, leaving it for 
legacy reasons
+// one change, based on XLSX: hidden implies not printed, let's not 
export the fPrint property in that case
+if (bVisible && EscherPropertyValueHelper::GetPropertyValue(aAny, 
aXPropSet, "Printable", true) && (aAny >>= bPrintable))
 {
-if ( !bVal )
+if ( !bPrintable )
 nShapeAttr |= 0x1;  // set fPrint = false;
 }
 if ( nShapeAttr )
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 9084e1b42638..0938905edb52 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4864,8 +4864,18 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 if ( pRet )
 {
 sal_Int32 nGroupProperties( GetPropertyValue( DFF_Prop_fPrint, 0 ) );
-pRet->SetVisible( ( nGroupProperties & 2 ) == 0 );
-pRet->SetPrintable( ( nGroupProperties & 1 ) != 0 );
+const bool bVisible = ( ( nGroupProperties & 2 ) == 0 );
+pRet->SetVisible( bVisible );
+// In Excel hidden means not printed
+if ( !bVisible )
+{
+pRet->SetPrintable( false );
+}
+else
+{
+// This property isn't used in Excel anymore, leaving it for 
legacy reasons
+pRet->SetPrintable( ( nGroupProperties & 1 ) != 0 );
+}
 }
 
 //Import alt text as description
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 6b5f9ac79b0e..0f5437dc9519 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -842,6 +842,9 @@ Reference< XShape > const & Shape::createAndInsert(
 SAL_INFO("oox.drawingml", "Shape::createAndInsert: invisible shape 
with id='" << msId << "'");
 const OUString sVisible( "Visible" );
 xSet->setPropertyValue( sVisible, Any( false ) );
+// In Excel hidden means not printed, let's use visibility for now 
until that's handled separately
+const OUString sPrintable( "Printable" );
+xSet->setPropertyValue( sPrintable, Any( false ) );
 }
 
 ActionLockGuard const alg(mxShape);
diff --git a/sc/qa/unit/data/xls/hiddenShape.xls 
b/sc/qa/unit/data/xls/hiddenShape.xls
new file mode 100644
index ..339a39c9acbf
Binary files /dev/null and b/sc/qa/unit/data/xls/hiddenShape.xls differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc

[Libreoffice-commits] core.git: compilerplugins/clang cui/source cui/uiconfig include/sfx2 include/svx sc/source sfx2/source sfx2/uiconfig starmath/inc starmath/source svtools/source svtools/uiconfig

[Libreoffice Gerrit user]

 compilerplugins/clang/vclwidgets.cxx   |3 
 cui/source/dialogs/colorpicker.cxx |6 
 cui/source/dialogs/cuicharmap.cxx  |2 
 cui/source/factory/dlgfact.cxx |8 -
 cui/source/factory/dlgfact.hxx |2 
 cui/source/inc/bbdlg.hxx   |9 -
 cui/source/inc/cuitabarea.hxx  |4 
 cui/source/tabpages/bbdlg.cxx  |   27 +--
 cui/source/tabpages/tparea.cxx |   14 +-
 cui/source/tabpages/tpbitmap.cxx   |   14 +-
 cui/source/tabpages/tpcolor.cxx|6 
 cui/source/tabpages/tpgradnt.cxx   |   14 +-
 cui/source/tabpages/tphatch.cxx|   14 +-
 cui/source/tabpages/tppattern.cxx  |   47 +++---
 cui/uiconfig/ui/areatabpage.ui |5 
 cui/uiconfig/ui/bitmaptabpage.ui   |  100 +-
 cui/uiconfig/ui/colorpage.ui   |9 -
 cui/uiconfig/ui/gradientpage.ui|  180 ++---
 cui/uiconfig/ui/hatchpage.ui   |   27 +--
 cui/uiconfig/ui/pageformatpage.ui  |4 
 cui/uiconfig/ui/patterntabpage.ui  |   41 ++---
 cui/uiconfig/ui/transparencytabpage.ui |   45 +-
 include/sfx2/tabdlg.hxx|   28 +++-
 include/sfx2/viewsh.hxx|2 
 include/svx/hdft.hxx   |2 
 include/svx/svxdlg.hxx |2 
 sc/source/ui/dbgui/tpsort.cxx  |2 
 sc/source/ui/inc/prevwsh.hxx   |2 
 sc/source/ui/inc/tabvwsh.hxx   |2 
 sc/source/ui/view/prevwsh.cxx  |4 
 sc/source/ui/view/tabvwsh4.cxx |4 
 sfx2/source/control/charwin.cxx|2 
 sfx2/source/dialog/mgetempl.cxx|2 
 sfx2/source/dialog/tabdlg.cxx  |   43 +-
 sfx2/source/view/printer.cxx   |2 
 sfx2/source/view/viewprn.cxx   |2 
 sfx2/uiconfig/ui/managestylepage.ui|2 
 starmath/inc/dialog.hxx|6 
 starmath/inc/view.hxx  |2 
 starmath/source/smmod.cxx  |4 
 starmath/source/view.cxx   |4 
 svtools/source/control/valueset.cxx|2 
 svtools/uiconfig/ui/linewindow.ui  |1 
 svx/source/dialog/charmap.cxx  |2 
 svx/source/dialog/dialcontrol.cxx  |2 
 svx/source/dialog/dlgctrl.cxx  |4 
 svx/source/dialog/fntctrl.cxx  |3 
 svx/source/dialog/frmsel.cxx   |2 
 svx/source/dialog/hdft.cxx |6 
 svx/source/dialog/pagectrl.cxx |3 
 svx/source/dialog/paraprev.cxx |2 
 svx/source/dialog/swframeexample.cxx   |2 
 svx/uiconfig/ui/colorwindow.ui |1 
 sw/inc/view.hxx|8 -
 sw/source/ui/chrdlg/drpcps.cxx |2 
 sw/source/ui/dialog/swdlgfact.cxx  |   21 +++
 sw/source/ui/dialog/swdlgfact.hxx  |   16 ++
 sw/source/ui/envelp/envlop1.cxx|2 
 sw/source/ui/envelp/envprt.cxx |2 
 sw/source/ui/envelp/labfmt.cxx |4 
 sw/source/ui/fmtui/tmpdlg.cxx  |  203 -
 sw/source/ui/frmdlg/column.cxx |2 
 sw/source/ui/misc/pggrid.cxx   |4 
 sw/source/uibase/docvw/HeaderFooterWin.cxx |2 
 sw/source/uibase/frmdlg/colex.cxx  |2 
 sw/source/uibase/inc/pview.hxx |2 
 sw/source/uibase/inc/tmpdlg.hxx|   24 +++
 sw/source/uibase/uiview/pview.cxx  |6 
 sw/source/uibase/uiview/viewprt.cxx|   12 -
 sw/uiconfig/swriter/ui/columnpage.ui   |2 
 sw/uiconfig/swriter/ui/templatedialog1.ui  |   39 ++---
 sw/uiconfig/swriter/ui/templatedialog16.ui |   33 +++-
 sw/uiconfig/swriter/ui/templatedialog2.ui  |   39 ++---
 sw/uiconfig/swriter/ui/templatedialog4.ui  |   39 ++---
 sw/uiconfig/swriter/ui/templatedialog8.ui  |   34 +++-
 sw/uiconfig/swriter/ui/textgridpage.ui |2 
 vcl/source/app/salvtables.cxx  |4 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |8 -
 78 files changed, 764 insertions(+), 476 deletions(-)

New commits:
commit a2304f62e963b413b7575bedfb8d34e5f2d3ea58
Author: Caolán McNamara 
AuthorDate: Thu Aug 30 09:43:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Sep 7 14:42:31 2018 +0200

weld writer page style dialog and SvxBorderBackgroundDlg

writer, format page is complete

Change-Id: I09f6e4354461c4374cdb0d0e0754dfee35415b45
Reviewed-on: https://gerrit.libreoffice.org/60058
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
index 6b8e8125daa7..8f625f5cdfdf 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -242,7 +2

Re: Need help on how to insert a layer into a Draw document in a unit test

[Regina Henschel]

Hi all,

I have found suitable methods. I can use InsertNewLayer() and 
SetLayerVisible().


Kind regards
Regina

Regina Henschel schrieb am 06-Sep-18 um 01:10:

Hi all,

I'm working on
https://bugs.documentfoundation.org/show_bug.cgi?id=119392. I have a
solution for it. Now I need a unit test. I need to do:
1. Load a Draw document, which has two user defined layers with
non-default settings for visible/printable/locked.
2. Insert a new layer between these two layers, which has non-default
settings for visible/printable/locked.
3. Save the document.
4a) Examine the saved file, whether it has the correct items in the
setting.xml or
4b) Reload the file and make sure the visible/printable/locked settings
are correct for each of the user defined layers.

Is there a test, where I can look, how to make step 2? A guide for step
4b is not quite necessary because I know how to do step 4a, but would be
nice to have.

Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: clang-tidy performance-move-const-arg

[Stephan Bergmann]

On 06/09/18 08:33, Libreoffice Gerrit user wrote:

commit 3d604d1cd6cc70ef96782ef769f0479b509987a8
Author: Noel Grandin 
AuthorDate: Wed Sep 5 13:51:39 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 6 08:33:28 2018 +0200

 clang-tidy performance-move-const-arg
 
 Change-Id: I607891e120688b746c8a4c577018d97147a79217

 Reviewed-on: https://gerrit.libreoffice.org/60029
 Tested-by: Jenkins
 Reviewed-by: Noel Grandin 


[...]

diff --git a/editeng/source/editeng/eertfpar.cxx 
b/editeng/source/editeng/eertfpar.cxx
index ccecfa5723de..16f202d24a28 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -62,14 +62,14 @@ RtfImportInfo::~RtfImportInfo()
  {
  }
  
-EditRTFParser::EditRTFParser(

-SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* 
pEditEngine) :
-SvxRTFParser(rAttrPool, rIn),
-aCurSel(std::move(aSel)),
-mpEditEngine(pEditEngine),
-aRTFMapMode(MapUnit::MapTwip),
-nDefFont(0),
-bLastActionInsertParaBreak(false)
+EditRTFParser::EditRTFParser(SvStream& rIn, EditSelection aSel, SfxItemPool& 
rAttrPool,
+ EditEngine* pEditEngine)
+: SvxRTFParser(rAttrPool, rIn)
+, aCurSel(aSel)
+, mpEditEngine(pEditEngine)
+, aRTFMapMode(MapUnit::MapTwip)
+, nDefFont(0)
+, bLastActionInsertParaBreak(false)
  {
  SetInsPos(EditPosition(mpEditEngine, &aCurSel));
  


I assume dropping the std::move from aCurSel(std::move(aSel)) is caused 
by performance-move-const-arg's warning "if std::move() is called with 
an argument of a trivially-copyable type" 
().


For my taste, that approach is too tightly tied to a class's current 
implementation details, something that may change over time.  Imagine a 
trivially copyable class C with a raw pointer member (where the 
lifecycle of the pointed-to object is tracked by some higher-level, 
likely broken protocol).  Now, that protocol is fixed and the raw 
pointer member is replaced with a std::shared_ptr.  C is no longer 
trivially copyable, and the dropped std::move would turn out to be 
beneficial again.


(Also, if Clang and clang-tidy did implement the fixed rules for 
trivially copyable classes from CWG1734/C++17, where a subset of a 
trivially copyable class's copy/move members may be deleted, the above 
rule to warn "if std::move() is called with an argument of a 
trivially-copyable type" would no longer make sense as written; consider 
a trivially copyable class whose copy ctor has been deleted.)


(And, concerning this specific commit:  Reformatting unrelated and 
otherwise unchanged lines is a pain.  It makes it so much more difficult 
to spot the actual changes here.)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: framework/inc

[Libreoffice Gerrit user]

 framework/inc/helper/shareablemutex.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a86f5643f3c36ead2f9aee42571664c2454ccf7
Author: Mike Kaganski 
AuthorDate: Fri Sep 7 07:38:29 2018 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 7 14:20:08 2018 +0200

Cppcheck: make 1-argument ctors explicit

Change-Id: I437988b238af961c6a3ac61ed4e93ea8206f6001
Reviewed-on: https://gerrit.libreoffice.org/60123
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/framework/inc/helper/shareablemutex.hxx 
b/framework/inc/helper/shareablemutex.hxx
index f28d524c7f07..6607e0f44b20 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -70,7 +70,7 @@ class FWI_DLLPUBLIC ShareableMutex
 class ShareGuard
 {
 public:
-ShareGuard( ShareableMutex& rShareMutex ) :
+explicit ShareGuard( ShareableMutex& rShareMutex ) :
 m_rShareMutex( rShareMutex )
 {
 m_rShareMutex.acquire();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/uitest-failed-default.sh |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3efc3f4902c4f8a5cf9c1ff748d5b01b28a6d271
Author: Noel Grandin 
AuthorDate: Fri Sep 7 11:05:37 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Sep 7 13:51:47 2018 +0200

improve help message for uitest failure

Change-Id: I7213ee2ca55ddc1a11c4f411d3b72f1b2382f7e7

diff --git a/solenv/gbuild/uitest-failed-default.sh 
b/solenv/gbuild/uitest-failed-default.sh
index c4555d0d069d..8e0dc0e34b9b 100755
--- a/solenv/gbuild/uitest-failed-default.sh
+++ b/solenv/gbuild/uitest-failed-default.sh
@@ -20,8 +20,10 @@ where
 Module - the name of the python file (without the .py extension)
 Class - is the name in the "class Class" declaration
 
-Or to do interactive debugging, put a long sleep in the beginning of the .py
-uitest file, and attach gdb to the running soffice process.
+Or to do interactive debugging, put a
+time.sleep(60)
+in the beginning of the method in the .py file,
+and attach gdb to the running soffice process.
 
 EOF
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.DocumentRepair.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c6a9227254478ae13eacb0ff3614c963559c9bb2
Author: Andras Timar 
AuthorDate: Thu Sep 6 15:31:43 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Sep 7 13:28:25 2018 +0200

loleaflet: don't use timeago, because it's hard to localize, use localized 
timestamps instead

Change-Id: Iae5cab6fe7f9b92f9098b66be48278c4fb293002
Reviewed-on: https://gerrit.libreoffice.org/60088
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/60089
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.DocumentRepair.js 
b/loleaflet/src/control/Control.DocumentRepair.js
index c27541d59..d2ecd4947 100644
--- a/loleaflet/src/control/Control.DocumentRepair.js
+++ b/loleaflet/src/control/Control.DocumentRepair.js
@@ -1,8 +1,7 @@
 /*
  * L.Control.DocumentRepair.
  */
-
-/* global $ _ _UNO */
+/* global _ _UNO */
 L.Control.DocumentRepair = L.Control.extend({
options: {
position: 'topright'
@@ -76,10 +75,11 @@ L.Control.DocumentRepair = L.Control.extend({
 
// Show relative date by default, absolute one as tooltip.
td = L.DomUtil.create('td', '', row);
-   var relativeDateTime = jQuery.timeago(dateTime.replace(/,.*/, 
'Z'));
+   var d = new Date(dateTime.replace(/,.*/, 'Z'));
+   var dateOptions = { year: 'numeric', month: 'short', day: 
'numeric', hour: '2-digit', minute: '2-digit' };
var span = document.createElement('span');
span.title = dateTime;
-   span.appendChild(document.createTextNode(relativeDateTime));
+   
span.appendChild(document.createTextNode(d.toLocaleDateString(String.locale, 
dateOptions)));
td.appendChild(span);
 
L.DomEvent.on(row, 'click', this._onRowClick, this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/layer/marker/Annotation.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4632c5c7d7b8e06323f957392c472325b092e40a
Author: Andras Timar 
AuthorDate: Thu Sep 6 10:39:03 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Sep 7 13:25:42 2018 +0200

loleaflet: localize annotation/comment date

Change-Id: If29a3a84bc5a3aab31bf4f259345845cd9004467
Reviewed-on: https://gerrit.libreoffice.org/60077
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index 73c4b5604..f95612853 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -334,7 +334,8 @@ L.Annotation = L.Layer.extend({
$(this._authorAvatarImg).attr('src', this._data.avatar);
 
var d = new Date(this._data.dateTime.replace(/,.*/, 'Z'));
-   $(this._contentDate).text((isNaN(d.getTime()) || 
this._map.getDocType() === 'spreadsheet')? this._data.dateTime: 
d.toDateString());
+   var dateOptions = { weekday: 'short', year: 'numeric', month: 
'short', day: 'numeric' };
+   $(this._contentDate).text((isNaN(d.getTime()) || 
this._map.getDocType() === 'spreadsheet')? this._data.dateTime: 
d.toLocaleDateString(String.locale, dateOptions));
 
if (this._data.trackchange) {
$(this._captionText).text(this._data.description);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/core/Socket.js  |4 +++-
 loleaflet/src/layer/tile/GridLayer.js |   30 --
 2 files changed, 23 insertions(+), 11 deletions(-)

New commits:
commit ea2dc76b2212567446a1ad0ff5cd5473015c442b
Author: Tamás Zolnai 
AuthorDate: Wed Sep 5 13:20:56 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Sep 7 13:24:29 2018 +0200

Reset client visible area members by connection lost / reloading

Change-Id: I28eb32d7c667a1a2b71de4bfcb348f5fab020123
(cherry picked from commit 8af096eb634d17c6937ff33fc4361c95d5e92fd5)
Reviewed-on: https://gerrit.libreoffice.org/60028
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index b07e4c098..13bc243f6 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -516,6 +516,7 @@ L.Socket = L.Class.extend({
 
if (this._map._docLayer) {
this._map._docLayer.removeAllViews();
+   this._map._docLayer._resetClientVisArea();
}
this.close();
 
@@ -748,7 +749,7 @@ L.Socket = L.Class.extend({
else if (this._reconnecting) {
// we are reconnecting ...
this._reconnecting = false;
-   this._map._docLayer.viewReset();
+   this._map._docLayer._resetClientVisArea();

this._map._docLayer._onMessage('invalidatetiles: EMPTY', null);
this._map.fire('statusindicator', {statusType: 
'reconnected'});

this._map.setPermission(this._map.options.permission);
@@ -792,6 +793,7 @@ L.Socket = L.Class.extend({
 
if (this._map._docLayer) {
this._map._docLayer.removeAllViews();
+   this._map._docLayer._resetClientVisArea();
}
 
if (isActive && this._reconnecting) {
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 3bd563639..3ef87b2d6 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -334,6 +334,7 @@ L.GridLayer = L.Layer.extend({
tileZoomChanged = this._tileZoom !== tileZoom;
 
if (!noUpdate && (hard || tileZoomChanged)) {
+   this._resetClientVisArea();
 
if (this._abortLoading) {
this._abortLoading();
@@ -359,6 +360,11 @@ L.GridLayer = L.Layer.extend({
this._setZoomTransforms(center, zoom);
},
 
+   _resetClientVisArea: function ()  {
+   this._clientZoom = '';
+   this._clientVisibleArea = '';
+   },
+
_updateTileTwips: function () {
// smaller zoom = zoom in
var factor = Math.pow(1.2, (this._map.options.zoom - 
this._tileZoom));
@@ -542,9 +548,9 @@ L.GridLayer = L.Layer.extend({
}
}
 
-   this._sendClientVisibleArea();
+   this._sendClientVisibleArea(true);
 
-   this._sendClientZoom();
+   this._sendClientZoom(true);
 
if (queue.length !== 0) {
if (newView) {
@@ -692,7 +698,7 @@ L.GridLayer = L.Layer.extend({
}
},
 
-   _sendClientVisibleArea: function () {
+   _sendClientVisibleArea: function (forceUpdate) {
var visibleTopLeft = 
this._latLngToTwips(this._map.getBounds().getNorthWest());
var visibleBottomRight = 
this._latLngToTwips(this._map.getBounds().getSouthEast());
var visibleArea = new L.Bounds(visibleTopLeft, 
visibleBottomRight);
@@ -700,10 +706,11 @@ L.GridLayer = L.Layer.extend({
var newClientVisibleArea = 'clientvisiblearea x=' + 
Math.round(visibleTopLeft.x) + ' y=' + Math.round(visibleTopLeft.y) +
' width=' + Math.round(size.x) + ' height=' + 
Math.round(size.y);
 
-   if (this._clientVisibleArea !== newClientVisibleArea) {
+   if (this._clientVisibleArea !== newClientVisibleArea || 
forceUpdate) {
// Visible area is dirty, update it on the server
-   this._clientVisibleArea = newClientVisibleArea
-   this._map._socket.sendMessage(this._clientVisibleArea);
+   this._map._socket.sendMessage(newClientVisibleArea);
+   if (!this._map._fatal && this._map._active && 
this._map._socket.connected())
+   this._clientVisibleArea = newClientVisibleArea
if (this._debug) {
this._debugInfo.clearLayers();
  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/filter/xml/xmlfilter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6e0e3872f30c177559446b2c050b2a6582f257ec
Author: Julien Nabet 
AuthorDate: Thu Sep 6 22:02:56 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 7 13:19:19 2018 +0200

tdf#119694: read embedded hsqldb file generated before 6.1

Regression from:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=ebb34571c19c5ac939fbf5aed2ab66ee18e298dc
Thank you Drew Jensen for the bibisect!

Change-Id: I9550f61709e8582a52554f578ef043c6551f09f0
Reviewed-on: https://gerrit.libreoffice.org/60117
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 4b5194bd1d0dd893720ec0b311ee215a3168219f)
Reviewed-on: https://gerrit.libreoffice.org/60131
Tested-by: Jenkins

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index a77db0ecec0f..02fd2fda823e 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -655,6 +655,7 @@ const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() 
const
 { XML_NAMESPACE_OOO,XML_AUTOMATIC_STYLES,   
XML_TOK_CONTENT_AUTOSTYLES  },
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,
XML_TOK_CONTENT_SCRIPTS },
 { XML_NAMESPACE_OFFICE, XML_BODY,   
XML_TOK_CONTENT_BODY},
+{ XML_NAMESPACE_OOO,XML_BODY,   
XML_TOK_CONTENT_BODY},
 XML_TOKEN_MAP_END
 };
 m_pDocContentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |   22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

New commits:
commit ea5143d7a9e4b309f4d98f65e2e4845fff6109ad
Author: Tamás Zolnai 
AuthorDate: Mon Sep 3 16:35:00 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Sep 7 13:19:13 2018 +0200

Handle unset client visible area case while calculating tiles-on-fly limit

Change-Id: I25ea6f1efdc8115304d5449cfccdbb5c0c15fb1f
(cherry picked from commit 14537846a8891adaa2a56ae05edbe288a9469f43)
Reviewed-on: https://gerrit.libreoffice.org/59944
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 367445e84..38b4d682d 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1393,13 +1393,23 @@ void DocumentBroker::sendRequestedTiles(const 
std::shared_ptr& se
 // How many tiles we have on the visible area, set the upper limit 
accordingly
 Util::Rectangle normalizedVisArea = session->getNormalizedVisibleArea();
 
-const int tilesFitOnWidth = std::ceil(normalizedVisArea._x2 / 
session->getTileWidthInTwips()) -
-std::ceil(normalizedVisArea._x1 / 
session->getTileWidthInTwips()) + 1;
-const int tilesFitOnHeight = std::ceil(normalizedVisArea._y2 / 
session->getTileHeightInTwips()) -
- std::ceil(normalizedVisArea._y1 / 
session->getTileHeightInTwips()) + 1;
-const int tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight;
+float tilesOnFlyUpperLimit = 0;
+if (normalizedVisArea.hasSurface() && session->getTileWidthInTwips() != 0 
&& session->getTileHeightInTwips() != 0)
+{
+
+const int tilesFitOnWidth = std::ceil(normalizedVisArea._x2 / 
session->getTileWidthInTwips()) -
+std::ceil(normalizedVisArea._x1 / 
session->getTileWidthInTwips()) + 1;
+const int tilesFitOnHeight = std::ceil(normalizedVisArea._y2 / 
session->getTileHeightInTwips()) -
+ std::ceil(normalizedVisArea._y1 / 
session->getTileHeightInTwips()) + 1;
+const int tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight;
+
+tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, 
tilesInVisArea * 1.5f);
+}
+else
+{
+tilesOnFlyUpperLimit = 200; // Have a big number here to get all tiles 
requested by file openning
+}
 
-const float tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, 
tilesInVisArea * 1.5f);
 
 // Update client's tilesBeingRendered list
 session->removeOutdatedTileSubscriptions();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/redline.hxx  |7 +
 sw/source/core/doc/DocumentContentOperationsManager.cxx |  105 ++--
 sw/source/core/doc/docredln.cxx |   41 --
 3 files changed, 109 insertions(+), 44 deletions(-)

New commits:
commit c0cbc39529f89537575d96419aa41312c60e27e7
Author: Michael Stahl 
AuthorDate: Fri Sep 7 12:35:54 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 7 13:07:18 2018 +0200

sw_redlinehide_2: fix frame updates for SwUndoRedlineDelete

There is a special case where the redline that is inserted doesn't have
a valid range and then it's split up inside AppendRedline(), in
SwRedlineTable::InsertWithValidRanges().  This happens for example
with a selection that includes a section start node but not its end node
(or vice versa).

This breaks the UpdateFramesForRemoveDeleteRedline() /
UpdateFramesForAddDeleteRedline() because they assume that the given
range is one SwRangeRedline; the result is duplicate text frames.

This could be worked around by iterating the SwRangeRedline in the given
PaM, but for the Remove case there is the additional complication that
the redlines are actually removed by the time the function is called.

So rework the implementation of DeleteAndJoinWithRedlineImpl()
to call the part of InsertWithValidRanges() that does the splitting
into multiple redlines (extracted into new sw::GetAllValidRanges())
and create multiple SwUndoRedlineDelete actions, each of which now
updates the frames properly.

Also clean up the horrible group-undo code to group before inserting,
instead of after-the-fact cleanup.

Change-Id: Ia279910e0c74edabe56b0c4cf87dbbad688179da

diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 40d8377fcb54..d66d8b4a8ec6 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -340,6 +340,13 @@ class SW_DLLPUBLIC SwRedlineHint : public SfxHint
 {
 };
 
+
+namespace sw {
+
+std::vector GetAllValidRanges(std::unique_ptr 
p);
+
+} // namespace sw
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index dc45775cbf25..46ee7b26f894 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3571,10 +3571,32 @@ bool 
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
 {
 assert(m_rDoc.getIDocumentRedlineAccess().IsRedlineOn());
 
-SwUndoRedlineDelete* pUndo = nullptr;
 RedlineFlags eOld = m_rDoc.getIDocumentRedlineAccess().GetRedlineFlags();
 m_rDoc.GetDocumentRedlineManager().checkRedlining( eOld );
 
+if (*rPam.GetPoint() == *rPam.GetMark())
+{
+return false; // do not add empty redlines
+}
+
+std::vector redlines;
+{
+auto 
pRedline(o3tl::make_unique(nsRedlineType_t::REDLINE_DELETE, 
rPam));
+if (pRedline->HasValidRange())
+{
+redlines.push_back(pRedline.release());
+}
+else // sigh ... why is such a selection even possible...
+{// split it up so we get one SwUndoRedlineDelete per inserted RL
+redlines = GetAllValidRanges(std::move(pRedline));
+}
+}
+
+if (redlines.empty())
+{
+return false;
+}
+
 auto & rDMA(*m_rDoc.getIDocumentMarkAccess());
 std::vector> MarkUndos;
 for (auto iter = rDMA.getAnnotationMarksBegin();
@@ -3604,6 +3626,7 @@ bool 
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
 }
 }
 
+std::vector> undos;
 if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
 {
 /* please don't translate -- for cultural reasons this comment is 
protected
@@ -3611,47 +3634,61 @@ bool 
DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
 //JP 06.01.98: MUSS noch optimiert werden!!!
 m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(
 RedlineFlags::On | RedlineFlags::ShowInsert | 
RedlineFlags::ShowDelete);
-pUndo = new SwUndoRedlineDelete( rPam, SwUndoId::DELETE );
-const SwRewriter aRewriter = pUndo->GetRewriter();
-m_rDoc.GetIDocumentUndoRedo().StartUndo( SwUndoId::DELETE, &aRewriter 
);
-for (auto& it : MarkUndos)
+for (SwRangeRedline * pRedline : redlines)
+{
+assert(pRedline->HasValidRange());
+undos.emplace_back(o3tl::make_unique(
+*pRedline, SwUndoId::DELETE));
+}
+const SwRewriter aRewriter = undos.front()->GetRewriter();
+// can only group a single undo action
+if (MarkUndos.empty() && undos.size() == 1
+&& m_rDoc.GetIDocumentUndoRedo().DoesGroupUndo())
+{
+SwUndo * const pLastUndo( m_rDoc.GetUndoManager().GetLastUndo

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp  |   18 --
 wsd/ClientSession.hpp  |3 +++
 wsd/DocumentBroker.cpp |   14 --
 3 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit ac47dfed72a549b5e15e00b5cef5e76ffd4b6277
Author: Tamás Zolnai 
AuthorDate: Thu Aug 30 17:40:42 2018 +0200
Commit: Jan Holesovsky 
CommitDate: Fri Sep 7 13:16:28 2018 +0200

Calculate tiles-on-fly limit a bit more precisely

Change-Id: Id012a83d6ccd226d1b66e3cd48a9caeafd849fc5
(cherry picked from commit dce6c18fb4848a27c2e50faed4e6585b0b7bfdcd)
Reviewed-on: https://gerrit.libreoffice.org/59836
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 00fd8373d..6461851d9 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1076,6 +1076,16 @@ void ClientSession::removeOutdatedTilesOnFly()
 }
 }
 
+Util::Rectangle ClientSession::getNormalizedVisibleArea() const
+{
+Util::Rectangle normalizedVisArea;
+normalizedVisArea._x1 = std::max(_clientVisibleArea._x1, 0);
+normalizedVisArea._y1 = std::max(_clientVisibleArea._y1, 0);
+normalizedVisArea._x2 = _clientVisibleArea._x2;
+normalizedVisArea._y2 = _clientVisibleArea._y2;
+return normalizedVisArea;
+}
+
 void ClientSession::onDisconnect()
 {
 LOG_INF(getName() << " Disconnected, current number of connections: " << 
LOOLWSD::NumConnections);
@@ -1169,12 +1179,8 @@ void ClientSession::handleTileInvalidation(const 
std::string& message,
 return;
 }
 
-// Visible area can have negativ value as position, but we have tiles only 
in the positiv range 
-Util::Rectangle normalizedVisArea;
-normalizedVisArea._x1 = std::max(_clientVisibleArea._x1, 0);
-normalizedVisArea._y1 = std::max(_clientVisibleArea._y1, 0);
-normalizedVisArea._x2 = _clientVisibleArea._x2;
-normalizedVisArea._y2 = _clientVisibleArea._y2;
+// Visible area can have negativ value as position, but we have tiles only 
in the positive range
+Util::Rectangle normalizedVisArea = getNormalizedVisibleArea();
 
 std::pair result = 
TileCache::parseInvalidateMsg(message);
 int part = result.first;
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 397f7b670..67664ee35 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -130,6 +130,9 @@ public:
 void removeOutdatedTilesOnFly();
 
 Util::Rectangle getVisibleArea() const { return _clientVisibleArea; }
+/// Visible area can have negative value as position, but we have tiles 
only in the positive range
+Util::Rectangle getNormalizedVisibleArea() const;
+
 int getTileWidthInTwips() const { return _tileWidthTwips; }
 int getTileHeightInTwips() const { return _tileHeightTwips; }
 
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 9f9e63304..367445e84 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1391,13 +1391,15 @@ void DocumentBroker::sendRequestedTiles(const 
std::shared_ptr& se
 std::unique_lock lock(_mutex);
 
 // How many tiles we have on the visible area, set the upper limit 
accordingly
-const float tilesFitOnWidth = 
static_cast(session->getVisibleArea().getWidth()) /
-  
static_cast(session->getTileWidthInTwips());
-const float tilesFitOnHeight = 
static_cast(session->getVisibleArea().getHeight()) /
-   
static_cast(session->getTileHeightInTwips());
-const float tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight;
+Util::Rectangle normalizedVisArea = session->getNormalizedVisibleArea();
 
-const float tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, 
tilesInVisArea * 1.20f);
+const int tilesFitOnWidth = std::ceil(normalizedVisArea._x2 / 
session->getTileWidthInTwips()) -
+std::ceil(normalizedVisArea._x1 / 
session->getTileWidthInTwips()) + 1;
+const int tilesFitOnHeight = std::ceil(normalizedVisArea._y2 / 
session->getTileHeightInTwips()) -
+ std::ceil(normalizedVisArea._y1 / 
session->getTileHeightInTwips()) + 1;
+const int tilesInVisArea = tilesFitOnWidth * tilesFitOnHeight;
+
+const float tilesOnFlyUpperLimit = std::max(TILES_ON_FLY_MIN_UPPER_LIMIT, 
tilesInVisArea * 1.5f);
 
 // Update client's tilesBeingRendered list
 session->removeOutdatedTileSubscriptions();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa sd/source

[Libreoffice Gerrit user]

 sd/qa/unit/data/odp/tdf99213-target-missing.odp |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   15 ++
 sd/source/filter/eppt/pptx-animations.cxx   |  143 ++--
 3 files changed, 126 insertions(+), 32 deletions(-)

New commits:
commit 612db6877a73e6f9b142b81697291f02c0adb95f
Author: Mark Hung 
AuthorDate: Sat Sep 1 11:11:38 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Sep 7 13:11:41 2018 +0200

tdf#99213: don't export invalid child nodes.

Create NodeContext for all child nodes at beginning and
check if they are valid, either it has a valid target or
it contains valid nodes, so that we only export valid
node later.

Change-Id: I660d99011eb57ddc79f727455fce0be8876e8b17
Reviewed-on: https://gerrit.libreoffice.org/59892
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sd/qa/unit/data/odp/tdf99213-target-missing.odp 
b/sd/qa/unit/data/odp/tdf99213-target-missing.odp
new file mode 100644
index ..3bc8c7260c8c
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf99213-target-missing.odp 
differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 6920531af778..fa994f219d6a 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -193,6 +193,7 @@ public:
 void testTdf116350TextEffects();
 void testTdf118825();
 void testTdf119118();
+void testTdf99213();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -269,6 +270,7 @@ public:
 CPPUNIT_TEST(testTdf116350TextEffects);
 CPPUNIT_TEST(testTdf118825);
 CPPUNIT_TEST(testTdf119118);
+CPPUNIT_TEST(testTdf99213);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1987,6 +1989,19 @@ void SdOOXMLExportTest2::testTdf119118()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf99213()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc( 
"sd/qa/unit/data/odp/tdf99213-target-missing.odp" ), ODP);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+// Number of nodes with p:attrNameLst was 3, including one that missed 
tgtEl
+assertXPath(pXmlDocContent, "//p:attrNameLst", 2);
+// Timenode that miss its target element should be filtered.
+assertXPath(pXmlDocContent, "//p:attrNameLst/preceding-sibling::p:tgtEl", 
2);
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-animations.cxx 
b/sd/source/filter/eppt/pptx-animations.cxx
index 7a64828ddfd1..b02ccdcc4cb7 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -410,6 +410,21 @@ void WriteAnimationAttributeName(const FSHelperPtr& pFS, 
const OUString& rAttrib
 pFS->endElementNS(XML_p, XML_attrNameLst);
 }
 
+bool isValidTarget(const Any& rTarget)
+{
+Reference xShape;
+
+if ((rTarget >>= xShape) && xShape.is())
+return true;
+
+ParagraphTarget aParagraphTarget;
+
+if ((rTarget >>= aParagraphTarget) && aParagraphTarget.Shape.is())
+return true;
+
+return false;
+}
+
 /// convert animation node type to corresponding ooxml element.
 sal_Int32 convertNodeType(sal_Int16 nType)
 {
@@ -575,9 +590,13 @@ typedef std::unique_ptr NodeContextPtr;
 
 class NodeContext
 {
-const Reference& mxNode;
+const Reference mxNode;
 const bool mbMainSeqChild;
 
+std::vector maChildNodes;
+// if the node has valid target or contains at least one valid target.
+bool mbValid;
+
 // Attributes initialized from mxNode->getUserData().
 sal_Int16 mnEffectNodeType;
 sal_Int16 mnEffectPresetClass;
@@ -587,14 +606,23 @@ class NodeContext
 /// constructor helper for initializing user datas.
 void initUserData();
 
+/// constructor helper to initialize maChildNodes.
+/// return true if at least one childnode is valid.
+bool initChildNodes();
+
+/// constructor helper to initialize mbValid
+void initValid(bool bHasValidChild, bool bIsIterateChild);
+
 public:
-NodeContext(const Reference& xNode, bool bMainSeqChild);
+NodeContext(const Reference& xNode, bool bMainSeqChild, 
bool bIsIterateChild);
 const Reference& getNode() const { return mxNode; }
 bool isMainSeqChild() const { return mbMainSeqChild; }
 sal_Int16 getEffectNodeType() const { return mnEffectNodeType; }
 sal_Int16 getEffectPresetClass() const { return mnEffectPresetClass; }
 const OUString& getEffectPresetId() const { return msEffectPresetId; }
 const OUString& getEffectPresetSubType() const { return 
msEffectPresetSubType; }
+bool isValid() const { return mbValid; }
+const std::vector& getChildNodes() const { return 
maChildNodes; };
 };
 
 class PPTXAnimationExport
@@ -1014,34 +1042,17 @@ void 
PPTXAnimationExport::WriteAnimatio

Re: Cppcheck: Reduction of False Positives with a MSVC Project File

[Stephan Bergmann]

On 07/09/18 11:26, Stephan Bergmann wrote:
 > 
D:\cygwin\home\Hearthstone\lode\dev\core\framework\inc\helper\shareablemutex.hxx 

 > 73    noExplicitConstructor    398    style    Class 'ShareGuard' has 
a constructor with 1 argument that is not explicit.


For all the nine noExplicitConstructor occurrences:  For one, what 
puzzles me is Cppcheck's fixation on "1 argument" ctors, as "explicit" 
has long surpassed being only relevant for ctors that can be called with 
one argument; if it warns about these, why doesn't it warn about ctors 
taking more arguments, too?  For another, for each individual ctor, they 
may be arguments for and against it being "explicit".  Would need deeper 
inspection, but generally feels on the level of rather unhelpful noise.


Especially, ctors that are part of the stable URE interface should 
likely not be changed to be explicit, to avoid incompatible changes. 
See the discussion at  
"Cppcheck: make 1-argument ctors explicit".

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svx/source

[Libreoffice Gerrit user]

 svx/source/form/formcontroller.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3448ca93eb46365d05387f7f3512c706bdb987c4
Author: Julien Nabet 
AuthorDate: Thu Sep 6 20:52:26 2018 +0200
Commit: Julien Nabet 
CommitDate: Fri Sep 7 12:00:24 2018 +0200

tdf#75341: fix condition to approve row (form)

Considering rColInfo.nNullable != ColumnValue::NO_NULLS is ok to approve row
isn't sufficient in the case the field is "Input required" in form.

Change-Id: I27c57fe8ce5afac97eb0650f9370c85f1421
Reviewed-on: https://gerrit.libreoffice.org/60109
(cherry picked from commit dbb444e4ed7c19a11733ce8438bbb6546d42f852)
Reviewed-on: https://gerrit.libreoffice.org/60125
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins

diff --git a/svx/source/form/formcontroller.cxx 
b/svx/source/form/formcontroller.cxx
index c302f4dee524..881f1ec84967 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3723,8 +3723,6 @@ sal_Bool SAL_CALL FormController::approveRowChange(const 
RowChangeEvent& _rEvent
 for ( size_t col = 0; col < colCount; ++col )
 {
 const ColumnInfo& rColInfo = m_pColumnInfoCache->getColumnInfo( 
col );
-if ( rColInfo.nNullable != ColumnValue::NO_NULLS )
-continue;
 
 if ( rColInfo.bAutoIncrement )
 continue;
@@ -3732,8 +3730,11 @@ sal_Bool SAL_CALL FormController::approveRowChange(const 
RowChangeEvent& _rEvent
 if ( rColInfo.bReadOnly )
 continue;
 
-if ( !rColInfo.xFirstControlWithInputRequired.is() && 
!rColInfo.xFirstGridWithInputRequiredColumn.is() )
+if ( !rColInfo.xFirstControlWithInputRequired.is() && 
!rColInfo.xFirstGridWithInputRequiredColumn.is()
+  && rColInfo.nNullable != ColumnValue::NO_NULLS )
+{
 continue;
+}
 
 // TODO: in case of binary fields, this "getString" below is 
extremely expensive
 if ( !rColInfo.xColumn->getString().isEmpty() || 
!rColInfo.xColumn->wasNull() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/inc oox/source oox/util solenv/bin

[Libreoffice Gerrit user]

 oox/inc/services.hxx |7 ---
 oox/source/core/services.cxx |1 -
 oox/source/ppt/pptimport.cxx |   27 ---
 oox/util/oox.component   |3 ++-
 solenv/bin/native-code.py|1 +
 5 files changed, 11 insertions(+), 28 deletions(-)

New commits:
commit c3c43c7966e0f4c7a3b76361559d29c9335487d9
Author: Miklos Vajna 
AuthorDate: Fri Sep 7 08:41:44 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Sep 7 11:58:02 2018 +0200

oox: create PowerPointImport instances with an uno constructor

PowerPointImport_getSupportedServiceNames() was copy&pasted from
oox::core::FilterBase::getSupportedServiceNames(), so it can go away 
entirely.

Change-Id: Ia6352cea1c2d65ba94cae66b500de951d82f455a
Reviewed-on: https://gerrit.libreoffice.org/60124
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx
index 849c28a279bc..7140a5b87d80 100644
--- a/oox/inc/services.hxx
+++ b/oox/inc/services.hxx
@@ -24,13 +24,6 @@
 
 namespace oox {
 namespace ppt {
-extern OUString PowerPointImport_getImplementationName();
-extern css::uno::Sequence< OUString > 
PowerPointImport_getSupportedServiceNames();
-/// @throws css::uno::Exception
-extern css::uno::Reference< css::uno::XInterface > 
PowerPointImport_createInstance(
-const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
-}
-namespace ppt {
 extern OUString QuickDiagrammingImport_getImplementationName();
 extern css::uno::Sequence< OUString > 
QuickDiagrammingImport_getSupportedServiceNames();
 /// @throws css::uno::Exception
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 9bf8e57466bf..c336022110a2 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -35,7 +35,6 @@ namespace {
 // Impress" would actually want to make use of them:
 static ::cppu::ImplementationEntry const spServices[] =
 {
-IMPLEMENTATION_ENTRY( ::oox::ppt::PowerPointImport ),
 IMPLEMENTATION_ENTRY( ::oox::ppt::QuickDiagrammingImport ),
 IMPLEMENTATION_ENTRY( ::oox::ppt::QuickDiagrammingLayout ),
 IMPLEMENTATION_ENTRY( ::oox::shape::ShapeContextHandler ),
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 634cd877f66f..8d5a6aa03f67 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -54,24 +54,6 @@ using ::com::sun::star::lang::XComponent;
 
 namespace oox { namespace ppt {
 
-OUString PowerPointImport_getImplementationName()
-{
-return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" );
-}
-
-uno::Sequence< OUString > PowerPointImport_getSupportedServiceNames()
-{
-Sequence< OUString > aSeq( 2 );
-aSeq[ 0 ] = "com.sun.star.document.ImportFilter";
-aSeq[ 1 ] = "com.sun.star.document.ExportFilter";
-return aSeq;
-}
-
-uno::Reference< uno::XInterface > PowerPointImport_createInstance( const 
Reference< XComponentContext >& rxContext )
-{
-return static_cast< ::cppu::OWeakObject* >( new PowerPointImport( 
rxContext ) );
-}
-
 #if OSL_DEBUG_LEVEL > 0
 XmlFilterBase* PowerPointImport::mpDebugFilterBase = nullptr;
 #endif
@@ -321,9 +303,16 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() 
const
 
 OUString PowerPointImport::getImplementationName()
 {
-return PowerPointImport_getImplementationName();
+return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" );
 }
 
 }}
 
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_oox_ppt_PowerPointImport_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new oox::ppt::PowerPointImport(pCtx));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/util/oox.component b/oox/util/oox.component
index 399348db905c..09952c7abdf4 100644
--- a/oox/util/oox.component
+++ b/oox/util/oox.component
@@ -31,7 +31,8 @@
 
constructor="com_sun_star_comp_oox_docprop_DocumentPropertiesImporter_get_implementation">
 
   
-  
+  
 
 
   
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d297f93bba05..75d3afbcbbac 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -256,6 +256,7 @@ core_constructor_list = [
 "com_sun_star_comp_oox_core_FastTokenHandler_get_implementation",
 "com_sun_star_comp_oox_FormatDetector_get_implementation",
 
"com_sun_star_comp_oox_docprop_DocumentPropertiesImporter_get_implementation",
+"com_sun_star_comp_oox_ppt_PowerPointImport_get_implementation",
 ]
 
 # edit group for apps, where you can edit documents
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dtrans/test sal/osl sfx2/source

[Libreoffice Gerrit user]

 dtrans/test/win32/dnd/atlwindow.cxx  |2 +-
 sal/osl/w32/dllentry.cxx |6 +-
 sfx2/source/appl/shutdowniconw32.cxx |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit aef44b5a71d6d2bd8e399d2cb35bce6d6023fbf8
Author: Mike Kaganski 
AuthorDate: Fri Sep 7 07:05:32 2018 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 7 11:46:14 2018 +0200

Cppcheck: release the handle that CreateThread returns

Change-Id: I4d6d04873d69d2ff1e5409372b353e0bb9a5d68d
Reviewed-on: https://gerrit.libreoffice.org/60120
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/dtrans/test/win32/dnd/atlwindow.cxx 
b/dtrans/test/win32/dnd/atlwindow.cxx
index 7aa0df7ce0ac..9e1e2e1fc693 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/dtrans/test/win32/dnd/atlwindow.cxx
@@ -181,7 +181,7 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM 
lParam, BOOL& bHandled
 
 data.evtThreadReady= CreateEvent( NULL, FALSE, FALSE, NULL);
 
-HANDLE hThread= CreateThread( NULL, 0, MTAFunc, &data, 0, 
&mtaThreadId);
+CloseHandle(CreateThread(NULL, 0, MTAFunc, &data, 0, 
&mtaThreadId));
 // We must wait until the thread copied the ThreadData 
structure
 WaitForSingleObject( data.evtThreadReady, INFINITE);
 CloseHandle( data.evtThreadReady);
diff --git a/sal/osl/w32/dllentry.cxx b/sal/osl/w32/dllentry.cxx
index 8e8c0feda62c..e9323248e3db 100644
--- a/sal/osl/w32/dllentry.cxx
+++ b/sal/osl/w32/dllentry.cxx
@@ -221,13 +221,17 @@ BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )
 {
 // No error check, it works or it does not
 // Thread should only be started for headless mode, see 
desktop/win32/source/officeloader.cxx
-CreateThread( nullptr, 0, ParentMonitorThreadProc, 
reinterpret_cast(dwParentProcessId), 0, &dwThreadId );
+HANDLE hThread
+= CreateThread(nullptr, 0, ParentMonitorThreadProc,
+   
reinterpret_cast(dwParentProcessId), 0, &dwThreadId);
 // Note: calling CreateThread in DllMain is discouraged
 // but this is only done in the headless mode and in
 // that case no other threads should be running at startup
 // when sal3.dll is loaded; also there is no
 // synchronization with the spawned thread, so there
 // does not appear to be a real risk of deadlock here
+if (hThread)
+CloseHandle(hThread);
 }
 }
 
diff --git a/sfx2/source/appl/shutdowniconw32.cxx 
b/sfx2/source/appl/shutdowniconw32.cxx
index 8ff9c621009d..47fb95c37f4a 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -528,7 +528,7 @@ void win32_init_sys_tray()
 );
 
 DWORD   dwThreadId;
-CreateThread( nullptr, 0, SystrayThread, nullptr, 0, &dwThreadId );
+CloseHandle(CreateThread(nullptr, 0, SystrayThread, nullptr, 0, 
&dwThreadId));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/Executable_odbcconfig.mk dbaccess/win32

[Libreoffice Gerrit user]

 dbaccess/Executable_odbcconfig.mk   |4 
 dbaccess/win32/source/odbcconfig/odbcconfig.cxx |4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 58008a0fdd611bb75e4f6922483818ffd2acbc26
Author: Mike Kaganski 
AuthorDate: Fri Sep 7 07:19:30 2018 +0200
Commit: Mike Kaganski 
CommitDate: Fri Sep 7 11:44:09 2018 +0200

Cppcheck: resource leak warning

Change-Id: I855097279cd091c1e8bd665bb0b48ce9279a9ca8
Reviewed-on: https://gerrit.libreoffice.org/60121
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/dbaccess/Executable_odbcconfig.mk 
b/dbaccess/Executable_odbcconfig.mk
index ea37824924cd..fdfcbf26f434 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Executable_Executable,odbcconfig))
 
 $(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES))
 
+$(eval $(call gb_Executable_use_libraries,odbcconfig,\
+comphelper \
+))
+
 $(eval $(call gb_Library_use_sdk_api,odbcconfig))
 
 $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx 
b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
index f9add1bef2f1..7874bb4c056f 100644
--- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
+++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
@@ -23,6 +23,7 @@
 #endif
 #include 
 #include 
+#include 
 
 // the name of the library which contains the SQLManageDataSources function
 #define ODBC_UI_LIB_NAMEL"ODBCCP32.DLL"
@@ -113,6 +114,7 @@ extern "C" int APIENTRY wWinMain( HINSTANCE _hAppInstance, 
HINSTANCE, LPWSTR, in
 hModule = LoadLibraryExW( ODBC_UI_LIB_NAME, nullptr, 
LOAD_WITH_ALTERED_SEARCH_PATH );
 if ( hModule == nullptr )
 return displayLastError();
+comphelper::ScopeGuard hModuleReleaser([hModule]() { FreeLibrary(hModule); 
});
 
 FARPROC pManageDSProc = GetProcAddress( hModule, "SQLManageDataSources" );
 if ( pManageDSProc == nullptr )
@@ -122,8 +124,6 @@ extern "C" int APIENTRY wWinMain( HINSTANCE _hAppInstance, 
HINSTANCE, LPWSTR, in
 if ( !( (*pManageDS)( hAppWindow ) ) )
 return displayLastError();
 
-FreeLibrary( hModule );
-
 return 0;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Calc research & funcalc ...

[Michael Meeks]

Hi there,

So - opening this to a wider audience with minor edits - and
more comments in-line:

On 03/09/18 16:21, Alexander Bock wrote:
> Sorry for the delay in getting back to you.
> 
> Michael wrote:
>> First - great to meet you; and good to find another team interested in
>> spreadsheets. The LibreOffice Calc team has been working hard to really
>> improve the state of the art wrt. spreadsheet representations - at least
>> in the form of things that we can feasibly re-architect towards while
>> continuing to ship a working product =) - not trivial.
> 
> Likewise :) we are still a relatively small crowd. I was very pleased to
> read about all the improvements from the slide materials to get a better
> idea of all the improvements that have been made.
> 
>> Isn't that implementation decision such 'fun' =) we work quite hard to
>> kill implicit intersection in our internal compiled form of formulae -
>> that helps have precise dependencies: so =SIN(A:A) doesn't end up with
>> some massive heap there.
> 
> Ugh…I’m very glad Funcalc does not support it. I would be very
> interested to know more about the internal compiled formulae if you have
> any resources on that. Funcalc is interpreted except for the
> sheet-defined functions (SDFs) which are compiled on-the-fly to .NET
> bytecode and executed by the JIT compiler.
> 
> Here’s a picture of an SDF for rolling an n-sided die to get a better
> idea of how it works. Cell A1 defines the function. The green cells are
> zero or more input cells, the light blue cells (not shown) are
> intermediate calculations and the blue cell is the single output cell of
> the function. The pink border stems from the fact that SDFs can only be
> defined on special “function sheets”.
> 
>> Having said that - reading funcalc - it seems your dependency
>> structures are a cell <-> cell(s) mapping - not special casing range
>> references - which is unusual. I personally think that one of the big
>> errors of spreadsheet design is separating dependencies from formulae
>> but ... ;-) These days we do group dependency tracking which makes life
>> hugely more efficient.
> 
> To be more precise, it is indeed a cell-to-cell mapping although the
> graph is implicitly defined, i.e. there is no omniscient, global data
> structure. We do special case areas/ranges for supported cells (i.e. the
> inverse direction of the dependency graph) which does a lot of caching
> and cleverness to remain efficient. For each cell, we can still query
> its dependencies and supported cells. For the full details, it is
> probably better to refer you to my supervisor’s book “Spreadsheet
> Implementation Technology”
> .
> There may be an older version available somewhere on his site
> .

Sounds like an interesting book =) It's a shame we had a
LibreOffice conference in Denmark a couple of years back and would have
been interesting to meet up and compare spreadsheet design notes. Perhaps
you could join one of our Hamburg hackfests at some stage.

> I was actually considering that we should track cell arrays/groups
> explicitly especially for dependency management, instead of finding them
> when necessary which is what I do in my tool currently. However, I am
> unsure how well it will fit with the current infrastructure.
> 
>> Hmm - so do you handle =RAND() for example - it's trivial using
>> =INDIRECT(ADDRESS(RAND()...)) to build dependency graph mutating horrors
>> - or just some vlookup on a semi-random cell range.
> 
> Good point. Simply by not having similar “problematic” functions
> available. I guess that is one benefit of working with a research
> prototype…I believe my supervisor did not want to deal with those
> issues, as important as they may be, since the primary proof-of-concept
> for Funcalc was sheet-defined functions.
> 
>> This is all really interesting. I'd prefer we move this mail to the
>> public LibreOffice developer list if that's ok (?) may I re-post this
>> mail there ? No doubt that would get more input - and we can CC more
>> people outside Collabora that would be curious.
> 
> That is perfectly fine. Do I need to respond there then? It’s been a
> quite a while since I’ve dealt with mailing lists :)

Easy - just reply to the mail - and be aware it's permanently public.

>> In addition - you should really check out Kohie's MDDS library - the
>> Multi-Dimensional-Data-Structures, which is the C++ template magic of
>> our core, and Kohei has his own new-gen spreadsheet prototype called
>> 'Orcus' that we re-use pieces of in LibreOffice.
> 
> Ah yes, I saw it in one of the slides. Very interesting stuff and cool
> use case! I’ll make sure to look into it.
...
>> Oh - and, another thing - in many of the cases that we can parallelize
>> LibreOffice 6.1 has some great performance characteristics vs. Excel by
>> wall-clock time measurements.

Re: Cppcheck: Reduction of False Positives with a MSVC Project File

[Kaganski Mike]

Hi!

https://gerrit.libreoffice.org/60119
https://gerrit.libreoffice.org/60122
https://gerrit.libreoffice.org/60120
https://gerrit.libreoffice.org/60121
https://gerrit.libreoffice.org/60123

are meant to take care of those that aren't false positives...

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5dd1474ca627c1354ebd4c22c890e9fd67afcffa
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 13:36:38 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 11:29:04 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Mute L10n in some regexp definitions and examples

Change-Id: I614575fd63d08e05ffdf7c74a9f73a4c3021cf08
Reviewed-on: https://gerrit.libreoffice.org/60105
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0858f6c2d93e..975365445280 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0858f6c2d93e701deef99a74567e214f05a9f8e3
+Subproject commit 975365445280e10d567dfb0bd8be6e5eb1dfdc46
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/shared/01/0211.xhp |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 975365445280e10d567dfb0bd8be6e5eb1dfdc46
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 13:36:38 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 11:29:04 2018 +0200

Mute L10n in some regexp definitions and examples

Change-Id: I614575fd63d08e05ffdf7c74a9f73a4c3021cf08
Reviewed-on: https://gerrit.libreoffice.org/60105
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index e527cc565..b4d037dd5 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -53,7 +53,7 @@
   
   
 
-  .
+  .
 
 
   Represents any single character except for a line break or 
paragraph break. For example, the search term "sh.rt" returns both "shirt" and 
"short".
@@ -61,7 +61,7 @@
   
   
 
-  ^
+^
 
 
   Only 
finds the search term if the term is at the beginning of a paragraph. Special 
objects such as empty fields or character-anchored frames, at the beginning of 
a paragraph are ignored. Example: "^Peter".
@@ -69,7 +69,7 @@
   
   
 
-  $
+$
 
 
   Only 
finds the search term if the term appears at the end of a paragraph. Special 
objects such as empty fields or character-anchored frames at the end of a 
paragraph are ignored. Example: "Peter$".
@@ -78,7 +78,7 @@
   
   
 
-  *
+*
 
 
   Finds 
zero or more of the characters in front of the "*". For example, "Ab*c" finds 
"Ac", "Abc", "Abbc", "Abbbc", and so on.
@@ -86,7 +86,7 @@
   
   
 
-  +
++
 
 
   Finds 
one or more of the characters in front of the "+". For example, "AX.+4" finds 
"AXx4", but not "AX4".
@@ -95,7 +95,7 @@
   
   
 
-  ?
+?
 
 
   Finds 
zero or one of the characters in front of the "?". For example, "Texts?" finds 
"Text" and "Texts" and "x(ab|c)?y" finds "xy", "xaby", or "xcy".
@@ -103,7 +103,7 @@
   
   
 
-  \
+\
 
 
   Search interprets the special character that follows the 
"\" as a normal character and not as a regular expression (except for the 
combinations \n, \t, \>, and \<). For example, "tree\." finds "tree.", 
not "treed" or "trees".
@@ -111,7 +111,7 @@
   
   
 
-  \n
+\n
 
 
   Represents a line break that was inserted with the 
Shift+Enter key combination. To change a line break 
into a paragraph break, enter \n in the Find and 
Replace boxes, and then perform a search and replace.
@@ -121,7 +121,7 @@
   
   
 
-  \t
+\t
 
 
   Represents a tab. You can also use this expression in the 
Replace box.
@@ -129,7 +129,7 @@
   
   
 
-  \b
+\b
 
 
   Match 
a word boundary. For example, "\bbook" finds "bookmark" but not "checkbook" 
whereas "book\b" finds "checkbook" but not "bookmark". The discrete word "book" 
is found by both search terms.
@@ -137,7 +137,7 @@
   
   
 
-  ^$
+^$
 
 
   Finds 
an empty paragraph.
@@ -145,7 +145,7 @@
   
   
 
-  ^.
+^.
 
 
   Finds 
the first character of a paragraph.
@@ -163,7 +163,7 @@
   
   
 
-  [abc123]
+[abc123]
 
 
   Represents one of the characters that are between the 
brackets.
@@ -171,7 +171,7 @@
   
   
 
-  [a-e]
+[a-e]
 
 
   Represents any of the characters that are between 
a and e, including both start and end 
characters.
@@ -180,7 +180,7 @@
   
   
 
-  [a-eh-x]
+[a-eh-x]
 
 
   Represents any of the characters that are between 
a-e and h-x.
@@ -188,7 +188,7 @@
   
   
 
-  [^a-s]
+[^a-s]
 
 
   Represents everything that is not between 
a and s.
@@ -196,8 +196,8 @@
   
   
 
-  \u
-  \U
+\u
+\U
 
 
   Represents a character based on its four-digit hexadecimal 
Unicode code ().
@@ -207,7 +207,7 @@
   
   
 
-  |
+|
 
 
   Finds 
the terms that occur before the "|" and also finds the terms that occur after 
the "|". For example, "this|that" finds "this" and "that".
@@ -215,7 +215,7 @@
   
   
 
-  {2}
+{2}
 
 
   Defines the number of times that the character in front of 
the opening bracket occurs. For example, "tre{2}" finds and selects 
"tree".
@@ -223,7 +223,7 @@
   
   
 
-  {1,2}
+{1,2}
 
 
   Defines the minimum and maximum number of times that the 
character in front of the opening bracket can occur. For example, "tre{1,2}" 
finds and selects "tre" and "tree".
@@ -231,7 +231,7 @@
   
   
 
-  {1,}
+{1,}
 
 
   Defines the minimum number of times that the characte

Re: Cppcheck: Reduction of False Positives with a MSVC Project File

[Stephan Bergmann]

On 07/09/18 06:31, Luke Benes wrote:
By using our MSVC Project file to teach cppcheck about includes and 
preprocessor configurations, I was able to reduce the number of warnings 
from 9,141 to 25.  You can see the Report here:


https://drive.google.com/file/d/1NCV4Zl8vcWl30f6cDfTbGwxvW7lhMxw-/view?usp=sharing

While the results are thin, are there any valid issues here?


Commenting on the referenced cppcheck_reports2/index.html:

> C:\Program Files (x86)\Windows 
Kits\10\Include\10.0.17134.0\shared\WTypesbase.h

> 357syntaxError error   syntax error
> C:\Program Files (x86)\Windows Kits\10\Include\10.0.17134.0\ucrt\malloc.h
> 150	variableScope	398	style	The scope of the variable '_Marker' can 
be reduced.


The above two are in system code; nothing we can do about.

> 
D:\cygwin\home\Hearthstone\lode\dev\core\dbaccess\win32\source\odbcconfig\odbcconfig.cxx

> 119resourceLeak775 error   Resource leak: hModule
> 123resourceLeak775 error   Resource leak: hModule

The above two should indeed be fixed

> 
D:\cygwin\home\Hearthstone\lode\dev\core\framework\inc\helper\shareablemutex.hxx
> 73	noExplicitConstructor	398	style	Class 'ShareGuard' has a 
constructor with 1 argument that is not explicit.


For all the nine noExplicitConstructor occurrences:  For one, what 
puzzles me is Cppcheck's fixation on "1 argument" ctors, as "explicit" 
has long surpassed being only relevant for ctors that can be called with 
one argument; if it warns about these, why doesn't it warn about ctors 
taking more arguments, too?  For another, for each individual ctor, they 
may be arguments for and against it being "explicit".  Would need deeper 
inspection, but generally feels on the level of rather unhelpful noise.


> 
D:\cygwin\home\Hearthstone\lode\dev\core\framework\source\fwi\helper\shareablemutex.cxx
> 33	copyCtorPointerCopying	398	style	Value of pointer 'm_pMutexRef', 
which points to allocated memory, is copied in copy constructor instead 
of allocating new memory.


The above is a false positive.

> D:\cygwin\home\Hearthstone\lode\dev\core\include\osl\endian.h
> 77 preprocessorErrorDirective  error   #error undetermined 
endianness

The two "preprocessorErrorDirective" are apparently fallout from 
Cppcheck (not being called in a correct way and thus?) not being able to 
determine which #if branch to take.


> D:\cygwin\home\Hearthstone\lode\dev\core\include\osl\mutex.hxx
> 120	noExplicitConstructor	398	style	Class 'Guard' has a constructor 
with 1 argument that is not explicit.
> 127	noExplicitConstructor	398	style	Class 'Guard' has a constructor 
with 1 argument that is not explicit.
> 154	noExplicitConstructor	398	style	Class 'ClearableGuard' has a 
constructor with 1 argument that is not explicit.
> 161	noExplicitConstructor	398	style	Class 'ClearableGuard' has a 
constructor with 1 argument that is not explicit.
> 200	noExplicitConstructor	398	style	Class 'ResettableGuard' has a 
constructor with 1 argument that is not explicit.
> 207	noExplicitConstructor	398	style	Class 'ResettableGuard' has a 
constructor with 1 argument that is not explicit.

> D:\cygwin\home\Hearthstone\lode\dev\core\include\rtl\byteseq.h
> 199	noExplicitConstructor	398	style	Class 'ByteSequence' has a 
constructor with 1 argument that is not explicit.
> 210	noExplicitConstructor	398	style	Class 'ByteSequence' has a 
constructor with 1 argument that is not explicit.


(see above)

> D:\cygwin\home\Hearthstone\lode\dev\core\include\sal\alloca.h
> 60	preprocessorErrorDirective		error	#error "unknown platform: please 
check for alloca"


(see above)

> D:\cygwin\home\Hearthstone\lode\dev\core\sal\osl\w32\dllentry.cxx
> 224	ignoredReturnValue	252	warning	Return value of function 
CreateThread() is not used.
> 224	leakReturnValNotUsed	771	error	Return value of allocation 
function 'CreateThread' is not stored.


From the comments around the above two, they appear to be intentional.

> D:\cygwin\home\Hearthstone\lode\dev\core\sal\rtl\byteseq.cxx
> 43	variableScope	398	style	The scope of the variable 'nElements' can 
be reduced.


The above could indeed be fixed.

> 82	incorrectStringBooleanError	571	warning	Conversion of string 
literal "### null ptr!" to bool always evaluates to true.

> D:\cygwin\home\Hearthstone\lode\dev\core\sot\source\sdstor\stgavl.cxx
> 137	incorrectStringBooleanError	571	warning	Conversion of string 
literal "The pointer is not allowed to be NULL!" to bool always 
evaluates to true.
> 149	incorrectStringBooleanError	571	warning	Conversion of string 
literal "The pointer is not allowed to be NULL!" to bool always 
evaluates to true.
> 180	incorrectStringBooleanError	571	warning	Conversion of string 
literal "The pointer is not allowed to be NULL!" to bool always 
evaluates to true.
> 191	incorrectStringBooleanError	571	warning	Conversion of string 
literal "The pointer is not allowed to be NULL!" to bool always 
evaluates to true.
> 302	incorrectStringBooleanError	

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d6f07fb75c716d8543c5338bbb9b8f9c8659b24
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 15:03:23 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 11:25:15 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix image dimensions expression in style

Change-Id: I1803f18aa0512e5b618daa64efff6487c583fb76
Reviewed-on: https://gerrit.libreoffice.org/60106
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 49ca3ec3c229..0858f6c2d93e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 49ca3ec3c2290c0ea58a57f31073fc838109f75d
+Subproject commit 0858f6c2d93e701deef99a74567e214f05a9f8e3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/online_transform.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0858f6c2d93e701deef99a74567e214f05a9f8e3
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 15:03:23 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 11:25:15 2018 +0200

Fix image dimensions expression in style

Change-Id: I1803f18aa0512e5b618daa64efff6487c583fb76
Reviewed-on: https://gerrit.libreoffice.org/60106
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index cbd43cd7e..5e7859b97 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -1089,7 +1089,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8e9f155dd91e4a08e4ff35ea5f4b600c9025f4e
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 15:06:29 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 11:15:57 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix icon sizes

SVG images must have width/height set.

Change-Id: Ia881ad81614d949f1d01764f3e750c066651d631
Reviewed-on: https://gerrit.libreoffice.org/60107
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 63f3f49bbd70..49ca3ec3c229 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 63f3f49bbd70940dbd1cf4ca7ab3ac89de6af532
+Subproject commit 49ca3ec3c2290c0ea58a57f31073fc838109f75d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/shared/02/1204.xhp |9 +
 source/text/shared/02/1212.xhp |2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 49ca3ec3c2290c0ea58a57f31073fc838109f75d
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 15:06:29 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 11:15:57 2018 +0200

Fix icon sizes

SVG images must have width/height set.

Change-Id: Ia881ad81614d949f1d01764f3e750c066651d631
Reviewed-on: https://gerrit.libreoffice.org/60107
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/02/1204.xhp 
b/source/text/shared/02/1204.xhp
index 87146c8f6..43ab98c03 100644
--- a/source/text/shared/02/1204.xhp
+++ b/source/text/shared/02/1204.xhp
@@ -30,8 +30,6 @@
 
 
 
-  
-  
   
 
 Reset 
Filter/Sorting
@@ -39,20 +37,15 @@
   
   
   
-   
-   
-   
 
  
-  Icon
+ Icon
  
  
   Reset 
Filter/Sorting
  
 
-   
   
   
-  
  
 
diff --git a/source/text/shared/02/1212.xhp 
b/source/text/shared/02/1212.xhp
index 608d4eda0..e4fd2faed 100644
--- a/source/text/shared/02/1212.xhp
+++ b/source/text/shared/02/1212.xhp
@@ -37,7 +37,7 @@
 
   
 
-  Icon
+  Icon
 
 
   Apply 
Filter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2443437c990f1c1033671d6116797c1ea68d34e2
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 15:07:41 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Sep 7 11:14:31 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Remove dup bookmarks

Change-Id: If88b54807649c5046d7f513eb533156687417e93
Reviewed-on: https://gerrit.libreoffice.org/60108
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 104f6c7fe8b3..63f3f49bbd70 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 104f6c7fe8b316edd9dbf35fc9ae17d1afddaff5
+Subproject commit 63f3f49bbd70940dbd1cf4ca7ab3ac89de6af532
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/shared/02/1213.xhp |1 -
 source/text/shared/main0213.xhp|   11 +--
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 63f3f49bbd70940dbd1cf4ca7ab3ac89de6af532
Author: Olivier Hallot 
AuthorDate: Thu Sep 6 15:07:41 2018 -0300
Commit: Olivier Hallot 
CommitDate: Fri Sep 7 11:14:31 2018 +0200

Remove dup bookmarks

Change-Id: If88b54807649c5046d7f513eb533156687417e93
Reviewed-on: https://gerrit.libreoffice.org/60108
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/02/1213.xhp 
b/source/text/shared/02/1213.xhp
index 90d2c1ba7..6be90282f 100644
--- a/source/text/shared/02/1213.xhp
+++ b/source/text/shared/02/1213.xhp
@@ -32,7 +32,6 @@
 data sources; as tables
 
 
-
 Data source as 
table
 Activates an additional table view when in the form 
view. When the Data source as table function is activated, 
you see the table in an area above the form.
 
diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp
index e6cba0012..5d74a7efb 100644
--- a/source/text/shared/main0213.xhp
+++ b/source/text/shared/main0213.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-   
+
 
 
 
@@ -47,11 +47,9 @@
 The current 
sort order or filter is saved with the current document. If a filter is set, 
the Apply Filter icon on the Navigation bar is 
activated. Sorting and filtering features in the document can also be 
configured in the Form Properties dialog. (Choose Form 
Properties - Data - properties Sort and Filter).
 If an SQL statement 
is the basis for a form (see Form Properties - tab 
Data - Data Source), then the filter and sort functions 
are only available when the SQL statement refers to only one table and is not 
written in the native SQL mode.
 
-
 Absolute Record
 Shows the number of the current record. Enter a 
number to go to the corresponding record.
 
-
 First 
Record
 
 
@@ -67,7 +65,6 @@
 
 
 
-
 Previous Record
 
 
@@ -83,7 +80,6 @@
 
 
 
-
 Next 
Record
 
 
@@ -99,7 +95,6 @@
 
 
 
-
 Last 
Record
 
 
@@ -115,7 +110,6 @@
 
 
 
-
 Save 
Record
 
 
@@ -131,7 +125,6 @@
 
 
 
-
 Undo: 
Data entry
 
 
@@ -147,7 +140,6 @@
 
 
 
-
 New 
Record
 
 
@@ -163,7 +155,6 @@
 
 
 
-
 Delete 
Record
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sccomp/source

[Libreoffice Gerrit user]

 sccomp/source/solver/CoinMPSolver.cxx  |   53 -
 sccomp/source/solver/LpsolveSolver.cxx |6 +--
 2 files changed, 29 insertions(+), 30 deletions(-)

New commits:
commit 2bfc7d480980ec9da723e46f21f1e73ff37b7127
Author: Noel Grandin 
AuthorDate: Thu Sep 6 11:25:47 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Sep 7 11:07:05 2018 +0200

loplugin:useuniqueptr in CoinMPSolver

Change-Id: Ibe0dfdfabf6f56498564406441a9c505e93dd9a6
Reviewed-on: https://gerrit.libreoffice.org/60112
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sccomp/source/solver/CoinMPSolver.cxx 
b/sccomp/source/solver/CoinMPSolver.cxx
index 23426e140e42..dbd19a4d9f43 100644
--- a/sccomp/source/solver/CoinMPSolver.cxx
+++ b/sccomp/source/solver/CoinMPSolver.cxx
@@ -143,7 +143,7 @@ void SAL_CALL CoinMPSolver::solve()
 // set objective function
 
 const std::vector& rObjCoeff = aCellsHash[maObjective];
-double* pObjectCoeffs = new double[nVariables];
+std::unique_ptr pObjectCoeffs(new double[nVariables]);
 for (nVar=0; nVar pCompMatrix(new double[nCompSize]);// first 
collect all coefficients, row-wise
 for (size_t i=0; i pRHS(new double[nRows]);
+std::unique_ptr pRowType(new char[nRows]);
 for (size_t i=0; i pMatrixBegin(new int[nVariables+1]);
+std::unique_ptr pMatrixCount(new int[nVariables]);
+std::unique_ptr pMatrix(new double[nCompSize]);// not always 
completely used
+std::unique_ptr pMatrixIndex(new int[nCompSize]);
 int nMatrixPos = 0;
 for (nVar=0; nVar pLowerBounds(new double[nVariables]);
+std::unique_ptr pUpperBounds(new double[nVariables]);
 for (nVar=0; nVar pColType(new char[nVariables]);
 for (nVar=0; nVar& rObjCoeff = aCellsHash[maObjective];
-REAL* pObjVal = new REAL[nVariables+1];
+std::unique_ptr pObjVal(new REAL[nVariables+1]);
 pObjVal[0] = 0.0;   // ignored
 for (nVar=0; nVarhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source

[Libreoffice Gerrit user]

 extras/source/autocorr/lang/tr/DocumentList.xml |   27 
 1 file changed, 27 insertions(+)

New commits:
commit 7c7e2fe9ad2197c131f26bc77083cb49932f1c1e
Author: Muhammet Kara 
AuthorDate: Thu Sep 6 17:58:27 2018 +0300
Commit: Muhammet Kara 
CommitDate: Fri Sep 7 11:05:55 2018 +0200

[tr] Add 27 new autocorrect entries for Turkish

Change-Id: Ifb0f6fbda69c0696f55a6430120e4ec2e1eb2754
Reviewed-on: https://gerrit.libreoffice.org/60096
Tested-by: Jenkins
Reviewed-by: Marco A.G.Pinto 
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index ad877d1a243a..eba1760f1f0d 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -12,12 +12,15 @@
   
   
   
+  
+  
   
   
   
   
   
   
+  
   
   
   
@@ -29,12 +32,17 @@
   
   
   
+  
   
+  
   
   
   
+  
   
+  
   
+  
   
   
   
@@ -48,17 +56,23 @@
   
   http://"/>
   
+  
   
   
   
   
+  
   
   
+  
+  
+  
   
   
   
   
   
+  
   
   
   
@@ -70,27 +84,40 @@
   
   
   
+  
   
   
+  
   
+  
   
+  
   
   
+  
   
   
   
   
+  
   
+  
+  
   
   
   
   
+  
+  
   
+  
   
   
+  
   
   
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/IwyuFilter_sd.yaml sd/source

[Libreoffice Gerrit user]

 sd/IwyuFilter_sd.yaml|   17 +
 sd/source/ui/annotations/annotationmanagerimpl.hxx   |2 +
 sd/source/ui/annotations/annotationtag.cxx   |1 
 sd/source/ui/dlg/TemplateScanner.cxx |1 
 sd/source/ui/dlg/tpaction.cxx|1 
 sd/source/ui/framework/factories/BasicToolBarFactory.cxx |1 
 sd/source/ui/func/fuconstr.cxx   |1 
 sd/source/ui/func/fuoaprms.cxx   |1 
 sd/source/ui/inc/DrawViewShell.hxx   |1 
 sd/source/ui/inc/OutlineViewShell.hxx|1 
 sd/source/ui/inc/TemplateScanner.hxx |7 -
 sd/source/ui/inc/TextObjectBar.hxx   |3 --
 sd/source/ui/inc/ToolBarManager.hxx  |2 -
 sd/source/ui/inc/View.hxx|7 -
 sd/source/ui/inc/ViewShell.hxx   |   16 +++-
 sd/source/ui/inc/ViewShellBase.hxx   |3 --
 sd/source/ui/inc/ViewShellImplementation.hxx |3 +-
 sd/source/ui/inc/ViewTabBar.hxx  |   10 ---
 sd/source/ui/inc/WindowUpdater.hxx   |3 --
 sd/source/ui/inc/tabtempl.hxx|3 +-
 sd/source/ui/inc/tpaction.hxx|1 
 sd/source/ui/inc/tpoption.hxx|3 --
 sd/source/ui/inc/uiobject.hxx|   11 
 sd/source/ui/inc/unmodpg.hxx |1 
 sd/source/ui/inc/unoaprms.hxx|1 
 sd/source/ui/inc/unomodel.hxx|   19 ---
 sd/source/ui/inc/unopage.hxx |9 ---
 sd/source/ui/inc/unosrch.hxx |   12 +++--
 sd/source/ui/inc/unprlout.hxx|1 
 sd/source/ui/inc/view/viewoverlaymanager.hxx |2 +
 sd/source/ui/sidebar/SlideBackground.hxx |1 
 sd/source/ui/unoidl/DrawController.cxx   |1 
 sd/source/ui/view/GraphicViewShellBase.cxx   |1 
 sd/source/ui/view/ImpressViewShellBase.cxx   |1 
 sd/source/ui/view/OutlineViewShellBase.cxx   |1 
 sd/source/ui/view/PresentationViewShellBase.cxx  |1 
 sd/source/ui/view/SlideSorterViewShellBase.cxx   |1 
 sd/source/ui/view/ViewTabBar.cxx |1 
 38 files changed, 65 insertions(+), 87 deletions(-)

New commits:
commit 9912d3e4003a10d7bc690afdef69473976244dd7
Author: Gabor Kelemen 
AuthorDate: Thu Sep 6 00:36:41 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Sep 7 10:43:51 2018 +0200

tdf#42949 Fix IWYU warnings in sd/source/ui/inc/[t-z]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I4ec951ddbc0a5ad4718bb44731eb2b4a0f718afc
Reviewed-on: https://gerrit.libreoffice.org/60061
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 75705e2b5156..d0561dc6eb15 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -128,3 +128,20 @@ blacklist:
 # typedef needs a complete type
 - com/sun/star/lang/XServiceInfo.hpp
 - com/sun/star/presentation/XPresentation2.hpp
+sd/source/ui/inc/unomodel.hxx:
+# base class has to be a complete type
+- com/sun/star/drawing/XDrawPages.hpp
+sd/source/ui/inc/unosrch.hxx:
+# base class has to be a complete type
+- com/sun/star/lang/XUnoTunnel.hpp
+- com/sun/star/util/XReplaceDescriptor.hpp
+sd/source/ui/inc/ViewShellManager.hxx:
+#std::unique_ptr deleter type has to be complete
+- o3tl/deleter.hxx
+sd/source/ui/inc/ViewTabBar.hxx:
+# base class has to be a complete type
+- com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
+- com/sun/star/drawing/framework/XTabBar.hpp
+- com/sun/star/drawing/framework/XToolBar.hpp
+- com/sun/star/lang/XUnoTunnel.hpp
+
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx 
b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 14efddce351e..daee8b8df347 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -33,6 +34,7 @@
 #include "annotationtag.hxx"
 
 class SfxRequest;
+class SdPage;
 
 namespace sd
 {
diff --git a/sd/source/ui/annotations/annotationtag.cxx 
b/sd/source/ui/annotations/annotationtag.cxx
index 99e37fd59c8a..0a3d017798a6 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/sd/source/ui/dlg/Templat

[Libreoffice-commits] core.git: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/filter/xml/xmlfilter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4b5194bd1d0dd893720ec0b311ee215a3168219f
Author: Julien Nabet 
AuthorDate: Thu Sep 6 22:02:56 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 7 10:38:19 2018 +0200

tdf#119694: read embedded hsqldb file generated before 6.1

Regression from:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=ebb34571c19c5ac939fbf5aed2ab66ee18e298dc
Thank you Drew Jensen for the bibisect!

Change-Id: I9550f61709e8582a52554f578ef043c6551f09f0
Reviewed-on: https://gerrit.libreoffice.org/60117
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index c5f5d58f1545..45718f7ee5ae 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -658,6 +658,7 @@ const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() 
const
 { XML_NAMESPACE_OOO,XML_AUTOMATIC_STYLES,   
XML_TOK_CONTENT_AUTOSTYLES  },
 { XML_NAMESPACE_OFFICE, XML_SCRIPTS,
XML_TOK_CONTENT_SCRIPTS },
 { XML_NAMESPACE_OFFICE, XML_BODY,   
XML_TOK_CONTENT_BODY},
+{ XML_NAMESPACE_OOO,XML_BODY,   
XML_TOK_CONTENT_BODY},
 XML_TOKEN_MAP_END
 };
 m_pDocContentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svx/source

[Libreoffice Gerrit user]

 svx/source/form/formcontroller.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c9d15d30b66102aff3f3e10bb8243edf2ab77334
Author: Julien Nabet 
AuthorDate: Wed Sep 5 23:25:36 2018 +0200
Commit: Lionel Elie Mamane 
CommitDate: Fri Sep 7 10:16:23 2018 +0200

tdf#91837: fix deinitializeControls (forms)

m_bControlsInitialized wasn't ever reset to false

Change-Id: I9f7bd6504ccaa0a41c9cb075c1ba33436f0f97dc
Reviewed-on: https://gerrit.libreoffice.org/60059
(cherry picked from commit d80b3235cc106e17a0c10dea44e8afa8db724400)
Reviewed-on: https://gerrit.libreoffice.org/60065
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/svx/source/form/formcontroller.cxx 
b/svx/source/form/formcontroller.cxx
index 19b11f16caa1..c302f4dee524 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -325,6 +325,7 @@ void ColumnInfoCache::deinitializeControls()
 {
 lcl_resetColumnControlInfo( *col );
 }
+m_bControlsInitialized = false;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[Libreoffice Gerrit user]

 vcl/headless/svpgdi.cxx |  401 ++--
 1 file changed, 289 insertions(+), 112 deletions(-)

New commits:
commit 32d49d077fff5c63ec731191bff4daed06744afa
Author: Armin Le Grand 
AuthorDate: Wed Sep 5 23:34:32 2018 +0200
Commit: Armin Le Grand 
CommitDate: Fri Sep 7 10:16:39 2018 +0200

Cleanup SvpSalGraphics LineGeometry creation

Target is to less modify the given PolyPolygons to
allow better buffer/reuse. To do so, multiple steps
need to be taken to make the creation of cairo_path_t
correct and effective.

Adapted AddPolygonToPath to no longer add a fixed
PixelOffxet of (0.5, 0.5) for LineDrawing. Moved that
at all places to set the needed linear transformation.
Some places which know to work in DeviceCoordinates got
directly adapted. The creation of geometry for polygon
paints that use line and fill no longer offsets by that
values for fill now (which should be better)

Adapted AddPolygonPath to use the closed information from
the given Polygon geometry - this is used in Win Gdiplus
for years and shoud be safe

Adapted AddPolygonPath to do correct PixelSnap when
a ObjectToDevice transformation is used. This requires
to have the ObjectToDevice transformation in the method
and using it and it's inverse

Adapted AddPolygonPath to support PixelSnapHairline which
now needs to be supported in the VCL-layer. Adapted the
BufferedData stuff accordingly (and saw that the old
solution for this snap was not used - sigh)

Corrected ::drawLine to correctly do PixelSnap if needed,
version before would have lost it

Change-Id: I5e8f71f7439b21f58561da5770b9054236a33235
Reviewed-on: https://gerrit.libreoffice.org/60083
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index e47eb402e40f..73b9a1fe24bf 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if ENABLE_CAIRO_CANVAS
 #   if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
@@ -52,7 +53,13 @@ namespace
 
 cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
 
-return basegfx::B2DRange(x1, y1, x2, y2);
+// support B2DRange::isEmpty()
+if(0.0 != x1 || 0.0 != y1 || 0.0 != x2 || 0.0 != y2)
+{
+return basegfx::B2DRange(x1, y1, x2, y2);
+}
+
+return basegfx::B2DRange();
 }
 
 basegfx::B2DRange getFillDamage(cairo_t* cr)
@@ -61,7 +68,13 @@ namespace
 
 cairo_fill_extents(cr, &x1, &y1, &x2, &y2);
 
-return basegfx::B2DRange(x1, y1, x2, y2);
+// support B2DRange::isEmpty()
+if(0.0 != x1 || 0.0 != y1 || 0.0 != x2 || 0.0 != y2)
+{
+return basegfx::B2DRange(x1, y1, x2, y2);
+}
+
+return basegfx::B2DRange();
 }
 
 basegfx::B2DRange getClippedFillDamage(cairo_t* cr)
@@ -77,7 +90,13 @@ namespace
 
 cairo_stroke_extents(cr, &x1, &y1, &x2, &y2);
 
-return basegfx::B2DRange(x1, y1, x2, y2);
+// support B2DRange::isEmpty()
+if(0.0 != x1 || 0.0 != y1 || 0.0 != x2 || 0.0 != y2)
+{
+return basegfx::B2DRange(x1, y1, x2, y2);
+}
+
+return basegfx::B2DRange();
 }
 
 basegfx::B2DRange getClippedStrokeDamage(cairo_t* cr)
@@ -514,36 +533,52 @@ void SvpSalGraphics::clipRegion(cairo_t* cr)
 
 bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long 
nHeight, sal_uInt8 nTransparency)
 {
+const bool bHasFill(m_aFillColor != SALCOLOR_NONE);
+const bool bHasLine(m_aLineColor != SALCOLOR_NONE);
+
+if(!(bHasFill || bHasLine))
+{
+return true;
+}
+
 cairo_t* cr = getCairoContext(false);
 clipRegion(cr);
 
 const double fTransparency = (100 - nTransparency) * (1.0/100);
 
-basegfx::B2DRange extents(0, 0, 0, 0);
+// To make releaseCairoContext work, use empty extents
+basegfx::B2DRange extents;
 
 cairo_rectangle(cr, nX, nY, nWidth, nHeight);
 
-if (m_aFillColor != SALCOLOR_NONE)
+if (bHasFill)
 {
 cairo_set_source_rgba(cr, m_aFillColor.GetRed()/255.0,
   m_aFillColor.GetGreen()/255.0,
   m_aFillColor.GetBlue()/255.0,
   fTransparency);
 
-if (m_aLineColor == SALCOLOR_NONE)
-extents = getClippedFillDamage(cr);
+// set FillDamage
+extents = getClippedFillDamage(cr);
 
 cairo_fill_preserve(cr);
 }
 
-if (m_aLineColor != SALCOLOR_NONE)
+if (bHasLine)
 {
+// PixelOffset used: Set PixelOffset as linear transformation
+// Note: Was missing here - probably not by purpose (?)
+cairo_matrix_t aMatrix;
+cairo_matrix_init_translate(&aMatrix, 0.5, 0.5);
+cairo_set_ma

[Libreoffice-commits] core.git: sal/qa vcl/source

[Libreoffice Gerrit user]

 sal/qa/rtl/ref/rtl_ref.cxx |4 ++--
 vcl/source/font/fontmetric.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dbd9ff5a29d60209ddff958ba9f8a1929011e5f7
Author: Noel Grandin 
AuthorDate: Thu Sep 6 17:18:32 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Sep 7 10:17:03 2018 +0200

clang-tidy bugprone-use-after-move

Change-Id: I6213706ace039492429349c2459923b0e9a5d758
Reviewed-on: https://gerrit.libreoffice.org/60127
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sal/qa/rtl/ref/rtl_ref.cxx b/sal/qa/rtl/ref/rtl_ref.cxx
index d8dc59e65839..e3987d9bb267 100644
--- a/sal/qa/rtl/ref/rtl_ref.cxx
+++ b/sal/qa/rtl/ref/rtl_ref.cxx
@@ -70,7 +70,7 @@ class TestReferenceRefCounting : public CppUnit::TestFixture
 
 // test1 now contains a null pointer
 CPPUNIT_ASSERT_MESSAGE("!test1.is()",
-   !test1.is());
+   !test1.is()); // NOLINT(bugprone-use-after-move)
 
 // function return should move the reference
 test2 = get_reference( &cTestClass );
@@ -94,7 +94,7 @@ class TestReferenceRefCounting : public CppUnit::TestFixture
 CPPUNIT_ASSERT_MESSAGE("!test1.is()",
!test1.is());
 CPPUNIT_ASSERT_MESSAGE("!test2.is()",
-   !test2.is());
+   !test2.is()); // NOLINT(bugprone-use-after-move)
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE("cTestClass.use_count() == 0",
static_cast(0), cTestClass.use_count());
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 6ed8fdb97496..5a108ca26f47 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -65,8 +65,8 @@ FontMetric& FontMetric::operator=(const FontMetric& 
rFontMetric)
 
 FontMetric& FontMetric::operator=(FontMetric&& rFontMetric)
 {
-Font::operator=(std::move(rFontMetric));
 mxImplMetric = std::move(rFontMetric.mxImplMetric);
+Font::operator=(std::move(rFontMetric));
 return *this;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits