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

[Andrea Gelmini]

 sc/source/ui/vba/vbarange.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a74183cd9bbfa200018743cbe944277a990beb6b
Author: Andrea Gelmini 
Date:   Sat May 26 00:04:22 2018 +0200

Fix typo

Change-Id: Ib7e080864f809294a4a6ae78694730fb07120753

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 9d2b78693fee..acfc39dd4e60 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -605,9 +605,9 @@ typedef ::std::vector< CellPos > vCellPos;
 
 // #FIXME - QUICK
 // we could probably could and should modify CellsEnumeration below
-// to handle rows and columns ( but I do this separately for now
-// and.. this class only handles singe areas ( does it have to handle
-// multi area ranges?? )
+// to handle rows and columns (but I do this separately for now
+// and... this class only handles single areas (does it have to handle
+// multi area ranges??)
 class ColumnsRowEnumeration: public CellsEnumeration_BASE
 {
 uno::Reference< excel::XRange > mxRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - officecfg/registry

[Michael Meeks]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1360a86cc3ccbe228acf2428a5e230cdf030bfde
Author: Michael Meeks 
Date:   Thu May 24 16:48:58 2018 +0100

Re-enable threading for formula groups for now.

As agreed at the ESC - lets see how this goes for 6.1

This reverts commit 4696d3728f0aba1087001bc543fc0867dd0ebdda.

Change-Id: Ic2be53c53dd7573972cd54c390443dc136739b6c
Reviewed-on: https://gerrit.libreoffice.org/54774
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit a9a15e59d6648223f751a43447676d144aa3fd58)
Reviewed-on: https://gerrit.libreoffice.org/54826
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 18b3612259e6..7951d4bf91cc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1455,7 +1455,7 @@
   
 Whether to use threaded calculation of formula groups when 
applicable.
   
-  false
+  true

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

[Andrea Gelmini]

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

New commits:
commit 14257916b872103b0c8e998499d3e30c94c7b9bb
Author: Andrea Gelmini 
Date:   Fri May 25 01:23:07 2018 +0200

Updated core
Project: help  6663ebc908563da96fcd68acc22c93e501daa4ed

Fix typos

Change-Id: I50e06c9bc42c1e5529074e944b9f1ed37f0a7385
Reviewed-on: https://gerrit.libreoffice.org/54784
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit e35e77e62e90d709633304a45bdc0d430595a01a)
Reviewed-on: https://gerrit.libreoffice.org/54828
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 03b4b8065266..6663ebc90856 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 03b4b8065266d30bfc9b149e20b7439581a02800
+Subproject commit 6663ebc908563da96fcd68acc22c93e501daa4ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - AllLangPackage_html_media_lang.mk source/text

[Andrea Gelmini]

 AllLangPackage_html_media_lang.mk  |2 +-
 source/text/shared/00/00040502.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6663ebc908563da96fcd68acc22c93e501daa4ed
Author: Andrea Gelmini 
Date:   Fri May 25 01:23:07 2018 +0200

Fix typos

Change-Id: I50e06c9bc42c1e5529074e944b9f1ed37f0a7385
Reviewed-on: https://gerrit.libreoffice.org/54784
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
(cherry picked from commit e35e77e62e90d709633304a45bdc0d430595a01a)
Reviewed-on: https://gerrit.libreoffice.org/54828
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/AllLangPackage_html_media_lang.mk 
b/AllLangPackage_html_media_lang.mk
index 45e983a43..7482ec997 100644
--- a/AllLangPackage_html_media_lang.mk
+++ b/AllLangPackage_html_media_lang.mk
@@ -10,7 +10,7 @@
 # Language-specific parts of the help/media/ sub-tree.  All language-specific 
content from
 # $(SRCDIR)/helpcontent2/source/media/ must be listed here.  Content that is 
present in $(SRCDIR)
 # for all languages in some set of languages can be handled with a foreach 
(like the screenshots
-# present for all languages in $(completelangiso) below).  More irregular 
conent that is present in
+# present for all languages in $(completelangiso) below).  More irregular 
content that is present in
 # $(SRCDIR) only for some languages is handled with the individual 
per-language blocks.
 
 $(eval $(call 
gb_AllLangPackage_AllLangPackage,helpcontent2_html_media_lang,$(SRCDIR)/helpcontent2/source/media))
diff --git a/source/text/shared/00/00040502.xhp 
b/source/text/shared/00/00040502.xhp
index 734671ccb..f63017e05 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -104,7 +104,7 @@
  Choose Format - Chart Area - Area tab (chart 
documents).
  Choose Slide - Properties - Background tab (in 
$[officename] Impress).
  Choose Page - Properties - Background tab (in 
$[officename] Draw).
- Choose Table 
- Propeties - Background tab.
+ Choose Table 
- Properties - Background tab.
   
   
  Choose Format - Area - Transparency tab (drawing 
documents)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/osx/salframeview.mm |   38 --
 1 file changed, 38 deletions(-)

New commits:
commit 938ec2597be2e0ad3af2fb99f77de7f87285ad86
Author: Tor Lillqvist 
Date:   Thu May 24 19:14:09 2018 +0300

Bin crack presumably related to the removed debug dialog thing

Change-Id: Ic0cdfc837ac8503968c5226ec309e75ff7172a75
Reviewed-on: https://gerrit.libreoffice.org/54801
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index ca9d44d7ff39..7b670f835695 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -152,27 +152,6 @@ static AquaSalFrame* s_pMouseFrame = nullptr;
 // which lack that information
 static sal_uInt16 s_nLastButton = 0;
 
-// combinations of keys we need to handle ourselves
-static const struct ExceptionalKey
-{
-const sal_uInt16nKeyCode;
-const unsigned int  nModifierMask;
-const sal_uInt16nModifiedKeyCode;
-const bool  bZeroCharacter;
-} aExceptionalKeys[] =
-{
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-// 'NSAlternateKeyMask' is deprecated: first deprecated in macOS 10.12
-// 'NSCommandKeyMask' is deprecated: first deprecated in macOS 10.12
-// 'NSControlKeyMask' is deprecated: first deprecated in macOS 10.12
-// 'NSShiftKeyMask' is deprecated: first deprecated in macOS 10.12
-// 'NSNumericPadKeyMask' is deprecated: first deprecated in macOS 10.12
-{ KEY_D, NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask, KEY_D, 
true },
-{ KEY_D, NSCommandKeyMask | NSShiftKeyMask | NSAlternateKeyMask, KEY_D, 
true },
-{ KEY_POINT, NSNumericPadKeyMask, KEY_DECIMAL, false }
-SAL_WNODEPRECATED_DECLARATIONS_POP
-};
-
 static AquaSalFrame* getMouseContainerFrame()
 {
 AquaSalFrame* pDispatchFrame = nullptr;
@@ -1013,23 +992,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 if( [self sendSingleCharacter: mpLastEvent] )
 return YES;
 }
-unichar keyChar = [pUnmodifiedString characterAtIndex: 0];
-sal_uInt16 nKeyCode = ImplMapCharCode( keyChar );
-
-// Caution: should the table grow to more than 5 or 6 entries,
-// we must consider moving it to a kind of hash map
-const unsigned int nExceptions = SAL_N_ELEMENTS( aExceptionalKeys );
-for( unsigned int i = 0; i < nExceptions; i++ )
-{
-if( nKeyCode == aExceptionalKeys[i].nKeyCode &&
-(mpFrame->mnLastModifierFlags & 
aExceptionalKeys[i].nModifierMask)
-== aExceptionalKeys[i].nModifierMask )
-{
-[self sendKeyInputAndReleaseToFrame: 
aExceptionalKeys[i].nModifiedKeyCode character: 
(aExceptionalKeys[i].bZeroCharacter ? 0 : keyChar) ];
-
-return YES;
-}
-}
 }
 return NO;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/debug loleaflet/evol.colorpicker.strings.js loleaflet/Makefile.am loleaflet/npm-shrinkwrap.json.in loleaflet/package.json

[Andras Timar]

 loleaflet/Makefile.am   |5 +
 loleaflet/debug/document/loleaflet.html |2 --
 loleaflet/evol.colorpicker.strings.js   |7 ---
 loleaflet/npm-shrinkwrap.json.in|   10 --
 loleaflet/package.json  |1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

New commits:
commit b1948bff68c8bbad55cc94b801df107692e92038
Author: Andras Timar 
Date:   Fri May 25 14:56:23 2018 +0200

remove unused evol-colorpicker

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

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index bd5fc2a0a..78bccc835 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -68,8 +68,7 @@ LOLEAFLET_CSS =\
$(builddir)/node_modules/smartmenus/dist/css/sm-core-css.css \
$(builddir)/node_modules/smartmenus/dist/css/sm-simple/sm-simple.css \
$(srcdir)/css/menubar.css \
-   $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css \
-   $(builddir)/node_modules/evol-colorpicker/css/evol-colorpicker.css
+   $(builddir)/node_modules/jquery-ui/themes/ui-lightness/jquery-ui.css
 
 LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(builddir)/dist/$(notdir 
$(file)))
 LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file
@@ -81,7 +80,6 @@ NODE_MODULES_JS =\
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/jquery-ui/jquery-ui.js \
-   node_modules/evol-colorpicker/js/evol-colorpicker.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
node_modules/timeago/jquery.timeago.js \
node_modules/autolinker/dist/Autolinker.js \
@@ -251,7 +249,6 @@ install-data-hook:
 pot:
xgettext --from-code=UTF-8 --keyword=_ 
--output=po/templates/loleaflet-ui.pot \
admin.strings.js \
-   evol.colorpicker.strings.js \
src/errormessages.js \
js/toolbar.js \
src/admin/AdminSocketAnalytics.js \
diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index 429da430e..8f9d5fd9d 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -26,7 +26,6 @@
 
 
 
-
 
 
 
@@ -52,7 +51,6 @@
 
 
 
-
 
 
 
diff --git a/loleaflet/evol.colorpicker.strings.js 
b/loleaflet/evol.colorpicker.strings.js
deleted file mode 100644
index 243259799..0
--- a/loleaflet/evol.colorpicker.strings.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Strings for l10n from evol.colorpicker */
-var themeColors = _('Theme Colors');
-var standardColors = _('Standard Colors');
-var webColors = _('Web Colors');
-var backToPalette = _('Back to Palette');
-var history = _('History');
-var noHistory = _('No history yet.');
diff --git a/loleaflet/npm-shrinkwrap.json.in b/loleaflet/npm-shrinkwrap.json.in
index c7c348cda..0cdbb868c 100644
--- a/loleaflet/npm-shrinkwrap.json.in
+++ b/loleaflet/npm-shrinkwrap.json.in
@@ -1169,16 +1169,6 @@
   "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
   "dev": true
 },
-"evol-colorpicker": {
-  "version": "3.2.6",
-  "resolved": "file:node_shrinkwrap/evol-colorpicker-3.2.6.tgz",
-  "integrity": "sha1-a4Nyx+jvjMVHiCNbl+n6JdZ1Kts=",
-  "dev": true,
-  "requires": {
-"jquery": "2.2.4",
-"jquery-ui": "1.10.5"
-  }
-},
 "evp_bytestokey": {
   "version": "1.0.3",
   "resolved": "file:node_shrinkwrap/evp_bytestokey-1.0.3.tgz",
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 025978dd3..4fbb38854 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -9,7 +9,6 @@
 "browserify-css": "0.9.1",
 "d3": "3.5.17",
 "eslint": "3.0.0",
-"evol-colorpicker": "3.2.6",
 "exorcist": "0.4.0",
 "jake": "~8.0.10",
 "jquery": "2.2.4",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSOC 100 paper cuts update

[Nick Thanda]

Hi everyone,

I have been making progress on two bugs:

tdf#17013 -  Table of Illustration doesn't take 
figures
Initially, I renamed the Illustration Index to Table of Figures and for the 
default category to be Figure. Now, my next step is to revert my changes to the 
Illustration Index and create a new table type for figures rather than renaming 
the illustration index so there would be a Illustration Index and a Table of 
Figures.

You can see progress of this bug here: https://gerrit.libreoffice.org/#/c/54461/

tdf#88961 -  Table line styles are not 
visible
see Image: https://i.imgur.com/bzlzAEB.png
[https://i.imgur.com/bzlzAEB.png]

Initially, I changed it to so the border color changes to be more visible 
(Option 1) but then I thought it would be more suitable to have the border 
color stay the same and the drop down box background color to change (Option 2).

You can see progress of this bug here: https://gerrit.libreoffice.org/#/c/54461/

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

[Libreoffice-commits] core.git: accessibility/source basctl/source chart2/source comphelper/source configmgr/source connectivity/source cppuhelper/source dbaccess/source desktop/source embeddedobj/sou

[Noel Grandin]

 accessibility/source/extended/textwindowaccessibility.cxx |7 
 basctl/source/dlged/dlgedobj.cxx  |6 
 chart2/source/controller/sidebar/Chart2PanelFactory.cxx   |6 
 chart2/source/tools/WrappedPropertySet.cxx|   10 
 comphelper/source/eventattachermgr/eventattachermgr.cxx   |4 
 comphelper/source/misc/backupfilehelper.cxx   |6 
 comphelper/source/misc/storagehelper.cxx  |   16 +
 configmgr/source/components.cxx   |8 
 configmgr/source/configurationregistry.cxx|   11 -
 connectivity/source/drivers/dbase/DTables.cxx |6 
 connectivity/source/drivers/hsqldb/HConnection.cxx|3 
 connectivity/source/drivers/jdbc/JConnection.cxx  |7 
 connectivity/source/drivers/jdbc/Object.cxx   |5 
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx|6 
 connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx   |6 
 connectivity/source/drivers/postgresql/pq_xindexes.cxx|6 
 connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx |6 
 connectivity/source/drivers/postgresql/pq_xkeys.cxx   |6 
 connectivity/source/drivers/postgresql/pq_xtables.cxx |6 
 connectivity/source/drivers/postgresql/pq_xusers.cxx  |6 
 connectivity/source/drivers/postgresql/pq_xviews.cxx  |6 
 connectivity/source/sdbcx/VCollection.cxx |4 
 cppuhelper/source/component.cxx   |8 
 cppuhelper/source/implbase.cxx|   14 -
 cppuhelper/source/propertysetmixin.cxx|  106 
+-
 dbaccess/source/core/api/CRowSetDataColumn.cxx|3 
 dbaccess/source/core/dataaccess/databasedocument.cxx  |   21 +
 dbaccess/source/core/dataaccess/definitioncontainer.cxx   |8 
 dbaccess/source/filter/xml/xmlfilter.cxx  |6 
 dbaccess/source/ui/control/tabletree.cxx  |5 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|6 
 desktop/source/app/check_ext_deps.cxx |6 
 desktop/source/deployment/gui/dp_gui_theextmgr.cxx|   10 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |6 
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx  |4 
 desktop/source/deployment/misc/dp_descriptioninfoset.cxx  |   13 -
 embeddedobj/source/commonembedding/embedobj.cxx   |6 
 embeddedobj/source/commonembedding/persistence.cxx|5 
 embeddedobj/source/msole/oleembed.cxx |   14 -
 eventattacher/source/eventattacher.cxx|6 
 extensions/source/ole/oleobjw.cxx |   64 +++---
 extensions/source/update/feed/updatefeed.cxx  |   29 +-
 forms/source/component/clickableimage.cxx |6 
 forms/source/xforms/submission.cxx|6 
 framework/source/accelerators/storageholder.cxx   |   17 +
 framework/source/fwe/xml/menuconfiguration.cxx|   21 +
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |7 
 jvmaccess/Library_jvmaccess.mk|1 
 jvmaccess/source/classpath.cxx|8 
 oox/source/docprop/docprophandler.cxx |6 
 package/source/manifest/ManifestWriter.cxx|6 
 package/source/xstor/ohierarchyholder.cxx |   12 -
 package/source/zippackage/ZipPackage.cxx  |   30 +-
 package/source/zippackage/zipfileaccess.cxx   |7 
 pyuno/source/module/pyuno_adapter.cxx |4 
 pyuno/source/module/pyuno_runtime.cxx |4 
 reportdesign/source/core/api/ReportDefinition.cxx |5 
 sax/source/expatwrap/saxwriter.cxx|   15 -
 sc/source/ui/sidebar/ScPanelFactory.cxx   |6 
 sc/source/ui/unoobj/dapiuno.cxx   |7 
 sc/source/ui/vba/vbaaxes.cxx  |6 
 sc/source/ui/vba/vbachartobjects.cxx  |5 
 sc/source/ui/vba/vbarange.cxx |   10 
 scripting/source/protocolhandler/scripthandler.cxx|   12 -
 scripting/source/provider/ActiveMSPList.cxx   |3 
 scripting/source/provider/ProviderCache.cxx   |   15 -
 sd/source/core/

[Libreoffice-commits] core.git: basegfx/source basic/source compilerplugins/clang cui/source dbaccess/source include/basegfx include/filter include/sfx2 include/svl include/svx include/vcl sc/inc sc/s

[Noel Grandin]

 basegfx/source/polygon/b3dpolygon.cxx  |8 
 basegfx/source/polygon/b3dpolypolygon.cxx  |2 +-
 basic/source/runtime/inputbox.cxx  |2 +-
 compilerplugins/clang/passstuffbyref.cxx   |4 
 cui/source/dialogs/cuicharmap.cxx  |2 +-
 cui/source/inc/cuicharmap.hxx  |4 ++--
 cui/source/inc/postdlg.hxx |2 +-
 dbaccess/source/filter/hsqldb/alterparser.hxx  |6 +++---
 dbaccess/source/filter/hsqldb/columndef.hxx|4 ++--
 dbaccess/source/filter/hsqldb/createparser.hxx |4 ++--
 include/basegfx/polygon/b3dpolygon.hxx |8 
 include/basegfx/polygon/b3dpolypolygon.hxx |2 +-
 include/filter/msfilter/svdfppt.hxx|4 ++--
 include/sfx2/charwin.hxx   |4 ++--
 include/sfx2/opengrf.hxx   |2 +-
 include/svl/aeitem.hxx |2 +-
 include/svx/charmap.hxx|2 +-
 include/vcl/customweld.hxx |2 +-
 sc/inc/scmod.hxx   |2 +-
 sc/inc/userdat.hxx |4 ++--
 sc/source/ui/inc/tabvwsh.hxx   |2 +-
 sd/source/ui/dlg/navigatr.cxx  |2 +-
 sd/source/ui/inc/navigatr.hxx  |2 +-
 sfx2/source/appl/opengrf.cxx   |2 +-
 sfx2/source/appl/sfxhelp.cxx   |2 +-
 svl/source/items/aeitem.cxx|2 +-
 vcl/inc/impgraph.hxx   |2 +-
 27 files changed, 44 insertions(+), 40 deletions(-)

New commits:
commit ff3bdde2527123fc9e011ff0d93e958174632186
Author: Noel Grandin 
Date:   Fri May 25 14:08:33 2018 +0200

loplugin:passstuffbyref

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

diff --git a/basegfx/source/polygon/b3dpolygon.cxx 
b/basegfx/source/polygon/b3dpolygon.cxx
index 1f2e6ebea67a..58be07cfe897 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -1442,7 +1442,7 @@ namespace basegfx
 return mpPolygon->count();
 }
 
-basegfx::B3DPoint B3DPolygon::getB3DPoint(sal_uInt32 nIndex) const
+basegfx::B3DPoint const & B3DPolygon::getB3DPoint(sal_uInt32 nIndex) const
 {
 OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside 
range (!)");
 
@@ -1457,7 +1457,7 @@ namespace basegfx
 mpPolygon->setPoint(nIndex, rValue);
 }
 
-BColor B3DPolygon::getBColor(sal_uInt32 nIndex) const
+BColor const & B3DPolygon::getBColor(sal_uInt32 nIndex) const
 {
 OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside 
range (!)");
 
@@ -1488,7 +1488,7 @@ namespace basegfx
 return mpPolygon->getNormal();
 }
 
-B3DVector B3DPolygon::getNormal(sal_uInt32 nIndex) const
+B3DVector const & B3DPolygon::getNormal(sal_uInt32 nIndex) const
 {
 OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside 
range (!)");
 
@@ -1520,7 +1520,7 @@ namespace basegfx
 mpPolygon->clearNormals();
 }
 
-B2DPoint B3DPolygon::getTextureCoordinate(sal_uInt32 nIndex) const
+B2DPoint const & B3DPolygon::getTextureCoordinate(sal_uInt32 nIndex) const
 {
 OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside 
range (!)");
 
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx 
b/basegfx/source/polygon/b3dpolypolygon.cxx
index b7ea0b36631e..7cb977065e0f 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -229,7 +229,7 @@ namespace basegfx
 return mpPolyPolygon->count();
 }
 
-B3DPolygon B3DPolyPolygon::getB3DPolygon(sal_uInt32 nIndex) const
+B3DPolygon const & B3DPolyPolygon::getB3DPolygon(sal_uInt32 nIndex) const
 {
 OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B3DPolyPolygon access 
outside range (!)");
 
diff --git a/basic/source/runtime/inputbox.cxx 
b/basic/source/runtime/inputbox.cxx
index ae7302f14c21..b3d495d5bead 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -42,7 +42,7 @@ class SvRTLInputBox : public weld::GenericDialogController
 public:
 SvRTLInputBox(weld::Window* pParent, const OUString& rPrompt, const 
OUString& rTitle,
 const OUString& rDefault, long nXTwips, long nYTwips );
-OUString GetText() const { return m_aText; }
+OUString const & GetText() const { return m_aText; }
 };
 
 SvRTLInputBox::SvRTLInputBox(weld::Window* pParent, const OUString& rPrompt,
diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 8cfae946f041..61bd3cf0f00c 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -274,6 +274,10 @@ void PassStuff

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

[Noel Grandin]

 editeng/source/editeng/editdoc.cxx |   59 ++---
 include/editeng/editids.hrc|1 
 2 files changed, 31 insertions(+), 29 deletions(-)

New commits:
commit 674a9ba1877bea5da60aab4c4bfe4605b0cc3066
Author: Noel Grandin 
Date:   Fri May 25 13:59:12 2018 +0200

SID_FIELD appears to be in use

partial revert part of
commit  fa135fd0e05fc4ba784b4349d65f2e5ed26c0f55
remove unused SID constants and associated code
noticed by Julien Nabet

Also document some more of that array to make the usage more obvious

Change-Id: I4d76034df32bc85b58e4a845b246e5e28dcea49f
Reviewed-on: https://gerrit.libreoffice.org/54799
Reviewed-by: Julien Nabet 
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 97656d378576..90481112cca1 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -162,7 +162,7 @@ const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
 { SID_ATTR_FRAMEDIRECTION, true }, // EE_PARA_WRITINGDIR
 { 0, true },   // EE_PARA_XMLATTRIBS
 { SID_ATTR_PARA_HANGPUNCTUATION, true },   // 
EE_PARA_HANGINGPUNCTUATION
-{ SID_ATTR_PARA_FORBIDDEN_RULES, true },
+{ SID_ATTR_PARA_FORBIDDEN_RULES, true },   // EE_PARA_FORBIDDENRULES
 { SID_ATTR_PARA_SCRIPTSPACE, true },   // EE_PARA_ASIANCJKSPACING
 { SID_ATTR_NUMBERING_RULE, true }, // EE_PARA_NUMBULL
 { 0, true },   // EE_PARA_HYPHENATE
@@ -177,42 +177,43 @@ const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
 { SID_ATTR_TABSTOP, true },// EE_PARA_TABS
 { SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, true }, // EE_PARA_JUST_METHOD
 { SID_ATTR_ALIGN_VER_JUSTIFY, true },  // EE_PARA_VER_JUST
-{ SID_ATTR_CHAR_COLOR, true },
-{ SID_ATTR_CHAR_FONT, true },
-{ SID_ATTR_CHAR_FONTHEIGHT, true },
-{ SID_ATTR_CHAR_SCALEWIDTH, true },
-{ SID_ATTR_CHAR_WEIGHT, true },
-{ SID_ATTR_CHAR_UNDERLINE, true },
-{ SID_ATTR_CHAR_STRIKEOUT, true },
-{ SID_ATTR_CHAR_POSTURE, true },
-{ SID_ATTR_CHAR_CONTOUR, true },
-{ SID_ATTR_CHAR_SHADOWED, true },
-{ SID_ATTR_CHAR_ESCAPEMENT, true },
-{ SID_ATTR_CHAR_AUTOKERN, true },
-{ SID_ATTR_CHAR_KERNING, true },
-{ SID_ATTR_CHAR_WORDLINEMODE, true },
-{ SID_ATTR_CHAR_LANGUAGE, true },
-{ SID_ATTR_CHAR_CJK_LANGUAGE, true },
-{ SID_ATTR_CHAR_CTL_LANGUAGE, true },
-{ SID_ATTR_CHAR_CJK_FONT, true },
-{ SID_ATTR_CHAR_CTL_FONT, true },
-{ SID_ATTR_CHAR_CJK_FONTHEIGHT, true },
-{ SID_ATTR_CHAR_CTL_FONTHEIGHT, true },
-{ SID_ATTR_CHAR_CJK_WEIGHT, true },
-{ SID_ATTR_CHAR_CTL_WEIGHT, true },
-{ SID_ATTR_CHAR_CJK_POSTURE, true },
-{ SID_ATTR_CHAR_CTL_POSTURE, true },
-{ SID_ATTR_CHAR_EMPHASISMARK, true },
-{ SID_ATTR_CHAR_RELIEF, true },
+{ SID_ATTR_CHAR_COLOR, true }, // EE_CHAR_COLOR
+{ SID_ATTR_CHAR_FONT, true },  // EE_CHAR_FONTINFO
+{ SID_ATTR_CHAR_FONTHEIGHT, true },// EE_CHAR_FONTHEIGHT
+{ SID_ATTR_CHAR_SCALEWIDTH, true },// EE_CHAR_FONTWIDTH
+{ SID_ATTR_CHAR_WEIGHT, true },// EE_CHAR_WEIGHT
+{ SID_ATTR_CHAR_UNDERLINE, true }, // EE_CHAR_UNDERLINE
+{ SID_ATTR_CHAR_STRIKEOUT, true }, // EE_CHAR_STRIKEOUT
+{ SID_ATTR_CHAR_POSTURE, true },   // EE_CHAR_ITALIC
+{ SID_ATTR_CHAR_CONTOUR, true },   // EE_CHAR_OUTLINE
+{ SID_ATTR_CHAR_SHADOWED, true },  // EE_CHAR_SHADOW
+{ SID_ATTR_CHAR_ESCAPEMENT, true },// EE_CHAR_ESCAPEMENT
+{ SID_ATTR_CHAR_AUTOKERN, true },  // EE_CHAR_PAIRKERNING
+{ SID_ATTR_CHAR_KERNING, true },   // EE_CHAR_KERNING
+{ SID_ATTR_CHAR_WORDLINEMODE, true },  // EE_CHAR_WLM
+{ SID_ATTR_CHAR_LANGUAGE, true },  // EE_CHAR_LANGUAGE
+{ SID_ATTR_CHAR_CJK_LANGUAGE, true },  // EE_CHAR_LANGUAGE_CJK
+{ SID_ATTR_CHAR_CTL_LANGUAGE, true },  // EE_CHAR_LANGUAGE_CTL
+{ SID_ATTR_CHAR_CJK_FONT, true },  // EE_CHAR_FONTINFO_CJK
+{ SID_ATTR_CHAR_CTL_FONT, true },  // EE_CHAR_FONTINFO_CTL
+{ SID_ATTR_CHAR_CJK_FONTHEIGHT, true }, // EE_CHAR_FONTHEIGHT_CJK
+{ SID_ATTR_CHAR_CTL_FONTHEIGHT, true }, // EE_CHAR_FONTHEIGHT_CTL
+{ SID_ATTR_CHAR_CJK_WEIGHT, true },// EE_CHAR_WEIGHT_CJK
+{ SID_ATTR_CHAR_CTL_WEIGHT, true },// EE_CHAR_WEIGHT_CTL
+{ SID_ATTR_CHAR_CJK_POSTURE, true },   // EE_CHAR_ITALIC_CJK
+{ SID_ATTR_CHAR_CTL_POSTURE, true },   // EE_CHAR_ITALIC_CTL
+{ SID_ATTR_CHAR_EMPHASISMARK, true },  // EE_CHAR_EMPHASISMARK
+{ SID_ATTR_CHAR_RELIEF, true },// EE_CHAR_RELI

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/productlist.mk

[David Tardon]

 sysui/productlist.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4f21e3a3bae06bd13bd7cc221502d9373e55994
Author: David Tardon 
Date:   Wed Dec 6 19:16:19 2017 +0100

fix variable name

Change-Id: Ie3eef59c934f5fe4146a911e4ee652457b94edd8
(cherry picked from commit 8978fdf58a403aa62e04d47e65cd799740e6b909)
Reviewed-on: https://gerrit.libreoffice.org/54807
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sysui/productlist.mk b/sysui/productlist.mk
index aa6fbd4a38d4..5d21a8e52b87 100644
--- a/sysui/productlist.mk
+++ b/sysui/productlist.mk
@@ -11,7 +11,7 @@ PRODUCTLIST := libreoffice libreofficedev
 PKGVERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)
 PKGVERSIONSHORT := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)
 PRODUCTNAME.libreoffice := LibreOffice
-PRODUCTNAME.libreofficeodev := LibreOfficeDev
+PRODUCTNAME.libreofficedev := LibreOfficeDev
 UNIXFILENAME.libreoffice := libreoffice$(PKGVERSIONSHORT)
 UNIXFILENAME.libreofficedev := libreofficedev$(PKGVERSIONSHORT)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit fb2744064baa62744bfa9c734a88645c2bf629ba
Author: Michael Stahl 
Date:   Fri May 25 18:41:52 2018 +0200

sw_redlinehide: fix SwCursorShell::GetContentAtPos() redline code

This calls SwTextFrame::GetCharRect() on the frame where the mouse
cursor is, with SwPositions that may be in a unrelated SwTextNode.

Bogus positions now triggers asserts, so let's fix it.

Change-Id: Idedb335ffd79c299976ad91b683dfb30cd0ceac2

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3864b07e9cf5..a8c8fada8c40 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1493,11 +1493,17 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 
 if( pFieldRect && nullptr != ( pFrame = 
pTextNd->getLayoutFrame( GetLayout(), &aPt ) ) )
 {
+// not sure if this should be limited to one
+// paragraph, or mark the entire redline; let's
+// leave it limited to one for now...
+sal_Int32 nStart;
+sal_Int32 nEnd;
+pRedl->CalcStartEnd(pTextNd->GetIndex(), nStart, 
nEnd);
 //get bounding box of range
 SwRect aStart;
-pFrame->GetCharRect(aStart, *pRedl->Start(), 
&aTmpState);
+pFrame->GetCharRect(aStart, SwPosition(*pTextNd, 
nStart), &aTmpState);
 SwRect aEnd;
-pFrame->GetCharRect(aEnd, *pRedl->End(), 
&aTmpState);
+pFrame->GetCharRect(aEnd, SwPosition(*pTextNd, 
nEnd), &aTmpState);
 if (aStart.Top() != aEnd.Top() || aStart.Bottom() 
!= aEnd.Bottom())
 {
 aStart.Left(pFrame->getFrameArea().Left());
commit a5d1645f95862938ba565490d09e8d6d128c8b6e
Author: Michael Stahl 
Date:   Fri May 25 14:04:33 2018 +0200

sw_redlinehide: hyphenation

There's a loop over nodes, calling SwTextNode::Hyphenate() each time.
Introduce a new class SwInterHyphInfoTextFrame that is used in the
SwTextFrame functions, and SwTextNode::Hyphenate() converts between
the 2 types.

Not sure if this will hyphenate a word that is split across nodes in the
model, but perhaps this is good enough in practice.

Change-Id: I78dec370e15c372284c934d9658b2dd5b3b97ae0

diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 11b39a10fa3a..efd4c33e6352 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -109,11 +109,15 @@ struct SwSpellArgs : SwArgsBase
 
 class SwInterHyphInfo
 {
-css::uno::Reference< css::linguistic2::XHyphenatedWord >xHyphWord;
+/// output: hyphenated word
+css::uno::Reference xHyphWord;
+/// input: cursor point to locate the frame
 const Point aCursorPos;
 public:
+/// input: requested range to hyphenate
 sal_Int32 nStart;
 sal_Int32 nEnd;
+/// output: found word
 sal_Int32 nWordStart;
 sal_Int32 nWordLen;
 
@@ -124,10 +128,6 @@ public:
 , nWordStart(0), nWordLen(0)
 {
 }
-sal_Int32 GetEnd() const
-{
-return nEnd;
-}
 const Point *GetCursorPos() const
 {
 return aCursorPos.X() || aCursorPos.Y() ? &aCursorPos : nullptr;
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index a139293fec7c..68087a0fb1b6 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -748,6 +748,8 @@ static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* 
pArgs )
 SwHyphArgs *pHyphArgs = static_cast(pArgs);
 if( pNode )
 {
+// sw_redlinehide: this will be called once per node for merged nodes;
+// the fully deleted ones won't have frames so are skipped.
 SwContentFrame* pContentFrame = pNode->getLayoutFrame( 
pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
 if( pContentFrame && 
!static_cast(pContentFrame)->IsHiddenNow() )
 {
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index e7c51f082efc..3307378a1026 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -25,6 +25,8 @@
 #include 
 #include "TextFrameIndex.hxx"
 
+namespace com { namespace sun { namespace star { namespace linguistic2 { class 
XHyphenatedWord; } } } }
+
 class SwCharRange;
 class SwTextNode;
 class SwTextFormatter;
@@ -46,6 +48,31 @@ class SwScriptInfo;
 
 #define NON_PRINTING_CHARACTER_COLOR Color(0x26, 0x8b, 0xd2)
 
+/// a clone of SwInterHyphInfo, but with TextFrameIndex instead of node index
+class SwInterHyphInfoTextFrame
+{
+private:
+/// output: hyphenated word
+css::uno::Reference m_xHyphWord;
+public:
+/// input: requested range to hyphenate

Fwd: GSoC weekly update: Manuj Vashist

[Manuj Vashist]

Hello Everyone,

I had a slow start in my project and now after almost 2 weeks I have
improved the entry ui (dataproviderentry.ui) having next and cancel buttons
and replaced the coloring of dialogue box with greyed out next button.
Now working on data transformation dialog and looking how to make a right
click menu and join the dialogs.
Thank you.

Regards,
Manuj Vashist
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar]

 loleaflet/dist/toolbar/toolbar.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5a29248000167d5e8995214d38b547f1202218eb
Author: Andras Timar 
Date:   Fri May 25 14:31:34 2018 +0200

l10n of color picker widget

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

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 94a402310..ad2a05848 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -307,6 +307,9 @@ function onClick(id, item, subItem) {
// absolutely no idea why, but without the timeout, the popup is
// closed as soon as it is opend
setTimeout(function () {
+   $('#fontColorPicker').colorpicker({
+   strings: _('Theme Colors') + ',' + _('Standard 
Colors') + ',' + _('Web Colors') + ',' + _('Theme Colors') + ',' + _('Back to 
Palette') + ',' + _('History') + ',' + _('No history yet.')
+   });
$('#fontColorPicker').colorpicker('showPalette');
$('.ui-widget-content').addClass('loleaflet-font');
}, 0);
@@ -315,6 +318,9 @@ function onClick(id, item, subItem) {
// absolutely no idea why, but without the timeout, the popup is
// closed as soon as it is opend
setTimeout(function () {
+   $('#backColorPicker').colorpicker({
+   strings: _('Theme Colors') + ',' + _('Standard 
Colors') + ',' + _('Web Colors') + ',' + _('Theme Colors') + ',' + _('Back to 
Palette') + ',' + _('History') + ',' + _('No history yet.')
+   });
$('#backColorPicker').colorpicker('showPalette');
$('.ui-widget-content').addClass('loleaflet-font');
}, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers vcl/UIConfig_vcl.mk

[Samuel Thibault]

 solenv/sanitizers/ui/vcl.suppr |   14 ++
 vcl/UIConfig_vcl.mk|4 
 2 files changed, 18 insertions(+)

New commits:
commit 305285bd1450bb847058a877b0dc2adface4e521
Author: Samuel Thibault 
Date:   Fri May 4 14:08:27 2018 +0200

vcl: Run gla11y on demo.ui

Change-Id: I63d67709ab50e86b138fecd814b4dee7e2f2a755
Reviewed-on: https://gerrit.libreoffice.org/53925
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/sanitizers/ui/vcl.suppr b/solenv/sanitizers/ui/vcl.suppr
index 5251717f54d5..1014ae74d870 100644
--- a/solenv/sanitizers/ui/vcl.suppr
+++ b/solenv/sanitizers/ui/vcl.suppr
@@ -7,3 +7,17 @@ vcl/uiconfig/ui/printdialog.ui://GtkEntry[@id='pagerange'] 
no-labelled-by
 vcl/uiconfig/ui/printerdevicepage.ui://GtkEntry[@id='custom'] no-labelled-by
 vcl/uiconfig/ui/printprogressdialog.ui://GtkLabel[@id='label'] orphan-label
 vcl/uiconfig/ui/printprogressdialog.ui://GtkProgressBar[@id='progressbar'] 
no-labelled-by
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='labelfoo'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label4'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label5'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkSpinButton[@id='spinbutton1'] 
no-labelled-by
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label6'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label7'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label8'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkEntry[@id='entry1'] no-labelled-by
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label34'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label35'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label36'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label37'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label38'] orphan-label
+vcl/qa/cppunit/builder/demo.ui://GtkLabel[@id='label39'] orphan-label
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index 85dbe823d5cc..8238c717a279 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -22,4 +22,8 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/querydialog \
 ))
 
+$(eval $(call gb_UIConfig_add_a11yerrors_uifiles,vcl,\
+   vcl/qa/cppunit/builder/demo \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Keith Curtis]

 vcl/source/window/toolbox2.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 758d2099ae281e270ef014711b693580ab27206b
Author: Keith Curtis 
Date:   Tue May 22 03:35:37 2018 -0400

Remove unnecessary code from ae37972cd25117d467d34ee8591c21dcbb5a0fec

Git commit: ae37972cd25117d467d34ee8591c21dcbb5a0fec added some logic at
the bottom to call Toolbox::SetItemImage to trigger the bitmap doubling
code. This is no longer needed and is faster without.

Change-Id: I0fb0538000d5616cb8d8a0ae35e15fb09cdf2c59
Reviewed-on: https://gerrit.libreoffice.org/54654
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index de0faecfa607..cc86b0d9a0f9 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -373,7 +373,6 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& 
rImage, ToolBoxItemBi
 // create item and add to list
 mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? 
mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(),
  ImplToolItem( nItemId, rImage, nBits ) );
-SetItemImage(nItemId, rImage);
 mpData->ImplClearLayoutData();
 
 ImplInvalidate( true );
@@ -393,7 +392,6 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& 
rImage, const OUStrin
 // create item and add to list
 mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? 
mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(),
  ImplToolItem( nItemId, rImage, 
MnemonicGenerator::EraseAllMnemonicChars(rText), nBits ) );
-SetItemImage(nItemId, rImage);
 mpData->ImplClearLayoutData();
 
 ImplInvalidate( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] help.git: Properly handle language-specific parts of --with-help=html media/ sub-tree

[Stephan Bergmann]

On 25/05/18 13:57, Stephan Bergmann wrote:

On 24/05/18 10:50, Stephan Bergmann wrote:

New commits:
commit 33551e7fd85aa327f76bb343a3740bceb162bbfa
Author: Stephan Bergmann 
Date:   Thu May 24 10:41:34 2018 +0200

 Properly handle language-specific parts of --with-help=html 
media/ sub-tree

[...]

 What is not quite right yet is that content from
 helpcontent2/AllLangPackage_html_lang.mk and
 helpcontent2/AllLangPackage_html_media_lang.mk is ending up in 
both per-language

 helpcontent installation sets (as intended, via the instructions in
 helpcontent2/CustomTarget_html.mk) and per-language languagepack 
installation
 sets (which is unintended).  This needs to be fixed with a 
follow-up commit.


For the record, it appears that the observed behavior is intended, and 
also happens with the old --with-help format:  For example on Linux with 
--with-help --with-lang=de --with-package-format=archive, 
workdir/installation/LibreOffice_languagepack/archive/install/de/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_archive_langpack_de.tar.gz 
contains everything from 
workdir/installation/LibreOffice_helppack/archive/install/de/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_archive_helppack_de.tar.gz. 
  This is presumably in line with the behavior for other package 
formats, where e.g. with --with-package-format=rpm, 
workdir/installation/LibreOffice_languagepack/rpm/install/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_langpack_de_download/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_langpack_de.tar.gz 
contains the libobasis6.1-de-help-6.1.0.0.alpha1-1.x86_64.rpm from 
workdir/installation/LibreOffice_helppack/rpm/install/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_helppack_de_download/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_helppack_de.tar.gz, 
too.  (On the other hand, 
 
does not contain a duplicate of 
libobasis6.0-de-help-6.0.4.2-2.x86_64.rpm from 
. 
  Oh my.)


As cloph explained on IRC, the magic difference is 
--without-helppack-integration explicitly specified in the various 
distro-configs/LibreOffice*.conf (and otherwise defaulting to 
--with-helppack-integration).

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

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/inc vcl/qt5

[Katarina Behrens]

 vcl/inc/qt5/Qt5Menu.hxx |3 ++-
 vcl/qt5/Qt5Menu.cxx |   21 ++---
 2 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 08c2927e0587428d2c242ffcdf142d39f23df092
Author: Katarina Behrens 
Date:   Fri May 25 16:04:24 2018 +0200

Dispatch commands from menus for real

Change-Id: I01997caa22e14c1350bd83100edb74397ebab5d7

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 408d97e76520..37887045506f 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -42,6 +42,7 @@ public:
 virtual voidSetSubMenu( SalMenuItem* pSalMenuItem, 
SalMenu* pSubMenu, unsigned nPos ) override;
 virtual voidSetFrame( const SalFrame* pFrame ) override;
 const Qt5Frame* GetFrame() const;
+Qt5Menu*GetTopLevel();
 virtual voidCheckItem( unsigned nPos, bool bCheck ) 
override;
 virtual voidEnableItem( unsigned nPos, bool bEnable ) 
override;
 virtual voidShowItem( unsigned nPos, bool bShow ) override;
@@ -56,7 +57,7 @@ public:
 Qt5MenuItem*GetItemAtPos( unsigned nPos ) { return 
maItems[ nPos ]; }
 
 private slots:
-void DispatchCommand();
+void DispatchCommand( Qt5MenuItem* pQItem );
 };
 
 class Qt5MenuItem : public SalMenuItem
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index f7ebc5617d8c..91de0defccff 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -114,7 +114,8 @@ void Qt5Menu::DoFullMenuUpdate( Menu* pMenuBar, QMenu* 
pParentMenu )
 // leaf menu
 QAction *pAction = pQMenu->addAction( toQString(aText) );
 pAction->setShortcut( toQString( 
nAccelKey.GetName(GetFrame()->GetWindow()) ) );
-connect( pAction, &QAction::triggered, this, 
&Qt5Menu::DispatchCommand );
+connect( pAction, &QAction::triggered, this,
+ [this, pSalMenuItem]{ 
DispatchCommand(pSalMenuItem); } );
 }
 }
 }
@@ -156,6 +157,14 @@ void Qt5Menu::GetSystemMenuData( SystemMenuData* pData )
 {
 }
 
+Qt5Menu* Qt5Menu::GetTopLevel()
+{
+Qt5Menu *pMenu = this;
+while (pMenu->mpParentSalMenu)
+pMenu = pMenu->mpParentSalMenu;
+return pMenu;
+}
+
 const Qt5Frame* Qt5Menu::GetFrame() const
 {
 SolarMutexGuard aGuard;
@@ -165,9 +174,15 @@ const Qt5Frame* Qt5Menu::GetFrame() const
 return pMenu ? pMenu->mpFrame : nullptr;
 }
 
-void Qt5Menu::DispatchCommand()
+void Qt5Menu::DispatchCommand( Qt5MenuItem *pQItem )
 {
-SAL_WARN("vcl.qt5", "menu triggered");
+if ( pQItem )
+{
+Qt5Menu* pSalMenu = pQItem->mpParentMenu;
+Qt5Menu* pTopLevel = pSalMenu->GetTopLevel();
+pTopLevel->GetMenu()->HandleMenuCommandEvent(pSalMenu->GetMenu(), 
pQItem->mnId);
+SAL_WARN("vcl.qt5", "menu triggered " << pQItem->mnId );
+}
 }
 
 void Qt5Menu::NativeItemText( OUString& rItemText )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamas Bunth]

 dbaccess/source/filter/hsqldb/createparser.cxx |   39 -
 1 file changed, 38 insertions(+), 1 deletion(-)

New commits:
commit ded4dcbbce875efeffba7e894a6dea1f584e8e9b
Author: Tamas Bunth 
Date:   Mon May 14 09:19:56 2018 +0200

tdf#117115 dbahsql: respect unicode in columns

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

diff --git a/dbaccess/source/filter/hsqldb/createparser.cxx 
b/dbaccess/source/filter/hsqldb/createparser.cxx
index 893cfa93330a..9054a2f9bf72 100644
--- a/dbaccess/source/filter/hsqldb/createparser.cxx
+++ b/dbaccess/source/filter/hsqldb/createparser.cxx
@@ -27,6 +27,42 @@ using namespace css::sdbc;
 
 namespace
 {
+//Find ascii escaped unicode
+sal_Int32 lcl_IndexOfUnicode(const OString& rSource, const sal_Int32 nFrom = 0)
+{
+const OString sHexDigits = "0123456789abcdefABCDEF";
+sal_Int32 nIndex = rSource.indexOf("\\u", nFrom);
+if (nIndex == -1)
+{
+return -1;
+}
+bool bIsUnicode = true;
+for (short nDist = 2; nDist <= 5; ++nDist)
+{
+if (sHexDigits.indexOf(rSource[nIndex + nDist]) == -1)
+{
+bIsUnicode = false;
+}
+}
+return bIsUnicode ? nIndex : -1;
+}
+
+//Convert ascii escaped unicode to utf-8
+OUString lcl_ConvertToUTF8(const OString& rText)
+{
+OString sResult = rText;
+sal_Int32 nIndex = lcl_IndexOfUnicode(sResult);
+while (nIndex != -1 && nIndex < rText.getLength())
+{
+const OString sHex = sResult.copy(nIndex + 2, 4);
+const sal_Unicode cDec = 
static_cast(strtol(sHex.getStr(), nullptr, 16));
+const OString sNewChar = OString(&cDec, 1, RTL_TEXTENCODING_UTF8);
+sResult = sResult.replaceAll("\\u" + sHex, sNewChar);
+nIndex = lcl_IndexOfUnicode(sResult, nIndex);
+}
+return OStringToOUString(sResult, RTL_TEXTENCODING_UTF8);
+}
+
 /// Returns substring of sSql from the first occurrence of '(' until the
 /// last occurrence of ')' (excluding the parenthesis)
 OUString lcl_getColumnPart(const OUString& sSql)
@@ -192,7 +228,7 @@ void CreateStmtParser::parseColumnPart(const OUString& 
sColumnPart)
 // to fetch the whole column name, including quotes
 auto nEndColumnName
 = bIsQuoteUsedForColumnName ? sColumn.indexOf("\"", 1) : 
sColumn.indexOf(" ");
-const OUString& rColumnName
+OUString rColumnName
 = sColumn.copy(0, bIsQuoteUsedForColumnName ? nEndColumnName + 1 : 
nEndColumnName);
 
 // create a buffer which begins on column type
@@ -232,6 +268,7 @@ void CreateStmtParser::parseColumnPart(const OUString& 
sColumnPart)
 }
 
 bool bCaseInsensitive = sTypeName.indexOf("IGNORECASE") >= 0;
+rColumnName = lcl_ConvertToUTF8(OUStringToOString(rColumnName, 
RTL_TEXTENCODING_UTF8));
 bool isPrimaryKey = lcl_isPrimaryKey(sColumn);
 
 if (isPrimaryKey)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/source/uibase/app/appenv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f11ce0670749b9da20dfb29269b176cb09fb01e
Author: Mike Kaganski 
Date:   Fri May 25 14:58:11 2018 +0300

tdf#35798: use separate paragraphs for Label elements

Since commit db04be037b611e296ef9f2542322c52ed82d7a2b, empty Database
fields are hidden. But since Labels wizard generates a single paragraph
with line breaks for the label's text, the hiding feature cannot be
used efficiently.

Let the individual lines be in individual paragraphs.

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

diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index bcb6932b2e1d..7b9a927d3df0 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -123,7 +123,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr& 
rFieldMgr, const OUStrin
 if ( !bField )
 rSh.Insert( sTmpText );
 }
-rSh.InsertLineBreak();
+rSh.SplitNode();
 }
 rSh.DelLeft();  // Again remove last linebreak
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'libreoffice-6-1'

[Miklos Vajna]

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6-1-branch-point'

[Miklos Vajna]

Tag 'libreoffice-6-1-branch-point' created by Andras Timar 
 at 2018-05-25 12:39 +

libreoffice-6-1-branch-point

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

Re: [Libreoffice-commits] help.git: Properly handle language-specific parts of --with-help=html media/ sub-tree

[Stephan Bergmann]

On 24/05/18 10:50, Stephan Bergmann wrote:

New commits:
commit 33551e7fd85aa327f76bb343a3740bceb162bbfa
Author: Stephan Bergmann 
Date:   Thu May 24 10:41:34 2018 +0200

 Properly handle language-specific parts of --with-help=html media/ sub-tree
 

[...]
 
 What is not quite right yet is that content from

 helpcontent2/AllLangPackage_html_lang.mk and
 helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both 
per-language
 helpcontent installation sets (as intended, via the instructions in
 helpcontent2/CustomTarget_html.mk) and per-language languagepack 
installation
 sets (which is unintended).  This needs to be fixed with a follow-up 
commit.


For the record, it appears that the observed behavior is intended, and 
also happens with the old --with-help format:  For example on Linux with 
--with-help --with-lang=de --with-package-format=archive, 
workdir/installation/LibreOffice_languagepack/archive/install/de/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_archive_langpack_de.tar.gz 
contains everything from 
workdir/installation/LibreOffice_helppack/archive/install/de/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_archive_helppack_de.tar.gz. 
 This is presumably in line with the behavior for other package 
formats, where e.g. with --with-package-format=rpm, 
workdir/installation/LibreOffice_languagepack/rpm/install/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_langpack_de_download/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_langpack_de.tar.gz 
contains the libobasis6.1-de-help-6.1.0.0.alpha1-1.x86_64.rpm from 
workdir/installation/LibreOffice_helppack/rpm/install/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_helppack_de_download/LibreOffice_6.1.0.0.alpha1_Linux_x86-64_rpm_helppack_de.tar.gz, 
too.  (On the other hand, 
 
does not contain a duplicate of 
libobasis6.0-de-help-6.0.4.2-2.x86_64.rpm from 
. 
 Oh my.)

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

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

[Noel Grandin]

 oox/source/export/chartexport.cxx |2 +-
 oox/source/export/drawingml.cxx   |2 +-
 sc/source/filter/lotus/lotform.cxx|4 ++--
 svx/source/accessibility/AccessibleTextHelper.cxx |5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 080fa092f466d5ba457852736a3fd6c6cb0dc4b8
Author: Noel Grandin 
Date:   Fri May 25 11:29:44 2018 +0200

improve some logging

if we're going to write "unhandled" messages, at least what is being
unhandled

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

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index bd91390d5f3c..9f170eaa53e8 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1239,7 +1239,7 @@ void ChartExport::exportManualLayout(const 
css::chart2::RelativePosition& rPos,
 x -= w;
 break;
 default:
-SAL_WARN("oox", "unhandled alignment case for manual layout 
export");
+SAL_WARN("oox", "unhandled alignment case for manual layout export 
" << static_cast(rPos.Anchor));
 }
 
 pFS->singleElement(FSNS(XML_c, XML_x),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1c0be28fdaf9..25ea475b2ac4 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -891,7 +891,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , 
bool bRelPathToMedia )
 }
 else
 {
-SAL_WARN("oox.shape", "unhandled graphic type" );
+SAL_WARN("oox.shape", "unhandled graphic type " << 
static_cast(aType) );
 /*Earlier, even in case of unhandled graphic types we were
   proceeding to write the image, which would eventually
   write an empty image with a zero size, and return a valid
diff --git a/sc/source/filter/lotus/lotform.cxx 
b/sc/source/filter/lotus/lotform.cxx
index 4000b3c1a4ea..cbf29f667bb7 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -287,7 +287,7 @@ void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, 
sal_uInt16 nRow, ScSingleRefDa
 nRow &= 0x1FFF;
 break;
 default:
-SAL_WARN( "sc.filter", "*LotusToSc::LotusRelToScRel(): 
unhandled case?" );
+SAL_WARN( "sc.filter", "*LotusToSc::LotusRelToScRel(): 
unhandled case? " << m_rContext.eTyp );
 }
 }
 else
@@ -307,7 +307,7 @@ void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, 
sal_uInt16 nRow, ScSingleRefDa
 nRow &= 0x3FFF;
 break;
 default:
-SAL_WARN( "sc.filter", "*LotusToSc::LotusRelToScRel(): 
unhandled case?" );
+SAL_WARN( "sc.filter", "*LotusToSc::LotusRelToScRel(): 
unhandled case? " << m_rContext.eTyp );
 }
 }
 
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx 
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 2707d768c273..f19e3a518c47 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -1285,7 +1286,7 @@ namespace accessibility
 }
 catch( const uno::Exception& )
 {
-SAL_WARN("svx", "Unhandled exception.");
+DBG_UNHANDLED_EXCEPTION("svx");
 }
 }
 }
@@ -1399,7 +1400,7 @@ namespace accessibility
 }
 catch( const uno::Exception& )
 {
-SAL_WARN("svx", "Unhandled exception.");
+DBG_UNHANDLED_EXCEPTION("svx");
 mbInNotify = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC weekly update: Smarart Editing in Impress

[Ekansh Jha]

Hello Community,

This mail is regarding status update about the work till now in the GSoC
period.
I have written a blog about the work I've done till now:
https://medium.com/@ekanshjha/google-summer-of-code18-first-and-second-week-
f0b090d163fd
and will be writing updates at https://medium.com/@ekanshjha.

Regards,
Ekansh Jha
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 8 commits - loleaflet/css loleaflet/images loleaflet/js

[Pranav Kant]

 loleaflet/css/toolbar.css   |  112 
+
 loleaflet/images/lc_arrowshapes.chevron.svg |6 
 loleaflet/images/lc_arrowshapes.circular-arrow.svg  |6 
 loleaflet/images/lc_arrowshapes.corner-right-arrow.svg  |6 
 loleaflet/images/lc_arrowshapes.down-arrow-callout.svg  |6 
 loleaflet/images/lc_arrowshapes.down-arrow.svg  |6 
 loleaflet/images/lc_arrowshapes.left-arrow-callout.svg  |6 
 loleaflet/images/lc_arrowshapes.left-arrow.svg  |6 
 loleaflet/images/lc_arrowshapes.left-right-arrow-callout.svg|6 
 loleaflet/images/lc_arrowshapes.notched-right-arrow.svg |6 
 loleaflet/images/lc_arrowshapes.pentagon-right.svg  |6 
 loleaflet/images/lc_arrowshapes.quad-arrow-callout.svg  |6 
 loleaflet/images/lc_arrowshapes.quad-arrow.svg  |6 
 loleaflet/images/lc_arrowshapes.right-arrow-callout.svg |6 
 loleaflet/images/lc_arrowshapes.right-arrow.svg |6 
 loleaflet/images/lc_arrowshapes.s-sharped-arrow.svg |6 
 loleaflet/images/lc_arrowshapes.split-arrow.svg |6 
 loleaflet/images/lc_arrowshapes.split-round-arrow.svg   |6 
 loleaflet/images/lc_arrowshapes.striped-right-arrow.svg |6 
 loleaflet/images/lc_arrowshapes.svg |6 
 loleaflet/images/lc_arrowshapes.up-arrow-callout.svg|6 
 loleaflet/images/lc_arrowshapes.up-arrow.svg|6 
 loleaflet/images/lc_arrowshapes.up-down-arrow-callout.svg   |6 
 loleaflet/images/lc_arrowshapes.up-down-arrow.svg   |6 
 loleaflet/images/lc_arrowshapes.up-right-arrow-callout.svg  |6 
 loleaflet/images/lc_arrowshapes.up-right-arrow.svg  |6 
 loleaflet/images/lc_arrowshapes.up-right-down-arrow.svg |6 
 loleaflet/images/lc_basicshapes.block-arc.svg   |7 
 loleaflet/images/lc_basicshapes.can.svg |7 
 loleaflet/images/lc_basicshapes.cross.svg   |7 
 loleaflet/images/lc_basicshapes.cube.svg|7 
 loleaflet/images/lc_basicshapes.diamond.svg |7 
 loleaflet/images/lc_basicshapes.hexagon.svg |7 
 loleaflet/images/lc_basicshapes.isosceles-triangle.svg  |7 
 loleaflet/images/lc_basicshapes.octagon.svg |7 
 loleaflet/images/lc_basicshapes.paper.svg   |   11 
 loleaflet/images/lc_basicshapes.pentagon.svg|7 
 loleaflet/images/lc_basicshapes.right-triangle.svg  |7 
 loleaflet/images/lc_basicshapes.ring.svg|7 
 loleaflet/images/lc_basicshapes.round-quadrat.svg   |7 
 loleaflet/images/lc_basicshapes.trapezoid.svg   |7 
 loleaflet/images/lc_calloutshapes.cloud-callout.svg |6 
 loleaflet/images/lc_calloutshapes.line-callout-1.svg|6 
 loleaflet/images/lc_calloutshapes.line-callout-2.svg|6 
 loleaflet/images/lc_calloutshapes.line-callout-3.svg|6 
 loleaflet/images/lc_calloutshapes.rectangular-callout.svg   |6 
 loleaflet/images/lc_calloutshapes.round-callout.svg |6 
 loleaflet/images/lc_calloutshapes.svg   |6 
 loleaflet/images/lc_flowchartshapes.flowchart-card.svg  |6 
 loleaflet/images/lc_flowchartshapes.flowchart-collate.svg   |6 
 loleaflet/images/lc_flowchartshapes.flowchart-data.svg  |6 
 loleaflet/images/lc_flowchartshapes.flowchart-decision.svg  |6 
 loleaflet/images/lc_flowchartshapes.flowchart-delay.svg |6 
 loleaflet/images/lc_flowchartshapes.flowchart-direct-access-storage.svg |6 
 loleaflet/images/lc_flowchartshapes.flowchart-display.svg   |6 
 loleaflet/images/lc_flowchartshapes.flowchart-document.svg  |6 
 loleaflet/images/lc_flowchartshapes.flowchart-internal-storage.svg  |6 
 loleaflet/images/lc_flowchartshapes.flowchart-manual-input.svg  |6 
 loleaflet/images/lc_flowchartshapes.flowchart-multidocument.svg |   10 
 loleaflet/images/lc_flowchartshapes.flowchart-off-page-connector.svg|6 
 loleaflet/images/lc_flowchartshapes.flowchart-or.svg|6 
 loleaflet/images/lc_flowchartshapes.flowchart-prede

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

[Armin Le Grand]

 svx/source/tbxctrls/fontworkgallery.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 726d7e7b8b50dca9914329dbfd9491f7c8961f68
Author: Armin Le Grand 
Date:   Fri May 25 12:58:10 2018 +0200

tdf#117629: Remove again after next step of SOSAW080 is done

Change-Id: I837b20b3334dbb7f241af31c5fa5b702f1df8742

diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index 29003a619d64..1c2d236d69ad 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -226,7 +226,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
 // : This also *might* be the hidden reason for the 
strange code at the
 // end of SdrObject::SetPage that tries to delete the 
SvxShape under some
 // circumstances...
-pNewObject->SetPage(nullptr);
+// pNewObject->SetPage(nullptr);
 
 tools::Rectangle aObjRect( pNewObject->GetLogicRect() );
 tools::Rectangle aVisArea = 
pOutDev->PixelToLogic(tools::Rectangle(Point(0,0), 
pOutDev->GetOutputSizePixel()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/i18nlangtag include/o3tl include/sfx2 include/svl include/svx

[Noel Grandin]

 include/i18nlangtag/lang.h  |4 ++--
 include/o3tl/strong_int.hxx |3 +--
 include/sfx2/shell.hxx  |3 +--
 include/svl/undo.hxx|3 +--
 include/svx/svdtypes.hxx|3 +--
 5 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit a28a839b9f9eeec1544c5ceeeabe7b1083ce1655
Author: Noel Grandin 
Date:   Thu May 24 21:43:08 2018 +0200

no need declare these tag structs separately

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

diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 84adccafc6bf..d49b701d94c8 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -83,8 +83,8 @@
 #include 
 #include 
 #include 
-struct LanguageTypeTag {};
-typedef o3tl::strong_int LanguageType;
+
+typedef o3tl::strong_int LanguageType;
 inline std::ostream& operator<<(std::ostream& os, LanguageType const & lt) { 
os << sal_uInt16(lt); return os; }
 constexpr LanguageType primary(LanguageType lt) { return 
LanguageType(sal_uInt16(lt) & 0x03ff); }
 
diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx
index c0378e344c69..bdb60b30fb69 100644
--- a/include/o3tl/strong_int.hxx
+++ b/include/o3tl/strong_int.hxx
@@ -75,8 +75,7 @@ isInRange(T2 value) {
 /// Wrap up an integer type so that we prevent accidental conversion to other 
integer types.
 ///
 /// e.g.
-///   struct MyIntTag {};
-///   typedef o3tl::strong_int MyInt;
+///   typedef o3tl::strong_int MyInt;
 ///
 /// \param UNDERLYING_TYPE the underlying scalar type
 /// \param PHANTOM_TYPEa type tag, used to distinguish this instantiation 
of the template
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index e3339e9de113..8b6bd28dbe30 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -66,8 +66,7 @@ namespace svl
 Id for s, gives a quasi-static access to the interface
 through an array to .
 */
-struct SfxInterfaceIdTag {};
-typedef o3tl::strong_int SfxInterfaceId;
+typedef o3tl::strong_int SfxInterfaceId;
 
 constexpr auto SFX_INTERFACE_NONE = SfxInterfaceId(0);
 constexpr auto SFX_INTERFACE_SFXAPP   = SfxInterfaceId(1);
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index b0ee7e21f657..e91aca41a69a 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -29,8 +29,7 @@
 
 struct MarkedUndoAction;
 
-struct ViewShellIdTag;
-typedef o3tl::strong_int ViewShellId;
+typedef o3tl::strong_int ViewShellId;
 
 class SVL_DLLPUBLIC SfxRepeatTarget
 {
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index 38e41fa45a92..f6c6b36e6971 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -56,8 +56,7 @@ enum class SdrDragMode
 // You can use this value in the methods of SdrLayerSet, but false is returned
 // every time or the method does nothing.
 // type declaration for Layer-IDs
-struct SdrLayerIDTag {};
-typedef o3tl::strong_int SdrLayerID;
+typedef o3tl::strong_int SdrLayerID;
 
 // If there is no layer when it should be identified, then
 // SdrLayerAdmin::GetLayerID(const String&) returns a value.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - include/vcl sd/source vcl/source

[Ashod Nakashian]

 include/vcl/pdfread.hxx  |   13 +
 sd/source/filter/pdf/sdpdffilter.cxx |   13 ++---
 vcl/source/filter/ipdf/pdfread.cxx   |   34 +-
 3 files changed, 40 insertions(+), 20 deletions(-)

New commits:
commit 40478fae4fe73319c5f336c69c6f5f5b0fed9991
Author: Ashod Nakashian 
Date:   Thu May 24 23:01:15 2018 -0400

pdf: preserve the original page dimensions on import

Also allow for rendering PDFs to images at custom
resolution, instead of hard-coded (old hard-coded
value of 96 dpi is now default arguments).

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

diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx
index 8fd840685248..5d79c6d38146 100644
--- a/include/vcl/pdfread.hxx
+++ b/include/vcl/pdfread.hxx
@@ -21,11 +21,16 @@ VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap 
&rBitmap,
  size_t nPageIndex,
  css::uno::Sequence &rPdfFata,
  sal_uInt64 nPos = STREAM_SEEK_TO_BEGIN,
- sal_uInt64 nSize = STREAM_SEEK_TO_END);
-VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic);
+ sal_uInt64 nSize = STREAM_SEEK_TO_END,
+ const double fResolutionDPI = 96.);
 
-VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL, std::vector& 
rBitmaps,
-   css::uno::Sequence& rPdfData);
+VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic,
+ const double fResolutionDPI = 96.);
+
+VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL,
+   std::vector& rBitmaps,
+   css::uno::Sequence& rPdfData,
+   const double fResolutionDPI = 96.);
 }
 
 #endif // INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx 
b/sd/source/filter/pdf/sdpdffilter.cxx
index 4f7bd4ed0a6c..01e6ee5623de 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -99,9 +99,12 @@ bool SdPdfFilter::Import()
 const OUString aFileName(
 
mrMedium.GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::NONE));
 
+// Rendering resolution.
+const double dResolutionDPI = 96.;
+
 uno::Sequence aPdfData;
 std::vector aBitmaps;
-if (vcl::ImportPDF(aFileName, aBitmaps, aPdfData) == 0)
+if (vcl::ImportPDF(aFileName, aBitmaps, aPdfData, dResolutionDPI) == 0)
 return false;
 
 // Prepare the link with the PDF stream.
@@ -129,8 +132,12 @@ bool SdPdfFilter::Import()
 
 // Create the page and insert the Graphic.
 SdPage* pPage = mrDocument.GetSdPage(nPageNumber++, 
PageKind::Standard);
-const Size aGrfSize(OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), 
aGraphic.GetPrefMapMode(),
-   
MapMode(MapUnit::Map100thMM)));
+Size aGrfSize(OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), 
aGraphic.GetPrefMapMode(),
+ 
MapMode(MapUnit::Map100thMM)));
+
+// Resize to original size based on 72 dpi to preserve page size.
+aGrfSize = Size(aGrfSize.Width() * 72. / dResolutionDPI,
+aGrfSize.Height() * 72. / dResolutionDPI);
 
 // Make the page size match the rendered image.
 pPage->SetSize(aGrfSize);
diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 52d8e7277719..f61c4062fb37 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -58,15 +58,16 @@ int CompatibleWriter::WriteBlockCallback(FPDF_FILEWRITE* 
pFileWrite, const void*
 }
 
 /// Convert to inch, then assume 96 DPI.
-double pointToPixel(double fPoint)
+inline double pointToPixel(const double fPoint, const double fResolutionDPI)
 {
-return fPoint / 72 * 96;
+return fPoint * fResolutionDPI / 72.;
 }
 
 /// Does PDF to bitmap conversion using pdfium.
 size_t generatePreview(SvStream& rStream, std::vector& rBitmaps,
sal_uInt64 nPos, sal_uInt64 nSize,
-   const size_t nFirstPage = 0, int nPages = 1)
+   const size_t nFirstPage = 0, int nPages = 1,
+   const double fResolutionDPI = 96.)
 {
 FPDF_LIBRARY_CONFIG aConfig;
 aConfig.version = 2;
@@ -97,8 +98,8 @@ size_t generatePreview(SvStream& rStream, 
std::vector& rBitmaps,
 break;
 
 // Returned unit is points, convert that to pixel.
-const size_t nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage));
-const size_t nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage));
+const size_t nPageWidth = pointToPix

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

[Gabor Kelemen]

 sc/IwyuFilter_sc.yaml  |4 
 sc/inc/attrib.hxx  |1 +
 sc/inc/chartpos.hxx|1 +
 sc/inc/conditio.hxx|2 ++
 sc/inc/consoli.hxx |1 +
 sc/inc/dociter.hxx |1 +
 sc/inc/document.hxx|1 +
 sc/inc/global.hxx  |9 ++---
 sc/inc/grouparealistener.hxx   |1 -
 sc/inc/helpids.h   |2 --
 sc/inc/hints.hxx   |1 +
 sc/inc/queryentry.hxx  |1 +
 sc/source/core/data/markarr.cxx|1 +
 sc/source/core/tool/jumpmatrix.cxx |2 +-
 sc/source/core/tool/zforauto.cxx   |1 +
 sc/source/filter/inc/formel.hxx|1 +
 sc/source/filter/xml/XMLExportSharedData.hxx   |1 +
 sc/source/filter/xml/XMLStylesExportHelper.cxx |1 +
 sc/source/filter/xml/xmlimprt.hxx  |1 +
 sc/source/ui/inc/impex.hxx |1 +
 sc/source/ui/inc/inputhdl.hxx  |1 +
 sc/source/ui/inc/pfuncache.hxx |1 +
 sc/source/ui/inc/rfindlst.hxx  |1 +
 23 files changed, 26 insertions(+), 11 deletions(-)

New commits:
commit f8edef392245c292398a80f6a858ca19f32df9c3
Author: Gabor Kelemen 
Date:   Sun May 13 22:19:46 2018 +0200

tdf#42949 Fix IWYU warnings in sc/inc/[gh]*

Found with bin/find-unneeded-includes
Simple removal proposals are dealt with here
and a bit of fallout management

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 84b23623a578..853e06214546 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -177,3 +177,7 @@ blacklist:
 - global.hxx
 # Needed for macros
 - calcmacros.hxx
+sc/inc/global.hxx:
+# base class has to be a complete type
+- com/sun/star/uno/Reference.hxx
+- tools/ref.hxx
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index d44a7cce4d77..fadbad0639ac 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_ATTRIB_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index cde8b9ff5285..275c4da1dafd 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_CHARTPOS_HXX
 
 #include "rangelst.hxx"
+#include 
 #include 
 #include 
 
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 6fd387a0e100..21a670053c11 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_CONDITIO_HXX
 
 #include "global.hxx"
+#include 
 #include "address.hxx"
 #include 
 #include "scdllapi.h"
@@ -42,6 +43,7 @@
 class ScFormulaCell;
 class ScTokenArray;
 struct ScRefCellValue;
+class Color;
 
 namespace sc {
 
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 015245cd1895..d16a082ce578 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -22,6 +22,7 @@
 
 #include "global.hxx"
 #include "address.hxx"
+#include 
 
 class ScDocument;
 
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index ac76f7412a9a..920759abc8c4 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -43,6 +43,7 @@ struct ScQueryParam;
 struct ScDBQueryParamInternal;
 struct ScDBQueryParamMatrix;
 class ScFormulaCell;
+class OutputDevice;
 struct ScInterpreterContext;
 enum class SvNumFormatType : sal_Int16;
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 77dfca451d2a..ccade9f02c6f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "scdllapi.h"
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index bbdd26d9d38a..050e38250508 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -23,18 +23,16 @@
 #include "address.hxx"
 #include 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include "scdllapi.h"
 #include 
 
 #include 
-#include 
 
-class Bitmap;
 class SfxItemSet;
 class SfxViewShell;
-class Color;
 struct ScCalcConfig;
 enum class SvtScriptType;
 enum class FormulaError : sal_uInt16;
@@ -460,7 +458,6 @@ struct ScImportParam
 booloperator==  ( const ScImportParam& r ) const;
 };
 
-class ScDocument;
 class ScDocShell;
 class SvxSearchItem;
 class ScAutoFormat;
@@ -471,7 +468,6 @@ class SvxBrushItem;
 class ScFunctionList;
 class ScFunctionMgr;
 class SfxItemPool;
-class SdrModel;
 class EditTextObject;
 class SfxObjectShell;
 class SvNumberFormatter;
@@ -482,7 +478,6 @@ class SvtSysLocale;
 class CalendarWrapper;
 class CollatorWrapper;
 class IntlWrapper;
-class OutputD

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

[Tor Lillqvist]

 vbahelper/source/vbahelper/vbaapplicationbase.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 3ebaf1a9fb28be42358f5460e5ab7322d4f1dee8
Author: Tor Lillqvist 
Date:   Tue Mar 6 10:02:44 2018 +0200

Bin some ASCII graphics

Change-Id: I53ef86a997f4ae1c0ad84bb381327cba3143dd4c

diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx 
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 2fb92cf5c786..198c71fb6c45 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -54,10 +54,8 @@ using namespace ::ooo::vba;
 
 #define OFFICEVERSION "11.0"
 
-// VbaTimerInfo==
 typedef ::std::pair< OUString, ::std::pair< double, double > > VbaTimerInfo;
 
-// VbaTimer==
 class VbaTimer
 {
 Timer m_aTimer;
@@ -134,7 +132,6 @@ IMPL_LINK_NOARG(VbaTimer, MacroCallHdl, Timer *, void)
 {}
 }
 
-// VbaTimerInfoHash==
 struct VbaTimerInfoHash
 {
 size_t operator()( const VbaTimerInfo& rTimerInfo ) const
@@ -145,10 +142,8 @@ struct VbaTimerInfoHash
 }
 };
 
-// VbaTimerHashMap==
 typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash > 
VbaTimerHashMap;
 
-// VbaApplicationBase_Impl==
 struct VbaApplicationBase_Impl final
 {
 VbaTimerHashMap m_aTimerHash;
@@ -169,7 +164,6 @@ struct VbaApplicationBase_Impl final
 }
 };
 
-// VbaApplicationBase==
 VbaApplicationBase::VbaApplicationBase( const uno::Reference< 
uno::XComponentContext >& xContext )
 : ApplicationBase_BASE( uno::Reference< XHelperInterface 
>(), xContext )
 , m_pImpl( new VbaApplicationBase_Impl )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC'18 Weekly Report 1: Listbox separate read values from input values - Hrishabh Rajput

[Hrishabh Rajput]

Hello,

In week 1, I worked on duplicating the List Entries and List Content
properties of the ListBox, which would contain the values which are
desirable, and not the deprecated ones.
The progress can be seen at https://gerrit.libreoffice.org/#/c/54791/

This week I am working on making connections between the newly
created properties and the original connections.

Thank you,
Hrishabh Rajput
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 395e7d47b87c152f994de289278e3a51c6ec1c9c
Author: Olivier Hallot 
Date:   Thu May 24 22:28:33 2018 -0300

Updated core
Project: help  0affb71917d215b6d76eb5983a39c726fed53f29

Add GDPR in online help

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

diff --git a/helpcontent2 b/helpcontent2
index e35e77e62e90..0affb71917d2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e35e77e62e90d709633304a45bdc0d430595a01a
+Subproject commit 0affb71917d215b6d76eb5983a39c726fed53f29
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

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

New commits:
commit 0affb71917d215b6d76eb5983a39c726fed53f29
Author: Olivier Hallot 
Date:   Thu May 24 22:28:33 2018 -0300

Add GDPR in online help

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

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 899526f19..54dd71c0c 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -240,8 +240,8 @@
 
 
 
+https://www.libreoffice.org/imprint"; 
target="_blank">Impressum (Legal Info) | https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy | 
https://www.documentfoundation.org/statutes.pdf"; 
target="_blank">Statutes (non-binding English translation) - https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung 
(binding German version) | Copyright information: Unless otherwise 
specified, all text and images on this website are licensed under the https://www.libreoffice.org/download/license/"; target="_blank">Mozilla 
Public License v2.0. “LibreOffice” and “The Document Foundation” are 
registered trademarks of their corresponding registered owners or are in actual 
use as trademarks in one or more countries. Their respective logos and icons 
are also subject to international copyright laws. Use thereof is explained in 
our https://wiki.documentfoundation.org/TradeMark_Poli
 cy" target="_blank">trademark policy. LibreOffice was based on 
OpenOffice.org.
 
-https://www.libreoffice.org/imprint"; 
target="_blank">Impressum (Legal Info) | https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy | 
https://www.documentfoundation.org/statutes.pdf"; 
target="_blank">Statutes (non-binding English translation) - https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung 
(binding German version) | Copyright information: Unless otherwise 
specified, all text and images on this website are licensed under the https://www.libreoffice.org/download/license/"; target="_blank">Mozilla 
Public License v2.0. “LibreOffice” and “The Document Foundation” are 
registered trademarks of their corresponding registered owners or are in actual 
use as trademarks in one or more countries. Their respective logos and icons 
are also subject to international copyright laws. Use thereof is explained in 
our https://wiki.documentfoundation.org/TradeMark_Policy"; 
 target="_blank">trademark policy. LibreOffice was based on 
OpenOffice.org.
 
 Help content debug info:
 This page is: https://opengrok.libreoffice.org/xref/help/source{$filename}"; 
target="_blank">
@@ -290,6 +290,7 @@
 

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9bbb71d4a003d00a3361f337b3f96d4a19a35562
Author: Tor Lillqvist 
Date:   Tue Feb 13 18:28:42 2018 +0200

Add one line of hopefully correctly understood explanation

Change-Id: Ib22583a45c03a4b7c3b4ff73e9d28f47ab31bc4f

diff --git a/extensions/source/ole/unoobjw.hxx 
b/extensions/source/ole/unoobjw.hxx
index d2fa9c4ac8cc..528d6a342a04 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -73,6 +73,9 @@ typedef std::unordered_map
 MemberInfo
 > IdToMemberInfoMap;
 
+// An InterfaceOleWrapper object can wrap either a UNO struct or a UNO
+// interface as a COM IDispatchEx and IUnoObjectWrapper.
+
 class InterfaceOleWrapper : public WeakImplHelper,
 public IDispatchEx,
 public UnoConversionUtilities,
___
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.3-desktop' - external/curl

[Mike Kaganski]

 external/curl/ExternalProject_curl.mk |2 +-
 external/curl/curl-msvc.patch.1   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 16dc1fe6ff6e4303ec2c7a461e907bbeecf534cc
Author: Mike Kaganski 
Date:   Fri May 25 05:31:27 2018 +0100

Define _USING_V110_SDK71_ conditionally

This reverts commit 331e325b8229976312129daa1bc94a584104cb07.

Change-Id: I4935d2cf62309776fee445d4babd42b5e385762a
Reviewed-on: https://gerrit.libreoffice.org/54788
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 1b7dd05e519e..c12a5cf19c7d 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -70,7 +70,7 @@ else ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
+   CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC)) $(if $(findstring 
120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),/D_USING_V110_SDK71_)" \
MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \
mode=dll \
VC=12 \
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 8ea8530454ad..80160958c99d 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -7,7 +7,7 @@ MSVC: using SOLARINC
  CC_NODEBUG  = $(CC) /O2 /DNDEBUG
  CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
 -CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL
-+CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL $(SOLARINC) /D_USING_V110_SDK71_
++CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL $(SOLARINC)
  !ENDIF
  
  LFLAGS = /nologo /machine:$(MACHINE)
___
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.3-desktop' - external/curl

[Andras Timar]

 external/curl/ExternalProject_curl.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c1b0e70151a5c441174954b22793b7f7571368be
Author: Andras Timar 
Date:   Wed May 23 22:35:53 2018 +0200

-mmacosx-version-min is passed already

Change-Id: I028253d752b9a9ce54d1725e987dc6d9f9a7514b

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 4a0b4d50a608..1b7dd05e519e 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -59,8 +59,6 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(ENABLE_DEBUG),--enable-debug) \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
-   $(if $(filter MACOSX,$(OS)),CFLAGS='$(CFLAGS) \
-   
-mmacosx-version-min=$(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS)') \
CPPFLAGS='$(curl_CPPFLAGS)' \
LDFLAGS='$(curl_LDFLAGS)' \
ZLIB_CFLAGS='$(ZLIB_CFLAGS)' ZLIB_LIBS='$(ZLIB_LIBS)' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 extensions/source/ole/servprov.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d6f684067092a32e45a75e9290d7d19a753f726
Author: Tor Lillqvist 
Date:   Tue Feb 13 00:53:48 2018 +0200

Bin noise part of comment

Our convention is to just have the name of the abstract base class in
a comment before the declaration of the concrete overrides of its
abstract member functions. No need to say "Abstract struct" there.

Change-Id: I2b9bdf0555af5280771370a6df56fd4c8623661a

diff --git a/extensions/source/ole/servprov.hxx 
b/extensions/source/ole/servprov.hxx
index 8d128b4c48e3..d5fd30f889fd 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -114,7 +114,7 @@ public:
 
 css::uno::Sequence SAL_CALL getSupportedServiceNames() override;
 
-// Abstract struct UnoConversionUtilities
+// UnoConversionUtilities
 Reference< XInterface > createUnoWrapperInstance() override;
 Reference< XInterface > createComWrapperInstance() override;
 protected:
@@ -141,7 +141,7 @@ public:
 
 css::uno::Sequence SAL_CALL getSupportedServiceNames() override;
 
-// Abstract struct UnoConversionUtilities
+// UnoConversionUtilities
 Reference< XInterface > createUnoWrapperInstance() override;
 Reference< XInterface > createComWrapperInstance() override;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC weekly update: Improvements in Notebookbar

[Kshitij Pathania]

Hi Everyone,

Following is the weekly update of my work:

1. Activated the notebookbar in draw
https://gerrit.libreoffice.org/#/c/54547/  .

2. Work in progress for label colors after theme change
https://gerrit.libreoffice.org/#/c/54301/  .

3. Also aligned hamburger icon to the center
https://gerrit.libreoffice.org/#/c/54111/ .

4. Also going through the code of resizing for notebookbar.

Regards,
Kshitij Pathania
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Running LOOL - openssl error

[Miklos Vajna]

Hi,

On Thu, May 24, 2018 at 10:18:22AM +, Renato Ribeiro 
 wrote:
> make[2]: Entering directory '/home/renato/libreoffice/online'
>   CXX  wsd/Admin.o
> In file included from /opt/poco/include/Poco/Crypto/RSADigestEngine.h:21:0,
>  from wsd/Auth.hpp:17,
>  from wsd/Admin.cpp:24:
> /opt/poco/include/Poco/Crypto/Crypto.h:30:30: fatal error: 
> openssl/opensslv.h: No such file or directory

Do you have the openssl headers (development package) installed? E.g.
libopenssl-devel on openSUSE.

Regards,

Miklos


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 6 commits - configure.ac download.lst external/curl lotuswordpro/source RepositoryExternal.mk sw/source

[Andras Timar]

 RepositoryExternal.mk |2 
 configure.ac  |2 
 download.lst  |4 
 external/curl/ExternalPackage_curl.mk |8 -
 external/curl/ExternalProject_curl.mk |   59 ++--
 external/curl/UnpackedTarball_curl.mk |   13 +-
 external/curl/clang-cl.patch.0|   11 ++
 external/curl/curl-7.26.0_mingw.patch |   24 -
 external/curl/curl-7.26.0_win-proxy.patch |   49 --
 external/curl/curl-msvc-disable-protocols.patch.1 |   35 +++
 external/curl/curl-msvc-schannel.patch.1  |   22 
 external/curl/curl-msvc.patch.1   |   48 +-
 external/curl/curl-xp.patch.1 |   12 --
 external/curl/zlib.patch.0|  100 ++
 lotuswordpro/source/filter/lwpfrib.cxx|2 
 sw/source/filter/xml/xmltexti.cxx |   13 +-
 16 files changed, 246 insertions(+), 158 deletions(-)

New commits:
commit 8069ad6bebdd18c5250e7d2ba0daedacdf0488e0
Author: Andras Timar 
Date:   Fri May 25 00:27:54 2018 -0700

Bump version to 5.0-45

Change-Id: I12d50b95f12ec66810dfa4a5c7b39c92987c2aee

diff --git a/configure.ac b/configure.ac
index c18fbd50f1b6..121fe43e17f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.0.10.44],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.45],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
commit 383d9ac86e9b77e0d4eac6e1ebea7851e3e55142
Author: Mike Kaganski 
Date:   Thu May 24 14:20:08 2018 -0700

Fix build with SDK 7.1A

Change-Id: I2031b8c162d6fdb666d6f6d0daec205b88190370
Reviewed-on: https://gerrit.libreoffice.org/54782
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 331e325b8229976312129daa1bc94a584104cb07)

diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 80160958c99d..8ea8530454ad 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -7,7 +7,7 @@ MSVC: using SOLARINC
  CC_NODEBUG  = $(CC) /O2 /DNDEBUG
  CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
 -CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL
-+CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL $(SOLARINC)
++CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL $(SOLARINC) /D_USING_V110_SDK71_
  !ENDIF
  
  LFLAGS = /nologo /machine:$(MACHINE)
commit 5596c16a34a2c8ac3b68ed7d7de2188640b17791
Author: Mike Kaganski 
Date:   Thu May 24 06:45:27 2018 -0700

Fix curl build on MSVC2013

Change-Id: Ie2e85d5c9945d4204f69135bc59e1d668294a83f
Reviewed-on: https://gerrit.libreoffice.org/54770
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit cce2149365fbf8599de18b277451aca0d0ce5f73)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eb12c36001ec..883fcf500311 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2622,7 +2622,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,curl)/lib/$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
+   $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if 
$(filter X86_64,$(CPUNAME)),x64,x86)-$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if 
$(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 9c88acbd16d3..ff5b9adee1b2 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -69,11 +69,10 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 
 else ifeq ($(COM),MSC)
 
-$(eval $(call gb_ExternalProject_use_nmake,curl,build))
-
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   nmake -f Makefile.vc \
+   CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
+   MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc \
mode=dll \
VC=12 \
$(if $(filter 
X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
commit 5eb96b416c26d77873363411f5d89a61c0f77f3d
Author: Andras Timar 
Date:   Wed May 23 14:10:08 2018 +0200

curl: upgrad

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/fdo80800b_tableStyle.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf117297_tableStyle.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx   |   47 
 sw/source/core/unocore/unotbl.cxx   |   31 ++
 sw/source/core/unocore/unotext.cxx  |   26 
 writerfilter/source/dmapper/DomainMapper.cxx|   18 --
 6 files changed, 80 insertions(+), 42 deletions(-)

New commits:
commit 5e4d89f59614cec08376e1e77625f8610a1490e5
Author: Justin Luth 
Date:   Fri May 18 07:01:59 2018 +0300

tdf#117297 sw unotbl XCell: apply char/para style props to text

This is specifically for the benefit of DOCX import, but it
also makes sense in general. If a SwXCell is given char/para
properties, then apply those properties (without overwriting)
to the cell's contents.

This allows ANY paragraph or character properties that are applied
to a table style to become the "default" for the table.

This fixes a number of things:
-remove one-off hack to get PROP_PARA_LINE_SPACING to work.
-works for all character and paragraph properties (except those
shared with tables like borders).
-works in multi-paragraph cells. Previously those could return
AMBIGUOUS state, in which case the style wasn't applied at all.

Change-Id: Ia98c129879575c1aa8ca1fe2a64f4991c0a264e8
Reviewed-on: https://gerrit.libreoffice.org/54511
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/fdo80800b_tableStyle.docx 
b/sw/qa/extras/ooxmlexport/data/fdo80800b_tableStyle.docx
new file mode 100644
index ..bde907cf227a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/fdo80800b_tableStyle.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf117297_tableStyle.docx 
b/sw/qa/extras/ooxmlexport/data/tdf117297_tableStyle.docx
new file mode 100644
index ..57260f81609f
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf117297_tableStyle.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 12483de3a041..b6125d78aedb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -863,6 +863,53 @@ 
DECLARE_OOXMLEXPORT_TEST(testTableCellWithDirectFormatting, "fdo80800.docx")
 
 }
 
+DECLARE_OOXMLEXPORT_TEST(testFdo80800b_tableStyle, "fdo80800b_tableStyle.docx")
+{
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Cell1 1.5lines"), xPara->getString());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell A1 1.5 line spacing", sal_Int16(150), 
getProperty(xPara, "ParaLineSpacing").Height);
+
+xCell.set(xTable->getCellByName("B1"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Cell2 Implicit (Single)"), 
xPara->getString());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell B1 single line spacing", 
sal_Int16(100), getProperty(xPara, 
"ParaLineSpacing").Height);
+
+xCell.set(xTable->getCellByName("C1"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Cell3 Implicit (Single)"), 
xPara->getString());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("C1 paragraph1 single line spacing", 
sal_Int16(100), getProperty(xPara, 
"ParaLineSpacing").Height);
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("C1 paragraph3 line spacing", sal_Int16(212), 
getProperty(xPara, "ParaLineSpacing").Height);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf117297_tableStyle, "tdf117297_tableStyle.docx")
+{
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("B1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+uno::Reference xText(xPara->getText(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Green text, default size (9), 1.5 spaced"), 
xPara->getString());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell B1 Paragraph1 green font", 
sal_Int32(0x70AD47), getProperty(getRun(xPara, 1), "Char

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

[Gabor Kelemen]

 chart2/IwyuFilter_chart2.yaml |  188 
++
 chart2/source/controller/accessibility/AccessibleChartElement.cxx |1 
 chart2/source/controller/dialogs/DataBrowserModel.cxx |1 
 chart2/source/inc/BaseGFXHelper.hxx   |3 
 chart2/source/inc/CachedDataSequence.hxx  |2 
 chart2/source/inc/CloneHelper.hxx |2 
 chart2/source/inc/CommonConverters.hxx|3 
 chart2/source/inc/CommonFunctors.hxx  |1 
 chart2/source/inc/ContainerHelper.hxx |6 
 chart2/source/inc/DataSource.hxx  |1 
 chart2/source/inc/ErrorBar.hxx|   10 
 chart2/source/inc/EventListenerHelper.hxx |2 
 chart2/source/inc/LifeTime.hxx|2 
 chart2/source/inc/LinePropertiesHelper.hxx|1 
 chart2/source/inc/MediaDescriptorHelper.hxx   |2 
 chart2/source/inc/ModifyListenerHelper.hxx|2 
 chart2/source/inc/NameContainer.hxx   |1 
 chart2/source/inc/OPropertySet.hxx|4 
 chart2/source/inc/PopupRequest.hxx|1 
 chart2/source/inc/PropertyHelper.hxx  |4 
 chart2/source/inc/RegressionCalculationHelper.hxx |1 
 chart2/source/inc/Scaling.hxx |1 
 chart2/source/inc/StatisticsHelper.hxx|1 
 chart2/source/inc/ThreeDHelper.hxx|1 
 chart2/source/inc/UncachedDataSequence.hxx|5 
 chart2/source/inc/UserDefinedProperties.hxx   |1 
 chart2/source/inc/WeakListenerAdapter.hxx |1 
 chart2/source/inc/WrappedPropertySet.hxx  |1 
 chart2/source/inc/chartview/DrawModelWrapper.hxx  |1 
 chart2/source/model/template/ChartTypeTemplate.cxx|1 
 chart2/source/tools/ErrorBar.cxx  |1 
 chart2/source/tools/FormattedStringHelper.cxx |1 
 chart2/source/tools/InternalDataProvider.cxx  |1 
 chart2/source/tools/RegressionCurveHelper.cxx |1 
 chart2/source/tools/Scaling.cxx   |1 
 chart2/source/tools/ThreeDHelper.cxx  |1 
 36 files changed, 203 insertions(+), 54 deletions(-)

New commits:
commit a73ae323fa55088321395a23301b4a87e4860bf6
Author: Gabor Kelemen 
Date:   Mon May 21 18:13:17 2018 +0200

tdf#42949 Fix IWYU warnings in chart2/source/inc/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here
A bit of fallout management was necessary as well
find-unneeded-includes gave no proposals for chart2/inc

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

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
new file mode 100644
index ..4951d1b1ae46
--- /dev/null
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -0,0 +1,188 @@
+---
+assumeFilename: chart2/source/controller/main/ChartWindow.cxx
+blacklist:
+chart2/source/inc/BaseGFXHelper.hxx:
+# base class has to be a complete type
+- com/sun/star/awt/Rectangle.hpp
+- com/sun/star/drawing/PolyPolygonShape3D.hpp
+chart2/source/inc/CharacterProperties.hxx:
+# base class has to be a complete type
+- com/sun/star/beans/Property.hpp
+- com/sun/star/beans/XMultiPropertySet.hpp
+chart2/source/inc/CachedDataSequence.hxx:
+# base class has to be a complete type
+- com/sun/star/beans/XPropertySet.hpp
+- com/sun/star/chart2/data/XDataSequence.hpp
+- com/sun/star/chart2/data/XNumericalDataSequence.hpp
+- com/sun/star/chart2/data/XTextualDataSequence.hpp
+- com/sun/star/lang/XInitialization.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+- com/sun/star/uno/XComponentContext.hpp
+- com/sun/star/util/XCloneable.hpp
+- com/sun/star/util/XModifyBroadcaster.hpp
+chart2/source/inc/ColorPerPointHelper.hxx:
+# base class has to be a complete type
+- com/sun/star/beans/XPropertySet.hpp
+chart2/source/inc/CommonConverters.hxx:
+# base class has to be a complete type
+- com/sun/star/awt/Rectangle.hpp
+- com/sun/star/chart2/data/XDataSequence.hpp
+- com/sun/star/drawing/PolyPolygonBezierCoords.hpp
+chart2/source/inc/ColorPerPointHelper.hxx:
+# base class has to be a complete type
+- com/sun/star/beans/XPropertySet.hpp
+chart2/source/

[Libreoffice-commits] online.git: kit/Kit.cpp

[Miklos Vajna]

 kit/Kit.cpp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8f4c348be35e63af28ea54093ba571b7ce3275b8
Author: Miklos Vajna 
Date:   Fri May 25 09:11:44 2018 +0200

kit: let getPixmap() return an std::vector instead of raw pointer

So the callers can know not only the address of the pixmap, but also the
size of it.

Change-Id: I3aecc33cb354f5878364b11398c276fcabd3103e

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 0b02d5569..25b03f2af 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -590,7 +590,7 @@ public:
 int width = tileWidth * 0.9;
 int height = tileHeight * 0.9;
 
-const unsigned char* pixmap = getPixmap(width, height);
+const std::vector* pixmap = getPixmap(width, height);
 
 if (pixmap && tilePixmap)
 {
@@ -600,7 +600,7 @@ public:
 offsetX += (tileWidth - maxX) / 2;
 offsetY += (tileHeight - maxY) / 2;
 
-alphaBlend(pixmap, _width, _height, offsetX, offsetY, tilePixmap, 
tilesPixmapWidth, tilesPixmapHeight);
+alphaBlend(pixmap->data(), _width, _height, offsetX, offsetY, 
tilePixmap, tilesPixmapWidth, tilesPixmapHeight);
 }
 }
 
@@ -637,10 +637,10 @@ private:
 }
 
 /// Create bitmap that we later use as the watermark for every tile.
-const unsigned char* getPixmap(int width, int height)
+const std::vector* getPixmap(int width, int height)
 {
 if (!_pixmap.empty() && width == _width && height == _height)
-return _pixmap.data();
+return &_pixmap;
 
 _pixmap.clear();
 
@@ -712,7 +712,7 @@ private:
 *p = static_cast(*p * _alphaLevel);
 }
 
-return _pixmap.data();
+return &_pixmap;
 }
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits