date:20160722

Re: New MSVC 2015 build failure

2016-07-22 Thread slacka

Yes, that fixed it. Thanks  Michael!

Now the only hold up with MSVC 2015 is the C4702: unreachable code Error. 

http://nabble.documentfoundation.org/C2220-warning-treated-as-error-64-bit-MSVC-2015-td4184053.html#a4189120







--
View this message in context: 
http://nabble.documentfoundation.org/New-C2220-warning-treated-as-error-MSVC-2015-build-failure-tp4187644p4189145.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/src loolwsd/FileServer.cpp

2016-07-22 Thread Ashod Nakashian

 loleaflet/dist/devtools-detect/index.js |   53 
 loleaflet/dist/devtools-detect/license  |   21 
 loleaflet/dist/devtools-detect/package.json |   71 
 loleaflet/dist/devtools-detect/readme.md|   53 
 loleaflet/dist/loleaflet.html   |1 
 loleaflet/src/map/Map.js|6 +-
 loolwsd/FileServer.cpp  |1 
 7 files changed, 205 insertions(+), 1 deletion(-)

New commits:
commit 9510c1aca7614d7f518c583f6349716143076d5e
Author: Ashod Nakashian 
Date:   Fri Jul 22 22:52:33 2016 -0400

loowsd: log file server requests

Change-Id: Ia3e9ebf2888a629b8e5fb0b83dd526fcaec03835
Reviewed-on: https://gerrit.libreoffice.org/27452
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/FileServer.cpp b/loolwsd/FileServer.cpp
index 7363abf..60cb58e 100644
--- a/loolwsd/FileServer.cpp
+++ b/loolwsd/FileServer.cpp
@@ -110,6 +110,7 @@ void 
FileServerRequestHandler::handleRequest(HTTPServerRequest& request, HTTPSer
 try
 {
 Poco::URI requestUri(request.getURI());
+Log::trace("Fileserver request: " + requestUri.toString());
 requestUri.normalize(); // avoid .'s and ..'s
 
 std::vector requestSegments;
commit e685f6a3067ea98da8f412802281b5b08a9944f5
Author: Ashod Nakashian 
Date:   Fri Jul 22 22:50:52 2016 -0400

loleaflet: disable grey-out when debug-tools is open

Change-Id: Id3d2502fc7a38303395e70b710adaeaf7fae92a6
Reviewed-on: https://gerrit.libreoffice.org/27451
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loleaflet/dist/devtools-detect/index.js 
b/loleaflet/dist/devtools-detect/index.js
new file mode 100644
index 000..342f7fc
--- /dev/null
+++ b/loleaflet/dist/devtools-detect/index.js
@@ -0,0 +1,53 @@
+/* eslint-disable spaced-comment */
+/*!
+   devtools-detect
+   Detect if DevTools is open
+   https://github.com/sindresorhus/devtools-detect
+   by Sindre Sorhus
+   MIT License
+*/
+(function () {
+   'use strict';
+   var devtools = {
+   open: false,
+   orientation: null
+   };
+   var threshold = 160;
+   var emitEvent = function (state, orientation) {
+   window.dispatchEvent(new CustomEvent('devtoolschange', {
+   detail: {
+   open: state,
+   orientation: orientation
+   }
+   }));
+   };
+
+   setInterval(function () {
+   var widthThreshold = window.outerWidth - window.innerWidth > 
threshold;
+   var heightThreshold = window.outerHeight - window.innerHeight > 
threshold;
+   var orientation = widthThreshold ? 'vertical' : 'horizontal';
+
+   if ((window.Firebug && window.Firebug.chrome && 
window.Firebug.chrome.isInitialized) ||
+   widthThreshold || heightThreshold) {
+   if (!devtools.open || devtools.orientation !== 
orientation) {
+   emitEvent(true, orientation);
+   }
+
+   devtools.open = true;
+   devtools.orientation = orientation;
+   } else {
+   if (devtools.open) {
+   emitEvent(false, null);
+   }
+
+   devtools.open = false;
+   devtools.orientation = null;
+   }
+   }, 500);
+
+   if (typeof module !== 'undefined' && module.exports) {
+   module.exports = devtools;
+   } else {
+   window.devtools = devtools;
+   }
+})();
diff --git a/loleaflet/dist/devtools-detect/license 
b/loleaflet/dist/devtools-detect/license
new file mode 100644
index 000..654d0bf
--- /dev/null
+++ b/loleaflet/dist/devtools-detect/license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus  (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN

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

2016-07-22 Thread Henry Castro

 loleaflet/dist/toolbar/toolbar.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa02df7ad32c24b2154b964945f901c1b9e26f5c
Author: Henry Castro 
Date:   Fri Jul 22 20:36:45 2016 -0400

loleaflet: avoid Uncaught TypeError: Cannot read property

Uncaught TypeError: Cannot read property 'toLowerCase' of undefined

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 4e25d6b..8cdf473 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -833,7 +833,7 @@ map.on('commandstatechanged', function (e) {
// For writer we get UI names; ideally we should be 
getting only programmatic ones
// For eg: 'Text body' vs 'Text Body'
// (likely to be fixed in core to make the pattern 
consistent)
-   if (value.toLowerCase() === state.toLowerCase()) {
+   if (state && value.toLowerCase() === 
state.toLowerCase()) {
state = value;
found = true;
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sfx2/classification sfx2/Package_classification.mk

2016-07-22 Thread Olivier Hallot

 sfx2/Package_classification.mk|1 
 sfx2/classification/example_pt-BR.xml |   71 ++
 2 files changed, 72 insertions(+)

New commits:
commit ad1a3ce392d3c3bd10deded704876349c4475a90
Author: Olivier Hallot 
Date:   Thu Jul 21 07:51:22 2016 -0300

tdf#100351 example_pt-BR.xml for classification

Change-Id: I2857d1209b7261cbbbf6908d7e8dde84be3e1da5
Reviewed-on: https://gerrit.libreoffice.org/27371
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 2158eb10b4b1013af57c2cbe64575ad7889940ff)
Reviewed-on: https://gerrit.libreoffice.org/27449
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk
index 0cca6f6..91f9d0e 100644
--- a/sfx2/Package_classification.mk
+++ b/sfx2/Package_classification.mk
@@ -11,6 +11,7 @@ $(eval $(call 
gb_Package_Package,sfx2_classification,$(SRCDIR)/sfx2))
 
 $(eval $(call 
gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/classification,\
classification/example.xml \
+   classification/example_pt-BR.xml \
classification/example_sl-SI.xml \
 ))
 
diff --git a/sfx2/classification/example_pt-BR.xml 
b/sfx2/classification/example_pt-BR.xml
new file mode 100644
index 000..25280f0
--- /dev/null
+++ b/sfx2/classification/example_pt-BR.xml
@@ -0,0 +1,71 @@
+
+
+Exemplo de autoridade de polÃticas 
TSCP
+Exemplo de polÃtica TSCP
+
+urn:example:tscp:1
+
+
+
+
+
+UK-Cabinet
+0
+
+
+
+
+
+Document: Header
+ClassificaÃ§Ã£o: Corporativo
+
+
+
+UK-Cabinet
+1
+
+
+
+
+
+Document: Header
+ClassificaÃ§Ã£o: Confidencial
+
+
+Document: Footer
+A informaÃ§Ã£o deste documento Ã© confidencial. 
NÃ£o distribuir externamente sem prÃ©via autorizaÃ§Ã£o.
+
+
+Document: Watermark
+Confidencial
+
+
+
+UK-Cabinet
+2
+
+
+
+
+
+Document: Header
+ClassificaÃ§Ã£o: Reservado
+
+
+Document: Footer
+A informaÃ§Ã£o deste documento Ã© reservada. 
NÃ£o distribuir externamente.
+
+
+Document: Watermark
+Reservado
+
+
+
+UK-Cabinet
+3
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - dictionaries

2016-07-22 Thread Aron Budea

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

New commits:
commit 533fdf7a3eeab1c335690687f85333708051558f
Author: Aron Budea 
Date:   Mon Jul 18 07:12:48 2016 +0200

Updated core
Project: dictionaries  258bf15aac7975e1202558b6d922be8a9a072b37

tdf#97393, tdf#100019: updated EN (CA, GB, US, ZA) dictionaries

Update is based on Marco A. G. Pinto's 2016.07.01 release of
English Dictionaries extension. Includes 2016.06.26 release of
CA/US dictionaries by Kevin Atkinson.

Version in description.xml bumped to 2016.07.01.

Change-Id: I7b3416286abf9aa3d987bed28c9efdc3e7cbf1a6
Reviewed-on: https://gerrit.libreoffice.org/27275
Reviewed-by: Marco A.G.Pinto 
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index 0f778e5..258bf15 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0f778e51f4b520fc8484d96437a579286c7b7dd0
+Subproject commit 258bf15aac7975e1202558b6d922be8a9a072b37
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-2-0' - en/changelog.txt en/description.xml en/en_CA.dic en/en_GB.aff en/en_GB.dic en/en_US.dic en/en_ZA.dic en/README_en_CA.txt en/README_

2016-07-22 Thread Aron Budea

 en/README_en_CA.txt |6 
 en/README_en_GB.txt | 1174 
 en/README_en_US.txt |6 
 en/changelog.txt|   13 
 en/description.xml  |2 
 en/en_CA.dic|  196 
 en/en_GB.aff|   30 
 en/en_GB.dic| 1416 
 en/en_US.dic|  196 
 en/en_ZA.dic|87654 ++--
 10 files changed, 46614 insertions(+), 44079 deletions(-)

New commits:
commit 258bf15aac7975e1202558b6d922be8a9a072b37
Author: Aron Budea 
Date:   Mon Jul 18 07:12:48 2016 +0200

tdf#97393, tdf#100019: updated EN (CA, GB, US, ZA) dictionaries

Update is based on Marco A. G. Pinto's 2016.07.01 release of
English Dictionaries extension. Includes 2016.06.26 release of
CA/US dictionaries by Kevin Atkinson.

Version in description.xml bumped to 2016.07.01.

Change-Id: I7b3416286abf9aa3d987bed28c9efdc3e7cbf1a6
Reviewed-on: https://gerrit.libreoffice.org/27275
Reviewed-by: Marco A.G.Pinto 
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/en/README_en_CA.txt b/en/README_en_CA.txt
index 0c14a5a..ad9b28f 100644
--- a/en/README_en_CA.txt
+++ b/en/README_en_CA.txt
@@ -1,6 +1,6 @@
 en_CA Hunspell Dictionary
-Version 2016.01.19
-Tue Jan 19 17:07:49 2016 -0500 [a535654]
+Version 2016.06.26
+Sun Jun 26 23:05:32 2016 -0400 [8b0808b]
 http://wordlist.sourceforge.net
 
 README file for English Hunspell dictionaries derived from SCOWL.
@@ -318,5 +318,5 @@ from the Ispell distribution they are under the Ispell 
copyright:
   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
 
-Build Date: Tue Jan 19 17:11:05 EST 2016
+Build Date: Sun Jun 26 23:29:14 EDT 2016
 Wordlist Command: mk-list --accents=strip en_CA 60
diff --git a/en/README_en_GB.txt b/en/README_en_GB.txt
index 873fa14..f29d292 100644
--- a/en/README_en_GB.txt
+++ b/en/README_en_GB.txt
@@ -51,9 +51,19 @@ OOo Issue 29112, 55498 - add NOSUGGEST flags to taboo words
 New REP items (better suggestions for accented words and a few mistakes)
 OOo Issue 63541 - remove *dessicated
 
-2008-12-18 nemeth AT OOo
+2008-12-18 - NOSUGGEST, NUMBER/COMPOUNDRULE patches (nemeth AT OOo)
+2010-03-09 (nemeth AT OOo)
+ - UTF-8 encoded dictionary:
+  - fix em-dash problem of OOo 3.2 by BREAK
+  - suggesting words with typographical apostrophes
+  - recognizing words with Unicode f ligatures
+ - add phonetic suggestion (Copyright (C) 2000 BjÃ¶rn Jacke, see the end of 
the file)
 

+ 2013-08-25 - GB Forked by Marco A.G.Pinto
+ 2016-06-10 - NOSUGGEST added to this clean version of the GB .AFF (Marco 
A.G.Pinto)
+ 2016-06-21 - COMPOUNDING added to this clean version of the GB .AFF (Ãron 
Budea)
+ 
+---
 
 MARCO A.G.PINTO:
 Since the dictionary hasn't been updated for many years,
@@ -14497,3 +14507,1163 @@ V2.36 - 1-MAY-2016
 12482) Ninian (+'s - name - Wikipedia)
 12483) Setswana
 12484) Victoriana
+
+
+V2.37 - 1-JUN-2016
+--
+12485) Exner (+'s - name - Wikipedia)
+12486) Rorschach's (added the 's - name - Wikipedia)
+12487) Kerner (+'s - name - Wikipedia)
+12488) Justinus (+'s - name - Wikipedia)
+12489) Binet (+'s - name - Wikipedia)
+12490) Bircher (+'s - name - Wikipedia)
+12491) affectivity
+12492) Klopfer (+'s - name - Wikipedia)
+12493) examinee's (added the 's)
+12494) psychodiagnostic (+plural)
+12495) Piotrowski (+'s - name - Wikipedia)
+12496) Tavistock (+'s - name - Wikipedia)
+12497) Fidgen (name - Wikipedia)
+12498) Cronbach (+'s - name - Wikipedia)
+12499) Reber (+'s - name - Wikipedia)
+12500) insightfulness (Wiktionary)
+12501) Lilienfeld (+'s - name - Wikipedia)
+12502) Poundstone (+'s - name - Wikipedia)
+12503) Koocher (+'s - name - Wikipedia)
+12504) Heilman (+'s - name - Wikipedia)
+12505) apperception
+12506) apperceptive
+12507) fumage (Collins)
+12508) pareidolia (Collins)
+12509) Holtzman (+'s - name - Wikipedia)
+12510) autopiloting + autopiloted (merged into autopilot - Wiktionary)
+12511) shitter (+plural - Oxford: vulgar slang)
+12512) shitstorm (Oxford: vulgar slang)
+12513) shiur
+12514) shiurim (plural of previous word)
+12515) shiva + shivah
+12516) Shivaism + Sivaism
+12517) Shivaite + Sivaite
+12518) Shivaji + Sivaji (name)
+12519) shiverers (added plural)
+12520) twitcher (+plural)
+12521) yachtie (+'s +plural)
+12522) Silbury (name - Wikipedia)
+12523) touristed + touristing (merged into tourist)
+12524) touristic
+12525) touristically
+12526) Piran (+'s - name - Wikipedia)
+12527) uppercase (+s +ing +ed - another way of upper case - Wiktionary)
+12528) lowercase (+s +ing +ed - another way of lower case - Wiktionary)
+12529) mottos (another plural of motto)
+12530) mottledness
+12531) Cruickshank (+'s - name - Wikipedia)
+12532) Watteau (+'s - name - Wikipedia)
+12533) Montgomerie (+'s - name - Wikipedia)
+12534) mottoed
+12535) mottoless
+12536) Froyd (+'s - name - Wikipedia)
+12537) Unwalla (name - Wikipedia)
+12538) Dolske (name -

[Libreoffice-commits] core.git: connectivity/source framework/source include/onlineupdate l10ntools/inc sc/source sd/source sfx2/source sw/source wizards/com

2016-07-22 Thread Andrea Gelmini

 connectivity/source/cpool/ZPoolCollection.cxx |2 +-
 framework/source/dispatch/interceptionhelper.cxx  |2 +-
 framework/source/jobs/jobexecutor.cxx |2 +-
 include/onlineupdate/mozilla/Attributes.h |2 +-
 l10ntools/inc/export.hxx  |2 +-
 sc/source/core/tool/compiler.cxx  |2 +-
 sd/source/ui/framework/factories/BasicViewFactory.cxx |2 +-
 sfx2/source/doc/objmisc.cxx   |2 +-
 sw/source/filter/html/swhtml.cxx  |2 +-
 wizards/com/sun/star/wizards/web/ImageListDialog.py   |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 8278be98600b21eaa237c9b7a072ffcff370f3b7
Author: Andrea Gelmini 
Date:   Thu Jul 21 13:54:43 2016 +0200

Fix typos

Thanks to Carlo Bertoldi for the german translation.

Change-Id: I76f554e757318aed4e28b5a05fae0ba15bd46afb
Reviewed-on: https://gerrit.libreoffice.org/27355
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/connectivity/source/cpool/ZPoolCollection.cxx 
b/connectivity/source/cpool/ZPoolCollection.cxx
index 4e4c1e3..9dd861d 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -465,7 +465,7 @@ void SAL_CALL OPoolCollection::propertyChange( const 
css::beans::PropertyChangeE
 {
 OUString sThisDriverName;
 getNodeValue(getDriverNameNodeName(),evt.Source) >>= 
sThisDriverName;
-// 1nd relase the driver
+// 1st release the driver
 // look if we already have a proxy for this driver
 MapDriver2DriverRef::iterator aLookup = m_aDriverProxies.begin();
 while(  aLookup != m_aDriverProxies.end())
diff --git a/framework/source/dispatch/interceptionhelper.cxx 
b/framework/source/dispatch/interceptionhelper.cxx
index dfff234..f3736de 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -177,7 +177,7 @@ void SAL_CALL 
InterceptionHelper::releaseDispatchProviderInterceptor(const css::
 // If it could be located inside cache -
 // use its slave/master relations to update the interception list;
 // set empty references for it as new master and slave;
-// and relase it from out cache.
+// and release it from out cache.
 InterceptorList::iterator pIt = 
m_lInterceptionRegs.findByReference(xInterceptor);
 if (pIt != m_lInterceptionRegs.end())
 {
diff --git a/framework/source/jobs/jobexecutor.cxx 
b/framework/source/jobs/jobexecutor.cxx
index ecf5b91..eaff5b5 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -380,7 +380,7 @@ void SAL_CALL JobExecutor::elementReplaced( const 
css::container::ContainerEvent
 css.document.XEventListener. So it can be, that this disposing 
call comes from
 the global event broadcaster service. But we don't hold any 
reference to this service
 which can or must be released. Because this broadcaster itself 
is an one instance service
-too, we can ignore this request. On the other side we must 
relase our internal CFG
+too, we can ignore this request. On the other side we must 
release our internal CFG
 reference ... SOLUTION => check the given event source and 
react only, if it's our internal
 hold configuration object!
  */
diff --git a/include/onlineupdate/mozilla/Attributes.h 
b/include/onlineupdate/mozilla/Attributes.h
index 129d1dc..6c2cc02 100644
--- a/include/onlineupdate/mozilla/Attributes.h
+++ b/include/onlineupdate/mozilla/Attributes.h
@@ -351,7 +351,7 @@
  *   void DeclaredFunction() MOZ_FUNCTION_ATTRIBUTE;
  *   void SomeFunction() MOZ_FUNCTION_ATTRIBUTE {}
  *   void PureFunction() const MOZ_FUNCTION_ATTRIBUTE = 0;
- *   void OverriddenFunction() MOZ_FUNCTION_ATTIRBUTE override;
+ *   void OverriddenFunction() MOZ_FUNCTION_ATTRIBUTE override;
  *
  * Attributes that apply to variables or parameters follow the variable's name:
  *
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 6372f90..de21039 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -306,7 +306,7 @@ class MergeDataFile
 MergeDataHashMap aMap;
 std::set aLanguageSet;
 
-MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = 
false );
+MergeData *GetMergeData( ResData *pResData , bool bCaseSensitive = 
false );
 void InsertEntry(const OString &rTYP, const OString &rGID,
 const OString &rLID, const OString &nLang,
 const OString &rTEXT, const OString &rQHTEXT,
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index be8810a..0767e2c 100644
--- a/sc/source/core/too

[Libreoffice-commits] core.git: helpcontent2

2016-07-22 Thread Stanislav Horacek

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

New commits:
commit 88e73ff03886c7d59c3977b9add5c97efecf6044
Author: Stanislav Horacek 
Date:   Fri Jul 22 17:03:29 2016 +0200

Updated core
Project: help  a5c501a84e0061e3316352f9ed5219419d9bc295

rename option for cursor in protected areas

Change-Id: I1e2ffcf03c952a5d40874d9aafe60ccd97d80dc3
Reviewed-on: https://gerrit.libreoffice.org/27443
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 33e1d32..a5c501a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 33e1d32da35c7eae844a798ecbb4df9dd1964769
+Subproject commit a5c501a84e0061e3316352f9ed5219419d9bc295
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Stanislav Horacek

 source/text/swriter/guide/indices_edit.xhp |4 +---
 source/text/swriter/guide/protection.xhp   |4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a5c501a84e0061e3316352f9ed5219419d9bc295
Author: Stanislav Horacek 
Date:   Fri Jul 22 17:03:29 2016 +0200

rename option for cursor in protected areas

Change-Id: I1e2ffcf03c952a5d40874d9aafe60ccd97d80dc3
Reviewed-on: https://gerrit.libreoffice.org/27443
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/guide/indices_edit.xhp 
b/source/text/swriter/guide/indices_edit.xhp
index 581315e..013948c 100644
--- a/source/text/swriter/guide/indices_edit.xhp
+++ b/source/text/swriter/guide/indices_edit.xhp
@@ -39,9 +39,7 @@
   
  
 Place the cursor in the index or table of 
contents.
-If you cannot place your cursor in the index or table of 
contents, choose %PRODUCTNAME - 
PreferencesTools - 
Options - 
%PRODUCTNAME Writer - Formatting Aids, and then select
-   Enable in the
-   Cursor in protected areas 
section.
+If 
you cannot place your cursor in the index or table of contents, choose 
%PRODUCTNAME - 
PreferencesTools - 
Options - 
%PRODUCTNAME Writer - Formatting Aids, and then select Enable cursor in the Protected 
Areas section.
  
  
 Right-click and choose an editing option from the 
menu.
diff --git a/source/text/swriter/guide/protection.xhp 
b/source/text/swriter/guide/protection.xhp
index b2eb5b5..ddf8864 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -79,7 +79,7 @@
Turning off protection
 
 
-   Place the cursor in the cell or 
select the cells. First, if necessary, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - 
Formatting Aids and mark Cursor in protected areas - 
Enable. Then right-click the cell to open the context menu, choose 
Cell - Unprotect.
+   Place the cursor in the cell or select the cells. First, if 
necessary, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - 
Formatting Aids and mark Protected Areas - Enable cursor. 
Then right-click the cell to open the context menu, choose Cell - 
Unprotect.
Select the table in the Navigator, 
open the context menu and select Table - Unprotect.
Use Shift+Ctrl+T to remove protection 
for the entire current table or all selected tables.
 
@@ -105,7 +105,7 @@
Turning off protection
 
 
-   Place the cursor in the index. First 
of all, if necessary, under %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - 
Formatting Aids , mark Cursor in protected areas - 
Enable.
+   Place the cursor in the index. First of all, if necessary, 
under %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Writer - 
Formatting Aids , mark Protected Areas - Enable 
cursor.
From the context menu choose Edit Index or Table of 
Contents. On the Index or Table of Contents tab page, unmark 
Protected against manual changes.
In the Navigator, select the index, 
then open the context menu in the Navigator and select Index - 
Read-only.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

 jvmfwk/inc/vendorbase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3b3c5fcd7efd3e33a0f0078bd6fd23689c45c41
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 21:02:17 2016 +0100

Related: tdf#101057 inherit MalformedVersionException from std::exception

so we don't get std::terminate on MacOSX if its thrown up to
JavaVirtualMachine::getJavaVM

Change-Id: I1c6b79bf16cbaa66b8f79d495239e301d3ca58de

diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index da8a3e7..8f4fab5 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -82,7 +82,7 @@ OpenJDK at least, but probably not true for Lemotes JDK */
 #endif // SPARC, INTEL, POWERPC, MIPS, MIPS64, ARM, IA64, M68K, HPPA, ALPHA
 
 
-class MalformedVersionException
+class MalformedVersionException : public std::exception
 {
 public:
 MalformedVersionException();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svl/qa

2016-07-22 Thread Laurent Balland-Poirier

 svl/qa/unit/svl.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit bfec304e86e8ffd258e99ffa3efbbfe1167486bc
Author: Laurent Balland-Poirier 
Date:   Tue Jul 12 22:10:20 2016 +0200

tdf#100842 qa unit test

test of text before after fraction, with or without integer
test of text before after and in the middle of scientific number

Change-Id: Ib4a1a722d4cf2350c73b1b721b4e77889dfc666c
Reviewed-on: https://gerrit.libreoffice.org/27172
Tested-by: Jenkins 
Reviewed-by: Laurent BP 

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 6271a59..a1231b0 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -1114,6 +1114,17 @@ void Test::testUserDefinedNumberFormats()
 sExpected = "2 6/16 inch";
 checkPreviewString(aFormatter, sCode, 2.379, eLang, sExpected);
 }
+{  // tdf#100842: text before/after fraction
+sCode = "\"before \"?/?\" after\"";
+sExpected = "before 11/9 after";
+checkPreviewString(aFormatter, sCode, 1.2345667, eLang, sExpected);
+sCode = "\"before \"# ?/?\" after\"";
+sExpected = "before 1 2/9 after";
+checkPreviewString(aFormatter, sCode, 1.2345667, eLang, sExpected);
+sCode = "\"before \"0.0\"inside\"0E+0\"middle\"0\" after\"";
+sExpected = "before 1.2inside3E+0middle4 after";
+checkPreviewString(aFormatter, sCode, 12345.667, eLang, sExpected);
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Jochen Nitschke

 sc/inc/global.hxx   |   14 +---
 sc/inc/tokenarray.hxx   |5 ---
 sc/source/core/data/formulacell.cxx |3 -
 sc/source/core/tool/token.cxx   |   60 
 4 files changed, 3 insertions(+), 79 deletions(-)

New commits:
commit c2524387f3c26c3f0a01a2ce06a352429e27f87c
Author: Jochen Nitschke 
Date:   Fri Jul 22 15:13:29 2016 +0200

sc: remove unused ScCloneFlags: Adjust3Drel and NoCaption

ScTokenArray::ReadjustRelative3DReferences() is unused now
and is removed too

Adjust3Drel got obsolete with
commit 3f41b12c6685b82b5c2674bd9b9d5991adebeaf9
SwapRow() is no more!

NoCaption got obsolete with
commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094
remove mpNote from ScBaseCell

Change-Id: I0e21a80ad06b2f0cb1346cf2eeeabbb7cce9d6e9
Reviewed-on: https://gerrit.libreoffice.org/27439
Tested-by: Jenkins 
Reviewed-by: Jochen Nitschke 

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 51679ea..4af5cf1 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -228,24 +228,16 @@ enum class ScCloneFlags{
 /** If set, cloned formula cells will start to listen to the document. */
 StartListening   = 0x0001,
 
-/** If set, relative 3D references of cloned formula cells will be adjusted to
-old position (used while swapping cells for sorting a cell range). */
-Adjust3Drel  = 0x0002,
-
-/** If set, the caption object of a cell note will not be cloned (used while
-copying cells to undo document, where captions are handled in drawing 
undo). */
-NoCaption= 0x0004,
-
 /** If set, absolute refs will not transformed to external references */
-NoMakeAbsExternal = 0x0008,
+NoMakeAbsExternal = 0x0002,
 
 /** If set, global named expressions will be converted to sheet-local named
 expressions. */
-NamesToLocal   = 0x0010
+NamesToLocal   = 0x0004
 };
 namespace o3tl
 {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
 }
 
 #ifndef DELETEZ
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 892cb88..8f6bce3 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -116,11 +116,6 @@ public:
 /// Assignment with references to FormulaToken entries (not copied!)
 ScTokenArray& operator=( const ScTokenArray& );
 
-/// Make 3D references point to old referenced position even if relative
-voidReadjustRelative3DReferences(
-const ScAddress& rOldPos,
-const ScAddress& rNewPos );
-
 /**
  * Make all absolute references external references pointing to the old 
document
  *
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 25a527f..f1b239d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -880,9 +880,6 @@ ScFormulaCell::ScFormulaCell(const ScFormulaCell& rCell, 
ScDocument& rDoc, const
 pCode->AdjustReferenceOnCopy( aPos);
 }
 
-if ( nCloneFlags & ScCloneFlags::Adjust3Drel )
-pCode->ReadjustRelative3DReferences( rCell.aPos, aPos );
-
 if( !bCompile )
 {   // Name references with references and ColRowNames
 pCode->Reset();
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 2d7b016..37838f0 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2264,66 +2264,6 @@ bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( 
SCCOLROW& nExtend,
 return false;
 }
 
-void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos,
-const ScAddress& rNewPos )
-{
-TokenPointers aPtrs( pCode, nLen, pRPN, nRPN, false);
-for (size_t j=0; j<2; ++j)
-{
-FormulaToken** pp = aPtrs.maPointerRange[j].mpStart;
-FormulaToken** pEnd = aPtrs.maPointerRange[j].mpStop;
-for (; pp != pEnd; ++pp)
-{
-FormulaToken* p = aPtrs.getHandledToken(j,pp);
-if (!p)
-continue;
-
-switch ( p->GetType() )
-{
-case svDoubleRef :
-{
-ScSingleRefData& rRef2 = *p->GetSingleRef2();
-// Also adjust if the reference is of the form 
Sheet1.A2:A3
-if ( rRef2.IsFlag3D() || p->GetSingleRef()->IsFlag3D() 
)
-{
-ScAddress aAbs = rRef2.toAbs(rOldPos);
-rRef2.SetAddress(aAbs, rNewPos);
-}
-}
-SAL_FALLTHROUGH;
-case svSingleRef :
-{
-ScSingleRefData& rRef1 = *p->GetSingleRef();
-if ( rRef1.IsFlag3D() )
-{
-ScAddress aAbs = rRef1.toAb

[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac sd/qa svtools/qa svx/qa sw/qa

2016-07-22 Thread Miklos Vajna

 config_host/config_features.h.in  |5 +
 configure.ac  |1 +
 sd/qa/unit/export-tests.cxx   |2 ++
 svtools/qa/unit/GraphicObjectTest.cxx |2 ++
 svx/qa/unit/xoutdev.cxx   |2 ++
 sw/qa/extras/odfexport/odfexport.cxx  |3 +++
 6 files changed, 15 insertions(+)

New commits:
commit 056fbbf93b45bf948911df11ba5273131844f9cc
Author: Miklos Vajna 
Date:   Fri Jul 22 18:14:40 2016 +0200

Fix --disable-pdfimport build

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

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 108bfca..bae2ecd 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -174,4 +174,9 @@
  */
 #define HAVE_FEATURE_UI 1
 
+/*
+ * Whether PDF import is available
+ */
+#define HAVE_FEATURE_PDFIMPORT 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index 8d0e785..b9e7217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10623,6 +10623,7 @@ ENABLE_PDFIMPORT=
 if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o 
"$enable_pdfimport" = yes \); then
 AC_MSG_RESULT([yes])
 ENABLE_PDFIMPORT=TRUE
+AC_DEFINE(HAVE_FEATURE_PDFIMPORT)
 
 dnl ===
 dnl Check for system poppler
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index ad1b168..8d195f2 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -517,6 +517,7 @@ void SdExportTest::testTdf62176()
 
 void SdExportTest::testEmbeddedPdf()
 {
+#if HAVE_FEATURE_PDFIMPORT
 sd::DrawDocShellRef xShell = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/embedded-pdf.odp"), 
ODP);
 xShell = saveAndReload(xShell, ODP);
 uno::Reference xPage = getPage(0, xShell);
@@ -525,6 +526,7 @@ void SdExportTest::testEmbeddedPdf()
 xShape->getPropertyValue("ReplacementGraphicURL") >>= 
aReplacementGraphicURL;
 CPPUNIT_ASSERT(!aReplacementGraphicURL.isEmpty());
 xShell->DoClose();
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx 
b/svtools/qa/unit/GraphicObjectTest.cxx
index c785fad..f17aeca 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -311,6 +311,7 @@ void GraphicObjectTest::testTdf88935()
 
 void GraphicObjectTest::testPdf()
 {
+#if HAVE_FEATURE_PDFIMPORT
 uno::Reference xComponent = 
loadFromDesktop(m_directories.getURLFromSrc("svtools/qa/unit/data/pdf.odt"), 
"com.sun.star.text.TextDocument");
 SwXTextDocument* pTxtDoc = 
dynamic_cast(xComponent.get());
 CPPUNIT_ASSERT(pTxtDoc);
@@ -339,6 +340,7 @@ void GraphicObjectTest::testPdf()
 CPPUNIT_ASSERT(pGraphicObject->GetGraphic().getPdfData().hasElements());
 
 xComponent->dispose();
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(GraphicObjectTest);
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx
index c053b26..ff2e8bc 100644
--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@@ -32,6 +32,7 @@ public:
 
 void XOutdevTest::testPdfGraphicExport()
 {
+#if HAVE_FEATURE_PDFIMPORT
 // Import the graphic.
 Graphic aGraphic;
 test::Directories aDirectories;
@@ -58,6 +59,7 @@ void XOutdevTest::testPdfGraphicExport()
 CPPUNIT_ASSERT_EQUAL(static_cast('D'), sFirstBytes[2]);
 CPPUNIT_ASSERT_EQUAL(static_cast('F'), sFirstBytes[3]);
 CPPUNIT_ASSERT_EQUAL(static_cast('-'), sFirstBytes[4]);
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(XOutdevTest);
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 1e8febf..56d2d2a 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 
 #include 
 
@@ -810,12 +811,14 @@ DECLARE_ODFEXPORT_TEST(testCellUserDefineAttr, 
"userdefattr-tablecell.odt")
 getUserDefineAttribute(uno::makeAny(xCellC1), "proName", "v3");
 }
 
+#if HAVE_FEATURE_PDFIMPORT
 DECLARE_ODFEXPORT_TEST(testEmbeddedPdf, "embedded-pdf.odt")
 {
 uno::Reference xShape = getShape(1);
 // This failed, pdf+svm replacement graphics pair didn't survive an ODT 
roundtrip.
 CPPUNIT_ASSERT(!getProperty(xShape, 
"ReplacementGraphicURL").isEmpty());
 }
+#endif
 
 DECLARE_ODFEXPORT_TEST(testTableStyles1, "table_styles_1.odt")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New MSVC 2015 build failure

2016-07-22 Thread Michael Stahl

On 22.07.2016 19:07, Luke Benes wrote:
> Before 
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=0f03a801318501a4904dbe7c1d09d0b9dd1cb852
> 
> I was able to successfully compile with MSVC 2015, but now I'm getting:
> 
> C:/core/chart2/source/controller/uitest/uiobject.cxx(149): error C2039:
> 'inserter': is not a member of 'std'
> C:/PROGRA~2/MICROS~1.0/VC//include\unordered_set(13): note: see
> declaration of 'std'
> C:/core/chart2/source/controller/uitest/uiobject.cxx(149): error C3861:
> 'inserter': identifier not found

hope it's fixed now by commit
580ed47cf7dd56850b3a6868f7ab1fbbdc9b3e98

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

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

2016-07-22 Thread Michael Stahl

 chart2/source/controller/uitest/uiobject.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 580ed47cf7dd56850b3a6868f7ab1fbbdc9b3e98
Author: Michael Stahl 
Date:   Fri Jul 22 19:32:25 2016 +0200

chart2: missing header  reportedly breaks MSVC2015

Change-Id: I09b5a292e38044f14cd033a05e459cc69197de57

diff --git a/chart2/source/controller/uitest/uiobject.cxx 
b/chart2/source/controller/uitest/uiobject.cxx
index f4e6644..d100466 100644
--- a/chart2/source/controller/uitest/uiobject.cxx
+++ b/chart2/source/controller/uitest/uiobject.cxx
@@ -17,6 +17,7 @@
 #include 
 
 #include 
+#include 
 
 ChartUIObject::ChartUIObject(VclPtr xChartWindow,
 const OUString& rCID):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Another C2220: warning treated as error with MSVC 2015

2016-07-22 Thread Luke Benes

Here is another C2220

[build CXX] comphelper/source/misc/threadpool.cxx
c:\\core\comphelper\source\misc\threadpool.cxx(80) : error C2220: warning 
treated as error - no 'object' file generated
c:\\core\comphelper\source\misc\threadpool.cxx(80) : warning C4702: unreachable 
code
C:/core/solenv/gbuild/LinkTarget.mk:189: recipe for target 
'C:/core/workdir/CxxObject/comphelper/source/misc/threadpool.o' failed
make[1]: *** [C:/core/workdir/CxxObject/comphelper/source/misc/threadpool.o] 
Error 2
make[1]: *** Waiting for unfinished jobs
Makefile:264: recipe for target 'build' failed
make: *** [build] Error 2

Looks like the source of the issue is:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=76ad32bec8e2c00c21247041b16d9e09e73d2504


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

Re: New MSVC 2015 build failure

2016-07-22 Thread Luke Benes

Before
https://cgit.freedesktop.org/libreoffice/core/commit/?id=0f03a801318501a4904dbe7c1d09d0b9dd1cb852

I was able to successfully compile with MSVC 2015, but now I'm getting:

C:/core/chart2/source/controller/uitest/uiobject.cxx(149): error C2039: 
'inserter': is not a member of 'std'
C:/PROGRA~2/MICROS~1.0/VC//include\unordered_set(13): note: see declaration of 
'std'
C:/core/chart2/source/controller/uitest/uiobject.cxx(149): error C3861: 
'inserter': identifier not found
C:/core/solenv/gbuild/LinkTarget.mk:189: recipe for target 
'C:/core/workdir/CxxObject/chart2/source/controller/uitest/uiobject.o' failed
make[1]: *** 
[C:/core/workdir/CxxObject/chart2/source/controller/uitest/uiobject.o] Error 2
make[1]: *** Waiting for unfinished jobs
Makefile:262: recipe for target 'build' failed
make: *** [build] Error 2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-07-22 Thread Stanislav Horacek

 source/text/scalc/guide/calc_date.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e1d32da35c7eae844a798ecbb4df9dd1964769
Author: Stanislav Horacek 
Date:   Fri Jul 22 18:31:36 2016 +0200

tdf#92825 adjust menu path for AutoCalculate

Change-Id: I7a18a0434d92db015721ef7e523aebaf76b3c7af
Reviewed-on: https://gerrit.libreoffice.org/27448
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/source/text/scalc/guide/calc_date.xhp 
b/source/text/scalc/guide/calc_date.xhp
index acafba6..9e866ef 100644
--- a/source/text/scalc/guide/calc_date.xhp
+++ b/source/text/scalc/guide/calc_date.xhp
@@ -61,7 +61,7 @@
 Experiment 
with some additional formulas: in A4 enter =A3*24 to calculate the hours, in A5 
enter =A4*60 for the minutes, and in A6 enter =A5*60 for seconds. Press the 
Enter key after each formula.
   
 
-The time since 
your date of birth will be calculated and displayed in the various units. The 
values are calculated as of the exact moment when you entered the last formula 
and pressed the Enter key. This value is not automatically updated, although 
"Now" continuously changes. In the Tools menu, the menu item 
Cell Contents - AutoCalculate is normally active; however, 
automatic calculation does not apply to the function NOW. This ensures that 
your computer is not solely occupied with updating the sheet.
+The time since 
your date of birth will be calculated and displayed in the various units. The 
values are calculated as of the exact moment when you entered the last formula 
and pressed the Enter key. This value is not automatically updated, although 
"Now" continuously changes. In the Data menu, the menu item 
Calculate - AutoCalculate is normally active; however, automatic 
calculation does not apply to the function NOW. This ensures that your computer 
is not solely occupied with updating the sheet.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Survey and interview on developers

2016-07-22 Thread jan iversen

Hi

I looked at your survey and it seems to make a couple of wrong assumptions. To 
me usability is very important, but I do not care too much about it, because at 
LibreOffice we have a hard working UX team, that makes sure the UI is 
consistent and has a high usability. All UI changes passes the UX team before 
getting merged, so a single developer cannot just add e.g. a whole new set of 
dialogs.

You might want to take a look at our wiki to see how we are organized. We have 
different teams (Development, QA, Doc, UX, L10n) each specialized in their 
area. Libreoffice is simply too big, to understand fully for a single volunteer 
(not even the core developers claim to know all of the code).

My role is among others to help new people, so it is fair to say, that I am 
highly involved in the process.

rgds
jan I.


> On 22 Jul 2016, at 16:53, Nino Provenzano  wrote:
> 
> Dear Developers,
> 
> my name is Antonino Provenzano and I am student of Media & Computer Science. 
> This semester I am writing a paper. I would like to interview several 
> Developers as well as a survey and document developers' opinions about 
> usability. In other words, I am interested in your experiences
> 
> 
> 
> Objective:
> 
> I want to unterstand how an open source project like LibreOffice is 
> organized. My main interest is on the communication between designer and 
> developer. I want to figure out how the cooperation between these both 
> positions works. Furthermore, I would like to know your opinion about the 
> relationship between usability and Open Source.
> 
> 
> 
> Why I do this:
> 
> I love the idea of Open Source. I am involved in the Unix Group at the 
> University of Kaiserslautern in Zweibrücken and in my spare time, I am 
> working a lot with Open Source software.
> 
> How long does the survey take?
> 
> 5 - 10 Minutes
> 
> Link: http://goo.gl/forms/p3n4uP6brSTD3cKz2
> 
> 
> The Interview:
> 
> If you are interested in an interview, because you want to tell me more about 
> your opinion, feel free to write a private email to me.
> 
> 
> 
> How long does the interview take?
> 
> 15 – 20 minutes
> 
> 
> 
> The questions are:
> 
> - What is your motivation for working on LibreOffice?
> 
> - How many hours per week do you work on LibreOffice?
> 
> - Did you work on other Open Source projects before?
> 
> - Why do you choose LibreOffice and not another Open Source project?
> 
> - Are there any differences between LibreOffice and other project(s)?
> 
> - Do you see Usability experts as a fully-fledged and accepted Member in the 
> Software development?
> 
> - Are you driven by the motivation to fix or improve program code because of 
> usability problems experienced personally, discovered in tests or are you not 
> interested in such challenges?
> 
> - Do you always consider usability, when do you make software development 
> decision?
> 
> - How would you describe your current knowledge about usability?
> 
> - Which recommendations can you give to a person who is starting to work in 
> the LibreOffice project as a developer?
> 
> - If you had one wish to improve LibreOffice, what would it be?
> 
>  
> Thank you for your patience.
> 
> 
> Kind regards
> Antonino Provenzano
> 
> 
> 
> ___
> 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

[Libreoffice-commits] core.git: helpcontent2

2016-07-22 Thread Stanislav Horacek

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

New commits:
commit b6ba2508932c2815b996d4c3e90b1d0cbe907005
Author: Stanislav Horacek 
Date:   Fri Jul 22 18:31:36 2016 +0200

Updated core
Project: help  33e1d32da35c7eae844a798ecbb4df9dd1964769

tdf#92825 adjust menu path for AutoCalculate

Change-Id: I7a18a0434d92db015721ef7e523aebaf76b3c7af
Reviewed-on: https://gerrit.libreoffice.org/27448
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/helpcontent2 b/helpcontent2
index 8908467..33e1d32 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 89084676982a55e4f0056360ec055dd156ee2439
+Subproject commit 33e1d32da35c7eae844a798ecbb4df9dd1964769
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

Tag 'cp-5.1-2' created by Andras Timar  at 
2016-07-22 17:07 +

cp-5.1-2

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.1-2'

2016-07-22 Thread Miklos Vajna

Tag 'cp-5.1-2' created by Andras Timar  at 
2016-07-22 17:07 +

cp-5.1-2

Changes since libreoffice-5-1-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-2'

2016-07-22 Thread Krunoslav Šebetić

Tag 'cp-5.1-2' created by Andras Timar  at 
2016-07-22 17:07 +

cp-5.1-2

Changes since libreoffice-5-1-branch-point-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-2'

2016-07-22 Thread Christian Lohmaier

Tag 'cp-5.1-2' created by Andras Timar  at 
2016-07-22 17:07 +

cp-5.1-2

Changes since libreoffice-5-1-branch-point-23:
---
 0 files changed
---
___
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

2016-07-22 Thread Miklos Vajna

 sd/qa/unit/tiledrendering/tiledrendering.cxx |   45 ++-
 sd/source/ui/view/sdview.cxx |   19 +++
 2 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit ffd9972e2a21f6490f25c712cd0ba49e534238c8
Author: Miklos Vajna 
Date:   Fri Jul 22 17:27:25 2016 +0200

sd: implement LOK_CALLBACK_VIEW_LOCK

So that edited shape text doesn't just disappear in other views without
any indication.

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

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 40fc296..6467cf7 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -66,6 +66,7 @@ public:
 void testViewCursors();
 void testViewCursorParts();
 void testCursorViews();
+void testViewLock();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -88,6 +89,7 @@ public:
 CPPUNIT_TEST(testViewCursors);
 CPPUNIT_TEST(testViewCursorParts);
 CPPUNIT_TEST(testCursorViews);
+CPPUNIT_TEST(testViewLock);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -821,12 +823,14 @@ public:
 /// Our current part, to be able to decide if a view cursor/selection is 
relevant for us.
 int m_nPart;
 bool m_bCursorVisibleChanged;
+bool m_bViewLock;
 
 ViewCallback()
 : m_bGraphicSelectionInvalidated(false),
   m_bGraphicViewSelectionInvalidated(false),
   m_nPart(0),
-  m_bCursorVisibleChanged(false)
+  m_bCursorVisibleChanged(false),
+  m_bViewLock(false)
 {
 }
 
@@ -859,6 +863,14 @@ public:
 m_bCursorVisibleChanged = true;
 }
 break;
+case LOK_CALLBACK_VIEW_LOCK:
+{
+std::stringstream aStream(pPayload);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+m_bViewLock = 
aTree.get_child("rectangle").get_value() != "EMPTY";
+}
+break;
 }
 }
 };
@@ -963,6 +975,37 @@ void SdTiledRenderingTest::testCursorViews()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SdTiledRenderingTest::testViewLock()
+{
+comphelper::LibreOfficeKit::setActive();
+
+// Load a document that has a shape and create two views.
+SdXImpressDocument* pXImpressDocument = createDoc("shape.odp");
+ViewCallback aView1;
+
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
 &aView1);
+SfxLokHelper::createView();
+
pXImpressDocument->initializeForTiledRendering(uno::Sequence());
+
+// Begin text edit in the second view and assert that the first gets a lock
+// notification.
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pActualPage = pViewShell->GetActualPage();
+SdrObject* pObject = pActualPage->GetObj(0);
+SdrView* pView = pViewShell->GetView();
+aView1.m_bViewLock = false;
+pView->SdrBeginTextEdit(pObject);
+CPPUNIT_ASSERT(aView1.m_bViewLock);
+
+// End text edit in the second view, and assert that the lock is removed in
+// the first view.
+pView->SdrEndTextEdit();
+CPPUNIT_ASSERT(!aView1.m_bViewLock);
+
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index df17d6c..5e097dd 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -91,6 +91,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include "DrawController.hxx"
 
 #include 
@@ -700,6 +703,18 @@ bool View::SdrBeginTextEdit(
 if ( mpViewSh )
 {
 
mpViewSh->GetViewShellBase().GetDrawController().FireSelectionChangeListener();
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+if (OutlinerView* pView = GetTextEditOutlinerView())
+{
+Rectangle aRectangle = pView->GetOutputArea();
+if (pWin && pWin->GetMapMode().GetMapUnit() == MAP_100TH_MM)
+aRectangle = OutputDevice::LogicToLogic(aRectangle, 
MAP_100TH_MM, MAP_TWIP);
+OString sRectangle = aRectangle.toString();
+SfxLokHelper::notifyOtherViews(&mpViewSh->GetViewShellBase(), 
LOK_CALLBACK_VIEW_LOCK, "rectangle", sRectangle);
+}
+}
 }
 
 if (bReturn)
@@ -790,6 +805,10 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool 
bDontDeleteReally)
 if ( mpViewSh )
 {
 
mpViewSh->GetViewShellBase().GetDrawController().FireSelectionChangeListener();
+
+if (comphelper

[Libreoffice-commits] core.git: sfx2/classification sfx2/Package_classification.mk

2016-07-22 Thread Olivier Hallot

 sfx2/Package_classification.mk|1 
 sfx2/classification/example_pt-BR.xml |   71 ++
 2 files changed, 72 insertions(+)

New commits:
commit 2158eb10b4b1013af57c2cbe64575ad7889940ff
Author: Olivier Hallot 
Date:   Thu Jul 21 07:51:22 2016 -0300

tdf#100351 example_pt-BR.xml for classification

Change-Id: I2857d1209b7261cbbbf6908d7e8dde84be3e1da5
Reviewed-on: https://gerrit.libreoffice.org/27371
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk
index 0cca6f6..91f9d0e 100644
--- a/sfx2/Package_classification.mk
+++ b/sfx2/Package_classification.mk
@@ -11,6 +11,7 @@ $(eval $(call 
gb_Package_Package,sfx2_classification,$(SRCDIR)/sfx2))
 
 $(eval $(call 
gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/classification,\
classification/example.xml \
+   classification/example_pt-BR.xml \
classification/example_sl-SI.xml \
 ))
 
diff --git a/sfx2/classification/example_pt-BR.xml 
b/sfx2/classification/example_pt-BR.xml
new file mode 100644
index 000..25280f0
--- /dev/null
+++ b/sfx2/classification/example_pt-BR.xml
@@ -0,0 +1,71 @@
+
+
+Exemplo de autoridade de polÃticas 
TSCP
+Exemplo de polÃtica TSCP
+
+urn:example:tscp:1
+
+
+
+
+
+UK-Cabinet
+0
+
+
+
+
+
+Document: Header
+ClassificaÃ§Ã£o: Corporativo
+
+
+
+UK-Cabinet
+1
+
+
+
+
+
+Document: Header
+ClassificaÃ§Ã£o: Confidencial
+
+
+Document: Footer
+A informaÃ§Ã£o deste documento Ã© confidencial. 
NÃ£o distribuir externamente sem prÃ©via autorizaÃ§Ã£o.
+
+
+Document: Watermark
+Confidencial
+
+
+
+UK-Cabinet
+2
+
+
+
+
+
+Document: Header
+ClassificaÃ§Ã£o: Reservado
+
+
+Document: Footer
+A informaÃ§Ã£o deste documento Ã© reservada. 
NÃ£o distribuir externamente.
+
+
+Document: Watermark
+Reservado
+
+
+
+UK-Cabinet
+3
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/bundled loolwsd/LOKitClient.cpp

2016-07-22 Thread Miklos Vajna

 loolwsd/LOKitClient.cpp  |1 
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h  |8 ++---
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   16 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit b9fbc6d36917bda3579ac51e1cdf45a42e062150
Author: Miklos Vajna 
Date:   Fri Jul 22 18:09:32 2016 +0200

Update bundled headers

diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 83c4075..df36a49 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -72,6 +72,7 @@ extern "C"
 CASE(CELL_VIEW_CURSOR);
 CASE(GRAPHIC_VIEW_SELECTION);
 CASE(VIEW_CURSOR_VISIBLE);
+CASE(VIEW_LOCK);
 #undef CASE
 }
 std::cout << " payload: " << pPayload << std::endl;
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 559d28a..81d65c1 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -212,13 +212,13 @@ struct _LibreOfficeKitDocumentClass
 void (*setClientVisibleArea) (LibreOfficeKitDocument* pThis, int nX, int 
nY, int nWidth, int nHeight);
 
 /// @see lok::Document::createView().
-uintptr_t (*createView) (LibreOfficeKitDocument* pThis);
+int (*createView) (LibreOfficeKitDocument* pThis);
 /// @see lok::Document::destroyView().
-void (*destroyView) (LibreOfficeKitDocument* pThis, uintptr_t nId);
+void (*destroyView) (LibreOfficeKitDocument* pThis, int nId);
 /// @see lok::Document::setView().
-void (*setView) (LibreOfficeKitDocument* pThis, uintptr_t nId);
+void (*setView) (LibreOfficeKitDocument* pThis, int nId);
 /// @see lok::Document::getView().
-uintptr_t (*getView) (LibreOfficeKitDocument* pThis);
+int (*getView) (LibreOfficeKitDocument* pThis);
 /// @see lok::Document::getViews().
 int (*getViews) (LibreOfficeKitDocument* pThis);
 
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 63abda8..651e9bc 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -390,6 +390,22 @@ typedef enum
  */
 LOK_CALLBACK_VIEW_CURSOR_VISIBLE,
 
+/**
+ * The size and/or the position of a lock rectangle in one of the other
+ * views has changed.
+ *
+ * The payload format:
+ *
+ * {
+ * "viewId": "..."
+ * "rectangle": "..."
+ * }
+ *
+ * - viewId is a value returned earlier by lok::Document::createView()
+ * - rectangle uses the format of LOK_CALLBACK_INVALIDATE_TILES.
+ */
+LOK_CALLBACK_VIEW_LOCK,
+
 }
 LibreOfficeKitCallbackType;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - include/LibreOfficeKit libreofficekit/source sw/qa sw/source

2016-07-22 Thread Miklos Vajna

 include/LibreOfficeKit/LibreOfficeKitEnums.h   |   16 ++
 libreofficekit/source/gtk/lokdocview.cxx   |   59 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   49 
 sw/source/core/frmedt/feshview.cxx |7 ++
 sw/source/uibase/uiview/viewdraw.cxx   |9 +++
 5 files changed, 139 insertions(+), 1 deletion(-)

New commits:
commit 599b1306ac59abc507f53ead3e7ca92bce3e6b77
Author: Miklos Vajna 
Date:   Fri Jul 22 16:39:47 2016 +0200

sw: add new LOK_CALLBACK_VIEW_LOCK callback

When we're after SdrBeginTextEdit(), but before SdrEndTextEdit(), and
have multiple views, then only the active view paints the edited text,
the other views look like the shape has no text at all.

Add a new callback that exposes the position and size of the rectangle
where the shape text will be painted after text edit ended, so clients
can draw some kind of locking indicator there. This way the rendered
result can differ in the "shape has no text" and the "shape text is
edited in an other view" cases.

Reviewed-on: https://gerrit.libreoffice.org/27441
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 897189cfc6b3f6f3a9a0148b060ea25e5f8d9eaa)

Conflicts:
libreofficekit/source/gtk/lokdocview.cxx

Change-Id: I6096479a8a05c2547d15222e6d997b848af02945

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 63abda8..651e9bc 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -390,6 +390,22 @@ typedef enum
  */
 LOK_CALLBACK_VIEW_CURSOR_VISIBLE,
 
+/**
+ * The size and/or the position of a lock rectangle in one of the other
+ * views has changed.
+ *
+ * The payload format:
+ *
+ * {
+ * "viewId": "..."
+ * "rectangle": "..."
+ * }
+ *
+ * - viewId is a value returned earlier by lok::Document::createView()
+ * - rectangle uses the format of LOK_CALLBACK_INVALIDATE_TILES.
+ */
+LOK_CALLBACK_VIEW_LOCK,
+
 }
 LibreOfficeKitCallbackType;
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 6386d26..37b0604 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -190,6 +190,10 @@ struct LOKDocViewPrivateImpl
 /// Event source ID for handleTimeout() of this widget.
 guint m_nTimeoutId;
 
+/// Rectangles of view locks. The current view can only see
+/// them, can't modify them. Key is the view id.
+std::map m_aViewLockRectangles;
+
 LOKDocViewPrivateImpl()
 : m_aLOPath(nullptr),
 m_pUserProfileURL(nullptr),
@@ -411,6 +415,8 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_CELL_VIEW_CURSOR";
 case LOK_CALLBACK_CELL_FORMULA:
 return "LOK_CALLBACK_CELL_FORMULA";
+case LOK_CALLBACK_VIEW_LOCK:
+return "LOK_CALLBACK_VIEW_LOCK";
 }
 g_assert(false);
 return nullptr;
@@ -1299,6 +1305,25 @@ callback (gpointer pData)
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
 break;
 }
+case LOK_CALLBACK_VIEW_LOCK:
+{
+std::stringstream aStream(pCallback->m_aPayload);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+int nViewId = aTree.get("viewId");
+int nPart = aTree.get("part");
+const std::string& rRectangle = aTree.get("rectangle");
+if (rRectangle != "EMPTY")
+priv->m_aViewLockRectangles[nViewId] = ViewRectangle(nPart, 
payloadToRectangle(pDocView, rRectangle.c_str()));
+else
+{
+auto it = priv->m_aViewLockRectangles.find(nViewId);
+if (it != priv->m_aViewLockRectangles.end())
+priv->m_aViewLockRectangles.erase(it);
+}
+gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+break;
+}
 default:
 g_assert(false);
 break;
@@ -1731,6 +1756,40 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
 cairo_stroke(pCairo);
 }
 
+// View locks: they are colored.
+for (auto& rPair : priv->m_aViewLockRectangles)
+{
+const ViewRectangle& rRectangle = rPair.second;
+if (rRectangle.m_nPart != priv->m_nPartId)
+continue;
+
+// Draw a rectangle.
+const GdkRGBA& rDark = getDarkColor(rPair.first);
+cairo_set_source_rgb(pCairo, rDark.red, rDark.green, rDark.blue);
+cairo_rectangle(pCairo,
+twipToPixel(rRectangle.m_aRectangle.x, priv->m_fZoom),
+twipToPixel(rRectangle.m_aRectangle.y, priv->m_fZoom),
+twipToPixel(rRectangle.m_aRectangle.width, 
priv->m_fZoom),
+twipToPixel(rRectangle.m_aRectangle.height, 
priv->m_fZoom

[Libreoffice-commits] core.git: Branch 'feature/fixes27' - include/vcl vcl/source

2016-07-22 Thread László Németh

 include/vcl/pdfextoutdevdata.hxx|2 -
 vcl/source/gdi/pdfextoutdevdata.cxx |   27 --
 vcl/source/gdi/pdfwriter_impl.hxx   |2 -
 vcl/source/gdi/pdfwriter_impl2.cxx  |   44 +---
 4 files changed, 18 insertions(+), 57 deletions(-)

New commits:
commit d9873699ee5f908dd8d640e07ebe1aefdfb9f062
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Jul 22 18:04:23 2016 +0200

Revert "tdf#97662 - Try to preserve original compressed JPEGs harder."

This reverts commit 2ee228e179d98630bc69cef8b13a55c0edbe9e1b.

diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index 1140180..477f668 100644
--- a/include/vcl/pdfextoutdevdata.hxx
+++ b/include/vcl/pdfextoutdevdata.hxx
@@ -146,8 +146,6 @@ public:
 
 std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks() { return 
maBookmarks;}
 
-Graphic GetCurrentGraphic() const;
-
 /** Start a new group of render output
 
 Use this method to group render output.
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx 
b/vcl/source/gdi/pdfextoutdevdata.cxx
index 75ce7de..1e3007c 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -294,17 +294,13 @@ struct PageSyncData
 std::deque< PDFWriter::StructAttribute >mParaStructAttributes;
 std::deque< PDFWriter::StructAttributeValue >   mParaStructAttributeValues;
 std::deque< Graphic >   mGraphics;
-Graphic mCurrentGraphic;
 std::deque< std::shared_ptr< PDFWriter::AnyWidget > >
 mControls;
 GlobalSyncData* mpGlobalData;
 
 boolmbGroupIgnoreGDIMtfActions;
 
-
-explicit PageSyncData( GlobalSyncData* pGlobal )
-: mbGroupIgnoreGDIMtfActions ( false )
-{ mpGlobalData = pGlobal; }
+explicit PageSyncData( GlobalSyncData* pGlobal ) : 
mbGroupIgnoreGDIMtfActions ( false ) { mpGlobalData = pGlobal; }
 
 void PushAction( const OutputDevice& rOutDev, const 
PDFExtOutDevDataSync::Action eAct );
 bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, 
const PDFExtOutDevData& rOutDevData );
@@ -407,19 +403,12 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc
 }
 else if ( aBeg->eAct == 
PDFExtOutDevDataSync::EndGroupGfxLink )
 {
-Graphic& rGraphic = mGraphics.front();
-if ( rGraphic.IsLink() )
+if ( rOutDevData.GetIsLosslessCompression() && 
!rOutDevData.GetIsReduceImageResolution() )
 {
-GfxLinkType eType = rGraphic.GetLink().GetType();
-if ( eType == GFX_LINK_TYPE_NATIVE_JPG  )
-{
-mbGroupIgnoreGDIMtfActions = 
rOutDevData.GetIsLosslessCompression() && 
!rOutDevData.GetIsReduceImageResolution();
-if ( !mbGroupIgnoreGDIMtfActions )
-mCurrentGraphic = rGraphic;
-}
-else if ( eType == GFX_LINK_TYPE_NATIVE_PNG )
+Graphic& rGraphic = mGraphics.front();
+if ( rGraphic.IsLink() && 
rGraphic.GetLink().GetType() == GFX_LINK_TYPE_NATIVE_JPG )
 {
-mCurrentGraphic = rGraphic;
+mbGroupIgnoreGDIMtfActions = true;
 }
 }
 break;
@@ -475,7 +464,6 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc
 }
 mbGroupIgnoreGDIMtfActions = false;
 }
-mCurrentGraphic.Clear();
 }
 break;
 case PDFExtOutDevDataSync::CreateNamedDest:
@@ -528,11 +516,6 @@ PDFExtOutDevData::~PDFExtOutDevData()
 delete mpGlobalSyncData;
 }
 
-Graphic PDFExtOutDevData::GetCurrentGraphic() const
-{
-return mpPageSyncData->mCurrentGraphic;
-}
-
 void PDFExtOutDevData::SetDocumentLocale( const css::lang::Locale& rLoc )
 {
 maDocLocale = rLoc;
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx 
b/vcl/source/gdi/pdfwriter_impl.hxx
index 306bb15..77b0d47 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1011,7 +1011,7 @@ i12626
 // helper for playMetafile
 void implWriteGradient( const tools::PolyPolygon& rPolyPoly, const 
Gradient& rGradient,
 VirtualDevice* pDummyVDev, const 
vcl::PDFWriter::PlayMetafileContext& );
-void implWriteBitmapEx( const Point& rPoint, const Size& rSize, const 
BitmapEx& rBitmapEx, Graphic i_pGraphic,
+v

[Libreoffice-commits] core.git: 3 commits - opencl/source sc/source xmloff/source

2016-07-22 Thread Tor Lillqvist

 opencl/source/openclwrapper.cxx  |2 +-
 sc/source/core/opencl/formulagroupcl.cxx |2 +-
 xmloff/source/draw/ximpshap.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6e70dc595e3291ff12c09c60b1e3ddf97a672aea
Author: Tor Lillqvist 
Date:   Fri Jul 22 18:51:50 2016 +0300

Add missing space

Change-Id: I57d2fa94f6f4cc932f306de80897fc8071738c8c

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 6747bc9..aa11046 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -4054,7 +4054,7 @@ DynamicKernel* DynamicKernel::create( const ScCalcConfig& 
rConfig, ScTokenArray&
 {
 // I think OpenCLError exceptions are actually exceptional 
(unexpected), so do use SAL_WARN
 // here.
-SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCLError from " << 
oce.mFunction << ": " << ::opencl::errorString(oce.mError) << "at " << 
oce.mFile << ":" << oce.mLineNumber);
+SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCLError from " << 
oce.mFunction << ": " << ::opencl::errorString(oce.mError) << " at " << 
oce.mFile << ":" << oce.mLineNumber);
 
 // OpenCLError used to go to the catch-all below, and not delete 
pDynamicKernel. Was that
 // intentional, should we not do it here then either?
commit dbdfd36f8a176780115ed5f3a44b19ab90c2396c
Author: Tor Lillqvist 
Date:   Fri Jul 22 18:46:55 2016 +0300

SAL_DETAIL_WHERE already ends with a space

Change-Id: I273e0e4301246122bd9e02556b771dc485877350

diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 9156ec2..d763dcc 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -49,7 +49,7 @@
 #define CHECK_OPENCL(status,name) \
 if( status != CL_SUCCESS )  \
 { \
-SAL_WARN( "opencl", "OpenCL error code " << status << " at " 
SAL_DETAIL_WHERE " from " name ); \
+SAL_WARN( "opencl", "OpenCL error code " << status << " at " 
SAL_DETAIL_WHERE "from " name ); \
 return false; \
 }
 
commit 61351e3e0dfe0ff809a7074bf06f32b3af15085f
Author: Tor Lillqvist 
Date:   Fri Jul 22 18:19:01 2016 +0300

loplugin:nullptr

Change-Id: I2084b360b9ee20c212bc5b44d4460551aff0a3d6

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 96a64c6..0d2ef7d 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3511,7 +3511,7 @@ SvXMLImportContext 
*SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref
 SdXMLPluginShapeContext* pPluginContext = 
dynamic_cast(pShapeContext);
 if( pPluginContext && pPluginContext->getMimeType() == 
"model/vnd.gltf+json" )
 {
- mxImplContext = 0;
+ mxImplContext = nullptr;
  return this;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

 vcl/source/gdi/pdfextoutdevdata.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit c72db36c7c791b1f92d3dd29fbc40c8ef168c609
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 16:30:14 2016 +0100

Resolves: tdf#100838 no transparency support on using original jpg data path

This became a problem since...

commit 76ec54e8c9f3580450bca85236a4f5af0c328588
Author: Michael Meeks 
Date:   Mon Feb 8 14:24:15 2016 +

tdf#97662 - Try to preserve original compressed JPEGs harder.

Avoiding de-compressing and re-compressing them saves lots of time too.

for the default JPEG Compress + Reduce Image resolution case

but appears to always be a problem with the Lossless - Reduce Image 
resolution
case.

Change-Id: I24c69a59a16d69817e402cd87f84e744ee146a66

diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx 
b/vcl/source/gdi/pdfextoutdevdata.cxx
index abd08d8..beb198f 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -442,7 +442,8 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc
 Graphic   aGraphic( mGraphics.front() );
 
 mGraphics.pop_front();
-mParaInts.pop_front(); //Transparency
+sal_Int32 nTransparency = mParaInts.front();
+mParaInts.pop_front();
 aOutputRect = mParaRects.front();
 mParaRects.pop_front();
 aVisibleOutputRect = mParaRects.front();
@@ -463,7 +464,15 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, 
sal_uInt32& rCurGDIMtfAc

aVisibleOutputRect.Right(), aVisibleOutputRect.Bottom() ) ) );
 rWriter.SetClipRegion( aRect);
 }
+
 Bitmap aMask;
+if (nTransparency)
+{
+AlphaMask aAlphaMask(aGraphic.GetSizePixel());
+aAlphaMask.Erase(nTransparency);
+aMask = aAlphaMask.GetBitmap();
+}
+
 SvMemoryStream aTmp;
 const sal_uInt8* pData = aGfxLink.GetData();
 sal_uInt32 nBytes = aGfxLink.GetDataSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/qa

2016-07-22 Thread Armin Le Grand

 xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk   |   66 +++
 xmlsecurity/Module_xmlsecurity.mk |4 
 xmlsecurity/qa/unit/data/xmlsecurity-dialogs-test.txt |   45 +
 xmlsecurity/qa/unit/xmlsecurity-dialogs-test.cxx  |  150 ++
 4 files changed, 265 insertions(+)

New commits:
commit 7c2f579e3c9fde90bd936858fa3dc61177c5ec0e
Author: Armin Le Grand 
Date:   Fri Jul 22 17:44:30 2016 +0200

Added dialog test case for screenshot creation for xmlsecurity

All *.ui files create a screenshot, but not all look useful

Change-Id: I5ae156d76d4b0b53a8c5a9950afdbc42d8e66b73

diff --git a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk 
b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
new file mode 100644
index 000..ba72c00
--- /dev/null
+++ b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
@@ -0,0 +1,66 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_dialogs_test, \
+xmlsecurity/qa/unit/xmlsecurity-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,xmlsecurity_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/xmlsecurity/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call 
gb_CppunitTest_use_external,xmlsecurity_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,xmlsecurity_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,xmlsecurity_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,xmlsecurity_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,xmlsecurity_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_instdir_configuration,xmlsecurity_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk 
b/xmlsecurity/Module_xmlsecurity.mk
index f5fb0ca..63b2f8c 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -31,4 +31,8 @@ $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
CppunitTest_qa_certext \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
+CppunitTest_xmlsecurity_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/qa/unit/data/xmlsecurity-dialogs-test.txt 
b/xmlsecurity/qa/unit/data/xmlsecurity-dialogs-test.txt
new file mode 100644
index 000..a83cdfa
--- /dev/null
+++ b/xmlsecurity/qa/unit/data/xmlsecurity-dialogs-test.txt
@@ -0,0 +1,45 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in xmlsecurity for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+xmlsec/ui/viewcertdialog.ui
+xmlsec/ui/macrosecuritydialog.ui
+xmlsec/ui/certgeneral.ui
+xmlsec/ui/certdetails.ui
+xmlsec/ui/certpage.ui
+xmlsec/ui/securitylevelpage.ui
+xmlsec/ui/security

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - vcl/CppunitTest_vcl_dialogs_test.mk vcl/Module_vcl.mk vcl/qa

2016-07-22 Thread Armin Le Grand

 vcl/CppunitTest_vcl_dialogs_test.mk   |   66 ++
 vcl/Module_vcl.mk |5 +
 vcl/qa/unit/data/vcl-dialogs-test.txt |   45 ++
 vcl/qa/unit/vcl-dialogs-test.cxx  |  150 ++
 4 files changed, 266 insertions(+)

New commits:
commit 6b4f9206ea506576e3a54f4cef1a5271a6ea25ee
Author: Armin Le Grand 
Date:   Fri Jul 22 17:36:02 2016 +0200

Added dialog test case for screenshot creation for vcl

All *.ui files create a screenshot, but not all look useful

Change-Id: Ie189030767feb0acafa879d6d3912851d0d6db5a

diff --git a/vcl/CppunitTest_vcl_dialogs_test.mk 
b/vcl/CppunitTest_vcl_dialogs_test.mk
new file mode 100644
index 000..b594015
--- /dev/null
+++ b/vcl/CppunitTest_vcl_dialogs_test.mk
@@ -0,0 +1,66 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_dialogs_test, \
+vcl/qa/unit/vcl-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/vcl/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,vcl_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,vcl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,vcl_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,vcl_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,vcl_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 03c884c..5d5a2ac 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -129,4 +129,9 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_blocklistparser_test \
 ))
 endif
+
+$(eval $(call gb_Module_add_slowcheck_targets,vcl,\
+CppunitTest_vcl_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/qa/unit/data/vcl-dialogs-test.txt 
b/vcl/qa/unit/data/vcl-dialogs-test.txt
new file mode 100644
index 000..4235486
--- /dev/null
+++ b/vcl/qa/unit/data/vcl-dialogs-test.txt
@@ -0,0 +1,45 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in vcl for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+vcl/ui/printerpropertiesdialog.ui
+vcl/ui/printerpaperpage.ui
+vcl/ui/printerdevicepage.ui
+vcl/ui/printdialog.ui
+vcl/ui/querydialog.ui
+vcl/ui/cupspassworddialog.ui
+vcl/ui/errornoprinterdialog.ui
+vcl/ui/errornocontentdialog.ui
+vcl/ui/printprogressdialog.ui
diff --git a/vcl/qa/unit/vcl-dialogs-test.cxx b/vcl/qa/unit/vcl-dialogs-test.cxx
new file mode 100644
index 000..914c52d
--- /dev/null
+++ b/vcl/qa/unit/vcl-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil;

[Libreoffice-commits] core.git: Branch 'feature/orcus-odf' - 6 commits - sc/source

2016-07-22 Thread Jaskaran Singh

 sc/source/filter/inc/orcusinterface.hxx |4 +---
 sc/source/filter/orcus/interface.cxx|   27 +++
 2 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 358c327846ccc44bc7f1df0e396e8afad16af310
Author: Jaskaran Singh 
Date:   Fri Jul 22 21:03:43 2016 +0530

Reform orcus unit warning

Change-Id: Iec221f019a65fcb42281f76b724ea306587f66c8

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 2fd826f..d59b2fa 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -258,7 +258,8 @@ double translateToInternal(double nVal, 
orcus::length_unit_t unit)
 return nVal * 20.0 * 72.0 / 2.54;
 break;
 case orcus::length_unit_t::unknown:
-SAL_WARN("sc.orcus", "unknown unit");
+if (nVal != 0)
+SAL_WARN("sc.orcus", "unknown unit");
 break;
 default:
 break;
commit d64978fa5116d7792700c5f94dfd88fc128638c4
Author: Jaskaran Singh 
Date:   Fri Jul 22 18:38:45 2016 +0530

Fix reorder and overflow warning in orcus interface

Change-Id: I700463434a99a87e485b61bac78513a286f507cd

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 3dd68ff..2fd826f 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -753,18 +753,19 @@ ScOrcusStyles::ScOrcusStyles(ScDocument& rDoc):
 ScOrcusStyles::font::font():
 mbBold(false),
 mbItalic(false),
+mnSize(10),
+maColor(COL_WHITE),
 mbHasFontAttr(false),
 mbHasUnderlineAttr(false),
-mnSize(10),
 meUnderline(LINESTYLE_NONE),
-maColor(COL_WHITE, COL_WHITE, COL_WHITE, COL_WHITE)
+maUnderlineColor(COL_WHITE)
 {
 }
 
 ScOrcusStyles::fill::fill():
 maPattern(""),
-maFgColor(Color(COL_WHITE, COL_WHITE, COL_WHITE)),
-maBgColor(Color(COL_WHITE, COL_WHITE, COL_WHITE)),
+maFgColor(COL_WHITE),
+maBgColor(COL_WHITE),
 mbHasFillAttr(false)
 {
 }
commit f83b5aa1603157557b67e855e2ec26b5c39c3d12
Author: Jaskaran Singh 
Date:   Fri Jul 22 18:36:57 2016 +0530

Remove unused variable from orcus interface

Change-Id: I3883b5361824838a3cb802cb9c577d4d39c070b2

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index 48332f4..7f469e4 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -262,8 +262,6 @@ private:
 bool mbHasUnderlineAttr;
 
 FontLineStyle meUnderline;
-FontLineStyle meUnderlineType;
-FontLineStyle meUnderlineWidth;
 Color maUnderlineColor;
 
 font();
commit 13c5c11f094921984183d9d49de7331518e2ca24
Author: Markus Mohrhard 
Date:   Tue Jul 19 23:18:30 2016 +0200

fix assert in number format orcus import

Change-Id: Ib0a8ce074c9245fa8ba66008524887f015c7bf76

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 89d8f47..3dd68ff 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -906,7 +906,7 @@ void 
ScOrcusStyles::number_format::applyToItemSet(SfxItemSet& rSet, ScDocument&
 {
 if (nCheckPos == 0)
 {
-rSet.Put(SfxUInt32Item(nKey, ATTR_VALUE_FORMAT));
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nKey));
 }
 }
 else
commit e6659211e4dfa54eb966897a4059798687442864
Author: Markus Mohrhard 
Date:   Tue Jul 19 23:25:43 2016 +0200

use ScDocument's number formatter

Change-Id: Iff04869b8e8ba73575bd5d336db42f1e08cec5d8

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index b6b7c676..48332f4 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -333,7 +333,7 @@ private:
 bool mbHasNumberFormatAttr;
 
 number_format();
-void applyToItemSet(SfxItemSet& rSet) const;
+void applyToItemSet(SfxItemSet& rSet, ScDocument& rDoc) const;
 };
 
 number_format maCurrentNumberFormat;
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 1aedcd5..89d8f47 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -894,15 +894,15 @@ void ScOrcusStyles::border::applyToItemSet(SfxItemSet& 
rSet) const
 rSet.Put(aBoxItem);
 }
 
-void ScOrcusStyles::number_format::applyToItemSet(SfxItemSet& rSet) const
+void ScOrcusStyles::number_format::applyToItemSet(SfxItemSet& rSet, 
ScDocument& rDoc) const
 {
 sal_uInt32 nKey;
 sal_Int32 nCheckPos;
-SvNumberFormatter 
NumberFormatter(comphelper::getProcessComponentContext(), LANGUAGE_ENGLISH_US);
+SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
 OUString Code = maCode; /* <-- Done because the 
SvNumberFormatter::PutEntry demands a non const Num

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

2016-07-22 Thread Szymon Kłos

 include/vcl/tabctrl.hxx|1 +
 sd/uiconfig/simpress/ui/notebookbar.ui |4 
 vcl/source/control/tabctrl.cxx |   17 -
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit d7da58ae362b661c03fc754e4e8f4a89798b0127
Author: Szymon KÅos 
Date:   Fri Jul 22 11:50:57 2016 +0200

GSoC notebookbar: better default page handling

+ selected default tab page in the Impress
+ the default tab page is set when context isn't supported
+ switching between unsupported contexts is not causing
  switch to default tab to avoid closing of tab which was
  recently used by user

Change-Id: Ieeda8a79e6c67708551351f9bb49d8b006c0e74f
Reviewed-on: https://gerrit.libreoffice.org/27432
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 14974e7..5b26c83 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -213,6 +213,7 @@ protected:
 virtual void ImplPaint(vcl::RenderContext& rRenderContext, const 
Rectangle& rRect) override;
 
 private:
+bool bLastContextWasSupported;
 vcl::EnumContext::Context eLastContext;
 Link m_aIconClickHdl;
 };
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index dd6c0ea..bd081e6 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1476,6 +1476,10 @@
 False
 Home
 True
+
+  
+  
+
   
   
 1
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 93b3b20..9441dea 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2205,7 +2205,8 @@ VCL_BUILDER_FACTORY(NotebookbarTabControl);
 
 NotebookbarTabControl::NotebookbarTabControl(vcl::Window* pParent, WinBits 
nStyle)
 : TabControl(pParent, nStyle)
-, eLastContext( vcl::EnumContext::Context::Context_Any )
+, bLastContextWasSupported(true)
+, eLastContext(vcl::EnumContext::Context::Context_Any)
 {
 LanguageTag aLocale( Application::GetSettings().GetUILanguageTag());
 ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "vcl", aLocale );
@@ -,6 +2223,8 @@ void NotebookbarTabControl::SetContext( 
vcl::EnumContext::Context eContext )
 {
 if (eLastContext != eContext)
 {
+bool bHandled = false;
+
 for (int nChild = 0; nChild < GetChildCount(); ++nChild)
 {
 TabPage* pPage = static_cast(GetChild(nChild));
@@ -2231,10 +2234,22 @@ void NotebookbarTabControl::SetContext( 
vcl::EnumContext::Context eContext )
 else
 EnablePage(nChild + 2, false);
 
+if (!bHandled && bLastContextWasSupported
+&& 
pPage->HasContext(vcl::EnumContext::Context::Context_Default))
+{
+SetCurPageId(nChild + 2);
+}
+
 if (pPage->HasContext(eContext) && eContext != 
vcl::EnumContext::Context::Context_Any)
+{
 SetCurPageId(nChild + 2);
+bHandled = true;
+bLastContextWasSupported = true;
+}
 }
 
+if (!bHandled)
+bLastContextWasSupported = false;
 eLastContext = eContext;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-22 Thread Stanislav Horacek

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

New commits:
commit b920fa5e90343a7e9ca6e9f1934f22b527ed9791
Author: Stanislav Horacek 
Date:   Fri Jul 22 16:15:45 2016 +0200

Updated core
Project: help  89084676982a55e4f0056360ec055dd156ee2439

remove redundant emph tag

Change-Id: I8de64440fb433bb51a32c93cd49ca5387221a936
Reviewed-on: https://gerrit.libreoffice.org/27440
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/helpcontent2 b/helpcontent2
index ff07ecb..8908467 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ff07ecb749ae707353ffe8fb0686857cc47dba2a
+Subproject commit 89084676982a55e4f0056360ec055dd156ee2439
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Stanislav Horacek

 source/text/swriter/guide/fields.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89084676982a55e4f0056360ec055dd156ee2439
Author: Stanislav Horacek 
Date:   Fri Jul 22 16:15:45 2016 +0200

remove redundant emph tag

Change-Id: I8de64440fb433bb51a32c93cd49ca5387221a936
Reviewed-on: https://gerrit.libreoffice.org/27440
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/source/text/swriter/guide/fields.xhp 
b/source/text/swriter/guide/fields.xhp
index 30e71fd..6342403 100644
--- a/source/text/swriter/guide/fields.xhp
+++ b/source/text/swriter/guide/fields.xhp
@@ -41,7 +41,7 @@
   Viewing Fields
   Fields consist of a field name and the field content. To switch the 
field display between the field name or the field content, choose View - Field 
Names.
   To display or hide field highlighting in a document, choose 
View - Field Shadings. To permanently disable this feature, choose 
%PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
Application Colors, and clear the check box in front of Field 
shadings.
-  To change the color of field shadings, choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Application 
Colors, locate the Field 
shadings option, and then select a different color in the Color setting box.
+  To 
change the color of field shadings, choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Application Colors, 
locate the Field shadings option, and then select 
a different color in the Color setting 
box.
   Field Properties
   Most field types in a document, including database fields, store 
and display variable values.
   The following field types execute an action when you click the 
field:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Stanislav Horacek

 source/text/swriter/guide/numbering_lines.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ff07ecb749ae707353ffe8fb0686857cc47dba2a
Author: Stanislav Horacek 
Date:   Fri Jul 22 17:30:09 2016 +0200

paragraph dialog has "Outline & Numbering" tab, not "Numbering"

Change-Id: I2a2a6c6e23022932d85d15da6228bab91ca45d1c
Reviewed-on: https://gerrit.libreoffice.org/27445
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/source/text/swriter/guide/numbering_lines.xhp 
b/source/text/swriter/guide/numbering_lines.xhp
index b2b5505..90d1506 100644
--- a/source/text/swriter/guide/numbering_lines.xhp
+++ b/source/text/swriter/guide/numbering_lines.xhp
@@ -77,7 +77,7 @@
 
 
   
-Click the 
Numbering tab.
+Click the 
Outline & Numbering tab.
   
   
 In the 
Line Numbering area, clear the Include this paragraph in line numbering check 
box.
@@ -89,7 +89,7 @@
 Select the 
paragraph(s) where you want to add the line numbers.
   
   
-Choose 
Format - Paragraph, and then click the Numbering tab.
+Choose 
Format - Paragraph, and then click the Outline & Numbering tab.
   
   
 Select 
Include this paragraph in line numbering.
@@ -107,7 +107,7 @@
 Click in a 
paragraph.
   
   
-Choose 
Format - Paragraph, and then click the Numbering tab.
+Choose 
Format - Paragraph, and then click the Outline & Numbering tab.
   
   
 Select the 
Include this paragraph in line numbering check 
box.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-22 Thread Stanislav Horacek

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

New commits:
commit 2631704d46174e2537cdfbcfdb8602dca63b0493
Author: Stanislav Horacek 
Date:   Fri Jul 22 17:30:09 2016 +0200

Updated core
Project: help  ff07ecb749ae707353ffe8fb0686857cc47dba2a

paragraph dialog has "Outline & Numbering" tab, not "Numbering"

Change-Id: I2a2a6c6e23022932d85d15da6228bab91ca45d1c
Reviewed-on: https://gerrit.libreoffice.org/27445
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/helpcontent2 b/helpcontent2
index d2e8010..ff07ecb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2e8010196b99875138088ec814df71b22554d9d
+Subproject commit ff07ecb749ae707353ffe8fb0686857cc47dba2a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Stanislav Horacek

 source/text/swriter/00/0404.xhp   |4 ++--
 source/text/swriter/guide/change_header.xhp   |2 +-
 source/text/swriter/guide/even_odd_sdw.xhp|4 ++--
 source/text/swriter/guide/footer_nextpage.xhp |2 +-
 source/text/swriter/guide/footer_pagenumber.xhp   |2 +-
 source/text/swriter/guide/header_footer.xhp   |4 ++--
 source/text/swriter/guide/header_with_chapter.xhp |2 +-
 source/text/swriter/guide/pagenumbers.xhp |2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit d2e8010196b99875138088ec814df71b22554d9d
Author: Stanislav Horacek 
Date:   Fri Jul 22 16:43:47 2016 +0200

tdf#92825 adjust menu path for inserting header and footer

Change-Id: Ifedf0c43050106da123dbf89ec2c165a8dcc1b5d
Reviewed-on: https://gerrit.libreoffice.org/27442
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/source/text/swriter/00/0404.xhp 
b/source/text/swriter/00/0404.xhp
index a4ab9d4..8f1e2b3 100644
--- a/source/text/swriter/00/0404.xhp
+++ b/source/text/swriter/00/0404.xhp
@@ -307,9 +307,9 @@
 
 
 
-Choose Insert - Header
+Choose Insert - Header and Footer - Header
 
-Choose Insert - Footer
+Choose Insert - Header and Footer - Footer
 
 
 
diff --git a/source/text/swriter/guide/change_header.xhp 
b/source/text/swriter/guide/change_header.xhp
index 26fb7b8..afbd438 100644
--- a/source/text/swriter/guide/change_header.xhp
+++ b/source/text/swriter/guide/change_header.xhp
@@ -53,7 +53,7 @@
 Double-click the name in the list to apply the style to the 
current page.
   
   
-Choose 
Insert - Header, and choose the new page style from the 
list.
+Choose 
Insert - Header and Footer - Header, and choose the new page style 
from the list.
   
   
 Type the 
text that you want in the header. Position the cursor into the main text area 
outside of the header.
diff --git a/source/text/swriter/guide/even_odd_sdw.xhp 
b/source/text/swriter/guide/even_odd_sdw.xhp
index 53e057f..377803b 100644
--- a/source/text/swriter/guide/even_odd_sdw.xhp
+++ b/source/text/swriter/guide/even_odd_sdw.xhp
@@ -80,8 +80,8 @@
 Go to the 
first page in your document, and double-click "Right Page" in the list of page 
styles in the Styles and Formatting window.
   
 
-To add a 
header to one of the page styles, choose Insert - 
Header, and choose the page style that you want to add the header to. In 
the header frame, type the text that you want to use as the header.
-To add a 
footer to one of the page styles, choose Insert - 
Footer, and choose the page style that you want to add the footer to. In 
the footer frame, type the text that you want to use as a footer.
+To add a 
header to one of the page styles, choose Insert - Header 
and Footer - Header, and choose the page style that you want to add the 
header to. In the header frame, type the text that you want to use as the 
header.
+To add a 
footer to one of the page styles, choose Insert - Header 
and Footer - Footer, and choose the page style that you want to add the 
footer to. In the footer frame, type the text that you want to use as a 
footer.
 If you do not want 
to have a header or a footer on the title page of your document, apply the 
"First Page" style to the title page.
 
 To 
Suppress the Printout of Empty Pages
diff --git a/source/text/swriter/guide/footer_nextpage.xhp 
b/source/text/swriter/guide/footer_nextpage.xhp
index 868a079..30e107d 100644
--- a/source/text/swriter/guide/footer_nextpage.xhp
+++ b/source/text/swriter/guide/footer_nextpage.xhp
@@ -41,7 +41,7 @@
 
 
   
-Choose 
Insert - Footer and select the page style that you want to add the 
footer to.
+Choose 
Insert - Header and Footer - Footer and select the page style that 
you want to add the footer to.
   
   
 Place the 
cursor in the footer and choose Insert - Field - More 
Fields.
diff --git a/source/text/swriter/guide/footer_pagenumber.xhp 
b/source/text/swriter/guide/footer_pagenumber.xhp
index 7fb1ff3..f93b4d8 100644
--- a/source/text/swriter/guide/footer_pagenumber.xhp
+++ b/source/text/swriter/guide/footer_pagenumber.xhp
@@ -38,7 +38,7 @@
   To Insert a Page Number
   
  
-Choose Insert - Footer and select the page 
style that you want to add the footer to.
+Choose Insert - Header and Footer - Footer and 
select the page style that you want to add the footer to.
  
  
 Choose Insert - Field - Page Number.
diff --git a/source/text/swriter/guide/header_footer.xhp 
b/source/text/swriter/guide/header_footer.xhp
index eb787e9..037bc2c 100644
--- a/source/text/swriter/guide/header_footer.xhp
+++ b/source/text/swriter/guide/header_footer.xhp
@@ -40,10 +40,10 @@
 
 
   
-To add a 
header to a page, choose Insert - Header, and then select the page 
style for the current page from the submenu.
+To add a 
header to a page, choose Insert - Header and Footer - Header, and 
t

[Libreoffice-commits] core.git: helpcontent2

2016-07-22 Thread Stanislav Horacek

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

New commits:
commit 625d5416fa21c46e4c90924d57c41c4a9d225ef0
Author: Stanislav Horacek 
Date:   Fri Jul 22 16:43:47 2016 +0200

Updated core
Project: help  d2e8010196b99875138088ec814df71b22554d9d

tdf#92825 adjust menu path for inserting header and footer

Change-Id: Ifedf0c43050106da123dbf89ec2c165a8dcc1b5d
Reviewed-on: https://gerrit.libreoffice.org/27442
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/helpcontent2 b/helpcontent2
index 41395cd..d2e8010 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 41395cd9ba77de6475ce59aa80856d614bdabc95
+Subproject commit d2e8010196b99875138088ec814df71b22554d9d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - uui/CppunitTest_uui_dialogs_test.mk uui/Module_uui.mk uui/qa

2016-07-22 Thread Armin Le Grand

 uui/CppunitTest_uui_dialogs_test.mk   |   66 ++
 uui/Module_uui.mk |4 
 uui/qa/unit/data/uui-dialogs-test.txt |   44 +
 uui/qa/unit/uui-dialogs-test.cxx  |  150 ++
 4 files changed, 264 insertions(+)

New commits:
commit 445021e15be87cfd12b99e874da63c2c5ed6cc2a
Author: Armin Le Grand 
Date:   Fri Jul 22 17:25:26 2016 +0200

Added dialog test case for screenshot creation for uui

All *.ui files create a screenshot, but not all look useful

Change-Id: I95c254a2f98e0d5b1efc4f167be8499c5cf82436

diff --git a/uui/CppunitTest_uui_dialogs_test.mk 
b/uui/CppunitTest_uui_dialogs_test.mk
new file mode 100644
index 000..5df7500
--- /dev/null
+++ b/uui/CppunitTest_uui_dialogs_test.mk
@@ -0,0 +1,66 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,uui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,uui_dialogs_test, \
+uui/qa/unit/uui-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,uui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/uui/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,uui_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,uui_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,uui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,uui_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,uui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,uui_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,uui_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,uui_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
index 193bea5..0f197a3 100644
--- a/uui/Module_uui.mk
+++ b/uui/Module_uui.mk
@@ -18,4 +18,8 @@ $(eval $(call gb_Module_add_l10n_targets,uui,\
UIConfig_uui \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,uui,\
+CppunitTest_uui_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/uui/qa/unit/data/uui-dialogs-test.txt 
b/uui/qa/unit/data/uui-dialogs-test.txt
new file mode 100644
index 000..c33944c
--- /dev/null
+++ b/uui/qa/unit/data/uui-dialogs-test.txt
@@ -0,0 +1,44 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in uui for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+uui/ui/authfallback.ui
+uui/ui/filterselect.ui
+uui/ui/logindialog.ui
+uui/ui/setmasterpassworddlg.ui
+uui/ui/masterpassworddlg.ui
+uui/ui/simplenameclash.ui
+uui/ui/password.ui
+uui/ui/macrowarnmedium.ui
diff --git a/uui/qa/unit/uui-dialogs-test.cxx b/uui/qa/unit/uui-dialogs-test.cxx
new file mode 100644
index 000..f3a7d0c
--- /dev/null
+++ b/uui/qa/unit/uui-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This S

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - svtools/CppunitTest_svtools_dialogs_test.mk svtools/Module_svtools.mk svtools/qa

2016-07-22 Thread Armin Le Grand

 svtools/CppunitTest_svtools_dialogs_test.mk   |   67 +++
 svtools/Module_svtools.mk |4 
 svtools/qa/unit/data/svtools-dialogs-test.txt |   45 +++
 svtools/qa/unit/svtools-dialogs-test.cxx  |  150 ++
 4 files changed, 266 insertions(+)

New commits:
commit 5b9470b2ddf0a992b6d652625a54b8e261671ad2
Author: Armin Le Grand 
Date:   Fri Jul 22 17:18:33 2016 +0200

Added dialog test case for screenshot creation for svtools

All *.ui files create a screenshot, but not all look useful

Change-Id: I7a7a6c3ab38e8890404082dd359ff5f4f1ebf9fd

diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk 
b/svtools/CppunitTest_svtools_dialogs_test.mk
new file mode 100644
index 000..6341850
--- /dev/null
+++ b/svtools/CppunitTest_svtools_dialogs_test.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,svtools_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,svtools_dialogs_test, \
+svtools/qa/unit/svtools-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,svtools_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/svtools/source/inc \
+-I$(SRCDIR)/svtools/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,svtools_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,svtools_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,svtools_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,svtools_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,svtools_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,svtools_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,svtools_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,svtools_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index 4707a15..2062ce7 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -49,6 +49,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
 ))
 endif
 
+$(eval $(call gb_Module_add_slowcheck_targets,svtools,\
+CppunitTest_svtools_dialogs_test \
+))
+
 #todo: javapatchres
 #todo: jpeg on mac in svtools/util/makefile.mk
 #todo: deliver errtxt.src as ehdl.srs
diff --git a/svtools/qa/unit/data/svtools-dialogs-test.txt 
b/svtools/qa/unit/data/svtools-dialogs-test.txt
new file mode 100644
index 000..8dad8ab
--- /dev/null
+++ b/svtools/qa/unit/data/svtools-dialogs-test.txt
@@ -0,0 +1,45 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in svtools for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+svt/ui/addresstemplatedialog.ui
+svt/ui/placeedit.ui
+svt/ui/printersetupdialog.ui
+svt/ui/restartdialog.ui
+svt/ui/graphicexport.ui
+svt/ui/GraphicExportOptionsDialog.ui
+svt/ui/wizarddialog.ui
+svt/ui/querydeletedialog.ui
+svt/ui/javadisableddialog.ui
diff --

[Libreoffice-commits] core.git: include/LibreOfficeKit libreofficekit/source sw/qa sw/source

2016-07-22 Thread Miklos Vajna

 include/LibreOfficeKit/LibreOfficeKitEnums.h   |   16 ++
 libreofficekit/source/gtk/lokdocview.cxx   |   59 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   49 
 sw/source/core/frmedt/feshview.cxx |7 ++
 sw/source/uibase/uiview/viewdraw.cxx   |9 +++
 5 files changed, 139 insertions(+), 1 deletion(-)

New commits:
commit 897189cfc6b3f6f3a9a0148b060ea25e5f8d9eaa
Author: Miklos Vajna 
Date:   Fri Jul 22 16:39:47 2016 +0200

sw: add new LOK_CALLBACK_VIEW_LOCK callback

When we're after SdrBeginTextEdit(), but before SdrEndTextEdit(), and
have multiple views, then only the active view paints the edited text,
the other views look like the shape has no text at all.

Add a new callback that exposes the position and size of the rectangle
where the shape text will be painted after text edit ended, so clients
can draw some kind of locking indicator there. This way the rendered
result can differ in the "shape has no text" and the "shape text is
edited in an other view" cases.

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

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 63abda8..651e9bc 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -390,6 +390,22 @@ typedef enum
  */
 LOK_CALLBACK_VIEW_CURSOR_VISIBLE,
 
+/**
+ * The size and/or the position of a lock rectangle in one of the other
+ * views has changed.
+ *
+ * The payload format:
+ *
+ * {
+ * "viewId": "..."
+ * "rectangle": "..."
+ * }
+ *
+ * - viewId is a value returned earlier by lok::Document::createView()
+ * - rectangle uses the format of LOK_CALLBACK_INVALIDATE_TILES.
+ */
+LOK_CALLBACK_VIEW_LOCK,
+
 }
 LibreOfficeKitCallbackType;
 
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index d5a1dd3..f604b58 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -190,6 +190,10 @@ struct LOKDocViewPrivateImpl
 /// Event source ID for handleTimeout() of this widget.
 guint m_nTimeoutId;
 
+/// Rectangles of view locks. The current view can only see
+/// them, can't modify them. Key is the view id.
+std::map m_aViewLockRectangles;
+
 LOKDocViewPrivateImpl()
 : m_aLOPath(nullptr),
 m_pUserProfileURL(nullptr),
@@ -415,6 +419,8 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_UNO_COMMAND_RESULT";
 case LOK_CALLBACK_ERROR:
 return "LOK_CALLBACK_ERROR";
+case LOK_CALLBACK_VIEW_LOCK:
+return "LOK_CALLBACK_VIEW_LOCK";
 }
 g_assert(false);
 return nullptr;
@@ -1314,6 +1320,25 @@ callback (gpointer pData)
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
 break;
 }
+case LOK_CALLBACK_VIEW_LOCK:
+{
+std::stringstream aStream(pCallback->m_aPayload);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+int nViewId = aTree.get("viewId");
+int nPart = aTree.get("part");
+const std::string& rRectangle = aTree.get("rectangle");
+if (rRectangle != "EMPTY")
+priv->m_aViewLockRectangles[nViewId] = ViewRectangle(nPart, 
payloadToRectangle(pDocView, rRectangle.c_str()));
+else
+{
+auto it = priv->m_aViewLockRectangles.find(nViewId);
+if (it != priv->m_aViewLockRectangles.end())
+priv->m_aViewLockRectangles.erase(it);
+}
+gtk_widget_queue_draw(GTK_WIDGET(pDocView));
+break;
+}
 default:
 g_assert(false);
 break;
@@ -1746,6 +1771,40 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
 cairo_stroke(pCairo);
 }
 
+// View locks: they are colored.
+for (auto& rPair : priv->m_aViewLockRectangles)
+{
+const ViewRectangle& rRectangle = rPair.second;
+if (rRectangle.m_nPart != priv->m_nPartId)
+continue;
+
+// Draw a rectangle.
+const GdkRGBA& rDark = getDarkColor(rPair.first);
+cairo_set_source_rgb(pCairo, rDark.red, rDark.green, rDark.blue);
+cairo_rectangle(pCairo,
+twipToPixel(rRectangle.m_aRectangle.x, priv->m_fZoom),
+twipToPixel(rRectangle.m_aRectangle.y, priv->m_fZoom),
+twipToPixel(rRectangle.m_aRectangle.width, 
priv->m_fZoom),
+twipToPixel(rRectangle.m_aRectangle.height, 
priv->m_fZoom));
+cairo_set_line_width(pCairo, 2.0);
+cairo_stroke(pCairo);
+
+// Cross it.
+cairo_move_to(pCairo,
+  tw

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - starmath/CppunitTest_starmath_dialogs_test.mk starmath/Module_starmath.mk starmath/qa

2016-07-22 Thread Armin Le Grand

 starmath/CppunitTest_starmath_dialogs_test.mk   |   66 ++
 starmath/Module_starmath.mk |4 
 starmath/qa/unit/data/starmath-dialogs-test.txt |   47 +++
 starmath/qa/unit/starmath-dialogs-test.cxx  |  150 
 4 files changed, 267 insertions(+)

New commits:
commit 79f10d010e20c2bca652c02b26c0f977e29faa7a
Author: Armin Le Grand 
Date:   Fri Jul 22 17:09:27 2016 +0200

Added dialog test case for screenshot creation for starmath

All *.ui files create a screenshot, but not all look useful

Change-Id: Iee511be3b1a94e036b289e55d77f690e10627706

diff --git a/starmath/CppunitTest_starmath_dialogs_test.mk 
b/starmath/CppunitTest_starmath_dialogs_test.mk
new file mode 100644
index 000..4ef798e
--- /dev/null
+++ b/starmath/CppunitTest_starmath_dialogs_test.mk
@@ -0,0 +1,66 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,starmath_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,starmath_dialogs_test, \
+starmath/qa/unit/starmath-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,starmath_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/starmath/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,starmath_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,starmath_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,starmath_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,starmath_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,starmath_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,starmath_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,starmath_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,starmath_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 1a6af4c..7141a14 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -29,4 +29,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
 JunitTest_starmath_unoapi \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,starmath,\
+CppunitTest_starmath_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/qa/unit/data/starmath-dialogs-test.txt 
b/starmath/qa/unit/data/starmath-dialogs-test.txt
new file mode 100644
index 000..50d42be
--- /dev/null
+++ b/starmath/qa/unit/data/starmath-dialogs-test.txt
@@ -0,0 +1,47 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in starmath for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+modules/smath/ui/printeroptions.ui
+modules/smath/ui/smathsettings.ui
+modules/smath/ui/fontdialog.ui
+modules/smath/ui/fontsizedialog.ui
+modules/smath/ui/fonttypedialog.ui
+modules/smath/ui/spacingdialog.ui
+modules/smath/ui/alignmentdialog.ui
+modules/smath/ui/catalogdialog.ui
+modules/smath/ui/symdefinedi

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sfx2/CppunitTest_sfx2_dialogs_test.mk sfx2/Module_sfx2.mk sfx2/qa

2016-07-22 Thread Armin Le Grand

 sfx2/CppunitTest_sfx2_dialogs_test.mk   |   67 ++
 sfx2/Module_sfx2.mk |4 
 sfx2/qa/unit/data/sfx2-dialogs-test.txt |   71 +++
 sfx2/qa/unit/sfx2-dialogs-test.cxx  |  150 
 4 files changed, 292 insertions(+)

New commits:
commit ee04c7d0f425dba4795011aa1f73f6a46eef1bf2
Author: Armin Le Grand 
Date:   Fri Jul 22 16:55:07 2016 +0200

Added dialog test case for screenshot creation for sfx2

All *.ui files create a screenshot, but not all look useful

Change-Id: I2bf5165828daed91a7e09205e6b329f0c844c3fc

diff --git a/sfx2/CppunitTest_sfx2_dialogs_test.mk 
b/sfx2/CppunitTest_sfx2_dialogs_test.mk
new file mode 100644
index 000..5c6087f
--- /dev/null
+++ b/sfx2/CppunitTest_sfx2_dialogs_test.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sfx2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_dialogs_test, \
+sfx2/qa/unit/sfx2-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sfx2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/sfx2/source/inc \
+-I$(SRCDIR)/sfx2/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sfx2_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,sfx2_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sfx2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,sfx2_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,sfx2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,sfx2_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,sfx2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index e13282f..c8c002a 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -60,4 +60,8 @@ endif
 #todo: clean up quickstarter stuff in both libraries
 #todo: move standard pool to svl
 
+$(eval $(call gb_Module_add_slowcheck_targets,sfx2,\
+CppunitTest_sfx2_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/qa/unit/data/sfx2-dialogs-test.txt 
b/sfx2/qa/unit/data/sfx2-dialogs-test.txt
new file mode 100644
index 000..08f07a6c
--- /dev/null
+++ b/sfx2/qa/unit/data/sfx2-dialogs-test.txt
@@ -0,0 +1,71 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in sfx2 for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+sfx/ui/documentpropertiesdialog.ui
+sfx/ui/descriptioninfopage.ui
+sfx/ui/documentinfopage.ui
+sfx/ui/custominfopage.ui
+sfx/ui/cmisinfopage.ui
+sfx/ui/documentfontspage.ui
+sfx/ui/managestylepage.ui
+sfx/ui/optprintpage.ui
+sfx/ui/securityinfopage.ui
+sfx/ui/helpcontentpage.ui
+sfx/ui/helpindexpage.ui
+sfx/ui/helpsearchpage.ui
+sfx/ui/helpbookmarkpage.ui
+sfx/ui/licensedialog.ui
+sfx/ui/linkeditdialog.ui
+sfx/ui/bookmarkdialog.ui
+sfx/ui/c

Survey and interview on developers

2016-07-22 Thread Nino Provenzano

Dear Developers,

my name is Antonino Provenzano and I am student of Media & Computer
Science. This semester I am writing a paper. I would like to interview several
Developers as well as a survey and document developers' opinions about
usability. In other words, I am interested in your experiences


*Objective:*

I want to unterstand how an open source project like LibreOffice is
organized. My main interest is on the communication between designer and
developer. I want to figure out how the cooperation between these both
positions works. Furthermore, I would like to know your opinion about the
relationship between usability and Open Source.


*Why I do this:*

I love the idea of Open Source. I am involved in the Unix Group at the
University of Kaiserslautern in Zweibrücken and in my spare time, I am
working a lot with Open Source software.

*How long does the survey take?*

5 - 10 Minutes

Link: http://goo.gl/forms/p3n4uP6brSTD3cKz2


*The Interview:*

If you are interested in an interview, because you want to tell me more
about your opinion, feel free to write a private email to me.


*How long does the interview take?*

15 – 20 minutes


*The questions are:*

- What is your motivation for working on LibreOffice?

- How many hours per week do you work on LibreOffice?

- Did you work on other Open Source projects before?

- Why do you choose LibreOffice and not another Open Source project?

- Are there any differences between LibreOffice and other project(s)?

- Do you see Usability experts as a fully-fledged and accepted Member in
the Software development?

- Are you driven by the motivation to fix or improve program code because
of usability problems experienced personally, discovered in tests or are
you not interested in such challenges?

- Do you always consider usability, when do you make software development
decision?

- How would you describe your current knowledge about usability?

- Which recommendations can you give to a person who is starting to work in
the LibreOffice project as a developer?

- If you had one wish to improve LibreOffice, what would it be?


Thank you for your patience.


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

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - reportdesign/CppunitTest_reportdesign_dialogs_test.mk reportdesign/Module_reportdesign.mk reportdesign/qa

2016-07-22 Thread Armin Le Grand

 reportdesign/CppunitTest_reportdesign_dialogs_test.mk   |   67 +++
 reportdesign/Module_reportdesign.mk |4 
 reportdesign/qa/unit/data/reportdesign-dialogs-test.txt |   51 +
 reportdesign/qa/unit/reportdesign-dialogs-test.cxx  |  150 
 4 files changed, 272 insertions(+)

New commits:
commit 62a68fc01f2d61e992df3a52a6f0aad6c4cdc68d
Author: Armin Le Grand 
Date:   Fri Jul 22 16:44:22 2016 +0200

Added dialog screenshot test case for reportdesign

One patterend dialog does not work what means all based on this one
do not work, need to be instantziated real probably

Change-Id: I8d82e0dbf937bb4c052486da21ada58afe7f5a08

diff --git a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk 
b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
new file mode 100644
index 000..07d56585
--- /dev/null
+++ b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,reportdesign_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,reportdesign_dialogs_test, \
+reportdesign/qa/unit/reportdesign-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,reportdesign_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/reportdesign/source/inc \
+-I$(SRCDIR)/reportdesign/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,reportdesign_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call 
gb_CppunitTest_use_external,reportdesign_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,reportdesign_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,reportdesign_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,reportdesign_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,reportdesign_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,reportdesign_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_instdir_configuration,reportdesign_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/Module_reportdesign.mk 
b/reportdesign/Module_reportdesign.mk
index bba86b9..a06efb0 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -27,4 +27,8 @@ $(eval $(call gb_Module_add_l10n_targets,reportdesign,\
JunitTest_reportdesign_complex \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,reportdesign,\
+CppunitTest_reportdesign_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/qa/unit/data/reportdesign-dialogs-test.txt 
b/reportdesign/qa/unit/data/reportdesign-dialogs-test.txt
new file mode 100644
index 000..d56f389
--- /dev/null
+++ b/reportdesign/qa/unit/data/reportdesign-dialogs-test.txt
@@ -0,0 +1,51 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in reportdesign for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+# all these are pretty much a single one b

Minutes of the Design Hangout: 2016-Jul-22

2016-07-22 Thread Heiko Tietze

Date: 2016-July-22 
Present:  Olivier, Jay, Heiko, Akshay, Regina, Rishabh, Susobhan, Tomaz, 
Unknown, Samuel, bubli

Easy hacks and extensions
  - nothing new

Google Summer of Code

  * Template Manager (Akshay/Samuel)
+ Emoji continued
+ Start center filter will be added this weekend

  * Area Fill (Rishabh/Heiko)
   + Decision on how to implement User colors vs. Recent colors
 + Option 1: Replacement of Recent colors
+ No user.soc in dropdown, only below the color grid
+ Manipulation (delete) at Tool > Options > Color
+ Limited to 12 items, or so
+ Workflow using recent colors could deal with Document colors
 + Option 2: Additional palette
+ User.soc as own palette
+ Manipulation in Area dialog
+ Tools > Options > Color would be obsolete
+ Recent colors remain (bugs need to get fixed)
 -> Fix Recent Colors first (bubli, jay)
 -> Go with Option 2 (Heiko, jay)
 + Double check View > Toolbars > Color bar so that the currently 
active palette is shown there (Regina)

  * Sidebar Improvements (Susobhan)
  + Media Playback Panel: Patch up here (scheduler not working) - 
https://gerrit.libreoffice.org/#/c/27363/
- Media Control Toolbar is already buggy (controls malfunction)
- Tested in 4.4 and it was working and broken in 5.0 (Jay)
- Needs more testing and looking for experts

   * Notebookbar (Szymon, Kendy, Samuel)
+ Several issues solved (empty tabs, window resizing etc.)

Enhancements and proposals
+ New entries in Help menus for better link between users and documentation 
(Olivier)
https://bugs.documentfoundation.org/show_bug.cgi?id=96015
+ Great idea (heiko, jay)
+ Have also social media in this menu? No, because this list would not 
have an end (jay)
+ Localization issues are being fixed (bubli)
+ Disable Download Offline Help when it is found on the local system 
(jay)
+ 
http://www.libreoffice.org/get-help/feedback/?LOversion=5.1.4.2&LOlocale=pt-BR&LOmodule=DrawingDocument
+ Consider to rename "The Book of LibreOffice" into something like 
"User Guide"
+ Add a link to the extensions/templates page





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

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - fpicker/CppunitTest_fpicker_dialogs_test.mk fpicker/Module_fpicker.mk fpicker/qa

2016-07-22 Thread Armin Le Grand

 fpicker/CppunitTest_fpicker_dialogs_test.mk   |   61 ++
 fpicker/Module_fpicker.mk |4 
 fpicker/qa/unit/data/fpicker-dialogs-test.txt |   40 ++
 fpicker/qa/unit/fpicker-dialogs-test.cxx  |  150 ++
 4 files changed, 255 insertions(+)

New commits:
commit 28699738ec25a4a0c96e2e84b1790991713a6fd4
Author: Armin Le Grand 
Date:   Fri Jul 22 16:29:17 2016 +0200

Added dialog test case for screenshot creation for fpicker

Change-Id: I6c94ff393e823552ea9c2332bd05abf5b2fafd54

diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk 
b/fpicker/CppunitTest_fpicker_dialogs_test.mk
new file mode 100644
index 000..0caf7e7
--- /dev/null
+++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,fpicker_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,fpicker_dialogs_test, \
+fpicker/qa/unit/fpicker-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,fpicker_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_libraries,fpicker_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,fpicker_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,fpicker_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,fpicker_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,fpicker_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,fpicker_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,fpicker_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index c3c4a6b..2805ca7 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -32,4 +32,8 @@ $(eval $(call gb_Module_add_targets,fpicker,\
 ))
 endif
 
+$(eval $(call gb_Module_add_slowcheck_targets,fpicker,\
+CppunitTest_fpicker_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/qa/unit/data/fpicker-dialogs-test.txt 
b/fpicker/qa/unit/data/fpicker-dialogs-test.txt
new file mode 100644
index 000..f856a0f
--- /dev/null
+++ b/fpicker/qa/unit/data/fpicker-dialogs-test.txt
@@ -0,0 +1,40 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in fpicker for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+fps/ui/foldernamedialog.ui
+fps/ui/explorerfiledialog.ui
+fps/ui/explorerfiledialog.ui
+fps/ui/remotefilesdialog.ui
diff --git a/fpicker/qa/unit/fpicker-dialogs-test.cxx 
b/fpicker/qa/unit/fpicker-dialogs-test.cxx
new file mode 100644
index 000..82269a1
--- /dev/null
+++ b/fpicker/qa/unit/fpicker-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MP

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - formula/CppunitTest_formula_dialogs_test.mk formula/Module_formula.mk formula/qa

2016-07-22 Thread Armin Le Grand

 formula/CppunitTest_formula_dialogs_test.mk   |   61 ++
 formula/Module_formula.mk |4 
 formula/qa/unit/data/formula-dialogs-test.txt |   40 ++
 formula/qa/unit/formula-dialogs-test.cxx  |  150 ++
 4 files changed, 255 insertions(+)

New commits:
commit ac7d98b39d7e5419edb667d7cc06bc89dffbe6d5
Author: Armin Le Grand 
Date:   Fri Jul 22 16:20:34 2016 +0200

Added dialog test case for screenshot creation for formula

Change-Id: I2fb495dd8603b00127504240e4bec16726c2153f

diff --git a/formula/CppunitTest_formula_dialogs_test.mk 
b/formula/CppunitTest_formula_dialogs_test.mk
new file mode 100644
index 000..3dacdc0
--- /dev/null
+++ b/formula/CppunitTest_formula_dialogs_test.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,formula_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,formula_dialogs_test, \
+formula/qa/unit/formula-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,formula_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_libraries,formula_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,formula_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,formula_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,formula_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,formula_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,formula_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,formula_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,formula_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk
index 2b0513b..6a3833b 100644
--- a/formula/Module_formula.mk
+++ b/formula/Module_formula.mk
@@ -20,4 +20,8 @@ $(eval $(call gb_Module_add_l10n_targets,formula,\
 UIConfig_formula \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,formula,\
+CppunitTest_formula_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/formula/qa/unit/data/formula-dialogs-test.txt 
b/formula/qa/unit/data/formula-dialogs-test.txt
new file mode 100644
index 000..2ba4185
--- /dev/null
+++ b/formula/qa/unit/data/formula-dialogs-test.txt
@@ -0,0 +1,40 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in formula for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+formula/ui/functionpage.ui
+formula/ui/parameter.ui
+formula/ui/structpage.ui
+formula/ui/formuladialog.ui
diff --git a/formula/qa/unit/formula-dialogs-test.cxx 
b/formula/qa/unit/formula-dialogs-test.cxx
new file mode 100644
index 000..80d2d3f
--- /dev/null
+++ b/formula/qa/unit/formula-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a c

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - filter/CppunitTest_filter_dialogs_test.mk filter/Module_filter.mk filter/qa

2016-07-22 Thread Armin Le Grand

 filter/CppunitTest_filter_dialogs_test.mk   |   66 
 filter/Module_filter.mk |4 
 filter/qa/unit/data/filter-dialogs-test.txt |   50 +
 filter/qa/unit/filter-dialogs-test.cxx  |  150 
 4 files changed, 270 insertions(+)

New commits:
commit 8e22728c5cf703c1716ee2a41b337730b5bca6c0
Author: Armin Le Grand 
Date:   Fri Jul 22 16:09:34 2016 +0200

Added dialog test case for screenshot creation for filter

All *.ui files create a screenshot, but not all look useful

Change-Id: Idd684f1fee55eebb58b4b56a2681cd4058be2880

diff --git a/filter/CppunitTest_filter_dialogs_test.mk 
b/filter/CppunitTest_filter_dialogs_test.mk
new file mode 100644
index 000..018bc63
--- /dev/null
+++ b/filter/CppunitTest_filter_dialogs_test.mk
@@ -0,0 +1,66 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_dialogs_test, \
+filter/qa/unit/filter-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,filter_dialogs_test,\
+-I$(SRCDIR)/filter/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,filter_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,filter_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,filter_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,filter_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,filter_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 594fa11..204d208 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -84,4 +84,8 @@ endif
JunitTest_filter_complex \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,filter,\
+CppunitTest_filter_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/filter/qa/unit/data/filter-dialogs-test.txt 
b/filter/qa/unit/data/filter-dialogs-test.txt
new file mode 100644
index 000..1b6fcbc
--- /dev/null
+++ b/filter/qa/unit/data/filter-dialogs-test.txt
@@ -0,0 +1,50 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in filter for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+
+filter/ui/pdfoptionsdialog.ui
+filter/ui/xsltfilterdialog.ui
+filter/ui/pdfgeneralpage.ui
+filter/ui/pdfviewpage.ui
+filter/ui/pdfuserinterfacepage.ui
+filter/ui/pdfsecuritypage.ui
+filter/ui/pdflinkspage.ui
+filter/ui/pdfsignpage.ui
+filter/ui/xmlfiltertabpagegeneral.ui
+filter/ui/xmlfiltertabpagetransformation.ui
+filter/ui/impswfdialog.ui
+filter/ui/testxmlfilter.ui
+filter/ui/warnpdfdialog.ui
+filter/ui/xmlfiltersettings.ui
diff --git a/filte

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - desktop/CppunitTest_desktop_dialogs_test.mk desktop/Module_desktop.mk desktop/qa

2016-07-22 Thread Armin Le Grand

 desktop/CppunitTest_desktop_dialogs_test.mk   |   67 +++
 desktop/Module_desktop.mk |4 
 desktop/qa/unit/data/desktop-dialogs-test.txt |   45 +++
 desktop/qa/unit/desktop-dialogs-test.cxx  |  150 ++
 4 files changed, 266 insertions(+)

New commits:
commit f8c4e7fc20c7041daf4980409946517bffaffe7f
Author: Armin Le Grand 
Date:   Fri Jul 22 16:00:57 2016 +0200

Added dialog test case for screenshot creation for desktop

Only one dialog had to be disabled, some others look not
very useful

Change-Id: I2f8e786c0bb94259c5d03e7a72cc1d6ed9bbc066

diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk 
b/desktop/CppunitTest_desktop_dialogs_test.mk
new file mode 100644
index 000..bffa591
--- /dev/null
+++ b/desktop/CppunitTest_desktop_dialogs_test.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,desktop_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,desktop_dialogs_test, \
+desktop/qa/unit/desktop-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+-I$(SRCDIR)/desktop/source/inc \
+-I$(SRCDIR)/desktop/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,desktop_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,desktop_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,desktop_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,desktop_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,desktop_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,desktop_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,desktop_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,desktop_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index e52c1b5..3d558ba 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -140,4 +140,8 @@ $(eval $(call gb_Module_add_check_targets,desktop, \
 ))
 endif
 
+$(eval $(call gb_Module_add_slowcheck_targets,desktop,\
+CppunitTest_desktop_dialogs_test \
+))
+
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/qa/unit/data/desktop-dialogs-test.txt 
b/desktop/qa/unit/data/desktop-dialogs-test.txt
new file mode 100644
index 000..b07bff1
--- /dev/null
+++ b/desktop/qa/unit/data/desktop-dialogs-test.txt
@@ -0,0 +1,45 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in desktop for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+# desktop/ui/extensionmanager.ui
+
+desktop/ui/cmdlinehelp.ui
+desktop/ui/dependenciesdialog.ui
+desktop/ui/updaterequireddialog.ui
+desktop/ui/showlicensedialog.ui
+desktop/ui/updatedialog.ui
+desktop/ui/updateinstalldialog.ui
+desktop/ui/licensedialog.ui
+desktop/ui/installforalldialog.ui
diff --git a/desktop/qa/unit/desktop-dialogs-tes

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - basctl/CppunitTest_basctl_dialogs_test.mk basctl/Module_basctl.mk basctl/qa

2016-07-22 Thread Armin Le Grand

 basctl/CppunitTest_basctl_dialogs_test.mk   |   67 
 basctl/Module_basctl.mk |4 
 basctl/qa/unit/basctl-dialogs-test.cxx  |  150 
 basctl/qa/unit/data/basctl-dialogs-test.txt |   47 
 4 files changed, 268 insertions(+)

New commits:
commit 6429a97467da22948310c56ea5115a269a4cbfaa
Author: Armin Le Grand 
Date:   Fri Jul 22 15:47:02 2016 +0200

Added dialog test case for screenshot creation for basctl

All *.ui files create a screenshot, but not all look useful

Change-Id: I79be2811df628286e5af058a5a8e0232ddf6a2f7

diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk 
b/basctl/CppunitTest_basctl_dialogs_test.mk
new file mode 100644
index 000..03a0287
--- /dev/null
+++ b/basctl/CppunitTest_basctl_dialogs_test.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,basctl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,basctl_dialogs_test, \
+basctl/qa/unit/basctl-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,basctl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,basctl_dialogs_test,\
+-I$(SRCDIR)/basctl/source/inc \
+-I$(SRCDIR)/basctl/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,basctl_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,basctl_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,basctl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,basctl_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,basctl_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,basctl_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,basctl_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index ae4ff50..5cedca0 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -35,4 +35,8 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\
UIConfig_basicide \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,basctl,\
+CppunitTest_basctl_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx 
b/basctl/qa/unit/basctl-dialogs-test.cxx
new file mode 100644
index 000..629cf4c
--- /dev/null
+++ b/basctl/qa/unit/basctl-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+/// Test opening a dialog in basctl
+class BasctlDialogsTest : public ScreenshotTest
+{
+private:
+/// helper method to populate KnownDialogs, called in setUp(). Needs to be
+/// written and has to add entries to KnownDialogs
+virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
+
+/// dialog creation for known dialogs by ID. Has to be implemented for
+/// each registered known dialog
+virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) override;
+
+public:
+BasctlDialogsTest();
+virtual ~BasctlDialogsTest();
+
+virtual void setUp() override;
+
+// try to open a dialog
+void openAnyDialog();
+
+CPPUNIT_TEST_SUITE(BasctlDialogsTest);
+CPPUNIT_TEST(openAnyDialog);
+CPPUNIT_TEST_SUITE_END();
+};
+
+BasctlDialogsTest::BasctlDialogsTest()
+{
+}
+
+BasctlDialogsTest::~BasctlDialogsTest()
+{
+}
+
+void BasctlDialogsTest::setUp()
+{
+ScreenshotTest::setUp();
+}
+
+void BasctlDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
+{
+// fill map of known dilogs
+}
+
+VclAbstractDialog* BasctlDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+{
+return nullptr;
+}
+
+void BasctlDialogsTest::openAnyDialog()
+{
+///

[Libreoffice-commits] core.git: offapi/com

2016-07-22 Thread Juergen Funk

 offapi/com/sun/star/frame/XDispatch.idl |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 4da8378302093dd3e3dc3e201ac5e188c55f8009
Author: Juergen Funk 
Date:   Thu Jul 21 11:00:22 2016 +0200

offapi: document SynchronMode argument

Change-Id: Ie47a7f4afbfab40f172705323520d75ef4927b0a
Reviewed-on: https://gerrit.libreoffice.org/27364
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/offapi/com/sun/star/frame/XDispatch.idl 
b/offapi/com/sun/star/frame/XDispatch.idl
index 6b4ca0a..c717565 100644
--- a/offapi/com/sun/star/frame/XDispatch.idl
+++ b/offapi/com/sun/star/frame/XDispatch.idl
@@ -53,7 +53,7 @@ module com {  module sun {  module star {  module frame {
  */
 published interface XDispatch: com::sun::star::uno::XInterface
 {
-/** dispatches (executes) an URL asynchronously.
+/** dispatches (executes) an URL
 
 
 It is only allowed to dispatch URLs for which this XDispatch
@@ -64,9 +64,22 @@ published interface XDispatch: 
com::sun::star::uno::XInterface
 fully parsed URL describing the feature which should be dispatched 
(=executed)
 
 @param Arguments
-optional arguments for this request.
+optional arguments for this request
+(see com::sun::star::document::MediaDescriptor)
 They depend on the real implementation of the dispatch object.
 
+Controlling synchronous or asynchronous mode happens via
+readonly boolean Flag SynchronMode
+
+
+By default, and absent any arguments, "SychronMode" is
+considered `FALSE` and the execution is performed
+asynchronously (i.e. dispatch() returns immediately, and
+the action is performed in the background).  But when set
+to `TRUE`, dispatch() processes the request synchronously
+- this call will block until it has finished.
+
+
 some code for a click-handler (Java)
 @code{.java}
 void myOnClick(String sURL,String sTargetFrame,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - dbaccess/CppunitTest_dbaccess_dialogs_test.mk dbaccess/Module_dbaccess.mk dbaccess/qa

2016-07-22 Thread Armin Le Grand

 dbaccess/CppunitTest_dbaccess_dialogs_test.mk   |   67 ++
 dbaccess/Module_dbaccess.mk |4 
 dbaccess/qa/unit/data/dbaccess-dialogs-test.txt |  102 
 dbaccess/qa/unit/dbaccess-dialogs-test.cxx  |  150 
 4 files changed, 323 insertions(+)

New commits:
commit a33ce38236d0d464b918ff58a4e338cf4ce69a5f
Author: Armin Le Grand 
Date:   Fri Jul 22 15:27:46 2016 +0200

Added dialog test case for screenshot creation for dbaccess

One dialog makes the execution hang, seems to wait for some interaction

Change-Id: I68ef4f9b2a1575a6c70238f82eb27ee87aaae336

diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk 
b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
new file mode 100644
index 000..6a3ee19
--- /dev/null
+++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_dialogs_test, \
+dbaccess/qa/unit/dbaccess-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,dbaccess_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,dbaccess_dialogs_test,\
+-I$(SRCDIR)/dbaccess/source/inc \
+-I$(SRCDIR)/dbaccess/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,dbaccess_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,dbaccess_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,dbaccess_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,dbaccess_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,dbaccess_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,dbaccess_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 200dea0..af8becd 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -78,6 +78,10 @@ $(eval $(call 
gb_Module_add_subsequentcheck_targets,dbaccess,\
 endif
 endif
 
+$(eval $(call gb_Module_add_slowcheck_targets,dbaccess,\
+CppunitTest_dbaccess_dialogs_test \
+))
+
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/qa/unit/data/dbaccess-dialogs-test.txt 
b/dbaccess/qa/unit/data/dbaccess-dialogs-test.txt
new file mode 100644
index 000..5063c98
--- /dev/null
+++ b/dbaccess/qa/unit/data/dbaccess-dialogs-test.txt
@@ -0,0 +1,102 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
+#
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
+
+#
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
+#
+
+# No known dialogs in dbaccess for now
+
+#
+# Dialogs without a hard-coded representation. These will
+# be visualized using a fallback based on VclBuilder
+#
+
+# currently deactivated, leads to problems and the test to not work
+# This is typically a hint that these should be hard-coded in the
+# test case since they need some document and model data to work
+# dbaccess/ui/rtfcopytabledialog.ui -> hangs execution, seems to wait for 
interaction somehow (?)
+
+dbaccess/ui/advancedsettingsdialog.ui
+dbaccess/ui/admindialog.ui
+dbaccess/ui/fielddialog.ui
+dbaccess/ui/useradmindialog.ui
+dbaccess/ui/mysqlnativesettings.u

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - chart2/CppunitTest_chart2_dialogs_test.mk chart2/Module_chart2.mk chart2/qa cui/qa

2016-07-22 Thread Armin Le Grand

 chart2/CppunitTest_chart2_dialogs_test.mk   |   69 
 chart2/Module_chart2.mk |4 
 chart2/qa/unit/chart2-dialogs-test.cxx  |  150 
 chart2/qa/unit/data/chart2-dialogs-test.txt |   69 
 cui/qa/unit/cui-dialogs-test.cxx|2 
 5 files changed, 293 insertions(+), 1 deletion(-)

New commits:
commit 2ec11c900d1cd92b4c40492d4afcf728dde7e124
Author: Armin Le Grand 
Date:   Fri Jul 22 15:08:31 2016 +0200

Added dialog test case for screenshot creation for chart2

All *.ui files create a screenshot, but not all look useful

Change-Id: I90d977ae84a65e9576ba9cc9b178407997e4ba79

diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk 
b/chart2/CppunitTest_chart2_dialogs_test.mk
new file mode 100644
index 000..a58559c
--- /dev/null
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,chart2_dialogs_test, \
+chart2/qa/unit/chart2-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,chart2_dialogs_test,\
+-I$(SRCDIR)/chart2/source/inc \
+-I$(SRCDIR)/chart2/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,chart2_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,chart2_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,chart2_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,chart2_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,chart2_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,chart2_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 3b32e1c..38937d1 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -46,4 +46,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
 JunitTest_chart2_unoapi \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,chart2,\
+CppunitTest_chart2_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/qa/unit/chart2-dialogs-test.cxx 
b/chart2/qa/unit/chart2-dialogs-test.cxx
new file mode 100644
index 000..9a9921f
--- /dev/null
+++ b/chart2/qa/unit/chart2-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+/// Test opening a dialog in chart2
+class Chart2DialogsTest : public ScreenshotTest
+{
+private:
+/// helper method to populate KnownDialogs, called in setUp(). Needs to be
+/// written and has to add entries to KnownDialogs
+virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
+
+/// dialog creation for known dialogs by ID. Has to be implemented for
+/// each registered known dialog
+virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) override;
+
+public:
+Chart2DialogsTest();
+virtual ~Chart2DialogsTest();
+
+virtual void setUp() override;
+
+// try to open a dialog
+void openAnyDialog();
+
+CPPUNIT_TEST_SUITE(Chart2DialogsTest);
+CPPUNIT_TEST(openAnyDialog);
+CPPUNIT_TEST_SUITE_END();
+};
+
+Chart2DialogsTest::Chart2DialogsTest()
+{
+}
+
+Chart2DialogsTest::~Chart2DialogsTest()
+{
+}
+
+void Chart2DialogsTest::setUp()
+{
+ScreenshotTest::setUp();
+}
+
+void Chart2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
+{
+// fill map of known dilogs
+}
+
+VclAbstractDialog* Chart2DialogsTest::createD

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 6 commits - basic/source cui/source sc/source svx/source vcl/source vcl/unx

2016-07-22 Thread Caolán McNamara

 basic/source/sbx/sbxscan.cxx |7 +++
 cui/source/options/optpath.cxx   |1 -
 sc/source/core/tool/interpr4.cxx |2 +-
 svx/source/fmcomp/gridcell.cxx   |   25 -
 vcl/source/control/field2.cxx|2 +-
 vcl/unx/gtk/a11y/atklistener.cxx |   16 +++-
 6 files changed, 40 insertions(+), 13 deletions(-)

New commits:
commit e81a237a6309c4ca147175770c6c4089b03d53e1
Author: CaolÃ¡n McNamara 
Date:   Wed Jul 20 13:04:54 2016 +0100

Resolves: tdf#100845 exception during vcl painting -> std::terminate

GetText throws under the circumstances described in the bug where
the record is missing

Change-Id: I03b0ce9a19d93a7eb8842831b433b80a20628541
(cherry picked from commit d8e225304b7c8465f5e7f038ec02270445e1b600)
Reviewed-on: https://gerrit.libreoffice.org/27341
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 90a26f7501b3829eba28e61f5dbae6ce6927b1f1)

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 1daaf35..b939a19 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3549,17 +3549,24 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
 nStyle |= DrawTextFlags::Left;
 }
 
-Color* pColor = nullptr;
-OUString aText = GetText(_rxField, xFormatter, &pColor);
-if (pColor != nullptr)
+try
 {
-Color aOldTextColor( rDev.GetTextColor() );
-rDev.SetTextColor( *pColor );
-rDev.DrawText(rRect, aText, nStyle);
-rDev.SetTextColor( aOldTextColor );
+Color* pColor = nullptr;
+OUString aText = GetText(_rxField, xFormatter, &pColor);
+if (pColor != nullptr)
+{
+Color aOldTextColor( rDev.GetTextColor() );
+rDev.SetTextColor( *pColor );
+rDev.DrawText(rRect, aText, nStyle);
+rDev.SetTextColor( aOldTextColor );
+}
+else
+rDev.DrawText(rRect, aText, nStyle);
+}
+catch (const Exception& e)
+{
+SAL_WARN("svx.form", "PaintFieldToCell: caught an exception: " << 
e.Message);
 }
-else
-rDev.DrawText(rRect, aText, nStyle);
 }
 
 FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
commit 16bf1b6da85a59383a7d88fc062cac1d93f6f06e
Author: CaolÃ¡n McNamara 
Date:   Thu Jul 21 11:28:57 2016 +0100

Resolves: tdf#101011 atk needs a value for accessible-table-column-header

This presumably became a problem after...

commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba
Author: Steve Yin 
Date:   Fri Nov 29 13:03:27 2013 +

Integrate branch of IAccessible2

added a TABLE_COLUMN_HEADER_CHANGED usage which triggered it.

Change-Id: If54b7a39a170566cf7def3548ba385fa5d99bb1c
(cherry picked from commit 9b47a8b21f87fa77d2d61ac4a2c2bbc7c0d67a19)
Reviewed-on: https://gerrit.libreoffice.org/27369
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit a768e5b7ff3a4788bbe6d23e427e34e9e81442c1)

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index f9c25fd..b18f927 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -520,8 +520,22 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 }
 
 case accessibility::AccessibleEventId::TABLE_COLUMN_HEADER_CHANGED:
-g_signal_emit_by_name( G_OBJECT( atk_obj ), 
"property_change::accessible-table-column-header");
+{
+accessibility::AccessibleTableModelChange aChange;
+aEvent.NewValue >>= aChange;
+
+AtkPropertyValues values;
+memset(&values,  0, sizeof(AtkPropertyValues));
+g_value_init (&values.new_value, G_TYPE_INT);
+values.property_name = "accessible-table-column-header";
+
+for (sal_Int32 nChangedColumn = aChange.FirstColumn; 
nChangedColumn <= aChange.LastColumn; ++nChangedColumn)
+{
+g_value_set_int (&values.new_value, nChangedColumn);
+g_signal_emit_by_name(G_OBJECT(atk_obj), 
"property_change::accessible-table-column-header", &values, nullptr);
+}
 break;
+}
 
 case accessibility::AccessibleEventId::TABLE_CAPTION_CHANGED:
 g_signal_emit_by_name( G_OBJECT( atk_obj ), 
"property_change::accessible-table-caption");
commit 55d0469c8d1a576e9149ad7ddffda5a023b171c3
Author: CaolÃ¡n McNamara 
Date:   Thu Jul 21 21:44:06 2016 +0100

Resolves: tdf#101054 crash on options->path with non-native file picker

regression from...

commit 3bbc0574d78d129359638b74612de2f93419eeb0
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 5 10:16:51 2016 +0100

Resolves: rhbz#1352835 path options doesn't promptly destroy folder 
picker

only clear the xFolderPicker immediately in the

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - cui/CppunitTest_cui_dialogs_test.mk cui/Module_cui.mk cui/qa svx/qa

2016-07-22 Thread Armin Le Grand

 cui/CppunitTest_cui_dialogs_test.mk   |   68 ++
 cui/Module_cui.mk |4 
 cui/qa/unit/cui-dialogs-test.cxx  |  150 ++
 cui/qa/unit/data/cui-dialogs-test.txt |  226 ++
 svx/qa/unit/data/svx-dialogs-test.txt |   86 ++--
 svx/qa/unit/svx-dialogs-test.cxx  |2 
 6 files changed, 492 insertions(+), 44 deletions(-)

New commits:
commit 2bbdbc042c83ad52f4ed08d7f077d1388fcbaa2a
Author: Armin Le Grand 
Date:   Fri Jul 22 14:51:43 2016 +0200

Added dialog test case for screenshot creation for cui

Only one dialog had to be disabled, some others look not
very useful

Change-Id: Icbf46365e1824ea320ce721b8c783883336e9278

diff --git a/cui/CppunitTest_cui_dialogs_test.mk 
b/cui/CppunitTest_cui_dialogs_test.mk
new file mode 100644
index 000..fa5d4e0
--- /dev/null
+++ b/cui/CppunitTest_cui_dialogs_test.mk
@@ -0,0 +1,68 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,cui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cui_dialogs_test, \
+cui/qa/unit/cui-dialogs-test \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_set_include,cui_dialogs_test,\
+-I$(SRCDIR)/cui/source/inc \
+-I$(SRCDIR)/cui/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,cui_dialogs_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+i18nlangtag \
+i18nutil \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sfx \
+sot \
+svl \
+svt \
+cui \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,cui_dialogs_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,cui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_ure,cui_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,cui_dialogs_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test,services))
+
+# $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 2a2fca4..9bd48b8 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -18,4 +18,8 @@ $(eval $(call gb_Module_add_l10n_targets,cui,\
UIConfig_cui \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,cui,\
+CppunitTest_cui_dialogs_test \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/cui/qa/unit/cui-dialogs-test.cxx b/cui/qa/unit/cui-dialogs-test.cxx
new file mode 100644
index 000..0d903e3
--- /dev/null
+++ b/cui/qa/unit/cui-dialogs-test.cxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+/// Test opening a dialog in cui
+class CuiDialogsTest : public ScreenshotTest
+{
+private:
+/// helper method to populate KnownDialogs, called in setUp(). Needs to be
+/// written and has to add entries to KnownDialogs
+virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
+
+/// dialog creation for known dialogs by ID. Has to be implemented for
+/// each registered known dialog
+virtual VclAbstractDialog* createDialogByID(sal_uInt32 nID) override;
+
+public:
+CuiDialogsTest();
+virtual ~CuiDialogsTest();
+
+virtual void setUp() override;
+
+// try to open a dialog
+void openAnyDialog();
+
+CPPUNIT_TEST_SUITE(CuiDialogsTest);
+CPPUNIT_TEST(openAnyDialog);
+CPPUNIT_TEST_SUITE_END();
+};
+
+CuiDialogsTest::CuiDialogsTest()
+{
+}
+
+CuiDialogsTest::~CuiDialogsTest()
+{
+}
+
+void CuiDialogsTest::setUp()
+{
+ScreenshotTest::setUp();
+}
+
+void CuiDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
+{
+// fill map of known dilogs
+}
+
+VclAbstractDialog* CuiDialogsTest::createDialogByID(sal_uInt32 /*nID*/)
+{
+return nullptr;
+}
+
+void CuiDialogsTest::openAnyDialog()
+{
+/// example how to process a

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/qa sd/qa svx/CppunitTest_svx_dialogs_test.mk svx/Module_svx.mk svx/qa sw/qa

2016-07-22 Thread Armin Le Grand

 sc/qa/unit/screenshots/data/screenshots.txt |  240 +
 sd/qa/unit/data/dialogs-test.txt|   24 +
 svx/CppunitTest_svx_dialogs_test.mk |   69 +
 svx/Module_svx.mk   |4 
 svx/qa/unit/data/svx-dialogs-test.txt   |   80 +
 svx/qa/unit/svx-dialogs-test.cxx|  150 +++
 sw/qa/unit/data/sw-dialogs-test.txt |  376 ++--
 sw/qa/unit/sw-dialogs-test.cxx  |   45 ---
 8 files changed, 634 insertions(+), 354 deletions(-)

New commits:
commit d7230bc2b3c87c78db42cc8c9cfbbacdc9fdd2ac
Author: Armin Le Grand 
Date:   Fri Jul 22 14:32:40 2016 +0200

Added dialog test case for screenshot creation for svx

All *.ui files create a screenshot, but not all look useful

Change-Id: I5aeec438b90488ea19cdb1251fee7dcf23e1c2cb

diff --git a/sc/qa/unit/screenshots/data/screenshots.txt 
b/sc/qa/unit/screenshots/data/screenshots.txt
index f2baf82..933fd23 100644
--- a/sc/qa/unit/screenshots/data/screenshots.txt
+++ b/sc/qa/unit/screenshots/data/screenshots.txt
@@ -7,17 +7,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-# This file contains all dialogs that the test dialogs-test
-# will test. It will read one-by-one, try to open it and create a
-# screenshot that will be saved in workdir/screenshots using the
-# pattern of the ui-file name.
+# This file contains all dialogs that the unit tests in the module
+# will work on if it is in script mode. It will read one-by-one,
+# try to open it and create a screenshot that will be saved in
+# workdir/screenshots using the pattern of the ui-file name.
 #
-# You may use empty lines, or lines starrting with '#' which are treated
-# as comments. All other lines have to end with  and will be interpreted
-# as ui-files.
+# Syntax:
+# - emty lines are allowed
+# - lines starting with '#' are treated as comment
+# - all other lines should contain a *.ui filename in the same
+#   notation as in the dialog constructors (see code)
 
 #
-# The known dialogs which have a hard-coded representation
+# The 'known' dialogs which have a hard-coded representation
+# in registerKnownDialogsByID/createDialogByID
 #
 
 modules/scalc/ui/insertsheet.ui
@@ -41,116 +44,119 @@ modules/scalc/ui/formatcellsdialog.ui
 # be visualized using a fallback based on VclBuilder
 #
 
-# deactivated, leads to problems and the test to not work
-# modules/scalc/ui/headerfootercontent.ui
-# modules/scalc/ui/pivottablelayoutdialog.ui
-
-modules/scalc/ui/autoformattable.ui
-modules/scalc/ui/sortwarning.ui
-modules/scalc/ui/condformatmanager.ui
-modules/scalc/ui/pagetemplatedialog.ui
-modules/scalc/ui/paratemplatedialog.ui
-modules/scalc/ui/databaroptions.ui
-modules/scalc/ui/advancedfilterdialog.ui
-modules/scalc/ui/datafielddialog.ui
-modules/scalc/ui/pivotfielddialog.ui
-modules/scalc/ui/datafieldoptionsdialog.ui
-modules/scalc/ui/showdetaildialog.ui
-modules/scalc/ui/consolidatedialog.ui
-modules/scalc/ui/dapiservicedialog.ui
-modules/scalc/ui/imoptdialog.ui
-modules/scalc/ui/pivotfilterdialog.ui
-modules/scalc/ui/groupbynumber.ui
-modules/scalc/ui/groupbydate.ui
-modules/scalc/ui/sortdialog.ui
-modules/scalc/ui/standardfilterdialog.ui
-modules/scalc/ui/validationdialog.ui
-modules/scalc/ui/subtotaldialog.ui
-modules/scalc/ui/scenariodialog.ui
-modules/scalc/ui/searchresults.ui
-modules/scalc/ui/definename.ui
-modules/scalc/ui/insertname.ui
-modules/scalc/ui/tpviewpage.ui
-modules/scalc/ui/scgeneralpage.ui
-modules/scalc/ui/optformula.ui
-modules/scalc/ui/formulacalculationoptions.ui
-modules/scalc/ui/optdlg.ui
-modules/scalc/ui/optcompatibilitypage.ui
-modules/scalc/ui/optchangespage.ui
-modules/scalc/ui/optdefaultpage.ui
-modules/scalc/ui/optsortlists.ui
-modules/scalc/ui/optcalculatepage.ui
-modules/scalc/ui/movingaveragedialog.ui
-modules/scalc/ui/analysisofvariancedialog.ui
-modules/scalc/ui/covariancedialog.ui
-modules/scalc/ui/correlationdialog.ui
-modules/scalc/ui/ttestdialog.ui
-modules/scalc/ui/ztestdialog.ui
-modules/scalc/ui/chisquaretestdialog.ui
-modules/scalc/ui/regressiondialog.ui
-modules/scalc/ui/exponentialsmoothingdialog.ui
-modules/scalc/ui/descriptivestatisticsdialog.ui
-modules/scalc/ui/samplingdialog.ui
-modules/scalc/ui/goalseekdlg.ui
-modules/scalc/ui/selectrange.ui
-modules/scalc/ui/protectsheetdlg.ui
-modules/scalc/ui/namerangesdialog.ui
-modules/scalc/ui/sharedocumentdlg.ui
-modules/scalc/ui/solverdlg.ui
-modules/scalc/ui/solveroptionsdialog.ui
-modules/scalc/ui/externaldata.ui
-modules/scalc/ui/datastreams.ui
-modules/scalc/ui/statisticsinfopage.ui
-modules/scalc/ui/cellprotectionpage.ui
-modules/scalc/ui/printareasdialog.ui
-modules/scalc/ui/headerfooterdialog.ui
-modules/scalc/ui/conditionalformatdialog.ui
-modules/scalc/ui/definedatabaserangedialog.ui
-modules/scalc/ui/sortkey.ui
-modules/scalc/ui/sortcriteriapage.ui
-modules/scalc/ui/sortoptionspage.ui
-modules/scalc/ui/subtotalgrppage.ui
-modules/scalc/ui/subtotaloptionspag

[Libreoffice-commits] core.git: configure.ac

2016-07-22 Thread Michael Stahl

 configure.ac |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a911b96bb10b41a7f97ad40c423d84388d6b7d96
Author: Michael Stahl 
Date:   Fri Jul 22 14:11:18 2016 +0200

configure: remove mysterious NO_JAVA_HOME value

This has been there since CVS import, but no reason is given why an
empty JAVA_HOME value wouldn't work as well.

This caused 086c13584dc672c4a07c6384ab7f08fa67ce0f95 to always invoke
autogen.sh if one used --without-java.

Change-Id: Ie72537ddd0247700fdcdb4126387935754c1bed5

diff --git a/configure.ac b/configure.ac
index cd7c9c4..8d0e785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7017,7 +7017,8 @@ you must use the "--with-jdk-home" configure option 
explicitly])
 fi
 else
 dnl Java disabled
-JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
+JAVA_HOME=
+export JAVA_HOME
 fi
 AC_SUBST([HAVE_JAVA6])
 AC_SUBST([HAVE_JAVA9])
@@ -12633,7 +12634,7 @@ fi
 ILIB1=
 if test "$build_os" = "cygwin"; then
 ILIB="."
-if test -n "$JAVA_HOME" -a "$JAVA_HOME" != "NO_JAVA_HOME"; then
+if test -n "$JAVA_HOME"; then
 ILIB="$ILIB;$JAVA_HOME/lib"
 fi
 ILIB1=-link
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

 i18npool/qa/cppunit/test_breakiterator.cxx  |   16 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 5e46e382694587e88ecdebc7fa57e90fbaca7a76
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 12:59:13 2016 +0100

crashtesting: fix tdf92993-1.docx failure

Change-Id: I76f09a09fd6c3b114ba74737d4a1ba5dad0fd28f

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 29fc489..1c8b1f9 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -142,6 +142,22 @@ void TestBreakIterator::testLineBreaking()
 CPPUNIT_ASSERT_MESSAGE("Expected a break at the start of the line, 
not at ]", aResult.breakIndex == 0);
 }
 }
+
+//this is an example sequence from tdf92993-1.docx caught by the load 
crashtesting
+{
+const sal_Unicode WEIRD1[] = { 0xd83c, 0xdf56, 0xd83c, 0xdf57, 0xd83c, 
0xdf46,
+   0xd83c, 0xdf64, 0x2668, 0xfe0f, 0xd83c, 
0xdfc6};
+
+OUString aTest(WEIRD1, SAL_N_ELEMENTS(WEIRD1));
+
+aLocale.Language = "en";
+aLocale.Country = "US";
+
+{
+//This must not assert/crash
+(void)m_xBreak->getLineBreak(aTest, 0, aLocale, 0, aHyphOptions, 
aUserOptions);
+}
+}
 }
 
 //See https://bugs.libreoffice.org/show_bug.cgi?id=49629
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 8707dd45..117b0ba 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -423,7 +423,7 @@ LineBreakResults SAL_CALL 
BreakIterator_Unicode::getLineBreak(
 GlueSpace=false;
 if (lbr.breakType == BreakType::WORDBOUNDARY) {
 nStartPos = lbr.breakIndex;
-if (Text[nStartPos--] == WJ)
+if (nStartPos >= 0 && Text[nStartPos--] == WJ)
 GlueSpace=true;
 while (nStartPos >= 0 &&
 (u_isWhitespace(Text.iterateCodePoints(&nStartPos, 0)) || 
Text[nStartPos] == WJ)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/fixes27'

2016-07-22 Thread Eike Rathke

New branch 'feature/fixes27' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

 svx/source/fmcomp/gridcell.cxx |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 90a26f7501b3829eba28e61f5dbae6ce6927b1f1
Author: CaolÃ¡n McNamara 
Date:   Wed Jul 20 13:04:54 2016 +0100

Resolves: tdf#100845 exception during vcl painting -> std::terminate

GetText throws under the circumstances described in the bug where
the record is missing

Change-Id: I03b0ce9a19d93a7eb8842831b433b80a20628541
(cherry picked from commit d8e225304b7c8465f5e7f038ec02270445e1b600)
Reviewed-on: https://gerrit.libreoffice.org/27341
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index ac2b744..be49a60 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3552,17 +3552,24 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
 nStyle |= DrawTextFlags::Left;
 }
 
-Color* pColor = nullptr;
-OUString aText = GetText(_rxField, xFormatter, &pColor);
-if (pColor != nullptr)
+try
 {
-Color aOldTextColor( rDev.GetTextColor() );
-rDev.SetTextColor( *pColor );
-rDev.DrawText(rRect, aText, nStyle);
-rDev.SetTextColor( aOldTextColor );
+Color* pColor = nullptr;
+OUString aText = GetText(_rxField, xFormatter, &pColor);
+if (pColor != nullptr)
+{
+Color aOldTextColor( rDev.GetTextColor() );
+rDev.SetTextColor( *pColor );
+rDev.DrawText(rRect, aText, nStyle);
+rDev.SetTextColor( aOldTextColor );
+}
+else
+rDev.DrawText(rRect, aText, nStyle);
+}
+catch (const Exception& e)
+{
+SAL_WARN("svx.form", "PaintFieldToCell: caught an exception: " << 
e.Message);
 }
-else
-rDev.DrawText(rRect, aText, nStyle);
 }
 
 FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/unx

2016-07-22 Thread Caolán McNamara

 vcl/unx/gtk/a11y/atklistener.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit a768e5b7ff3a4788bbe6d23e427e34e9e81442c1
Author: CaolÃ¡n McNamara 
Date:   Thu Jul 21 11:28:57 2016 +0100

Resolves: tdf#101011 atk needs a value for accessible-table-column-header

This presumably became a problem after...

commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba
Author: Steve Yin 
Date:   Fri Nov 29 13:03:27 2013 +

Integrate branch of IAccessible2

added a TABLE_COLUMN_HEADER_CHANGED usage which triggered it.

Change-Id: If54b7a39a170566cf7def3548ba385fa5d99bb1c
(cherry picked from commit 9b47a8b21f87fa77d2d61ac4a2c2bbc7c0d67a19)
Reviewed-on: https://gerrit.libreoffice.org/27369
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index f9c25fd..b18f927 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -520,8 +520,22 @@ void AtkListener::notifyEvent( const 
accessibility::AccessibleEventObject& aEven
 }
 
 case accessibility::AccessibleEventId::TABLE_COLUMN_HEADER_CHANGED:
-g_signal_emit_by_name( G_OBJECT( atk_obj ), 
"property_change::accessible-table-column-header");
+{
+accessibility::AccessibleTableModelChange aChange;
+aEvent.NewValue >>= aChange;
+
+AtkPropertyValues values;
+memset(&values,  0, sizeof(AtkPropertyValues));
+g_value_init (&values.new_value, G_TYPE_INT);
+values.property_name = "accessible-table-column-header";
+
+for (sal_Int32 nChangedColumn = aChange.FirstColumn; 
nChangedColumn <= aChange.LastColumn; ++nChangedColumn)
+{
+g_value_set_int (&values.new_value, nChangedColumn);
+g_signal_emit_by_name(G_OBJECT(atk_obj), 
"property_change::accessible-table-column-header", &values, nullptr);
+}
 break;
+}
 
 case accessibility::AccessibleEventId::TABLE_CAPTION_CHANGED:
 g_signal_emit_by_name( G_OBJECT( atk_obj ), 
"property_change::accessible-table-caption");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - vcl/unx

2016-07-22 Thread Takeshi Abe

 vcl/unx/gtk/gtksalframe.cxx   |2 ++
 vcl/unx/gtk3/gtk3gtkframe.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit b39b835e1728a8871f017f1af3b3b642fdbff1d8
Author: Takeshi Abe 
Date:   Tue Jul 19 06:08:36 2016 +0900

Resolves: tdf#100903 Calc hangs when preediting Japanese with GTK plugin

... + Mozc.
This issue shares a common root with tdf#56937.

Change-Id: Ic5720c19f22f7e6b047e1251b34f90d04ce7eee7
Reviewed-on: https://gerrit.libreoffice.org/27305
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 1c81af2c1814e8bd12701f85e09cebf5fe206647)
Reviewed-on: https://gerrit.libreoffice.org/27330
(cherry picked from commit 3af2382e6155abbb3e9e6102878bad1fa3f79373)
Reviewed-on: https://gerrit.libreoffice.org/27357
Reviewed-by: Eike Rathke 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 0d8e153..070d98a 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3823,6 +3823,8 @@ uno::Reference
 if (xText.is())
 return xText;
 }
+if 
(xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS))
+return uno::Reference< accessibility::XAccessibleEditableText >();
 }
 
 for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index e8d12e3..21c5bf8 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3949,6 +3949,8 @@ uno::Reference
 if (xText.is())
 return xText;
 }
+if 
(xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS))
+return uno::Reference< accessibility::XAccessibleEditableText >();
 }
 
 for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/gcd.fods | 3056 +++
 sc/qa/unit/data/functions/fods/int.fods | 2552 
 sc/qa/unit/data/functions/fods/iso.ceiling.fods | 2732 +
 sc/qa/unit/data/functions/fods/lcm.fods | 3062 
 4 files changed, 11402 insertions(+)

New commits:
commit d8bcfcf1b6e909b27f55e252b66f6e46b19ff6ab
Author: ZdenÄk Crhonek 
Date:   Tue Jul 12 16:39:18 2016 +0200

add GCD, INT, ISO.CEILING, LCM test case

Change-Id: I35440d57c5e3ebecfed6dfeefb14c8fb57ae0ead
Reviewed-on: https://gerrit.libreoffice.org/27153
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/gcd.fods 
b/sc/qa/unit/data/functions/fods/gcd.fods
new file mode 100644
index 000..d598135
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/gcd.fods
@@ -0,0 +1,3056 @@
+
+
+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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
+ 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/54f2a4184d1296814e64cfeab1d06ae90d002357
+ 
+  
+   0
+   0
+   33166
+   19868
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   3
+   40
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   27
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ en
+ US
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+$
+   
+
+  
+  
+$(
+   
+   )
+  
+  
+$-
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/debian

2016-07-22 Thread Andras Timar

 loolwsd/debian/loolwsd.cron.d |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 66eddd34412b48985fbf1497b80d8d0fb5f4a623
Author: Andras Timar 
Date:   Fri Jul 22 14:09:53 2016 +0200

fix loolwsd cache cleanu cron job on Debian

(cherry picked from commit 0bd3e3e109fcd74ab0d4ce294569304eb6035ab8)

diff --git a/loolwsd/debian/loolwsd.cron.d b/loolwsd/debian/loolwsd.cron.d
index 6e8d16b..85a3afc 100644
--- a/loolwsd/debian/loolwsd.cron.d
+++ b/loolwsd/debian/loolwsd.cron.d
@@ -1 +1 @@
-0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} ;
+0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} \;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-07-22 Thread Andras Timar

 loolwsd/debian/loolwsd.cron.d |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bd3e3e109fcd74ab0d4ce294569304eb6035ab8
Author: Andras Timar 
Date:   Fri Jul 22 14:09:53 2016 +0200

fix loolwsd cache cleanu cron job on Debian

diff --git a/loolwsd/debian/loolwsd.cron.d b/loolwsd/debian/loolwsd.cron.d
index 6e8d16b..85a3afc 100644
--- a/loolwsd/debian/loolwsd.cron.d
+++ b/loolwsd/debian/loolwsd.cron.d
@@ -1 +1 @@
-0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} ;
+0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} \;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Laurent Balland-Poirier

 sc/source/ui/view/viewfun2.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 0baeea95f38a5cdb19936290c69d33541274ad41
Author: Laurent Balland-Poirier 
Date:   Wed Jul 20 20:27:23 2016 +0200

tdf#90943 Don't ask to move cells if they are empty

During merge of cells, test of empty cells was wrong.
Test of first column should not be done if there is only 1 row

Change-Id: If8011f3e6d6e9006d242a8c2ef0fcb2ce12180ad
Reviewed-on: https://gerrit.libreoffice.org/27354
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 889c7f2..1970e04 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1063,9 +1063,15 @@ bool ScViewFunc::MergeCells( bool bApi, bool& 
rDoContents, bool bCenter )
 SCTAB i = *itr;
 aMergeOption.maTabs.insert(i);
 
-if (!rDoc.IsBlockEmpty(i, nStartCol, nStartRow+1, nStartCol, nEndRow) 
||
-!rDoc.IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, nEndRow))
-bAskDialog = true;
+if ( nEndRow == nStartRow )
+{
+if (!rDoc.IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, 
nEndRow))
+bAskDialog = true;
+}
+else
+if (!rDoc.IsBlockEmpty(i, nStartCol, nStartRow+1, nStartCol, 
nEndRow) ||
+!rDoc.IsBlockEmpty(i, nStartCol+1, nStartRow, nEndCol, 
nEndRow))
+bAskDialog = true;
 }
 
 bool bOk = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Large scale changes on Master

2016-07-22 Thread Christian Lohmaier

Hi Jan, *,

On Fri, Jul 22, 2016 at 1:22 PM, jan iversen
 wrote:
>
> The ESC discussed when to make large scale changes on master and whether or
> not the current policy should be changed.
> […]
> Please have a look at:
> https://wiki.documentfoundation.org/Development/LargeScaleChanges
>
> And let me know your opinion.

I think it kind of misses the point. It should start with:

Changes that make backporting of other fixes to release branch harder
might be only be merged  *after creation of the x.y.2 release* and
*before branchoff for the next x.y+1 release*.
Why?
the time between the .0 release and the second bugfix release is the
time when most backporting will occur, so this timeframe should be
avoided.

Automatically created changes (changes that  are done by runnning a
prepared script), should be run right before branch-off for the next
x.y+1 cycle. That way it won't interfere with managing the older
branches.

Unsure whether your change falls into that cagegory? Read below
(then follows description of whether a cosmetic change is one that
hinders backporting, etc)

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

Large scale changes on Master

2016-07-22 Thread jan iversen

Hi

The ESC discussed when to make large scale changes on master and whether or not 
the current policy should be changed.

I was tasked with making a wiki page, describing a policy, since I frequently 
need to explain why some patches linger for a long time.

I have tried to strike a balance between not making backport difficult and 
responding timely to patches.

Please have a look at:
https://wiki.documentfoundation.org/Development/LargeScaleChanges

And let me know your opinion.

Please remark, the page currently reflect my opinion, and have not been 
discussed. My hope is to have a good discussion from now and to the next ESC 
meeting, where we then can make a decision.

Have a nice weekend.
rgds
jan I.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-07-22 Thread Caolán McNamara

 svx/uiconfig/ui/compressgraphicdialog.ui |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit c4feea24c28b38c81205accbb7ae24a61f0b94e0
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 12:02:24 2016 +0100

Related: tdf#100340 use same terms as export graphic dialog

and move the Lossless/Lossy hints into tooltips

Change-Id: Ia777dbef5124ea119925d521126262f7ddb709f6

diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui 
b/svx/uiconfig/ui/compressgraphicdialog.ui
index b6599ac..f7120cd 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -54,8 +54,8 @@
 False
 6
 Compress Image
-True
 False
+True
 dialog
 
   
@@ -147,10 +147,11 @@
 6
 
   
-JPEG 
(lossy compression)
+JPEG 
Compression
 True
 True
 False
+Lossy compression
 0
 True
 radio-lossless
@@ -162,10 +163,11 @@
 
 
   
-PNG 
(lossless compression)
+PNG 
Quality
 True
 True
 False
+Lossless compression
 0
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Yousuf Philips

 svx/uiconfig/ui/compressgraphicdialog.ui |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 0bd3daf959a6ac94e2538f6b9b7f7c6892596210
Author: Yousuf Philips 
Date:   Fri Jul 15 03:08:53 2016 +0400

tdf#100340 reduce the compress graphic dialog a little more

Change-Id: I183c399207f6676ff660a59358dee32ebff8e667
Reviewed-on: https://gerrit.libreoffice.org/27205
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui 
b/svx/uiconfig/ui/compressgraphicdialog.ui
index da94ccb..b6599ac 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -55,6 +55,7 @@
 6
 Compress Image
 True
+False
 dialog
 
   
@@ -146,7 +147,7 @@
 6
 
   
-JPEG 
Compression
+JPEG 
(lossy compression)
 True
 True
 False
@@ -161,7 +162,7 @@
 
 
   
-PNG 
Quality
+PNG 
(lossless compression)
 True
 True
 False
@@ -186,12 +187,11 @@
 6
 
   
-200
+150
 True
 True
 True
 quality-adjustment
-99
 0
 False
 right
@@ -236,11 +236,10 @@
 6
 
   
-200
+150
 True
 True
 compression-adjustment
-9
 0
 False
 right
@@ -281,7 +280,7 @@
   
 True
 False
-Compression 
Options
+Compression
 
   
 
@@ -521,7 +520,7 @@
 True
 False
 6
-12
+16
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

 drawinglayer/source/primitive2d/textlayoutdevice.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fedd856894f3c9ae5a6c4afb58c43922e3e7dbeb
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 11:11:15 2016 +0100

Resolves: tdf#101067 put SolarMutexGuard back in again

commit 4f27ff917237be96eec897d4af90a3379be904c6
Author: Tor Lillqvist 
Date:   Mon Jul 29 18:24:23 2013 +0300

Avoid SolarMutex assertion in a dbgutil build when exiting Impress

put in a SolarMutex in that ImpTimedRefDev dtor for what sounds like
just this problem

commit 9f0766917a4fb1bc8fe1786c3b46132dd63c1c66
Author: Armin Le Grand 
Date:   Fri Jul 1 14:40:00 2016 +0200

tdf#50613 add support to load charts asynchronously

took it out again, to presumably move it into TextLayouterDevice
but we destroy this thing asyncronously outside of TextLayouterDevice
so lets put it back in again

Change-Id: If801a701701a3d87fce2f76bc22bb3184b46743a

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx 
b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index a7eb749..2229023 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -85,6 +85,7 @@ namespace
 ImpTimedRefDev::~ImpTimedRefDev()
 {
 OSL_ENSURE(0L == mnUseCount, "destruction of a still used 
ImpTimedRefDev (!)");
+const SolarMutexGuard aSolarGuard;
 mpVirDev.disposeAndClear();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Miklos Vajna

 svl/source/numbers/zformat.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2263ff8550a896312d2eae16e0b1b2e9b0d6c884
Author: Miklos Vajna 
Date:   Fri Jul 22 12:49:50 2016 +0200

svl: fix loplugin:loopvartoosmall warnings

Change-Id: I003719f67e6c1f0f48580c414b2ef7a7a2a2abcb

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index a638581..5e37a70 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2580,7 +2580,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
   || sNumeratorFormat.indexOf('?') >= 0
   || sDenominatorFormat.indexOf('?') >= 0 )
 {
-for (sal_uInt16 i = 0; i < 
rInfo.sStrArray[j].getLength(); i++)
+for (sal_Int32 i = 0; i < 
rInfo.sStrArray[j].getLength(); i++)
 sFrac.insert(0, ' ');
 }
 }
@@ -2593,7 +2593,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 if ( sIntegerFormat.indexOf('?') >= 0
   || sNumeratorFormat.indexOf('?') >= 0 )
 {
-for (sal_uInt16 i = 0; i < 
rInfo.sStrArray[j].getLength(); i++)
+for (sal_Int32 i = 0; i < 
rInfo.sStrArray[j].getLength(); i++)
 sFrac.insert(0, ' ');
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svgio/source

2016-07-22 Thread Xisco Fauli

 svgio/source/svgreader/svgstyleattributes.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 4bb2f539b1d6e806ac992d142d5af0e44958a798
Author: Xisco Fauli 
Date:   Tue Jul 19 23:25:14 2016 +0200

SVGIO: use clamp on strokeOpacity in case it's negative

testcase: painting-stroke-08-t.svg

Change-Id: Ia09a4581e5189cbb88aca4391474ada89e7af042
testcase: painting-stroke-08-t.svg
Reviewed-on: https://gerrit.libreoffice.org/27326
Tested-by: Jenkins 
Reviewed-by: Xisco FaulÃ 
(cherry picked from commit ecb34112cc4c768fd2f57499151920fa7798776f)
Reviewed-on: https://gerrit.libreoffice.org/27346
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 8be96e6..1e8810b 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1434,14 +1434,12 @@ namespace svgio
 }
 case SVGTokenStrokeOpacity:
 {
+
 SvgNumber aNum;
 
 if(readSingleNumber(aContent, aNum))
 {
-if(aNum.isPositive())
-{
-setStrokeOpacity(aNum);
-}
+
setStrokeOpacity(SvgNumber(basegfx::clamp(aNum.getNumber(), 0.0, 1.0), 
aNum.getUnit(), aNum.isSet()));
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - cui/source

2016-07-22 Thread Caolán McNamara

 cui/source/options/optpath.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit aafdbb7763b939742050159ce784b799f26eb834
Author: CaolÃ¡n McNamara 
Date:   Thu Jul 21 21:44:06 2016 +0100

Resolves: tdf#101054 crash on options->path with non-native file picker

regression from...

commit 3bbc0574d78d129359638b74612de2f93419eeb0
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 5 10:16:51 2016 +0100

Resolves: rhbz#1352835 path options doesn't promptly destroy folder 
picker

only clear the xFolderPicker immediately in the non-async case

Change-Id: Id6a411424d41262a9379ad3eb7976c8dd666a5cf
(cherry picked from commit c1bd3156cf66318023f36d81ce809a38072588e4)
Reviewed-on: https://gerrit.libreoffice.org/27417
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 7c2de67..6aa3466 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -730,7 +730,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, 
DialogClosedEvent*, pEvt, void
 OUString sURL = xFolderPicker->getDirectory();
 ChangeCurrentEntry( sURL );
 }
-xFolderPicker.clear();
 }
 
 void SvxPathTabPage::GetPathList(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Laurent Balland-Poirier

 svl/source/numbers/zformat.cxx |   68 ++---
 1 file changed, 58 insertions(+), 10 deletions(-)

New commits:
commit 3363539e425d5d8f75d976ca2261c07086d6d06a
Author: Laurent Balland-Poirier 
Date:   Wed Jul 6 00:10:38 2016 +0200

tdf#100834 String between integer and fraction

Fraction number format
Insert Blank delimiter string between Integer/Fraction only if both of them 
are present
In other cases, replace string with blank string if there are some '?' in 
formats
Else insert nothing.

If there is no fraction part, insert blank instead of '/' if there are some 
'?' in formats

Change-Id: Ib606bdaa2b3809f15ce23acc3b5b6ee3fdbd230d
Reviewed-on: https://gerrit.libreoffice.org/27252
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 9d5de1c..a638581 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2002,6 +2002,24 @@ OUString lcl_GetNumeratorString(const 
ImpSvNumberformatInfo &rInfo, sal_uInt16 n
 return aNumeratorString.makeStringAndClear();
 }
 
+OUString lcl_GetFractionIntegerString(const ImpSvNumberformatInfo &rInfo, 
sal_uInt16 nAnz)
+{
+sal_Int16 i;
+OUStringBuffer aIntegerString;
+for( i = 0; i < nAnz; i++ )
+{
+if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRACBLANK )
+{
+for( i--; i >= 0 && rInfo.nTypeArray[i] == NF_SYMBOLTYPE_DIGIT ; 
i-- )
+{
+aIntegerString.insert( 0, rInfo.sStrArray[i] );
+}
+i = nAnz;
+}
+}
+return aIntegerString.makeStringAndClear();
+}
+
 }
 
 OUString SvNumberformat::GetDenominatorString( sal_uInt16 nNumFor ) const
@@ -2397,6 +2415,9 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 OUStringBuffer sStr, sFrac, sDiv; // Strings, value for
 sal_uInt64 nFrac=0, nDiv=1;   // Integral part
 bool bSign = false;   // Numerator and denominator
+const OUString sIntegerFormat = lcl_GetFractionIntegerString(rInfo, nAnz);
+const OUString sNumeratorFormat = lcl_GetNumeratorString(rInfo, nAnz);
+const OUString sDenominatorFormat = lcl_GetDenominatorString(rInfo, nAnz);
 
 if (fNumber < 0)
 {
@@ -2420,7 +2441,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 return false;
 }
 
-if( sal_Int32 nForcedDiv = lcl_GetDenominatorString(rInfo, nAnz).toInt32() 
)
+if( sal_Int32 nForcedDiv = sDenominatorFormat.toInt32() )
 {   // Forced Denominator
 nDiv = (sal_uInt64) nForcedDiv;
 nFrac = (sal_uInt64)floor ( fNumber * nDiv );
@@ -2500,9 +2521,9 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 impTransliterate(sStr, NumFor[nIx].GetNatNum());
 }
 bool bHideFraction = (rInfo.nCntPre > 0 && nFrac == 0
-&& (lcl_GetNumeratorString(rInfo, nAnz).indexOf('0') < 
0)
-&& (lcl_GetDenominatorString(rInfo, nAnz).indexOf('0') 
< 0
-|| lcl_GetDenominatorString(rInfo, nAnz).toInt32() 
> 0) );
+&& (sNumeratorFormat.indexOf('0') < 0)
+&& (sDenominatorFormat.indexOf('0') < 0
+|| sDenominatorFormat.toInt32() > 0) );
 if ( bHideFraction )
 {
 sDiv.truncate();
@@ -2522,8 +2543,10 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRAC)
 {
 if ( bHideFraction )
-{
-sDiv.insert(0, ' ');
+{   // do not insert blank for fraction if there is no '?'
+if ( sNumeratorFormat.indexOf('?') >= 0
+  || sDenominatorFormat.indexOf('?') >= 0 )
+sDiv.insert(0, ' ');
 }
 else
 {
@@ -2546,18 +2569,43 @@ bool SvNumberformat::ImpGetFractionOutput(double 
fNumber,
 else
 {
 bRes |= ImpNumberFill(sFrac, fNumber, k, j, nIx, 
NF_SYMBOLTYPE_FRACBLANK);
-bCont = false;  // there is no main number?
+bCont = false;  // there is no integer part?
 if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRACBLANK)
 {
-sFrac.insert(0, rInfo.sStrArray[j]);
 if ( j )
 {
+if ( bHideFraction )
+{   // '?' in any format force display of blank as delimiter
+if ( sIntegerFormat.indexOf('?') >= 0
+  || sNumeratorFormat.indexOf('?') >= 0
+  || sDenominatorFormat.indexOf('?') >= 0 )
+{
+for (sal_uInt16 i = 0; i < 
rInfo.sStrArray[j].getLength(); i++)
+sFrac.insert(0, ' ');
+}
+}
+else
+{
+if ( fNum != 0.0 || sIntegerFormat.indexOf('0') >= 0 )
+

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

2016-07-22 Thread Michael Stahl

 shell/source/backends/desktopbe/desktopbackend.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c13d130024c52598ef687a4cb189f6d77804de1d
Author: Michael Stahl 
Date:   Fri Jul 22 12:33:08 2016 +0200

shell: loplugin:nullptr / staticanonymous / stringconstant

Change-Id: I67458301fb13601c5bf8d83c689fd861694ee460

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index f4a2169..550e87a 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -151,7 +151,9 @@ void Default::setPropertyValue(OUString const &, 
css::uno::Any const &)
 static_cast< cppu::OWeakObject * >(this), -1);
 }
 
-static OUString xdg_user_dir_lookup (const char *type)
+namespace {
+
+OUString xdg_user_dir_lookup (const char *type)
 {
 char *config_home;
 char *p;
@@ -166,12 +168,12 @@ static OUString xdg_user_dir_lookup (const char *type)
 
 if (!aSecurity.getHomeDir( aHomeDirURL ) )
 {
-osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), 
aDocumentsDirURL);
+osl::FileBase::getFileURLFromSystemPath("/tmp", aDocumentsDirURL);
 return aDocumentsDirURL;
 }
 
 config_home = getenv ("XDG_CONFIG_HOME");
-if (config_home == NULL || config_home[0] == 0)
+if (config_home == nullptr || config_home[0] == 0)
 {
 aConfigFileURL = aHomeDirURL + "/.config/user-dirs.dirs";
 }
@@ -250,6 +252,8 @@ static OUString xdg_user_dir_lookup (const char *type)
 return aHomeDirURL + "/" + OUString::createFromAscii(type);
 }
 
+} // namespace
+
 css::uno::Any Default::getPropertyValue(OUString const & PropertyName)
 throw (
 css::beans::UnknownPropertyException, 
css::lang::WrappedTargetException,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Jochen Nitschke

 sc/inc/cellvalue.hxx|2 +-
 sc/inc/formulacell.hxx  |2 +-
 sc/inc/global.hxx   |   18 --
 sc/source/core/data/cellvalue.cxx   |2 +-
 sc/source/core/data/colorscale.cxx  |4 ++--
 sc/source/core/data/column.cxx  |   12 ++--
 sc/source/core/data/documen4.cxx|4 ++--
 sc/source/core/data/formulacell.cxx |   12 ++--
 sc/source/core/data/table2.cxx  |2 +-
 sc/source/ui/undo/undocell.cxx  |4 ++--
 10 files changed, 30 insertions(+), 32 deletions(-)

New commits:
commit 2a5a69de7f4696e5bf6e2e1ada414b46c6a4d983
Author: Jochen Nitschke 
Date:   Fri Jul 22 10:22:14 2016 +0200

sc: convert SC_CLONECELL_... to typed_flags

Change-Id: I4ce14eecaa9fbdc007bbb39f0543099c75f2ffcb
Reviewed-on: https://gerrit.libreoffice.org/27428
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 6dcbc8f..ca7dc2e 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -59,7 +59,7 @@ struct SC_DLLPUBLIC ScCellValue
  */
 void assign( const ScDocument& rDoc, const ScAddress& rPos );
 
-void assign( const ScCellValue& rOther, ScDocument& rDestDoc, int 
nCloneFlags = SC_CLONECELL_DEFAULT );
+void assign(const ScCellValue& rOther, ScDocument& rDestDoc, ScCloneFlags 
nCloneFlags = ScCloneFlags::Default);
 
 /**
  * Set cell value at specified position in specified document.
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 987704f..7aa569b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -190,7 +190,7 @@ public:
 const formula::FormulaGrammar::Grammar = 
formula::FormulaGrammar::GRAM_DEFAULT,
 sal_uInt8 cMatInd = MM_NONE );
 
-ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, const 
ScAddress& rPos, int nCloneFlags = SC_CLONECELL_DEFAULT );
+ScFormulaCell(const ScFormulaCell& rCell, ScDocument& rDoc, const 
ScAddress& rPos, ScCloneFlags nCloneFlags = ScCloneFlags::Default);
 
 size_t GetHash() const;
 
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 15769bd..51679ea 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -220,27 +220,33 @@ enum class ScEnterMode {
 #define SUBTOTAL_IGN_HIDDEN0x02
 #define SUBTOTAL_IGN_FILTERED  0x01
 
+enum class ScCloneFlags{
 /** Default cell clone flags: do not start listening, do not adjust 3D refs to
 old position, clone note captions of cell notes. */
-const int SC_CLONECELL_DEFAULT  = 0x;
+Default  = 0x,
 
 /** If set, cloned formula cells will start to listen to the document. */
-const int SC_CLONECELL_STARTLISTENING   = 0x0001;
+StartListening   = 0x0001,
 
 /** If set, relative 3D references of cloned formula cells will be adjusted to
 old position (used while swapping cells for sorting a cell range). */
-const int SC_CLONECELL_ADJUST3DREL  = 0x0002;
+Adjust3Drel  = 0x0002,
 
 /** If set, the caption object of a cell note will not be cloned (used while
 copying cells to undo document, where captions are handled in drawing 
undo). */
-const int SC_CLONECELL_NOCAPTION= 0x0004;
+NoCaption= 0x0004,
 
 /** If set, absolute refs will not transformed to external references */
-const int SC_CLONECELL_NOMAKEABS_EXTERNAL = 0x0008;
+NoMakeAbsExternal = 0x0008,
 
 /** If set, global named expressions will be converted to sheet-local named
 expressions. */
-const int SC_CLONECELL_NAMES_TO_LOCAL   = 0x0010;
+NamesToLocal   = 0x0010
+};
+namespace o3tl
+{
+template<> struct typed_flags : is_typed_flags {};
+}
 
 #ifndef DELETEZ
 #define DELETEZ(pPtr) { delete pPtr; pPtr = 0; }
diff --git a/sc/source/core/data/cellvalue.cxx 
b/sc/source/core/data/cellvalue.cxx
index d6b71f1..25ed7d70 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -308,7 +308,7 @@ void ScCellValue::assign( const ScDocument& rDoc, const 
ScAddress& rPos )
 }
 }
 
-void ScCellValue::assign( const ScCellValue& rOther, ScDocument& rDestDoc, int 
nCloneFlags )
+void ScCellValue::assign(const ScCellValue& rOther, ScDocument& rDestDoc, 
ScCloneFlags nCloneFlags)
 {
 clear();
 
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 72c016c..da7f42e6 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -165,7 +165,7 @@ ScColorScaleEntry::ScColorScaleEntry(const 
ScColorScaleEntry& rEntry):
 {
 if(rEntry.mpCell)
 {
-mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
*rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
SC_CLONECELL_NOMAKEABS_EXTERNAL));
+mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
*rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
 mpCell->StartListeningTo( mpCell->GetDocument() );
 mpListener.reset(new ScFo

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - libreofficekit/qa

2016-07-22 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 02c22a1f345ea61b5cac4981ca6fde4ede78774a
Author: Miklos Vajna 
Date:   Fri Jul 22 10:38:18 2016 +0200

gtktiledviewer: align to top/left for Calc

Otherwise when zooming out enough that not all available space is used,
the default horizontal/vertical centering happens, and the row/column
headers and the tiles become out of sync.

Also revert to the previous default window size, I'm not sure why that
was necessary. Currently checking the mentioned situation (empty Writer
document with comments only) does not require this larger size, and
testing two views is easier with the smaller size.

Change-Id: Ia92a591387f62655a671e2d09f5053827fde5045
Reviewed-on: https://gerrit.libreoffice.org/27427
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 672b7411637f92acd30622ec2aaee840cbbbd0a9)

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 8da591b..5aeea19 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -1189,6 +1189,16 @@ static void openDocumentCallback (GObject* 
source_object, GAsyncResult* res, gpo
 return;
 }
 
+LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pDocView);
+if (pDocument && pDocument->pClass->getDocumentType(pDocument) == 
LOK_DOCTYPE_SPREADSHEET)
+{
+// Align to top left corner, so the tiles are in sync with the
+// row/column bar, even when zooming out enough that not all space is
+// used.
+gtk_widget_set_halign(GTK_WIDGET(pDocView), GTK_ALIGN_START);
+gtk_widget_set_valign(GTK_WIDGET(pDocView), GTK_ALIGN_START);
+}
+
 populatePartSelector(pDocView);
 populatePartModeSelector( GTK_COMBO_BOX_TEXT(rWindow.m_pPartModeComboBox) 
);
 registerSelectorHandlers(rWindow);
@@ -1205,7 +1215,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
 {
 GtkWidget *pWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW(pWindow), "LibreOfficeKit GTK Tiled 
Viewer");
-gtk_window_set_default_size(GTK_WINDOW(pWindow), 1280, 720);
+gtk_window_set_default_size(GTK_WINDOW(pWindow), 1024, 768);
 g_signal_connect(pWindow, "destroy", G_CALLBACK(gtk_widget_destroy), 
pWindow);
 
 rWindow.m_pVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Caolán McNamara

 sw/qa/extras/ww8import/data/tdf59896.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx |7 +++
 sw/source/filter/ww8/ww8scan.cxx |6 --
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 99833c2d6c9882bfad17e3e7fb659f5a81184a3f
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 10:33:02 2016 +0100

Resolves: tdf#59896 ww6 plcf generation reversed check

regression since...

commit 69e040a59e1c6497b606da8a27e8f605edd041bb
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 17 00:19:00 2011 +0100

check seeks, check available size, pointers to ref

Change-Id: Idfcde46959e5693d200a91a619e7196f00f40ca0

diff --git a/sw/qa/extras/ww8import/data/tdf59896.doc 
b/sw/qa/extras/ww8import/data/tdf59896.doc
new file mode 100644
index 000..a3c7242
Binary files /dev/null and b/sw/qa/extras/ww8import/data/tdf59896.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index d59b9ad..640f7b7 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -9,6 +9,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -608,6 +609,12 @@ DECLARE_WW8IMPORT_TEST(testTdf95576, "tdf95576.doc")
 }
 }
 
+DECLARE_WW8IMPORT_TEST(testTdf59896, "tdf59896.doc")
+{
+// This was awt::FontWeight::NORMAL, i.e. the first run wasn't bold, when 
it should be bold
+CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(getRun(getParagraph(1), 1), "CharWeight"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 694ff1a..387eab5 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2159,11 +2159,13 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 
nPN, sal_Int32 ncpN)
 failure = true;
 // construct FC entries
 // first FC entry of each Fkp
-if (checkSeek(rSt, ( nPN + i ) << 9 ))
-continue;
+if (!checkSeek(rSt, (nPN + i) << 9))
+break;
+
 WW8_CP nFc(0);
 rSt.ReadInt32( nFc );
 pPLCF_PosArray[i] = nFc;
+
 failure = rSt.GetError();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libreofficekit/qa

2016-07-22 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 672b7411637f92acd30622ec2aaee840cbbbd0a9
Author: Miklos Vajna 
Date:   Fri Jul 22 10:38:18 2016 +0200

gtktiledviewer: align to top/left for Calc

Otherwise when zooming out enough that not all available space is used,
the default horizontal/vertical centering happens, and the row/column
headers and the tiles become out of sync.

Also revert to the previous default window size, I'm not sure why that
was necessary. Currently checking the mentioned situation (empty Writer
document with comments only) does not require this larger size, and
testing two views is easier with the smaller size.

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

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index f80b506..58139a5 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -1189,6 +1189,16 @@ static void openDocumentCallback (GObject* 
source_object, GAsyncResult* res, gpo
 return;
 }
 
+LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pDocView);
+if (pDocument && pDocument->pClass->getDocumentType(pDocument) == 
LOK_DOCTYPE_SPREADSHEET)
+{
+// Align to top left corner, so the tiles are in sync with the
+// row/column bar, even when zooming out enough that not all space is
+// used.
+gtk_widget_set_halign(GTK_WIDGET(pDocView), GTK_ALIGN_START);
+gtk_widget_set_valign(GTK_WIDGET(pDocView), GTK_ALIGN_START);
+}
+
 populatePartSelector(pDocView);
 populatePartModeSelector( GTK_COMBO_BOX_TEXT(rWindow.m_pPartModeComboBox) 
);
 registerSelectorHandlers(rWindow);
@@ -1205,7 +1215,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
 {
 GtkWidget *pWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title(GTK_WINDOW(pWindow), "LibreOfficeKit GTK Tiled 
Viewer");
-gtk_window_set_default_size(GTK_WINDOW(pWindow), 1280, 720);
+gtk_window_set_default_size(GTK_WINDOW(pWindow), 1024, 768);
 g_signal_connect(pWindow, "destroy", G_CALLBACK(gtk_widget_destroy), 
pWindow);
 
 rWindow.m_pVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source icon-themes/galaxy include/sfx2 include/vcl sfx2/Library_sfx.mk sfx2/source vcl/inc vcl/source

2016-07-22 Thread Szymon Kłos

 extras/source/glade/libreoffice-catalog.xml.in   |4 -
 icon-themes/galaxy/res/notebookbar.png   |binary
 include/sfx2/notebookbar/SfxNotebookBar.hxx  |   12 +++
 include/vcl/notebookbar.hxx  |4 -
 include/vcl/tabctrl.hxx  |   10 ++
 sfx2/Library_sfx.mk  |1 
 sfx2/source/dialog/backingcomp.cxx   |4 -
 sfx2/source/dialog/dialog.src|   49 +
 sfx2/source/inc/sfxlocal.hrc |2 
 sfx2/source/notebookbar/NotebookBarPopupMenu.cxx |   82 +++
 sfx2/source/notebookbar/NotebookBarPopupMenu.hxx |   23 ++
 sfx2/source/notebookbar/SfxNotebookBar.cxx   |   61 +
 vcl/inc/svids.hrc|1 
 vcl/source/control/notebookbar.cxx   |8 +-
 vcl/source/control/tabctrl.cxx   |   37 +-
 vcl/source/src/images.src|5 +
 16 files changed, 290 insertions(+), 13 deletions(-)

New commits:
commit b949604b91f77dee3b2737ea09e1ac3ade4eed1c
Author: Szymon KÅos 
Date:   Wed Jul 20 16:08:38 2016 +0200

GSoC notebookbar: file menu

+ added icon to the notebookbar, after click the file menu will appear

Change-Id: I30e1ed7e2c4a194e150c7196652904fd4e5c9e8e
Reviewed-on: https://gerrit.libreoffice.org/27347
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 10b3d02..bf49a28 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -807,8 +807,8 @@
 
-
 
+#include 
+#include 
 
 class SfxBindings;
 
@@ -22,6 +24,7 @@ class SFX2_DLLPUBLIC SfxNotebookBar
 {
 public:
 static void CloseMethod(SfxBindings& rBindings);
+static void CloseMethod(SystemWindow* pSysWindow);
 
 /// Function to be called from the sdi's ExecMethod.
 static void ExecMethod(SfxBindings& rBindings);
@@ -33,6 +36,15 @@ public:
 const OUString& rUIFile);
 
 static void RemoveListeners(SystemWindow* pSysWindow);
+
+static void ShowMenubar(bool bShow);
+
+private:
+static bool m_bLock;
+static css::uno::Reference m_xLayoutManager;
+static css::uno::Reference m_xFrame;
+
+DECL_STATIC_LINK_TYPED(SfxNotebookBar, ToggleMenubar, NotebookBar*, void);
 };
 
 } // namespace sfx2
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index 05c91a8..51f32aa 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -17,7 +17,7 @@
 #include 
 
 /// This implements Widget Layout-based notebook-like menu bar.
-class NotebookBar : public Control, public VclBuilderContainer
+class VCL_DLLPUBLIC NotebookBar : public Control, public VclBuilderContainer
 {
 friend class NotebookBarContextChangeEventListener;
 public:
@@ -28,6 +28,8 @@ public:
 virtual Size GetOptimalSize() const SAL_OVERRIDE;
 virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, 
PosSizeFlags nFlags = PosSizeFlags::All) SAL_OVERRIDE;
 
+void SetIconClickHdl(Link aHdl);
+
 virtual void StateChanged(StateChangedType nType) override;
 
 const css::uno::Reference& 
getContextChangeEventListener() const { return m_pEventListener; }
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index a708161..14974e7 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -132,10 +132,10 @@ public:
 sal_uInt16  GetPageId( const TabPage& rPage ) const;
 sal_uInt16  GetPageId( const OString& rName ) const;
 
-voidSetCurPageId( sal_uInt16 nPageId );
+virtual voidSetCurPageId( sal_uInt16 nPageId );
 sal_uInt16  GetCurPageId() const;
 
-voidSelectTabPage( sal_uInt16 nPageId );
+virtual voidSelectTabPage( sal_uInt16 nPageId );
 
 voidSetTabPage( sal_uInt16 nPageId, TabPage* pPage );
 TabPage*GetTabPage( sal_uInt16 nPageId ) const;
@@ -194,14 +194,19 @@ public:
 virtual void queue_resize(StateChangedType eReason = 
StateChangedType::Layout) override;
 };
 
+class NotebookBar;
+
 class VCL_DLLPUBLIC NotebookbarTabControl : public TabControl
 {
 public:
 NotebookbarTabControl( vcl::Window* pParent, WinBits nStyle = 
WB_STDTABCONTROL );
 
 void SetContext( vcl::EnumContext::Context eContext );
+void SetIconClickHdl( Link aHdl );
 
 virtual sal_uInt16  GetPageId( const Point& rPos ) const override;
+virtual voidSelectTabPage( sal_uInt16 nPageId ) override;
+virtual voidSetCurPageId( sal_uInt16 nPageId ) override;
 
 protected:
 virtual bool ImplPlaceTabs( long nWidth ) override;
@@ -209,6 +214,7 @@ protected:
 
 private:
 vcl::EnumContext::Context eLastContext;
+Link m_aIconClickHdl;
 };
 
 #e

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - starmath/source

2016-07-22 Thread Takeshi Abe

 starmath/source/node.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6efbaac8e1eb86d9fd3751b2422964c8d17bf589
Author: Takeshi Abe 
Date:   Fri Jul 8 15:54:24 2016 +0900

starmath: Fix missing negation

which was a regression from fa614231733800f4a961b77e36c86f8840d12251.

Change-Id: Ia7bab72dbd6f82519024809cf6384e1442a02327
Reviewed-on: https://gerrit.libreoffice.org/27033
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 2fcb8022a22b55b6680af57f2b101d56a3d88e36)
Reviewed-on: https://gerrit.libreoffice.org/27329
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: Eike Rathke 
Reviewed-by: Markus Mohrhard 

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 71c48ba..da9d861 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2737,7 +2737,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, 
const SmDocShell &rDocShell
 else if (nStyle == 2)
 {
 const OUString& rTmp(GetText());
-if (rTmp.isEmpty())
+if (!rTmp.isEmpty())
 {
 static const sal_Unicode cUppercaseAlpha = 0x0391;
 static const sal_Unicode cUppercaseOmega = 0x03A9;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - basic/source

2016-07-22 Thread Caolán McNamara

 basic/source/sbx/sbxscan.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 854e4a714d9abea5d66ed34f73f1b05c06b62b86
Author: CaolÃ¡n McNamara 
Date:   Wed Jul 20 16:30:16 2016 +0100

Resolves: tdf#98778 fix parsing of exponents

regression from...

commit 9e9f39d171cafa035d7b8e74187e25c3581cb89d
Date:   Tue Mar 19 23:23:16 2013 +0100

resolved rhbz#919020 Basic CDbl() and CSng() scan localized number

Change-Id: I96535fd9bc9ec59d6e07739a3118c96eb2d8bd05
Reviewed-on: https://gerrit.libreoffice.org/27342
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 2aed0d49d7891b9360916b65771222810aeeac96)
Reviewed-on: https://gerrit.libreoffice.org/27349
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
Reviewed-by: Markus Mohrhard 

diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index bf68189..05a4eae 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -160,6 +160,13 @@ SbxError ImpScan( const OUString& rWSrc, double& nVal, 
SbxDataType& rType,
 eScanType = SbxDOUBLE;
 aBuf[ p - pStart ] = 'E';
 p++;
+if (*p == '+')
+++p;
+else if (*p == '-')
+{
+aBuf.append('-');
+++p;
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - shell/source

2016-07-22 Thread Caolán McNamara

 shell/source/backends/desktopbe/desktopbackend.cxx |  125 +++--
 1 file changed, 118 insertions(+), 7 deletions(-)

New commits:
commit b5c05876f73c31270bc374e4f481ef1d09a42e5f
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 09:39:55 2016 +0100

Related: rhbz#1065807 recover using xdg templates and documents settings

Change-Id: If2c594174a6fa8c524d9664c9f197cb7c6d4641d

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx 
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 64f06a3..f4a2169 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -42,9 +42,12 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "osl/diagnose.h"
+#include "osl/file.hxx"
+#include "osl/security.hxx"
 #include "rtl/string.h"
 #include "rtl/textenc.h"
 #include "rtl/ustring.h"
+#include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
 #include "uno/current_context.hxx"
@@ -148,17 +151,128 @@ void Default::setPropertyValue(OUString const &, 
css::uno::Any const &)
 static_cast< cppu::OWeakObject * >(this), -1);
 }
 
+static OUString xdg_user_dir_lookup (const char *type)
+{
+char *config_home;
+char *p;
+bool bError = false;
+
+osl::Security aSecurity;
+oslFileHandle handle;
+OUString aHomeDirURL;
+OUString aDocumentsDirURL;
+OUString aConfigFileURL;
+OUStringBuffer aUserDirBuf;
+
+if (!aSecurity.getHomeDir( aHomeDirURL ) )
+{
+osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), 
aDocumentsDirURL);
+return aDocumentsDirURL;
+}
+
+config_home = getenv ("XDG_CONFIG_HOME");
+if (config_home == NULL || config_home[0] == 0)
+{
+aConfigFileURL = aHomeDirURL + "/.config/user-dirs.dirs";
+}
+else
+{
+aConfigFileURL = OUString::createFromAscii(config_home) + 
"/user-dirs.dirs";
+}
+
+if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, &handle, 
osl_File_OpenFlag_Read))
+{
+rtl::ByteSequence seq;
+while (osl_File_E_None == osl_readLine(handle , 
reinterpret_cast(&seq)))
+{
+/* Remove newline at end */
+int relative = 0;
+int len = seq.getLength();
+if(len>0 && seq[len-1] == '\n')
+seq[len-1] = 0;
+
+p = reinterpret_cast(seq.getArray());
+while (*p == ' ' || *p == '\t')
+p++;
+if (strncmp (p, "XDG_", 4) != 0)
+continue;
+p += 4;
+if (strncmp (p, type, strlen (type)) != 0)
+continue;
+p += strlen (type);
+if (strncmp (p, "_DIR", 4) != 0)
+continue;
+p += 4;
+while (*p == ' ' || *p == '\t')
+p++;
+if (*p != '=')
+continue;
+p++;
+while (*p == ' ' || *p == '\t')
+p++;
+if (*p != '"')
+continue;
+p++;
+if (strncmp (p, "$HOME/", 6) == 0)
+{
+p += 6;
+relative = 1;
+}
+else if (*p != '/')
+continue;
+if (relative)
+{
+aUserDirBuf = OUStringBuffer(aHomeDirURL + "/");
+}
+else
+{
+aUserDirBuf = OUStringBuffer();
+}
+while (*p && *p != '"')
+{
+if ((*p == '\\') && (*(p+1) != 0))
+p++;
+aUserDirBuf.append((sal_Unicode)*p++);
+}
+}//end of while
+osl_closeFile(handle);
+}
+else
+bError = true;
+if (aUserDirBuf.getLength()>0 && !bError)
+{
+aDocumentsDirURL = aUserDirBuf.makeStringAndClear();
+osl::Directory aDocumentsDir( aDocumentsDirURL );
+if( osl::FileBase::E_None == aDocumentsDir.open() )
+return aDocumentsDirURL;
+}
+/* Use fallbacks historical compatibility if nothing else exists */
+return aHomeDirURL + "/" + OUString::createFromAscii(type);
+}
+
 css::uno::Any Default::getPropertyValue(OUString const & PropertyName)
 throw (
 css::beans::UnknownPropertyException, 
css::lang::WrappedTargetException,
 css::uno::RuntimeException, std::exception)
 {
+if (PropertyName == "TemplatePathVariable")
+{
+OUString aDirURL = xdg_user_dir_lookup("Templates");
+css::uno::Any aValue(aDirURL);
+return css::uno::makeAny(css::beans::Optional(true, 
aValue));
+}
+
+if (PropertyName == "WorkPathVariable")
+{
+OUString aDirURL = xdg_user_dir_lookup("Documents");
+css::uno::Any aValue(aDirURL);
+return css::uno::makeAny(css::beans::Optional(true, 
aValue));
+}
+
 if ( PropertyName == "EnableATToolSupport" ||
  Pro

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-5' - sc/source

2016-07-22 Thread Eike Rathke

 sc/source/core/tool/interpr4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 11535b80816d131963eb8f916ba1791816513664
Author: Eike Rathke 
Date:   Mon Jul 11 14:20:37 2016 +0200

Resolves: tdf#100847 also external svEmptyCell is 0 in numeric context

Regression of 243f19a1878d52a4074b59041dc3bc57ab84e417 that now
differentiates between numeric and string content of external
references' cells.

Change-Id: I7a9635357cc7651353067a38f9ac8bc295f88546
(cherry picked from commit 89a5464a21046821648ec77f03db8316ceb4e6f8)
Reviewed-on: https://gerrit.libreoffice.org/27111
Reviewed-by: Markus Mohrhard 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 9c30e2aab23e34ba91dbe80b7dd5e5c352bbaeb0)
Reviewed-on: https://gerrit.libreoffice.org/27373

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 9cf3ed1..2e31123 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1991,7 +1991,7 @@ double ScInterpreter::GetDouble()
 PopExternalSingleRef(pToken);
 if (!nGlobalError && pToken)
 {
-if (pToken->GetType() == svDouble)
+if (pToken->GetType() == svDouble || pToken->GetType() == 
svEmptyCell)
 nVal = pToken->GetDouble();
 else
 nVal = ConvertStringToValue( 
pToken->GetString().getString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source

2016-07-22 Thread Caolán McNamara

 cui/source/options/optpath.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 354c148edce5cafa1efb136630618f3063ce3c99
Author: CaolÃ¡n McNamara 
Date:   Thu Jul 21 21:44:06 2016 +0100

Resolves: tdf#101054 crash on options->path with non-native file picker

regression from...

commit 3bbc0574d78d129359638b74612de2f93419eeb0
Author: CaolÃ¡n McNamara 
Date:   Tue Jul 5 10:16:51 2016 +0100

Resolves: rhbz#1352835 path options doesn't promptly destroy folder 
picker

only clear the xFolderPicker immediately in the non-async case

Change-Id: Id6a411424d41262a9379ad3eb7976c8dd666a5cf
(cherry picked from commit c1bd3156cf66318023f36d81ce809a38072588e4)
Reviewed-on: https://gerrit.libreoffice.org/27418
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5a0a87e..3001d12 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -711,7 +711,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, 
DialogClosedEvent*, pEvt, void
 OUString sURL = xFolderPicker->getDirectory();
 ChangeCurrentEntry( sURL );
 }
-xFolderPicker.clear();
 }
 
 void SvxPathTabPage::GetPathList(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-22 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/npv.fods | 3625 
 1 file changed, 3625 insertions(+)

New commits:
commit 8eab200e4029bcaf1d919c7338c635a2a526d695
Author: ZdenÄk Crhonek 
Date:   Mon Jul 18 21:11:09 2016 +0200

add NPV test case

Change-Id: I7f645e6450fca23577e35df468369d1a8a67b6f9
Reviewed-on: https://gerrit.libreoffice.org/27299
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/npv.fods 
b/sc/qa/unit/data/functions/fods/npv.fods
new file mode 100644
index 000..31b15f0
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/npv.fods
@@ -0,0 +1,3625 @@
+
+
+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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
+ 
2016-07-01T15:50:01.699737572P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a2c557d80ac68c06ea59586245a7431e061938f0
+ 
+  
+   0
+   0
+   36630
+   145995
+   
+
+ view1
+ 
+  
+   1
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   11
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1280
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - jvmfwk/plugins

2016-07-22 Thread Caolán McNamara

 jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 191e3809f5d62392bf98b940ad8f6937ae5ee6c6
Author: CaolÃ¡n McNamara 
Date:   Fri Jul 22 08:22:47 2016 +0100

Related: tdf#101057 allow java update version number > 99

Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85
(cherry picked from commit 64d3270a89fd88d4d0cf70329af2c66f722fd95e)
Reviewed-on: https://gerrit.libreoffice.org/27425
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 4787440..b4ad701 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -135,9 +135,9 @@ bool SunVersion::init(const char *szVersion)
 {
 if ( ! isdigit(*pCur))
 {
-//1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 
chars.
-int len = pCur - pLast;
-if (len > 2)
+//1.8.0_102-, 1.8.0_01a,
+size_t len = pCur - pLast;
+if (len > sizeof(buf) - 1)
 return false;
 //we've got the update: 01, 02 etc
 strncpy(buf, pLast, len);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Abhilash Singh - license statement

2016-07-22 Thread jan iversen

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

[Libreoffice-commits] online.git: Changes to 'private/pranavk/Leaflet_upstrea'

2016-07-22 Thread Pranav Kant

New branch 'private/pranavk/Leaflet_upstrea' available with the following 
commits:
commit 152faaf90e9103d7c2a6e490024e7f5bc86a529a
Author: Pranav Kant 
Date:   Thu Jul 21 23:37:59 2016 +0530

loleaflet: Cherry-pick source map build changes from upstream

Contributed by IvÃ¡n SÃ¡nchez Ortega to upstream Leaflet
repository.

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: stav meitav license statement

2016-07-22 Thread jan iversen

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

Re: Tommie Matherne license statement

2016-07-22 Thread jan iversen

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

Re: Artyom Sovetnikov license statement

2016-07-22 Thread jan iversen

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.


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

[Libreoffice-commits] core.git: basic/qa

2016-07-22 Thread Miklos Vajna

 basic/qa/cppunit/test_append.cxx|2 +-
 basic/qa/cppunit/test_nested_struct.cxx |8 
 basic/qa/cppunit/test_vba.cxx   |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4e6d0f6fe70cb84c0fda0cc8e61baf20f5ab250e
Author: Miklos Vajna 
Date:   Fri Jul 22 09:14:24 2016 +0200

basic: fix loplugin:cppunitassertequals warnings

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

diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx
index 98b96c4..986c941 100644
--- a/basic/qa/cppunit/test_append.cxx
+++ b/basic/qa/cppunit/test_append.cxx
@@ -53,7 +53,7 @@ void EnableTest::testEnableRuntime()
 myMacro.Compile();
 CPPUNIT_ASSERT_MESSAGE("testEnableRuntime fails with compile 
error",!myMacro.HasError() );
 SbxVariableRef pNew = myMacro.Run();
-CPPUNIT_ASSERT(pNew->GetInteger() == 3 );
+CPPUNIT_ASSERT_EQUAL(static_cast(3), pNew->GetInteger());
 }
 
 void EnableTest::testDimEnable()
diff --git a/basic/qa/cppunit/test_nested_struct.cxx 
b/basic/qa/cppunit/test_nested_struct.cxx
index aaa3ca8..2fc0600 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -173,7 +173,7 @@ void Nested_Struct::testAssign1()
 myMacro.Compile();
 CPPUNIT_ASSERT_MESSAGE("testAssign1 fails with compile 
error",!myMacro.HasError() );
 SbxVariableRef pNew = myMacro.Run();
-CPPUNIT_ASSERT(pNew->GetInteger() == 9 );
+CPPUNIT_ASSERT_EQUAL(static_cast(9), pNew->GetInteger());
 }
 
 void Nested_Struct::testAssign1Alt()
@@ -196,7 +196,7 @@ void Nested_Struct::testOldAssign()
 myMacro.Compile();
 CPPUNIT_ASSERT_MESSAGE("testOldAssign fails with compile 
error",!myMacro.HasError() );
 SbxVariableRef pNew = myMacro.Run();
-CPPUNIT_ASSERT(pNew->GetInteger() == 9 );
+CPPUNIT_ASSERT_EQUAL(static_cast(9), pNew->GetInteger());
 }
 
 void Nested_Struct::testOldAssignAlt()
@@ -220,7 +220,7 @@ void Nested_Struct::testUnfixedVarAssign()
 CPPUNIT_ASSERT_MESSAGE("testUnfixedVarAssign fails with compile 
error",!myMacro.HasError() );
 // forces a broadcast
 SbxVariableRef pNew = myMacro.Run();
-CPPUNIT_ASSERT(pNew->GetInteger() == 13 );
+CPPUNIT_ASSERT_EQUAL(static_cast(13), pNew->GetInteger());
 }
 
 void Nested_Struct::testUnfixedVarAssignAlt()
@@ -256,7 +256,7 @@ void Nested_Struct::testFixedVarAssign()
 myMacro.Compile();
 CPPUNIT_ASSERT_MESSAGE("testFixedVarAssign fails with compile 
error",!myMacro.HasError() );
 SbxVariableRef pNew = myMacro.Run();
-CPPUNIT_ASSERT(pNew->GetInteger() == 13 );
+CPPUNIT_ASSERT_EQUAL(static_cast(13), pNew->GetInteger());
 }
 
 void Nested_Struct::testFixedVarAssignAlt()
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 7d145e8..ee0d6dc 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -81,7 +81,7 @@ void VBATest::testMiscVBAFunctions()
 fprintf(stderr, "macro returned:\n%s\n", OUStringToOString( 
pReturn->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() );
 }
 CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != nullptr );
-CPPUNIT_ASSERT_MESSAGE("Result not as expected", 
pReturn->GetOUString() == "OK" );
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Result not as expected", OUString("OK"), 
pReturn->GetOUString() );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/uiconfig sd/uiconfig

2016-07-22 Thread Szymon Kłos

 sc/uiconfig/scalc/ui/notebookbar.ui|  521 +
 sd/uiconfig/simpress/ui/notebookbar.ui |  517 
 2 files changed, 1038 insertions(+)

New commits:
commit 10b13ba41d608a14789a94f53344d76bceca9aae
Author: Szymon KÅos 
Date:   Fri Jul 22 10:24:23 2016 +0200

GSoC notebookbar: image tab for Impress

Change-Id: I45ef6691d32f3fd084143a80ac904e441b4a6098

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 6b53d7c..dd6c0ea 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -2712,6 +2712,523 @@
 False
   
 
+
+  
+True
+False
+6
+
+  
+True
+False
+vertical
+
+  
+True
+False
+vertical
+
+  
+True
+False
+False
+
+  
+False
+135
+True
+False
+True
+.uno:GrafLuminance
+True
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+False
+
+  
+False
+135
+True
+False
+True
+.uno:GrafContrast
+True
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+  
+  
+False
+True
+0
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+vertical
+
+  
+True
+False
+vertical
+
+  
+True
+False
+False
+
+  
+False
+135
+True
+False
+True
+.uno:GrafGamma
+True
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+False
+False
+
+  
+False
+135
+True
+False
+True
+.uno:GrafTransparence
+True
+  
+  
+

Re: confusing dr3d:lighting-mode

2016-07-22 Thread Armin Le Grand


Hi Regina,

yes, looks irritating. I took a look and it seems that the attribute is 
used in two different scenarios.


When used in 'style-graphic-properties-attlist' it is




standard
double-sided




while in 'dr3d-scene-attlist' it is







In the 1st case it is used as object attribute for each SdrObject (but 
only of use when it is a 3D object) and in the style hierarchy to define 
if double-sided lighting is applied. This is equivalent to the button in 
the 3D dialog (Tab 'GeometryÄ, Button 'Double-Sided'). Mostly useful for 
non-closed 3D objects.


In the 2nd case it is used for 3D Scene objects only and defines if 
lighting is applied at all to the whole scene. If applied, flat, phong 
or gourard is used, if not, the objects are rendered without lighting 
calculations in their FillStyle definitions. This is also in the 3D 
dialog, see Tab 'Textures' the 'Mode' switches.


Something must have run out of order though, the original 'Mode' was not 
a bool but had three states (as the 3D dialog shows). Someone at some 
time must have changed it to bool, but probably forgot to cleanup the 3D 
dialog.


I am not sure if the attribute is allowed to be used with the same name 
in two scenarios (maybe valid), but probably not with two different data 
types (?) so one probably should be renamed.


And the 3D dialog should be corrected...


Regards,

ALG



Am 22.07.2016 um 00:44 schrieb Regina Henschel:

Hi all,

in ODF 1.2 exists the attribute
19.99 dr3d:lighting-mode

It has the description
"The dr3d:lighting-mode attribute specifies whether lighting is used 
in a three-dimensional chart." and "... a three-dimensional scene."


And for data type: "The dr3d:lighting-mode attribute has the data type 
boolean 18.3.3."


What is the purpose of this attribute? From the text I would expect, 
that it enables/disables the use of lights in the scene or chart.




But in addition exists in ODF 1.2 for 3D Objects the style property 
20.79 dr3d:lighting-mode


The description is, "The dr3d:lighting-mode attribute specifies 
whether lighting is used for a three-dimensional object."

Notice the "three-dimensional object" here.

And for data type: "The defined values for the dr3d:lighting-mode 
attribute are:
●double-sided: the front and back sides of all planes are 
displayed if they are visible from the viewer's perspective.
●standard: Depending on the value of the dr3d:normals-direction 
attribute, only the front or only the back side sides of the plane are 
displayed. The opposite sides are not displayed, whether they are 
visible from the viewer's perspective or not."


So this style property is connected to normals.



The code is very confusing. I find in mbLightingMode(false) in 
SdXML3DSceneAttributesHelper and later 
setPropertyValue("D3DSceneTwoSidedLighting", uno::Any(mbLightingMode))

That makes no sense to me.

I do not find any place where "double-sided" vs "standard" is 
evaluated on file open, I see no UI element to set it, and the 
property "D3DDoubleSided", which sounds so, is mapped to 
XML_BACKFACE_CULLING in sdpropls.cxx, which is another different style 
property. And my test files do not work as I expect it in regard to 
normals, in case I write dr3d:lighting-mode="standard" in the file.



Reason for my investigation is, that the OASIS ODF TC will revise 
these texts for ODF1.3.


Kind regards
Regina



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


--
--
ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)

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

1 2 >

1 - 100 of 105 matches

Mail list logo