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

[Markus Mohrhard]

 include/svl/hint.hxx  |1 +
 sc/source/filter/xml/xmlimprt.cxx |5 +
 sc/source/ui/unoobj/chart2uno.cxx |5 +
 3 files changed, 11 insertions(+)

New commits:
commit f9d8fe959d88011d63fc047a8cc00ded1dd2fda1
Author: Markus Mohrhard 
Date:   Mon Dec 18 00:48:36 2017 +0100

clear the data provider cache after import, tdf#111960

This might also fix some problems with normal ODS files and not just
with FODS files when we recompile formulas after the whole import.

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

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 4cee3ba569a9..223151362e6d 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -90,6 +90,7 @@ enum class SfxHintId {
 ScKillEditViewNoPaint,
 ScHiddenRowsChanged,
 ScSelectionChanged,
+ScClearCache,
 
 // SC accessibility hints
 ScAccTableChanged,
diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 91ebc28bd1cb..0a7f0a44efa8 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1870,6 +1870,11 @@ void SAL_CALL ScXMLImport::endDocument()
 }
 SvXMLImport::endDocument();
 
+if (pDoc)
+{
+pDoc->BroadcastUno(SfxHint(SfxHintId::ScClearCache));
+}
+
 if(pDoc && bSelfImportingXMLSet)
 ScModelObj::getImplementation(GetModel())->AfterXMLLoading();
 }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 41e248971911..020326a268f7 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2850,6 +2850,11 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& 
/*rBC*/, const SfxHint& rHint
 if ( !m_aValueListeners.empty() )
 m_bGotDataChangedHint = true;
 }
+else if (nId == SfxHintId::ScClearCache)
+{
+// necessary after import
+m_aDataArray.clear();
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/htmltab.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 71129c2aa3fc9c4d68e5d16c80c750115487b9b4
Author: Caolán McNamara 
Date:   Sun Dec 17 23:36:07 2017 +

ofz: Null-deref

Change-Id: Ice265d7c868b44c6673f3960dffc227d8352ccd0

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index d422f13e5f0f..1361c574fcea 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3952,7 +3952,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, 
bool bReadOptions,
 
 // If there was an adjustment set for the cell, we need to close it
 std::unique_ptr xCntxt(PopContext());
-EndContext(xCntxt.get());
+if (xCntxt)
+EndContext(xCntxt.get());
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/layout/flylay.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5258b4153239ebd8753b2dd30408df58859f29bb
Author: Caolán McNamara 
Date:   Mon Dec 18 09:02:19 2017 +

coverity#1426315 Logically dead code

Change-Id: I61368c5fa5675ac6a9e43642700ae3ea03d2fda9

diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 92342f5928f6..ae487ebee352 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -717,7 +717,7 @@ void SwFlyLayFrame::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem *pNew )
 
 if (pNew)
 {
-const sal_uInt16 nWhich = pNew ? pNew->Which() : 0;
+const sal_uInt16 nWhich = pNew->Which();
 if( RES_ATTRSET_CHG == nWhich && SfxItemState::SET ==
 static_cast(pNew)->GetChgSet()->GetItemState( 
RES_ANCHOR, false,
 reinterpret_cast(&pAnch) ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 195e0524f9e4964fa5730ecd146f56760e8dcd68
Author: Caolán McNamara 
Date:   Mon Dec 18 09:15:26 2017 +

coverity#1426312 Unchecked return value

Change-Id: I59c65a2fc43e55c445efde351e7bd959f6dfbd04

diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx 
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index fa80968521e1..4f589f32c01b 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -597,7 +597,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & 
sDownloadURL, Update
 dp_misc::create_folder( &destFolderContent, destFolder, 
m_updateCmdEnv.get() );
 
 ::ucbhelper::Content sourceContent;
-dp_misc::create_ucb_content( &sourceContent, sDownloadURL, 
m_updateCmdEnv.get() );
+(void)dp_misc::create_ucb_content(&sourceContent, sDownloadURL, 
m_updateCmdEnv.get());
 
 const OUString sTitle( StrTitle::getTitle( sourceContent ) );
 
___
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' - download.lst external/noto_font Makefile.fetch scp2/source

[Andras Timar]

 Makefile.fetch|8 ++
 download.lst  |   16 +
 external/noto_font/ExternalPackage_noto.mk|   68 --
 external/noto_font/ExternalPackage_notosansjp.mk  |   17 +
 external/noto_font/ExternalPackage_notosanskr.mk  |   17 +
 external/noto_font/ExternalPackage_notosanssc.mk  |   17 +
 external/noto_font/ExternalPackage_notosanstc.mk  |   17 +
 external/noto_font/ExternalPackage_notoserifjp.mk |   17 +
 external/noto_font/ExternalPackage_notoserifkr.mk |   17 +
 external/noto_font/ExternalPackage_notoserifsc.mk |   17 +
 external/noto_font/ExternalPackage_notoseriftc.mk |   17 +
 external/noto_font/Module_noto_font.mk|   16 +
 external/noto_font/UnpackedTarball_noto.mk|   32 ++
 external/noto_font/UnpackedTarball_notosansjp.mk  |   14 
 external/noto_font/UnpackedTarball_notosanskr.mk  |   14 
 external/noto_font/UnpackedTarball_notosanssc.mk  |   14 
 external/noto_font/UnpackedTarball_notosanstc.mk  |   14 
 external/noto_font/UnpackedTarball_notoserifjp.mk |   14 
 external/noto_font/UnpackedTarball_notoserifkr.mk |   14 
 external/noto_font/UnpackedTarball_notoserifsc.mk |   14 
 external/noto_font/UnpackedTarball_notoseriftc.mk |   14 
 scp2/source/ooo/file_font_ooo.scp |8 ++
 scp2/source/ooo/module_hidden_ooo.scp |   10 ++-
 23 files changed, 337 insertions(+), 69 deletions(-)

New commits:
commit 49cc6bc8300223d9cbb7f1e9444ac7eca44cca92
Author: Andras Timar 
Date:   Sun Dec 17 09:12:59 2017 +0100

reduce the size of Noto fonts package (484M->101M)

* do not install UI font variants
* do not install monospaced CJK fonts
* install Region-specific Subset OpenType/CFF (Subset OTF) for CJK
* this is the logical choice on Linux:
  see: https://www.google.com/get/noto/help/cjk/
* keep only 2 weights, Regular and Bold for CJK fonts

Change-Id: I292c7a656a55b76a5c07c4fb24529ac36b5bc34b
Reviewed-on: https://gerrit.libreoffice.org/46637
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/Makefile.fetch b/Makefile.fetch
index c5eabd2d429c..63622b12d9ff 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -225,6 +225,14 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
, $(call 
fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call 
fetch_Optional,LIBGLTF,LIBGLTF_TARBALL)))
$(foreach item, \
$(call fetch_Optional,NOTO_FONT,FONT_NOTO_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_JP_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_KR_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_SC_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SANS_TC_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_JP_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_KR_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_SC_TARBALL) \
+   $(call fetch_Optional,NOTO_FONT,FONT_NOTO_SERIF_TC_TARBALL) \
,$(call 
fetch_Download_item,https://noto-website-2.storage.googleapis.com/pkgs,$(item)))
@mkdir -p $(dir $@) && touch $@
 
diff --git a/download.lst b/download.lst
index 39103821c856..dd39b9588b71 100644
--- a/download.lst
+++ b/download.lst
@@ -49,6 +49,22 @@ export FONT_LIBERATION_TARBALL := 
5c781723a0d9ed6188960defba8e91cf-liberation-fo
 export FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 export FONT_NOTO_TARBALL := Noto-hinted.zip
 export FONT_NOTO_MD5SUM := 5489f1765afd34a2adfdc04d014762e7
+export FONT_NOTO_SANS_JP_TARBALL := NotoSansJP.zip
+export FONT_NOTO_SANS_JP_MD5SUM := 7f2597c54c292b4c72ffcdc5e6d31e4d
+export FONT_NOTO_SANS_KR_TARBALL := NotoSansKR.zip
+export FONT_NOTO_SANS_KR_MD5SUM := f4eb1a945c9eb92fee2767b6cd31b2fb
+export FONT_NOTO_SANS_SC_TARBALL := NotoSansSC.zip
+export FONT_NOTO_SANS_SC_MD5SUM := 9c158949366651424b904ba2a5938dfe
+export FONT_NOTO_SANS_TC_TARBALL := NotoSansTC.zip
+export FONT_NOTO_SANS_TC_MD5SUM := 8409d9b3c5411fbcb51a6f13326435fa
+export FONT_NOTO_SERIF_JP_TARBALL := NotoSerifJP.zip
+export FONT_NOTO_SERIF_JP_MD5SUM := d0cc719f75a379140b7489b8f0ca36a4
+export FONT_NOTO_SERIF_KR_TARBALL := NotoSerifKR.zip
+export FONT_NOTO_SERIF_KR_MD5SUM := 7d57d811f6995647d6454cce6d6bb097
+export FONT_NOTO_SERIF_SC_TARBALL := NotoSerifSC.zip
+export FONT_NOTO_SERIF_SC_MD5SUM := 179aafc778d3f9b3be2de7cb26e2b140
+export FONT_NOTO_SERIF_TC_TARBALL := NotoSerifTC.zip
+export FONT_NOTO_SERIF_TC_MD5SUM := 6b1b043a3c466055f515d515d1418fdf
 export FONT_OPENSANS_TARBALL := 
7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
 export FONT_PTSERIF_TARBALL := 
c3c1a8ba7452950636e871d25020ce0

Weekly QA Report (W50-2017)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 116 bugs have been created, of which, 44 are still unconfirmed (
Total Unconfirmed bugs: 384 )
    Link: http://tinyurl.com/ydcbudl3

  * 1022 comments have been written.

== STATUSES CHANGED ==
  * 12 bugs have been changed to 'ASSIGNED'.
    Link: http://tinyurl.com/y9oap6zb
    Done by: Miklos Vajna ( 2 ), Heiko Tietze ( 2 ), Tamás Zolnai ( 1 ),
Xisco Faulí ( 1 ), Samuel Mehrbrodt (CIB) ( 1 ), Yousuf Philips (jay) (
1 ), Manuj Vashist ( 1 ), Laurent BP ( 1 ), Dennis Francis ( 1 ), 123tqb
( 1 )

  * 4 bugs have been changed to 'CLOSED'.
    Link: http://tinyurl.com/y92y3vl4
    Done by: Regina Henschel ( 3 ), Eike Rathke ( 1 )

  * 22 bugs have been changed to 'NEEDINFO'.
    Link: http://tinyurl.com/yc2g7b3k
    Done by: Xisco Faulí ( 10 ), Buovjaga ( 7 ), m.a.riosv ( 1 ),
Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 ), Jacques Guilleron ( 1 ),
Eike Rathke ( 1 )

  * 68 bugs have been changed to 'NEW'.
    Link: http://tinyurl.com/y8kf4y2l
    Done by: Buovjaga ( 17 ), Yousuf Philips (jay) ( 8 ), Jacques
Guilleron ( 6 ), Xisco Faulí ( 5 ), V Stuart Foote ( 5 ), Aron Budea ( 5
), dieterp ( 4 ), Heiko Tietze ( 2 ), MM ( 2 ), Alex Thurgood ( 2 ),
Telesto ( 1 ), sawakaze ( 1 ), Julien Nabet ( 1 ), robert ( 1 ), Regina
Henschel ( 1 ), Olivier Hallot ( 1 ), Michael Stahl ( 1 ), lotusom-dev (
1 ), Y ( 1 ), Gabor Kelemen ( 1 ), Timur ( 1 ), a.burger ( 1 )

  * 4 bugs have been changed to 'REOPENED'.
    Link: http://tinyurl.com/y9zan9gz
    Done by: Volga ( 1 ), perie_gut ( 1 ), darrask ( 1 ), Rainer
Bielefeld Retired ( 1 )

  * 26 bugs have been changed to 'RESOLVED DUPLICATE'.
    Link: http://tinyurl.com/y92tdlq3
    Done by: Maxim Monastirsky ( 5 ), Xisco Faulí ( 3 ), m.a.riosv ( 3
), Alex Thurgood ( 3 ), V Stuart Foote ( 2 ), raal ( 2 ), Yousuf Philips
(jay) ( 2 ), XTR ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), Thomas Lendo
( 1 ), jorojmaqui ( 1 ), Timur ( 1 )

  * 39 bugs have been changed to 'RESOLVED FIXED'.
    Link: http://tinyurl.com/y96ajfcw
    Done by: Olivier Hallot ( 11 ), Michael Stahl ( 4 ), Tamás Zolnai (
3 ), Caolán McNamara ( 3 ), Yousuf Philips (jay) ( 2 ), Markus Mohrhard
( 2 ), Justin L ( 2 ), Eike Rathke ( 2 ), Xisco Faulí ( 1 ), Miklos
Vajna ( 1 ), Heiko Tietze ( 1 ), Regina Henschel ( 1 ), Jim Raykowski (
1 ), Patrick Jaap ( 1 ), Maxim Monastirsky ( 1 ), Mike Kaganski ( 1 ),
Gabor Kelemen ( 1 ), Timur ( 1 )

  * 1 bug has been changed to 'RESOLVED INSUFFICIENTDATA'.
    Link: http://tinyurl.com/yalgbr3f
    Done by: Timur ( 1 )

  * 2 bugs have been changed to 'RESOLVED INVALID'.
    Link: http://tinyurl.com/ycrhyoou
    Done by: Buovjaga ( 1 ), László Németh ( 1 )

  * 2 bugs have been changed to 'RESOLVED MOVED'.
    Link: http://tinyurl.com/y6vok6np
    Done by: Buovjaga ( 1 ), Caolán McNamara ( 1 )

  * 6 bugs have been changed to 'RESOLVED NOTABUG'.
    Link: http://tinyurl.com/y7jamyby
    Done by: m.a.riosv ( 2 ), V Stuart Foote ( 1 ), Heiko Tietze ( 1 ),
raal ( 1 ), Jacques Guilleron ( 1 )

  * 2 bugs have been changed to 'RESOLVED NOTOURBUG'.
    Link: http://tinyurl.com/ybl2hfra
    Done by: Buovjaga ( 1 ), David Edmundson ( 1 )

  * 12 bugs have been changed to 'RESOLVED WONTFIX'.
    Link: http://tinyurl.com/yb9unbsn
    Done by: Xisco Faulí ( 4 ), Buovjaga ( 3 ), Olivier Hallot ( 2 ),
Heiko Tietze ( 1 ), Yousuf Philips (jay) ( 1 ), Eike Rathke ( 1 )

  * 22 bugs have been changed to 'RESOLVED WORKSFORME'.
    Link: http://tinyurl.com/y8lfnqgq
    Done by: Buovjaga ( 4 ), Xisco Faulí ( 2 ), Volga ( 2 ), Yousuf
Philips (jay) ( 2 ), OfficeUser ( 2 ), Ximeng Zu ( 1 ), Telesto ( 1 ),
Julien Nabet ( 1 ), Luke ( 1 ), ken ( 1 ), Timon ( 1 ), Jean-Pierre
Ledure ( 1 ), John F. Ervin ( 1 ), Timur ( 1 ), Aron Budea ( 1 )

  * 10 bugs have been changed to 'UNCONFIRMED'.
    Link: http://tinyurl.com/yax2x9b7
    Done by: Kamei ( 1 ), Buovjaga ( 1 ), Mike Kaganski ( 1 ), kuswan (
1 ), Kamil Landa ( 1 ), John Thomas Lenaghan ( 1 ), HG Rybak ( 1 ),
Jacques Guilleron ( 1 ), dieterp ( 1 ), Alessandro ( 1 )

  * 1 bug has been changed to 'VERIFIED DUPLICATE'.
    Link: http://tinyurl.com/yb2l6tjf
    Done by: baffclan ( 1 )

  * 11 bugs have been changed to 'VERIFIED FIXED'.
    Link: http://tinyurl.com/y7zy7g3j
    Done by: Xisco Faulí ( 6 ), m.a.riosv ( 1 ), Timur ( 1 ), Eike
Rathke ( 1 ), Aron Budea ( 1 ), Alex ARNAUD ( 1 )

== KEYWORDS ADDED ==
  * 'bibisectRequest' has been added to 3 bugs.
    Link: http://tinyurl.com/ybcuoad3
    Done by: Telesto ( 2 ), Buovjaga ( 1 )

  * 'bibisected' has been added to 6 bugs.
    Link: http://tinyurl.com/y76y3mxx
    Done by: Xisco Faulí ( 3 ), raal ( 1 ), Terrence Enger ( 1 ), Aron
Budea ( 1 )

  * 'bisected' has been added to 5 bugs.
    Link: http://tinyurl.com/y7gal2ql
    Done by: Xisco Faulí ( 2 ), raal ( 1 ), Michael Stahl ( 1 ), Aron
Budea ( 1 )

  * 'dataLoss' has been added to 1 bug.
    Link: http://tinyurl.com/y9cyqjlf
    Done by: allanforms ( 1 )

  * 'easyHack' has been added t

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

[Noel Grandin]

 sw/source/uibase/lingu/sdrhhcwrap.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e9a201bacef56438111a2ad150325164ae71b573
Author: Noel Grandin 
Date:   Mon Dec 18 09:10:33 2017 +0200

partially revert "Use for range loop in sdrhhcwrap (sw)"

commit 01b64e5f5e3658810c7e66c6577705764ef7e288
managed to drop a fairly important assignment to a class field.

Change-Id: I3fc28fd8b6a47e2ed6a363f42876ce57c9f2e5c2
Reviewed-on: https://gerrit.libreoffice.org/46682
Reviewed-by: Julien Nabet 
Tested-by: Noel Grandin 

diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx 
b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index eab365ffaeb2..5bb3e164352b 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -127,6 +127,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
 SwDrawContact::GetTextObjectsFromFormat( aTextObjs, 
pView->GetDocShell()->GetDoc() );
 for (auto const& textObj : aTextObjs)
 {
+pTextObj = textObj;
 if (textObj)
 {
 OutlinerParaObject* pParaObj = textObj->GetOutlinerParaObject();
___
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' - libreofficekit/qa

[Ashod Nakashian]

 libreofficekit/qa/tilebench/tilebench.cxx |   73 +-
 1 file changed, 61 insertions(+), 12 deletions(-)

New commits:
commit 0e7ccbdd559df3a446e73c367b12824c6c143579
Author: Ashod Nakashian 
Date:   Sun Dec 3 23:34:22 2017 -0500

LOK: support tile-dumping in tilebench

And other improvements.

Change-Id: I5a27d6d2df5f946a708dd3b0b4fef8159da86e5c
(cherry picked from commit b7d893d8a1ecb24290c4470e12d71caba2b85216)
Reviewed-on: https://gerrit.libreoffice.org/46678
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/libreofficekit/qa/tilebench/tilebench.cxx 
b/libreofficekit/qa/tilebench/tilebench.cxx
index e326bd9220bd..a5745b28e5d2 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -13,6 +13,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 #include 
@@ -36,6 +37,48 @@ static double getTimeNow()
(double)aValue.Nanosec / (1000*1000*1000);
 }
 
+/// Dump an array of RGBA or BGRA to an RGB PPM file.
+static void dumpTile(const int nWidth, const int nHeight, const int mode, 
const char* pBuffer)
+{
+std::ofstream ofs("/tmp/dump_tile.ppm");
+ofs << "P6" << "\n"
+<< nWidth << " "
+<< nHeight << "\n"
+<< 255 << "\n" ;
+
+for (int y = 0; y < nHeight; ++y)
+{
+const char* row = pBuffer + y * nWidth * 4;
+for (int x = 0; x < nWidth; ++x)
+{
+const char* pixel = row + x * 4;
+if (mode == LOK_TILEMODE_RGBA)
+{
+ofs.write(pixel, 3); // Skip alpha
+}
+else if (mode == LOK_TILEMODE_BGRA)
+{
+const int alpha = *(pixel + 3);
+char buf[3];
+if (alpha == 0)
+{
+buf[0] = 0;
+buf[1] = 0;
+buf[2] = 0;
+}
+else
+{
+buf[0] = (*(pixel + 2) * 255 + alpha / 2) / alpha;
+buf[1] = (*(pixel + 1) * 255 + alpha / 2) / alpha;
+buf[2] = (*(pixel + 0) * 255 + alpha / 2) / alpha;
+}
+
+ofs.write(buf, 3);
+}
+}
+}
+}
+
 int main( int argc, char* argv[] )
 {
 static const double origin = getTimeNow();
@@ -73,35 +116,42 @@ int main( int argc, char* argv[] )
 aTimes.push_back(TimeRecord());
 
 const int max_parts = (argc > 3 ? atoi(argv[3]) : -1);
-const int max_tiles = (argc > 4 ? atoi(argv[4]) : -1);
+int max_tiles = (argc > 4 ? atoi(argv[4]) : -1);
+const bool dump = true;
 
 if (argv[2] != nullptr)
 {
 aTimes.emplace_back("load document");
 Document *pDocument(pOffice->documentLoad(argv[2]));
 aTimes.emplace_back();
+const int mode = pDocument->getTileMode();
 
 aTimes.emplace_back("getparts");
-const int nOriginalPart = pDocument->getPart();
+const int nOriginalPart = (pDocument->getDocumentType() == 
LOK_DOCTYPE_TEXT ? 1 : pDocument->getPart());
 // Writer really has 1 part (the full doc).
 const int nTotalParts = (pDocument->getDocumentType() == 
LOK_DOCTYPE_TEXT ? 1 : pDocument->getParts());
 const int nParts = (max_parts < 0 ? nTotalParts : std::min(max_parts, 
nTotalParts));
-fprintf(stderr, "Parts to render: %d, Total Parts: %d, Max parts: %d, 
Max tiles: %d\n", nParts, nTotalParts, max_parts, max_tiles);
 aTimes.emplace_back();
 
 aTimes.emplace_back("get size of parts");
+long nWidth = 0;
+long nHeight = 0;
 for (int n = 0; n < nParts; ++n)
 {
 const int nPart = (nOriginalPart + n) % nTotalParts;
 char* pName = pDocument->getPartName(nPart);
 pDocument->setPart(nPart);
-long nWidth = 0, nHeight = 0;
 pDocument->getDocumentSize(&nWidth, &nHeight);
 fprintf (stderr, "  '%s' -> %ld, %ld\n", pName, nWidth, nHeight);
 free (pName);
 }
 aTimes.emplace_back();
 
+// Estimate the maximum tiles based on the number of parts requested, 
if Writer.
+if (pDocument->getDocumentType() == LOK_DOCTYPE_TEXT)
+max_tiles = (int)ceil(max_parts * 16128. / nTilePixelHeight) * 
ceil((double)nWidth / nTilePixelWidth);
+fprintf(stderr, "Parts to render: %d, Total Parts: %d, Max parts: %d, 
Max tiles: %d\n", nParts, nTotalParts, max_parts, max_tiles);
+
 std::vector vBuffer(nTilePixelWidth * nTilePixelHeight 
* 4);
 unsigned char* pPixels = &vBuffer[0];
 
@@ -110,25 +160,25 @@ int main( int argc, char* argv[] )
 const int nPart = (nOriginalPart + n) % nTotalParts;
 char* pName = pDocument->getPartName(nPart);
 pDocument->setPart(nPart);
-long nWidth = 0, nHeight = 0;
 pDocument->getDocumentSize(&nWidth, &n

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - vcl/headless vcl/inc vcl/qa

[Ashod Nakashian]

 vcl/headless/svpbmp.cxx   |5 +-
 vcl/headless/svpgdi.cxx   |   98 --
 vcl/inc/headless/svpgdi.hxx   |3 +
 vcl/qa/cppunit/BitmapTest.cxx |   22 ++---
 4 files changed, 105 insertions(+), 23 deletions(-)

New commits:
commit 11adb51f2553dc4a838c8668d94909771d70e1ab
Author: Ashod Nakashian 
Date:   Sun Dec 3 23:35:26 2017 -0500

vcl-svp: Store 24-bit images in 3-byte pixels

This adds support in headless rendering for more
compact 24-bit RGB image storage in 3-byte pixels
instead of 4 bytes.

There is a conversion necessary to accomodate Cairo,
which requires 4-byte pixels, but that is relatively.

Early tests show no loss of performance at runtime.

Change-Id: I3919f7c56d14d09e67f163f035b4c7683b49087c
(cherry picked from commit 354ad875092fd0c3b12f232950375206ec5d66a6)
Reviewed-on: https://gerrit.libreoffice.org/46679
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index c3ba02f57528..63d0ee047046 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -96,14 +96,15 @@ BitmapBuffer* ImplCreateDIB(
 pDIB->maColorMask = ColorMask(aRedMask, aGreenMask, aBlueMask);
 break;
 }
+case 24:
+pDIB->mnFormat = SVP_24BIT_FORMAT;
+break;
 default:
 nBitCount = 32;
 SAL_FALLTHROUGH;
 case 32:
-{
 pDIB->mnFormat = SVP_CAIRO_FORMAT;
 break;
-}
 }
 
 pDIB->mnFormat |= ScanlineFormat::TopDown;
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 8f09939df899..cd546ab5fdb1 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -23,6 +23,7 @@
 #include "headless/svpcairotextrender.hxx"
 #include "saldatabasic.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -123,25 +124,113 @@ namespace
 }
 }
 
+BitmapBuffer* FastConvert24BitRgbTo32BitCairo(const BitmapBuffer* pSrc)
+{
+if (pSrc == nullptr)
+return nullptr;
+
+assert(pSrc->mnFormat == SVP_24BIT_FORMAT);
+const long nWidth = pSrc->mnWidth;
+const long nHeight = pSrc->mnHeight;
+BitmapBuffer* pDst = new BitmapBuffer;
+pDst->mnFormat = (ScanlineFormat::N32BitTcArgb | 
ScanlineFormat::TopDown);
+pDst->mnWidth = nWidth;
+pDst->mnHeight = nHeight;
+pDst->mnBitCount = 32;
+pDst->maColorMask = pSrc->maColorMask;
+pDst->maPalette = pSrc->maPalette;
+
+long nScanlineBase;
+bool bFail = o3tl::checked_multiply(pDst->mnBitCount, nWidth, 
nScanlineBase);
+if (bFail)
+{
+SAL_WARN("vcl.gdi", "checked multiply failed");
+pDst->mpBits = nullptr;
+delete pDst;
+return nullptr;
+}
+
+pDst->mnScanlineSize = AlignedWidth4Bytes(nScanlineBase);
+if (pDst->mnScanlineSize < nScanlineBase/8)
+{
+SAL_WARN("vcl.gdi", "scanline calculation wraparound");
+pDst->mpBits = nullptr;
+delete pDst;
+return nullptr;
+}
+
+try
+{
+pDst->mpBits = new sal_uInt8[ pDst->mnScanlineSize * nHeight ];
+}
+catch( const std::bad_alloc& )
+{
+// memory exception, clean up
+pDst->mpBits = nullptr;
+delete pDst;
+return nullptr;
+}
+
+for (int y = 0; y < nHeight; ++y)
+{
+sal_uInt8* pS = pSrc->mpBits + y * pSrc->mnScanlineSize;
+sal_uInt8* pD = pDst->mpBits + y * pDst->mnScanlineSize;
+for (int x = 0; x < nWidth; ++x)
+{
+if ((SVP_CAIRO_FORMAT & ~ScanlineFormat::TopDown) == 
ScanlineFormat::N32BitTcRgba)
+{
+pD[0] = pS[0];
+pD[1] = pS[1];
+pD[2] = pS[2];
+pD[3] = 0xff; // Alpha
+}
+else if ((SVP_CAIRO_FORMAT & ~ScanlineFormat::TopDown) == 
ScanlineFormat::N32BitTcArgb)
+{
+pD[0] = 0xff; // Alpha
+pD[1] = pS[0];
+pD[2] = pS[1];
+pD[3] = pS[2];
+}
+else if ((SVP_CAIRO_FORMAT & ~ScanlineFormat::TopDown) == 
ScanlineFormat::N32BitTcBgra)
+{
+pD[0] = pS[2];
+pD[1] = pS[1];
+pD[2] = pS[0];
+pD[3] = 0xff; // Alpha
+}
+else
+{
+assert(!"Unsupported SVP_CAIRO_FORMAT!");
+}
+
+pS += 3;
+pD += 4;
+}
+}
+
+return pDst;
+}
+
 class SourceHelper
 {
 public:
 explicit SourceH

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/inc sc/source

[Ashod Nakashian]

 sc/inc/attarray.hxx  |3 
 sc/inc/column.hxx|   13 +--
 sc/source/core/data/cellvalue.cxx|4 -
 sc/source/core/data/column.cxx   |  103 +++--
 sc/source/core/data/column2.cxx  |   30 +---
 sc/source/core/data/column3.cxx  |  107 ---
 sc/source/core/data/column4.cxx  |   19 +++--
 sc/source/core/data/dociter.cxx  |4 -
 sc/source/core/data/table4.cxx   |2 
 sc/source/ui/docshell/externalrefmgr.cxx |2 
 10 files changed, 153 insertions(+), 134 deletions(-)

New commits:
commit dc3f0bde0bdef2a1e94055be146b433cb9fc54ba
Author: Ashod Nakashian 
Date:   Wed Dec 6 19:41:45 2017 -0500

sc: compact ScColumn

Remove ScDocument* member from ScColumn
and re-use the one in ScAttrArray.

This saves 8 bytes and makes the code more
homogenious by using GetDoc() member everywhere.

Change-Id: I16a94b7ef7c45ef3af14e812b45f255f39939a6e
(cherry picked from commit 1168a11278ed3c2a00058e1f802f6e44cb925318)
Reviewed-on: https://gerrit.libreoffice.org/46680
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 49626ea9e124..e6cfbab5201f 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -83,7 +83,7 @@ class ScAttrArray
 private:
 SCCOL   nCol;
 SCTAB   nTab;
-ScDocument* pDocument;
+ScDocument* const pDocument;
 
 SCSIZE  nCount;
 SCSIZE  nLimit;
@@ -109,6 +109,7 @@ public:
 ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, 
ScAttrArray* pNextColAttrArray = nullptr, bool bCreateEmpty = false );
 ~ScAttrArray();
 
+ScDocument* GetDoc() { return pDocument; }
 voidSetTab(SCTAB nNewTab)   { nTab = nNewTab; }
 voidSetCol(SCCOL nNewCol)   { nCol = nNewCol; }
 #if DEBUG_SC_TESTATTRARRAY
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 569f1ec06e5c..93ed1ce94e8d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -29,6 +29,7 @@
 #include "mtvelements.hxx"
 #include 
 #include 
+#include "attarray.hxx"
 
 #include 
 #include 
@@ -137,14 +138,13 @@ class ScColumn
 // Cell values.
 sc::CellStoreType maCells;
 
-SCCOL   nCol;
-SCTAB   nTab;
-
-ScAttrArray*  pAttrArray;
-ScDocument*   pDocument;
+ScAttrArray* pAttrArray;
 
 size_t mnBlkCountFormula;
 
+SCCOL   nCol;
+SCTAB   nTab;
+
 friend class ScDocument;// for FillInfo
 friend class ScTable;
 friend class ScValueIterator;
@@ -188,8 +188,7 @@ public:
 
 voidInit(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, bool 
bEmptyAttrArray = false);
 
-ScDocument& GetDoc() { return *pDocument;}
-const ScDocument& GetDoc() const { return *pDocument;}
+ScDocument* GetDoc() const { return pAttrArray->GetDoc(); }
 SCTAB GetTab() const { return nTab; }
 SCCOL GetCol() const { return nCol; }
 sc::CellStoreType& GetCellStore() { return maCells; }
diff --git a/sc/source/core/data/cellvalue.cxx 
b/sc/source/core/data/cellvalue.cxx
index 75b7c5bbb12f..5eb57751b312 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -115,7 +115,7 @@ void commitToColumn( const ScCellValue& rCell, ScColumn& 
rColumn, SCROW nRow )
 rColumn.SetRawString(nRow, *rCell.mpString);
 break;
 case CELLTYPE_EDIT:
-rColumn.SetEditText(nRow, ScEditUtil::Clone(*rCell.mpEditText, 
rColumn.GetDoc()));
+rColumn.SetEditText(nRow, ScEditUtil::Clone(*rCell.mpEditText, 
*rColumn.GetDoc()));
 break;
 case CELLTYPE_VALUE:
 rColumn.SetValue(nRow, rCell.mfValue);
@@ -123,7 +123,7 @@ void commitToColumn( const ScCellValue& rCell, ScColumn& 
rColumn, SCROW nRow )
 case CELLTYPE_FORMULA:
 {
 ScAddress aDestPos(rColumn.GetCol(), nRow, rColumn.GetTab());
-rColumn.SetFormulaCell(nRow, new ScFormulaCell(*rCell.mpFormula, 
rColumn.GetDoc(), aDestPos));
+rColumn.SetFormulaCell(nRow, new ScFormulaCell(*rCell.mpFormula, 
*rColumn.GetDoc(), aDestPos));
 }
 break;
 default:
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 350b5b19a67f..5c9b00ee12a1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -88,11 +88,10 @@ ScColumn::ScColumn() :
 maBroadcasters(MAXROWCOUNT),
 maCellsEvent(this),
 maCells(maCellsEvent),
-nCol( 0 ),
-nTab( 0 ),
 pAttrArray( nullptr ),
-pDocument( nullptr ),
-mnBlkCountFormula(0)
+mnBlkCountFormula(0),
+nCol( 0 ),
+nTab( 0 )
 {
 maCells.resize(MAXROWCOUNT);
 }
@@ -107,11 +106,10 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, 
ScDocument* pDoc, bool bEmptyA
 {
 n

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - external/cairo vcl/headless vcl/inc

[Ashod Nakashian]

 external/cairo/cairo/cairo-1.10.2.patch |  137 
 vcl/headless/svpgdi.cxx |   42 +++--
 vcl/inc/headless/svpgdi.hxx |7 -
 3 files changed, 157 insertions(+), 29 deletions(-)

New commits:
commit 31c044e2501b9d4a0917e4e09133660bbe2a24dc
Author: Ashod Nakashian 
Date:   Sat Dec 9 16:28:42 2017 -0500

vcl-svp: add 24-bit (3-byte) RGB surface support to Cairo

Change-Id: I7707219eae4c2d6d40c8dc957207b63d3049a75f
(cherry picked from commit e8ba02b1d56dc7b59a4f0a7373995b28653a0597)
Reviewed-on: https://gerrit.libreoffice.org/46681
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/external/cairo/cairo/cairo-1.10.2.patch 
b/external/cairo/cairo/cairo-1.10.2.patch
index d564d53ab9e0..f50501926faa 100644
--- a/external/cairo/cairo/cairo-1.10.2.patch
+++ b/external/cairo/cairo/cairo-1.10.2.patch
@@ -1,5 +1,6 @@
 misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18 
09:47:30.0 +0200
-+++ misc/build/cairo-1.10.2/build/Makefile.win32.features  2011-12-20 
09:57:06.428170146 +0100
+diff -ruNw misc/cairo-1.10.2/build/Makefile.win32.features 
misc/build/cairo-1.10.2/build/Makefile.win32.features
+--- misc/cairo-1.10.2/build/Makefile.win32.features2015-10-27 
17:04:21.0 -0400
 misc/build/cairo-1.10.2/build/Makefile.win32.features  2017-11-24 
21:43:14.103524768 -0500
 @@ -30,7 +30,7 @@
  CAIRO_HAS_FC_FONT=0
  CAIRO_HAS_PS_SURFACE=1
@@ -9,9 +10,10 @@
  CAIRO_HAS_TEST_SURFACES=0
  CAIRO_HAS_TEE_SURFACE=0
  CAIRO_HAS_XML_SURFACE=0
 misc/cairo-1.10.2/configure2010-12-25 15:22:57.0 +0100
-+++ misc/build/cairo-1.10.2/configure  2010-12-25 15:22:57.0 +0100
-@@ -19259,59 +19259,10 @@
+diff -ruNw misc/cairo-1.10.2/configure misc/build/cairo-1.10.2/configure
+--- misc/cairo-1.10.2/configure2015-12-09 15:41:45.0 -0500
 misc/build/cairo-1.10.2/configure  2017-11-24 21:43:14.103524768 -0500
+@@ -20580,61 +20580,12 @@
  rm -f confcache
  
  
@@ -58,8 +60,8 @@
  have_libz=yes
  
  $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
--
--
+ 
+ 
 -else
 -  have_libz="no (requires zlib http://www.gzip.org/zlib/)"
 -fi
@@ -68,10 +70,12 @@
 -else
 -  have_libz="no (requires zlib http://www.gzip.org/zlib/)"
 -fi
- 
- 
+-
+-
  save_LIBS="$LIBS"
-@@ -29424,7 +29424,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo2a_decompress in 
-llzo2" >&5
+ $as_echo_n "checking for lzo2a_decompress in -llzo2... " >&6; }
+@@ -30069,7 +30020,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - OK" 
>&5
  $as_echo "$FREETYPE_VERSION - OK" >&6; }
   ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
@@ -80,7 +84,7 @@
  else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - 
Too old" >&5
  $as_echo "$FREETYPE_VERSION - Too old" >&6; }
   use_ft="no ($FREETYPE_VERSION found; version 
$FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"
-@@ -29434,7 +29434,7 @@
+@@ -30079,7 +30030,7 @@
  fi
  
ft_CFLAGS="$FREETYPE_CFLAGS"
@@ -89,7 +93,7 @@
  
  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 
cairo's FreeType font backend feature could be enabled" >&5
-@@ -30121,7 +30121,7 @@
+@@ -30686,7 +30637,7 @@
  
  # The ps backend requires zlib.
  use_ps=$have_libz
@@ -98,7 +102,7 @@
  
  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 
cairo's PostScript surface backend feature could be enabled" >&5
-@@ -30549,7 +30549,7 @@
+@@ -31082,7 +31033,7 @@
  
  # The pdf backend requires zlib.
  use_pdf=$have_libz
@@ -107,7 +111,7 @@
  
  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 
cairo's PDF surface backend feature could be enabled" >&5
-@@ -32296,7 +32296,7 @@
+@@ -32973,7 +32924,7 @@
  
  
  use_xml=$have_libz
@@ -116,4 +120,107 @@
  
  
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 
cairo's xml surface backend feature could be enabled" >&5
-$as_echo_n "checking whether cairo's xml surface backend feature could be 
enabled... " >&6; }
+diff -ruNw misc/cairo-1.10.2/src/cairo.h misc/build/cairo-1.10.2/src/cairo.h
+--- misc/cairo-1.10.2/src/cairo.h  2015-10-27 17:04:21.0 -0400
 misc/build/cairo-1.10.2/src/cairo.h2017-12-17 12:09:59.880406411 
-0500
+@@ -397,6 +397,8 @@
+  *   with red in the upper 5 bits, then green in the middle
+  *   6 bits, and blue in the lower 5 bits. (Since 1.2)
+  * @CAIRO_FORMAT_RGB30: like RGB24 but with 10bpc. (Since 1.12)
++ * @CAIRO_FORMAT_RGB24_888: each pixel is a 24-bit quantity,
++ *   with Red, Green, Blue taking 8-bits each, in that order. (Since 1.1x)
+  *
+  * #cairo_format_t is used to identify the memory format of
+  * image data.
+@@ -412,9 +414,16 @@
+ CAIRO_FORMAT_A8= 2,
+ CAIRO_FORMAT_A1= 3,
+ CAIRO_FORMAT_RGB16_565 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/qa writerfilter/source

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf112352_nextPageColumns.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   11 +++
 writerfilter/source/dmapper/PropertyMap.cxx  |2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 2bdfe1355c4c571e71bd4197d5814c6e15fb8db7
Author: Justin Luth 
Date:   Tue Nov 7 09:29:30 2017 +0300

tdf#112352 ooxmlimport: ALWAYS treat 1st nextpage w/cols as cont

fix 5.4 regression from 4605bd46984125a99b0e993b71efa6edb411699f.

When there are columns, if a nextpage section doesn't contain any
other "page style" details we treat it as a continuous break,
If we don't, the column info becomes part of the style itself,
and not just a section property.

However, the very first section is troublesome - by definition it DOES
contain page style details, and so if the document starts with columns,
the default style would gain the column attribute. Usually that
results in a mess, so lets make sure that we avoid that also in
the case where headers/footers are defined.

Reviewed-on: https://gerrit.libreoffice.org/44505
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 
(cherry picked from commit afc96d263959d10e457b54a574f0829d20e99df4)

Change-Id: I7e08a9218e4304206579ed064bc92c9604d4470e
Reviewed-on: https://gerrit.libreoffice.org/46638
Reviewed-by: Justin Luth 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf112352_nextPageColumns.docx 
b/sw/qa/extras/ooxmlexport/data/tdf112352_nextPageColumns.docx
new file mode 100644
index ..f14681dd51c2
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf112352_nextPageColumns.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 8d125bea4910..7fef2cd0e199 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -190,6 +190,17 @@ DECLARE_OOXMLEXPORT_TEST(testRhbz988516, "rhbz988516.docx")
 CPPUNIT_ASSERT_EQUAL( 2, getPages() );
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf112352_nextPageColumns, 
"tdf112352_nextPageColumns.docx")
+{
+uno::Reference xTextSection = getProperty< 
uno::Reference >(getParagraph(2), "TextSection");
+uno::Reference xTextColumns = getProperty< 
uno::Reference >(xTextSection, "TextColumns");
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xTextColumns->getColumnCount());
+
+xTextSection = getProperty< uno::Reference 
>(getParagraph(3), "TextSection");
+xTextColumns = getProperty< uno::Reference 
>(xTextSection, "TextColumns");
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xTextColumns->getColumnCount());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 6ff4d05c1476..91528c7967ce 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1223,7 +1223,7 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 // Continuous sections usually create only a section, and not a new page 
style
 const bool bTreatAsContinuous = m_nBreakType == 
NS_ooxml::LN_Value_ST_SectionMark_nextPage
 && m_nColumnCount > 0
-&& !HasHeader(m_bTitlePage) && 
!HasFooter(m_bTitlePage)
+&& (m_bIsFirstSection || (!HasHeader( 
m_bTitlePage ) && !HasFooter( m_bTitlePage )) )
 && (m_bIsFirstSection || 
m_sFollowPageStyleName.isEmpty() || (m_sFirstPageStyleName.isEmpty() && 
m_bTitlePage));
 if(m_nBreakType == 
static_cast(NS_ooxml::LN_Value_ST_SectionMark_continuous) || 
bTreatAsContinuous)
 {
___
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' - external/icu

[Eike Rathke]

 external/icu/UnpackedTarball_icu.mk|1 +
 external/icu/icu4c-58-icu13329-xlocale.patch.1 |   14 ++
 2 files changed, 15 insertions(+)

New commits:
commit 5bbe46ee00921586b9b72297e7be9048e0e921e9
Author: Eike Rathke 
Date:   Wed Sep 13 13:42:29 2017 +0200

icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASED

... should be more platforms ... but be conservative.
U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises.

"The file and this data structure is not standardized.  Don't rely on it.  
It
can go away without warning."

...

And since glibc 2.26 it's gone.

https://ssl.icu-project.org/trac/ticket/13329

Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a
(cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b)
Reviewed-on: https://gerrit.libreoffice.org/46584
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index f1658a229586..1254d6fb993c 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/khmerbreakengine.patch \
external/icu/icu4c-changeset-39671.patch.1 \
external/icu/icu4c-changeset-40324.patch.1 \
+   external/icu/icu4c-58-icu13329-xlocale.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-58-icu13329-xlocale.patch.1 
b/external/icu/icu4c-58-icu13329-xlocale.patch.1
new file mode 100644
index ..d9168c1bd1eb
--- /dev/null
+++ b/external/icu/icu4c-58-icu13329-xlocale.patch.1
@@ -0,0 +1,14 @@
+# xlocale.h is gone with glibc 2.26 and should never had been included.
+# https://ssl.icu-project.org/trac/ticket/13329
+diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.org/source/i18n/digitlst.cpp   2016-10-17 10:40:38.0 +0530
 icu/source/i18n/digitlst.cpp   2017-12-16 10:26:56.477053596 +0530
+@@ -63,6 +63,8 @@
+ #if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
+ # if U_PLATFORM == U_PF_CYGWIN
+ #   include 
++# elif U_PLATFORM_IS_LINUX_BASED
++#   include // should be for all POSIX.2008 compliant platforms, 
but..
+ # else
+ #   include 
+ # endif
___
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' - configure.ac

[Andras Timar]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bb5e55d407c013b5b59459d9551268924cd7f785
Author: Andras Timar 
Date:   Mon Dec 18 11:32:05 2017 +0100

Bump version to 5.3-36

Change-Id: Id883e98994a3745bea0c30a6f82c46b8360e8354

diff --git a/configure.ac b/configure.ac
index 425430d9db89..9c30362abcf5 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.3.10.35],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.36],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source compilerplugins/clang

[Noel Grandin]

 avmedia/source/vlc/inc/wrapper/Instance.hxx  |2 -
 avmedia/source/vlc/inc/wrapper/Media.hxx |2 -
 avmedia/source/vlc/inc/wrapper/Player.hxx|2 -
 compilerplugins/clang/unnecessaryvirtual.results |   44 +++
 4 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 234ed63451b934a683078404a1b895ee68875efb
Author: Noel Grandin 
Date:   Fri Dec 15 13:51:03 2017 +0200

loplugin:unnecessaryvirtual

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

diff --git a/avmedia/source/vlc/inc/wrapper/Instance.hxx 
b/avmedia/source/vlc/inc/wrapper/Instance.hxx
index f2e8c9c8ef0e..e944fe423309 100644
--- a/avmedia/source/vlc/inc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Instance.hxx
@@ -25,7 +25,7 @@ namespace wrapper
 Instance( int argc, const char * const argv[] );
 Instance( const Instance& other );
 Instance& operator=( const Instance& other );
-virtual ~Instance();
+~Instance();
 
 operator libvlc_instance_t*()
 {
diff --git a/avmedia/source/vlc/inc/wrapper/Media.hxx 
b/avmedia/source/vlc/inc/wrapper/Media.hxx
index 77d17118f2f7..d52bf8a6795a 100644
--- a/avmedia/source/vlc/inc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Media.hxx
@@ -31,7 +31,7 @@ namespace wrapper
 
 int getDuration() const;
 
-virtual ~Media();
+~Media();
 
 operator libvlc_media_t*()
 {
diff --git a/avmedia/source/vlc/inc/wrapper/Player.hxx 
b/avmedia/source/vlc/inc/wrapper/Player.hxx
index 2e2921682260..4931f08ac312 100644
--- a/avmedia/source/vlc/inc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Player.hxx
@@ -34,7 +34,7 @@ namespace wrapper
 explicit Player( Media& media );
 Player( const Player& other );
 Player& operator=( const Player& other );
-virtual ~Player();
+~Player();
 
 bool play();
 void pause();
diff --git a/compilerplugins/clang/unnecessaryvirtual.results 
b/compilerplugins/clang/unnecessaryvirtual.results
index 025ab76820eb..8f79346079d0 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -1,3 +1,9 @@
+avmedia/source/vlc/inc/wrapper/Instance.hxx:28
+avmedia::vlc::wrapper::Instance::void-~Instance()
+avmedia/source/vlc/inc/wrapper/Media.hxx:34
+avmedia::vlc::wrapper::Media::void-~Media()
+avmedia/source/vlc/inc/wrapper/Player.hxx:37
+avmedia::vlc::wrapper::Player::void-~Player()
 basic/source/comp/codegen.cxx:391
 PCodeVisitor::void-~PCodeVisitor()
 basic/source/comp/codegen.cxx:468
@@ -84,13 +90,13 @@ include/comphelper/servicedecl.hxx:168
 
comphelper::service_decl::detail::OwnServiceImpl::sal_Bool-supportsService(const
 class rtl::OUString &,)
 include/comphelper/servicedecl.hxx:172
 
comphelper::service_decl::detail::OwnServiceImpl::css::uno::Sequence-getSupportedServiceNames()
-include/comphelper/unique_disposing_ptr.hxx:40
+include/comphelper/unique_disposing_ptr.hxx:41
 comphelper::unique_disposing_ptr::void-reset(T *,)
-include/comphelper/unique_disposing_ptr.hxx:40
+include/comphelper/unique_disposing_ptr.hxx:41
 comphelper::unique_disposing_ptr::void-reset(class (anonymous 
namespace)::ImpTimedRefDev *,)
-include/comphelper/unique_disposing_ptr.hxx:65
+include/comphelper/unique_disposing_ptr.hxx:66
 comphelper::unique_disposing_ptr::void-~unique_disposing_ptr()
-include/comphelper/unique_disposing_ptr.hxx:168
+include/comphelper/unique_disposing_ptr.hxx:169
 comphelper::unique_disposing_solar_mutex_reset_ptr::void-reset(T *,)
 include/comphelper/weakeventlistener.hxx:118
 comphelper::OWeakListenerAdapter::void-disposing(const 
css::lang::EventObject &,)
@@ -130,14 +136,12 @@ include/sfx2/itemwrapper.hxx:158
 sfx::IdentItemWrapper::void-SetItemValue(ItemT &,const ItemT &,)const
 include/svl/svdde.hxx:307
 DdeService::void-~DdeService()
+include/svtools/svparser.hxx:92
+SvParser::void-NextToken(T,)
+include/svtools/svparser.hxx:128
+SvParser::void-Continue(T,)
 include/toolkit/controls/geometrycontrolmodel.hxx:192
 
OGeometryControlModel::void-fillProperties(css::uno::Sequence
 &,css::uno::Sequence &,)const
-include/tools/stream.hxx:294
-SvStream::_Bool-ReadLine(class rtl::OString &,sal_Int32,)
-include/tools/stream.hxx:410
-SvStream::_Bool-good()const
-include/unotools/fontcvt.hxx:55
-StarSymbolToMSMultiFont::void-~StarSymbolToMSMultiFont()
 include/vbahelper/vbacollectionimpl.hxx:290
 ScVbaCollectionBasesal_Int32-getCount()
 include/vbahelper/vbacollectionimpl.hxx:295
@@ -164,8 +168,6 @@ include/vcl/vclptr.hxx:110
 VclPtr::void-~VclPtr()
 mysqlc/source/mysqlc_subcomponent.hxx:104
 
connectivity::mysqlc::OPropertyArrayUsageHelper::void-~OPropertyArrayUsageHelper()
-oox/source/drawingml/diagr

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit beb091666aa325376b4ad6d1ff68c7c3ae82fcd4
Author: Christian Lohmaier 
Date:   Mon Dec 18 12:03:56 2017 +0100

Updated core
Project: translations  9a856d562ebae5d1ae691ec623cf4ebb23299930

update translations for 6.0/master

and force-fix errors using pocheck

Change-Id: Ie978deb62c62ea4ad661ea45d155bdd4b0d1f811

diff --git a/translations b/translations
index 28cfef34df86..9a856d562eba 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 28cfef34df86f518e0d03f4d2fd18bfe2916d982
+Subproject commit 9a856d562ebae5d1ae691ec623cf4ebb23299930
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

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

New commits:
commit b4f8bb32bc016880cac007d5e15610de16fe3cbc
Author: Christian Lohmaier 
Date:   Mon Dec 18 12:03:56 2017 +0100

Updated core
Project: translations  fcb3a9f517e17cb90c309a6bc0c38ce2029508ed

update translations for 6.0/master

and force-fix errors using pocheck

Change-Id: Ie978deb62c62ea4ad661ea45d155bdd4b0d1f811
(cherry picked from commit 9a856d562ebae5d1ae691ec623cf4ebb23299930)

diff --git a/translations b/translations
index 7f54f2c03e63..fcb3a9f517e1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7f54f2c03e630b543ebd8ffab23b698ed5f07c16
+Subproject commit fcb3a9f517e17cb90c309a6bc0c38ce2029508ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - net/Ssl.cpp

[Pranav Kant]

 net/Ssl.cpp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit bd817b2e60dfd049d25a539d25861ed5b0cf5498
Author: Pranav Kant 
Date:   Mon Nov 27 16:29:26 2017 +0530

tdf#114073: Potential fix for crash with openssl1.1

Using null ssl context to set options is surely not a good idea:

unsigned long SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op)
{
return ctx->options |= op;
}

Change-Id: I2700350e0c3928e372488c81b8111c9ab0b48e06
(cherry picked from commit 483a5d68e5f7e6b145d957c50120cd05c436387b)
Reviewed-on: https://gerrit.libreoffice.org/46704
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index dd0094b8..a16caa25 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -50,8 +50,7 @@ SslContext::SslContext(const std::string& certFilePath,
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x1013L
-SSL_CTX_set_options(nullptr, 0);
-OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);
+OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, nullptr);
 #else
 SSL_library_init();
 SSL_load_error_strings();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - Makefile.am

[Pranav Kant]

 Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit db3d19a534257a4038049bb68ca78c2c8c39282b
Author: Pranav Kant 
Date:   Fri Dec 15 00:16:37 2017 +0530

Use `ctags` for emacs TAGS file too

So that we can use same arguments for both. `etags` binary is also
supplied on some systems by emacs-common package which doesn't
understand ctag like arguments. Best to use one program for all.

Change-Id: I22b57a43f7688c96c9e138e5783ee4157a34a172
(cherry picked from commit 193cb33afc4c9d485e67907ede25121f1f6eee28)
Reviewed-on: https://gerrit.libreoffice.org/46709
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/Makefile.am b/Makefile.am
index ae34e8bf..3bfb3fc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,7 @@ endif
 
 loolwsd_fuzzer_CPPFLAGS = -DKIT_IN_PROCESS=1 -DFUZZER=1 
-DTDOC=\"$(abs_top_srcdir)/test/data\" $(AM_CPPFLAGS)
 
+ETAGS=ctags -e
 AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes 
--exclude=loleaflet *
 AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 chart2/source/view/main/ShapeFactory.cxx |  275 +--
 1 file changed, 152 insertions(+), 123 deletions(-)

New commits:
commit e1697600253361a26d77a1ef61f8bde16af0ed2c
Author: Tomaž Vajngerl 
Date:   Wed Dec 13 22:03:12 2017 +0900

chart2: Batch changes to properties when creating 3D objects

MultiPropertySet doesn't broadcast ItemSets as often as setting
each property separately. This can help when we create a lot of
3D objects.

Change-Id: I4eb842a5d8c43963bdceee84468593f5f6b47336
Reviewed-on: https://gerrit.libreoffice.org/46445
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/view/main/ShapeFactory.cxx 
b/chart2/source/view/main/ShapeFactory.cxx
index 3ed37f316225..53a10b922276 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -60,6 +61,21 @@ using ::com::sun::star::uno::Reference;
 namespace chart
 {
 
+namespace
+{
+
+void lcl_addProperty(uno::Sequence & rPropertyNames, 
uno::Sequence & rPropertyValues,
+ OUString const & rName, uno::Any const & rAny)
+{
+rPropertyNames.realloc(rPropertyNames.getLength() + 1);
+rPropertyNames[rPropertyNames.getLength() - 1] = rName;
+
+rPropertyValues.realloc(rPropertyValues.getLength() + 1);
+rPropertyValues[rPropertyValues.getLength() - 1] = rAny;
+}
+
+} // end anonymous namespace
+
 uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape(
 const uno::Reference< drawing::XDrawPage>& xDrawPage )
 {
@@ -389,40 +405,42 @@ uno::Reference
 xTarget->add(xShape);
 
 //set properties
-uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
-if( xProp.is())
+uno::Reference xMultiPropertySet(xShape, 
uno::UNO_QUERY);
+OSL_ENSURE(xMultiPropertySet.is(), "created shape offers no 
XMultiPropertySet");
+if (xMultiPropertySet.is())
 {
 try
 {
 //depth
 double fDepth = rSize.DirectionZ;
-if(fDepth<0)
+if (fDepth<0)
 fDepth*=-1.0;
-xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
-, uno::Any((sal_Int32)fDepth) );
 
 //PercentDiagonal
 sal_Int16 nPercentDiagonal = bRounded ? 3 : 0;
-xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
-, uno::Any( nPercentDiagonal ) );
-
-//Polygon
-xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
-, createPolyPolygon_Cube( rSize, 
double(nPercentDiagonal)/200.0,bRounded) );
 
 //Matrix for position
-{
-::basegfx::B3DHomMatrix aM;
-if(nRotateZAngleHundredthDegree!=0)
-
aM.rotate(0.0,0.0,-nRotateZAngleHundredthDegree/18000.00*F_PI);
-aM.translate(rPosition.PositionX
-, rPosition.PositionY
-, rPosition.PositionZ - (fDepth/2.0));
-drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
-xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
-, uno::Any(aHM) );
-}
+basegfx::B3DHomMatrix aHomMatrix;
+if (nRotateZAngleHundredthDegree != 0)
+aHomMatrix.rotate(0.0, 0.0, -nRotateZAngleHundredthDegree / 
18000.00 * F_PI);
+aHomMatrix.translate(rPosition.PositionX, rPosition.PositionY,
+ rPosition.PositionZ - (fDepth / 2.0));
+
+uno::Sequence aPropertyNames {
+UNO_NAME_3D_EXTRUDE_DEPTH,
+UNO_NAME_3D_PERCENT_DIAGONAL,
+UNO_NAME_3D_POLYPOLYGON3D,
+UNO_NAME_3D_TRANSFORM_MATRIX,
+};
+
+uno::Sequence aPropertyValues {
+uno::Any(sal_Int32(fDepth)), // Depth
+uno::Any(nPercentDiagonal),  // PercentDiagonal
+createPolyPolygon_Cube(rSize, double(nPercentDiagonal) / 
200.0, bRounded),
+uno::Any(B3DHomMatrixToHomogenMatrix(aHomMatrix))
+};
+
+xMultiPropertySet->setPropertyValues(aPropertyNames, 
aPropertyValues);
 }
 catch( const uno::Exception& e )
 {
@@ -632,46 +650,45 @@ uno::Reference
 double fHeight = rSize.DirectionY;
 
 //set properties
-uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
-OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
-if( xProp.is())
+uno::Reference xMultiPropertySet(xShape, 
uno::UNO_QUERY);
+OSL_ENSURE(xMultiPropertySet.is(), "created shape offers no 
XMultiPropertySet");
+if (xMultiPropertySet.is())
 {
 try
 {
-//PercentDiago

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

[Tomaž Vajngerl]

 chart2/source/view/charttypes/BarChart.cxx |   19 +++
 include/svx/scene3d.hxx|5 +
 svx/source/engine3d/scene3d.cxx|   17 +++--
 3 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 55a7e836a2db662a53adc4f8b98d08b06790c758
Author: Tomaž Vajngerl 
Date:   Wed Dec 13 22:08:20 2017 +0900

chart2: When creating objects prevent setting object rects dirty

3D objects using a E3dScene are traversing all object in the tree
when setting rects dirty. When we are creating objects, setting
properties and adding them to the tree we trigger setting rects
dirty which slows down considerably - more are added objects,
bigger the slowdown gets. So the solution here is to temporary
disable setting object rects dirty during creation of objects.

Change-Id: Id068cda9cb798d49b75bf4228cf6460f7e98c033
Reviewed-on: https://gerrit.libreoffice.org/46446
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index 41002429d900..34c28deb9057 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -404,6 +406,20 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
 }
 }
 
+E3dScene* lcl_getE3dScene(uno::Reference const & xShapes)
+{
+E3dScene* pScene = nullptr;
+
+SvxShape* pSvxShape = SvxShape::getImplementation(xShapes);
+if (pSvxShape)
+{
+SdrObject* pObject = pSvxShape->GetSdrObject();
+if (pObject && dynamic_cast(pObject) != nullptr)
+pScene = static_cast(pObject);
+}
+return pScene;
+}
+
 void BarChart::createShapes()
 {
 if( m_aZSlots.empty() ) //no series
@@ -761,9 +777,12 @@ void BarChart::createShapes()
 if( fTopHeight < 0 )
 fTopHeight *= -1.0;
 
+E3dScene* pScene = 
lcl_getE3dScene(xSeriesGroupShape_Shapes);
+pScene->EnterObjectSetupMode();
 xShape = createDataPoint3D_Bar(
 xSeriesGroupShape_Shapes, 
aTransformedBottom, aSize, fTopHeight, nRotateZAngleHundredthDegree
 , xDataPointProperties, nGeometry3D );
+pScene->ExitObjectSetupMode();
 }
 else //m_nDimension!=3
 {
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 81703f1d001f..2f76cec02a13 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -75,6 +75,8 @@ protected:
 // Flag to determine if only selected objects should be drawn
 boolbDrawOnlySelected   : 1;
 
+bool mbSkipSettingDirty : 1;
+
 virtual void NewObjectInserted(const E3dObject* p3DObj) override;
 virtual void StructureChanged() override;
 
@@ -161,6 +163,9 @@ public:
 virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
 virtual bool BckCreate(SdrDragStat& rStat) override;
 virtual void BrkCreate(SdrDragStat& rStat) override;
+
+void EnterObjectSetupMode();
+void ExitObjectSetupMode();
 };
 
 #endif // INCLUDED_SVX_SCENE3D_HXX
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index bec310a686a9..1da5c1411150 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -174,7 +174,8 @@ E3dScene::E3dScene()
 :   E3dObject(),
 aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()),
 mp3DDepthRemapper(nullptr),
-bDrawOnlySelected(false)
+bDrawOnlySelected(false),
+mbSkipSettingDirty(false)
 {
 // Set defaults
 SetDefaultAttributes();
@@ -345,7 +346,9 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj)
 void E3dScene::StructureChanged()
 {
 E3dObject::StructureChanged();
-SetRectsDirty();
+
+if (!GetScene()->mbSkipSettingDirty)
+SetRectsDirty();
 
 ImpCleanup3DDepthMapper();
 }
@@ -413,6 +416,16 @@ E3dScene* E3dScene::Clone() const
 return CloneHelper< E3dScene >();
 }
 
+void E3dScene::EnterObjectSetupMode()
+{
+GetScene()->mbSkipSettingDirty = true;
+}
+
+void E3dScene::ExitObjectSetupMode()
+{
+GetScene()->mbSkipSettingDirty = false;
+}
+
 E3dScene& E3dScene::operator=(const E3dScene& rObj)
 {
 if( this == &rObj )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: compilation error

[Michael Stahl]

On 16.12.2017 01:32, la.jolie@paquerette wrote:
> Hello,
> 
> I'm compiling Lool thanks to this script
> https://github.com/husisusi/officeonlin-install.sh.
> 
> My system is a VPS with Debian 9.
> 
> My new attempt (after 3 months) to recompile lool generates now an error.
> 
> I found that this commit is the cause:
> https://github.com/LibreOffice/core/commit/0f455f2309d018906e147269f839f52aa22eaf6a
> 
> Part of the log where the error is throwned (I can send the full log)
> -
> /opt/libreoffice2/vcl/null/printerinfomanager.cxx: In constructor
> ‘psp::PrinterInfoManager::PrinterInfoManager(psp::PrinterInfoManager::Type)’:
> /opt/libreoffice2/vcl/null/printerinfomanager.cxx:47:33: error: call of
> overloaded ‘unique_ptr(NULL)’ is ambiguous
>  m_aSystemDefaultPaper( "A4" )
>  ^

this was changed to "nullptr" in commit
76c21c57b7de227df87a285c3907157242ccddde more than a year ago, and this
commit is also in the libreoffice-5-4 branch so you're trying to build
some EOL branch that is no longer maintained.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/inc sc/source

[Eike Rathke]

 sc/inc/formulacell.hxx  |1 +
 sc/source/core/data/formulacell.cxx |   12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 14ce530d467a21d2d7fdae5272c5cc4b83104bdc
Author: Eike Rathke 
Date:   Sat Dec 16 15:04:19 2017 +0100

Do not recalculate the same weight over and over again, tdf#114251 related

Remember it at the group so if for some reason the group is not
calculated as group then the individual cells of the group don't
iterate over the RPN again to calculate the same value.

This does not solve tdf#114251 in any way, just side-cars.

Change-Id: Ia26d4a7fe608d8aaa30686ce95c1caa25da02469
Reviewed-on: https://gerrit.libreoffice.org/46601
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit da81ec6862490a87bc240edb81c0a9b5fd04a1b3)
Reviewed-on: https://gerrit.libreoffice.org/46612
Tested-by: Jenkins 

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e75416de8e56..09d26b232950 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -65,6 +65,7 @@ public:
 ScTokenArray* mpCode;
 ScFormulaCell *mpTopCell;
 SCROW mnLength; // How many of these do we have ?
+sal_Int32 mnWeight;
 short mnFormatType;
 bool mbInvariant:1;
 bool mbSubTotal:1;
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 989919b2886b..1068f25ff5b2 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -523,6 +523,7 @@ ScFormulaCellGroup::ScFormulaCellGroup() :
 mpCode(nullptr),
 mpTopCell(nullptr),
 mnLength(0),
+mnWeight(0),
 mnFormatType(css::util::NumberFormat::NUMBER),
 mbInvariant(false),
 mbSubTotal(false),
@@ -3875,6 +3876,7 @@ void ScFormulaCell::SetCellGroup( const 
ScFormulaCellGroupRef &xRef )
 
 mxGroup = xRef;
 pCode = mxGroup->mpCode;
+mxGroup->mnWeight = 0;  // invalidate
 }
 
 ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( const 
ScFormulaCell& rOther ) const
@@ -4919,12 +4921,18 @@ sal_Int32 ScFormulaCell::GetWeight() const
 {
 if (!mxGroup)
 return 1;
+
+if (mxGroup->mnWeight > 0)
+return mxGroup->mnWeight;
+
 double nSharedCodeWeight = GetSharedCode()->GetWeight();
 double nResult = nSharedCodeWeight * GetSharedLength();
 if (nResult < SAL_MAX_INT32)
-return nResult;
+mxGroup->mnWeight = nResult;
 else
-return SAL_MAX_INT32;
+mxGroup->mnWeight = SAL_MAX_INT32;
+
+return mxGroup->mnWeight;
 }
 
 ScTokenArray* ScFormulaCell::GetSharedCode()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 3 commits - sc/source

[Eike Rathke]

 sc/source/core/data/grouptokenconverter.cxx |   20 
 sc/source/core/tool/token.cxx   |   21 -
 2 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit ee7c13e134bfa620535714721085c1c0856a84df
Author: Eike Rathke 
Date:   Sat Dec 16 22:52:09 2017 +0100

Type svIndex does not necessarily mean range name, tdf#114251 related

Change-Id: I5e7930b7f93ee44fb0d6b4c86f261afde8ed2ccc
Reviewed-on: https://gerrit.libreoffice.org/46615
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
(cherry picked from commit ecac94f3a6872538c19827603b52f1ed7e671a4c)
Reviewed-on: https://gerrit.libreoffice.org/46639

diff --git a/sc/source/core/data/grouptokenconverter.cxx 
b/sc/source/core/data/grouptokenconverter.cxx
index 898c01675d56..89823fee5238 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -254,6 +254,13 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& 
rCode, sc::FormulaLogge
 break;
 case svIndex:
 {
+if (p->GetOpCode() != ocName)
+{
+// May be DB-range or TableRef
+mrGroupTokens.AddToken(*p);
+break;
+}
+
 // Named range.
 ScRangeName* pNames = mrDoc.GetRangeName();
 if (!pNames)
commit 21575d3bd1caa615687f44982ad2092e9c9290f1
Author: Eike Rathke 
Date:   Sun Dec 17 17:34:15 2017 +0100

Related: tdf#114251 disable vectorization of svDoubleRef

It doesn't work, not knowing how to handle implicit intersections
not only produces huge unnecessary matrix operations but also
delivers wrong results.

Unit test will follow as a separate commit.

Change-Id: I14982d4a53d6af57196da998e53d426502c22fec
Reviewed-on: https://gerrit.libreoffice.org/46647
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 67444cbe5dae6e24db776ab712017ad063319276)
Reviewed-on: https://gerrit.libreoffice.org/46649
Tested-by: Jenkins 

diff --git a/sc/source/core/data/grouptokenconverter.cxx 
b/sc/source/core/data/grouptokenconverter.cxx
index 98ba8cdfa9b1..898c01675d56 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -165,6 +165,18 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& 
rCode, sc::FormulaLogge
 break;
 case svDoubleRef:
 {
+/* FIXME: this simply does not work, it doesn't know
+ * a) the context of implicit intersection, for which creating
+  two arrays dows not only result in huge unnecessary 
matrix
+  operations but also produces wrong results, e.g. =B:B/C:C
+ * b) when to keep a reference as a reference depending on the
+  expected parameter type, e.g. INDEX(), OFFSET() and
+  others (though that *may* be disabled by OpCode already).
+ * Until both are solved keep the reference. */
+mrGroupTokens.AddToken(*p);
+break;
+
+#if 0
 ScComplexRefData aRef = *p->GetDoubleRef();
 ScRange aAbs = aRef.toAbs(mrPos);
 
@@ -237,6 +249,7 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& 
rCode, sc::FormulaLogge
 //ensure that backing storage exists for our lifetime
 mxFormulaGroupContext = mrDoc.GetFormulaGroupContext();
 }
+#endif
 }
 break;
 case svIndex:
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 6e7996c87828..aee7f56d8e8f 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1612,10 +1612,11 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
 // Don't change the state.
 break;
 case svSingleRef:
-case svDoubleRef:
 // Depends on the reference state.
 meVectorState = FormulaVectorCheckReference;
 break;
+case svDoubleRef:
+// Does not work yet, see ScGroupTokenConverter::convert()
 case svError:
 case svEmptyCell:
 case svExternal:
commit 22cfc4385ed2e272013fc300f593ab9fae61f3b2
Author: Eike Rathke 
Date:   Sun Dec 17 00:46:07 2017 +0100

Related: tdf#114251 disable ocName named expressions for vectorization

Recursive checking of their token arrays would be needed.

This solves the slowness in the non-threading case of tdf#114251
because no arrays are generated for the named ranges, which is
rather a lucky workaround than a solution.

The wrong handling of range references in general (array where
scalar is expected, no implicit intersect

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/msc-externals instsetoo_native/inc_openoffice postprocess/CustomTarget_signing.mk RepositoryExternal.mk Repository.mk scp2/Insta

[Mike Kaganski]

 Repository.mk  |1 
 RepositoryExternal.mk  |4 +
 config_host.mk.in  |4 -
 configure.ac   |   37 
--
 external/msc-externals/Module_msc-externals.mk |8 --
 external/msc-externals/Package_vcredist_exe.mk |6 -
 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |2 
 postprocess/CustomTarget_signing.mk|1 
 scp2/InstallModule_windows.mk  |8 +-
 scp2/source/ooo/vc_redist.scp  |   26 
+++
 solenv/bin/modules/installer/windows/idtglobal.pm  |2 
 12 files changed, 65 insertions(+), 36 deletions(-)

New commits:
commit 61b1d631331551b43bc7d619be33bfbfeff7cad6
Author: Mike Kaganski 
Date:   Wed Dec 13 00:04:03 2017 +0300

tdf#108580: integrate vc_redist.exe into MSI

... in InstallUISequense.

Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe
and/or vc_redist.x86.exe. Use --without-vcredist-dir (or
--with-vcredist-dir=no) if you don't want to ship it as part of
installer and want to silence the configure warning.

VCRedist 2015 version 14.0.24215.1 is available at
https://www.microsoft.com/en-us/download/details.aspx?id=53840

Since VisualStudio 2015, VC redist merge module that we used before
started to work differently: it installs the UCRT only on WinXP,
but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10
has it out of the box). The merge module only installs VCRuntime on
those systems, which still leaves us with "api-ms-*.dll is missing"
problem.


(https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/
gives more information on VCRedist refactoring background.)

Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a
workaround described at the page mentioned above as "App-local
deployment of the Universal CRT". We just copy all UCRT DLLs to
LibreOffice/program. This has a drawback though, that our UCRT
is not updated by Windows Update, so users would rely on LibreOffice
updates in case of some vulnerabilities in UCRT (and they could
even not realize they have that problem).

MS recommends to install UCRT using EXEs they provide from their
site. The EXEs install both VCRuntimes and UCRTs, along with
required patches, for all Windows versions (Windows XP through
Windows 10, where they only install VCRuntimes); the installed
libraries are managed by system's update mechanism. But those EXEs
cannot be used in MSI custom actions inside InstallExecuteSequence,
because they use MSI themselves.

So this patch integrates the vc_redist.xXX.exe into MSI binary
table, and uses custom action to run the EXE after ExecuteAction
in InstallUISequence. This will show the user a VCRedist install
window after the main LibreOffice installation finishes; no user
interaction is required (except for one additional UAC request),
and errors are ignored.

Since this installation takes care of both VCRuntime and UCRT,
we can ultimately drop both the app-local workaround, and
vcredist merge module (so VCRuntime would also be updated by
system). The former is done here: this reverts commit
71d9a61302e65fe091cf70c13fa72b3df09b7e3a.

This approach has its drawback: if one wants to use unattended
installation (without UI; one example is deployment using
ActiveDirectory GPO), then InstallUISequence is not run, and so
VCRedist isn't installed. In this case, one should install
VCRedist separately. Supposedly this should not be huge problem,
because this is the case for many existing applications that need
separate VCRedist deployment in these scenarios, and unattended
installation is advanced stuff that requires prepared user. A
notice would be required in release notes and FAQ, though.

Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006
Reviewed-on: https://gerrit.libreoffice.org/46356
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/Repository.mk b/Repository.mk
index ef2b12a9bc0f..4e9728adc5c6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -828,7 +828,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
jvmfwk_jreproperties \
$(if $(filter MACOSX,$(OS)),bridges_jnilib_java_uno) \
) \
-   $(if $(UCRT_REDISTDIR),ucrt) \
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

[Michael Stahl]

 sw/source/uibase/index/toxmgr.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4d4dfeac7cf8cd14efa15a2c5204afc9af4f680c
Author: Michael Stahl 
Date:   Thu Dec 14 18:52:15 2017 +0100

tdf#100635 sw: fix crash in SwTOXMgr::UpdateOrInsertTOX()

GetAuthBrackets() returns an empty string if the user selects
[None], in that case apparently 0 bytes are used, multiple places
check for that.

Change-Id: I8375621fa553bc780db343ed8a0bd7ecb3c832dc
(cherry picked from commit 2993bb634dc9ea66af90671a55a4503843338746)
Reviewed-on: https://gerrit.libreoffice.org/46568
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/index/toxmgr.cxx 
b/sw/source/uibase/index/toxmgr.cxx
index bbd2b293628d..b5b8b31e9198 100644
--- a/sw/source/uibase/index/toxmgr.cxx
+++ b/sw/source/uibase/index/toxmgr.cxx
@@ -355,8 +355,16 @@ bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& 
rDesc,
 pFType = static_cast(
 pSh->InsertFieldType(type));
 }
-pFType->SetPreSuffix(rDesc.GetAuthBrackets()[0],
-rDesc.GetAuthBrackets()[1]);
+OUString const& rBrackets(rDesc.GetAuthBrackets());
+if (rBrackets.isEmpty())
+{
+pFType->SetPreSuffix('\0', '\0');
+}
+else
+{
+assert(rBrackets.getLength() == 2);
+pFType->SetPreSuffix(rBrackets[0], rBrackets[1]);
+}
 pFType->SetSequence(rDesc.IsAuthSequence());
 SwTOXSortKey rArr[3];
 rArr[0] = rDesc.GetSortKey1();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 3 commits - editeng/source sw/source

[Michael Stahl]

 editeng/source/editeng/impedit4.cxx   |   23 ---
 sw/source/core/doc/DocumentRedlineManager.cxx |4 
 sw/source/core/layout/trvlfrm.cxx |5 -
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit b8ba995f079add002ab9606168d31d5386993160
Author: Michael Stahl 
Date:   Thu Dec 14 14:17:03 2017 +0100

editeng: fix RTF export of colors

SfxItemPool may contain null pointers and return them from GetItem2(),
even if non-null pointers follow, so have to use GetItemCount2() here.

This later asserts when it can't find the items in aColorList.

(cherry picked from commit 30504139af039d524ca0fd7158fc21ed38db2d9f)

editeng: RTF export: another buggy GetItem2() loop, for fonts
(cherry picked from commit 8ce353279caa84944971f22ec536433030e5d9c7)

editeng: error: "remove_const_t" is not a member of "std"
Manual type inference was an interesting oxymoronic curiosity that
can probably only exist in C++, but it turns out our baseline
compilers don't even support it yet.
(cherry picked from commit 700e1e7fda6f0a415adbbd5bb190efa5c7435c4f)

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

diff --git a/editeng/source/editeng/impedit4.cxx 
b/editeng/source/editeng/impedit4.cxx
index f315141e9719..4b09582b99d1 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -315,10 +315,15 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, 
EditSelection aSel )
 else if ( nScriptType == 2 )
 nWhich = EE_CHAR_FONTINFO_CTL;
 
-sal_uInt32 i = 0;
-const SvxFontItem* pFontItem = static_cast(aEditDoc.GetItemPool().GetItem2( nWhich, i ));
-while ( pFontItem )
+auto const nFonts(aEditDoc.GetItemPool().GetItemCount2(nWhich));
+for (sal_uInt32 i = 0; i < nFonts; ++i)
 {
+SvxFontItem const*const pFontItem = static_cast(
+aEditDoc.GetItemPool().GetItem2(nWhich, i));
+if (!pFontItem)
+{
+continue;
+}
 bool bAlreadyExist = false;
 sal_uLong nTestMax = nScriptType ? aFontTable.size() : 1;
 for ( sal_uLong nTest = 0; !bAlreadyExist && ( nTest < nTestMax ); 
nTest++ )
@@ -328,8 +333,6 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, 
EditSelection aSel )
 
 if ( !bAlreadyExist )
 aFontTable.push_back( new SvxFontItem( *pFontItem ) );
-
-pFontItem = static_cast(aEditDoc.GetItemPool().GetItem2( nWhich, ++i ));
 }
 }
 
@@ -392,16 +395,14 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, 
EditSelection aSel )
 {
 aColorList.push_back(rDefault.GetValue());
 }
-sal_uInt32 i = 0;
-SvxColorItem const* pColorItem = aEditDoc.GetItemPool().GetItem2( 
EE_CHAR_COLOR, i);
-while ( pColorItem )
+auto const nColors(aEditDoc.GetItemPool().GetItemCount2(EE_CHAR_COLOR));
+for (sal_uInt32 i = 0; i < nColors; ++i)
 {
-++i;
-if ( pColorItem->GetValue() != COL_AUTO )
+SvxColorItem const*const 
pColorItem(aEditDoc.GetItemPool().GetItem2(EE_CHAR_COLOR, i));
+if (pColorItem && pColorItem->GetValue() != COL_AUTO) // may be null!
 {
 aColorList.push_back(pColorItem->GetValue());
 }
-pColorItem = aEditDoc.GetItemPool().GetItem2(EE_CHAR_COLOR, i);
 }
 
 rOutput.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_COLORTBL );
commit a1e377aff16ea7c4d434ab60d7ed946c82514684
Author: Michael Stahl 
Date:   Fri Dec 15 17:07:01 2017 +0100

tdf#100635 sw: fix layout crash caused by field expansion ...

... triggering recursive layout-in-layout where a SwTextFrame
that's being formatted is deleted inside some other frame's
SwTextNode::GetFormatted().

The offending field is a SwAuthorityField that's located in a
fly-frame with FLY_AT_PAGE anchor.

SwPageFrame::GetContentPosition() is only called by field expansion
code, so this shouldn't have an effect on layout.

It already has a fall-back for the case when the frame has invalid
flags, so handle the situation when the SwLineLayout has been
deleted from the SwCache due to overflow the same way,
which prevents the recursive formatting.

Change-Id: I90437edb5692dc2bdec7ad03964588942bde05be
(cherry picked from commit b77881366b17230908f441dfa27afcafc4374708)
Reviewed-on: https://gerrit.libreoffice.org/46569
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 1225e6f65f41..2b9cd10d 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw

[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - external/cairo vcl/headless

[Ashod Nakashian]

 external/cairo/cairo/cairo-1.10.2.patch |   26 +-
 vcl/headless/svpgdi.cxx |   16 
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit f5fd3d4887351e63f669425a9e1b50869500517a
Author: Ashod Nakashian 
Date:   Sun Dec 17 14:27:20 2017 -0500

svp: CAIRO_FORMAT_24BIT_RGB -> CAIRO_FORMAT_RGB24_888

This is more consistent with the Cairo naming convention.

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

diff --git a/external/cairo/cairo/cairo-1.10.2.patch 
b/external/cairo/cairo/cairo-1.10.2.patch
index c11a68675069..f50501926faa 100644
--- a/external/cairo/cairo/cairo-1.10.2.patch
+++ b/external/cairo/cairo/cairo-1.10.2.patch
@@ -122,12 +122,12 @@ diff -ruNw misc/cairo-1.10.2/configure 
misc/build/cairo-1.10.2/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 
cairo's xml surface backend feature could be enabled" >&5
 diff -ruNw misc/cairo-1.10.2/src/cairo.h misc/build/cairo-1.10.2/src/cairo.h
 --- misc/cairo-1.10.2/src/cairo.h  2015-10-27 17:04:21.0 -0400
-+++ misc/build/cairo-1.10.2/src/cairo.h2017-12-10 18:26:56.584047695 
-0500
 misc/build/cairo-1.10.2/src/cairo.h2017-12-17 12:09:59.880406411 
-0500
 @@ -397,6 +397,8 @@
   *   with red in the upper 5 bits, then green in the middle
   *   6 bits, and blue in the lower 5 bits. (Since 1.2)
   * @CAIRO_FORMAT_RGB30: like RGB24 but with 10bpc. (Since 1.12)
-+ * @CAIRO_FORMAT_24BIT_RGB: each pixel is a 24-bit quantity,
++ * @CAIRO_FORMAT_RGB24_888: each pixel is a 24-bit quantity,
 + *   with Red, Green, Blue taking 8-bits each, in that order. (Since 1.1x)
   *
   * #cairo_format_t is used to identify the memory format of
@@ -138,26 +138,26 @@ diff -ruNw misc/cairo-1.10.2/src/cairo.h 
misc/build/cairo-1.10.2/src/cairo.h
  CAIRO_FORMAT_RGB16_565 = 4,
 -CAIRO_FORMAT_RGB30 = 5
 +CAIRO_FORMAT_RGB30 = 5,
-+CAIRO_FORMAT_24BIT_RGB = 6
++CAIRO_FORMAT_RGB24_888 = 6
  } cairo_format_t;
  
 +/**
-+ * Need this until CAIRO_FORMAT_24BIT_RGB is in some official release.
++ * Need this until CAIRO_FORMAT_RGB24_888 is in some official release.
 + * Otherwise we can't reliably check if this is available or we should
 + * convert from 24-bit RGB to 32-bit RGB before passing to Cairo.
 + **/
-+#define HAVE_CAIRO_FORMAT_24BIT_RGB
++#define HAVE_CAIRO_FORMAT_RGB24_888
  
  /**
   * cairo_write_func_t:
 diff -ruNw misc/cairo-1.10.2/src/cairo-image-source.c 
misc/build/cairo-1.10.2/src/cairo-image-source.c
 --- misc/cairo-1.10.2/src/cairo-image-source.c 2015-10-27 17:04:30.0 
-0400
-+++ misc/build/cairo-1.10.2/src/cairo-image-source.c   2017-12-10 
22:31:08.911151137 -0500
 misc/build/cairo-1.10.2/src/cairo-image-source.c   2017-12-17 
12:09:56.076344387 -0500
 @@ -508,6 +508,19 @@
color.blue = expand_channel(pixel & 0x3fff, 10);
return pixman_image_create_solid_fill (&color);
  
-+case CAIRO_FORMAT_24BIT_RGB:
++case CAIRO_FORMAT_RGB24_888:
 +  pixel = *(uint32_t *) (image->data + y * image->stride + 3 * x);
 +  pixel &= 0x00ff; /* ignore next pixel bits */
 +  if (pixel == 0)
@@ -175,13 +175,13 @@ diff -ruNw misc/cairo-1.10.2/src/cairo-image-source.c 
misc/build/cairo-1.10.2/sr
pixel = *(uint32_t *) (image->data + y * image->stride + 4 * x);
 diff -ruNw misc/cairo-1.10.2/src/cairo-image-surface.c 
misc/build/cairo-1.10.2/src/cairo-image-surface.c
 --- misc/cairo-1.10.2/src/cairo-image-surface.c2015-10-27 
17:04:30.0 -0400
-+++ misc/build/cairo-1.10.2/src/cairo-image-surface.c  2017-12-09 
16:23:41.702363265 -0500
 misc/build/cairo-1.10.2/src/cairo-image-surface.c  2017-12-17 
12:09:59.876406346 -0500
 @@ -104,13 +104,15 @@
return CAIRO_FORMAT_A1;
  case PIXMAN_r5g6b5:
return CAIRO_FORMAT_RGB16_565;
 +  case PIXMAN_r8g8b8:
-+  return CAIRO_FORMAT_24BIT_RGB;
++  return CAIRO_FORMAT_RGB24_888;
  #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0)
  case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8:
  #endif
@@ -197,7 +197,7 @@ diff -ruNw misc/cairo-1.10.2/src/cairo-image-surface.c 
misc/build/cairo-1.10.2/s
  case CAIRO_FORMAT_RGB16_565:
ret = PIXMAN_r5g6b5;
break;
-+  case CAIRO_FORMAT_24BIT_RGB:
++  case CAIRO_FORMAT_RGB24_888:
 +  ret = PIXMAN_r8g8b8;
 +  break;
  case CAIRO_FORMAT_ARGB32:
@@ -207,20 +207,20 @@ diff -ruNw misc/cairo-1.10.2/src/cairo-image-surface.c 
misc/build/cairo-1.10.2/s
  case CAIRO_FORMAT_RGB30:
  case CAIRO_FORMAT_RGB24:
return 32;
-+  case CAIRO_FORMAT_24BIT_RGB:
++  case CAIRO_FORMAT_RGB24_888:
 +  return 24;
  case CAIRO_FORMAT_RGB16_565:
return 16;
  case CAIRO_FORMAT_A8:
 diff -ruNw misc/cairo-1.10.2/src/cairoint.h 
misc/build/cairo-1.10.2/src/cairoint.

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Maxim Monastirsky]

 vcl/source/window/toolbox.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e067187427cf5f53ee1c2176f1042b4fedb67783
Author: Maxim Monastirsky 
Date:   Wed Dec 6 01:20:13 2017 +0200

tdf#114262 Respect text+image toolbar style

Regression of 67c9d054517fc3b5cbc203c330eedef4b50f0e57
("fdo#84938: replace TIB_ constants with enum").

Change-Id: Ib90473a80fd491f4a136b4e76864c107a9240990
Reviewed-on: https://gerrit.libreoffice.org/45920
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 291ea673180a37912697646850959b3f6553cc7a)
Reviewed-on: https://gerrit.libreoffice.org/46144
Reviewed-by: Katarina Behrens 

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c7b98962689b..0eb843cf167c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -148,12 +148,13 @@ int ToolBox::ImplGetDragWidth() const
 ButtonType determineButtonType( ImplToolItem const * pItem, ButtonType 
defaultType )
 {
 ButtonType tmpButtonType = defaultType;
-if ( pItem->mnBits & (ToolBoxItemBits::TEXT_ONLY | 
ToolBoxItemBits::ICON_ONLY) ) // item has custom setting
+ToolBoxItemBits nBits = pItem->mnBits & ( ToolBoxItemBits::TEXT_ONLY | 
ToolBoxItemBits::ICON_ONLY );
+if ( nBits != ToolBoxItemBits::NONE ) // item has custom setting
 {
 tmpButtonType = ButtonType::SYMBOLTEXT;
-if ( pItem->mnBits & ToolBoxItemBits::TEXT_ONLY )
+if ( nBits == ToolBoxItemBits::TEXT_ONLY )
 tmpButtonType = ButtonType::TEXT;
-else if ( pItem->mnBits & ToolBoxItemBits::ICON_ONLY )
+else if ( nBits == ToolBoxItemBits::ICON_ONLY )
 tmpButtonType = ButtonType::SYMBOLONLY;
 }
 return tmpButtonType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig

[Yousuf Philips]

 sw/uiconfig/swriter/ui/textgridpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b02335dd53975ccea164709e42c0605291e61ea
Author: Yousuf Philips 
Date:   Thu Dec 14 04:00:29 2017 +0400

Dont translate strings replaced with text in code

These are two labels in the Page dialog's Text Grid tab

Change-Id: I77da5fab08fbd70825f3bfc46e1b12d7948291e0
Reviewed-on: https://gerrit.libreoffice.org/46431
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 
(cherry picked from commit d631d2aad44e2d2bc64fc01168b9a948f54b249f)
Reviewed-on: https://gerrit.libreoffice.org/46452
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui 
b/sw/uiconfig/swriter/ui/textgridpage.ui
index 80a8dd783d46..45485b9b67c2 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -220,7 +220,7 @@
 True
 False
 start
-(1-45)
+(1-45)
 True
   
   
@@ -262,7 +262,7 @@
 False
 start
 4
-(1-48)
+(1-48)
   
   
 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 sfx2/source/view/classificationhelper.cxx  |3 +--
 svx/source/dialog/ClassificationDialog.cxx |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 59b62c9af6961300555e4f2a170fd70c76b83a72
Author: Tomaž Vajngerl 
Date:   Mon Nov 27 17:07:33 2017 +0900

TSCP: don't put a non-existing name into doc. props

We combined the abbr. name with the name and put that as a value
into doc. properties. This is not correct as such a name doesn't
exist in the BAPolicy and con't be identified anymore, so removing
this.

Also use the values that were put into the ClassificationField
instead of the extracted text.

Change-Id: I3037bc90a7a394d430f7c0cca4d326473eff3147
Reviewed-on: https://gerrit.libreoffice.org/45316
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit ec9b555e8094f4552c068820cab633307fcf520f)
Reviewed-on: https://gerrit.libreoffice.org/46720
Tested-by: Tomaž Vajngerl 

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index e1381e85cd01..1d7c0e94b4d3 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -451,8 +451,7 @@ void 
SfxClassificationHelper::Impl::pushToDocumentProperties()
 SfxClassificationPolicyType eType = rPair.first;
 SfxClassificationCategory& rCategory = rPair.second;
 std::map aLabels = rCategory.m_aLabels;
-const OUString abbreviation = (rCategory.m_aName != 
rCategory.m_aAbbreviatedName ? " (" + rCategory.m_aAbbreviatedName + ")" : 
OUString());
-aLabels[policyTypeToString(eType) + PROP_BACNAME()] = 
rCategory.m_aName + abbreviation;
+aLabels[policyTypeToString(eType) + PROP_BACNAME()] = 
rCategory.m_aName;
 for (const auto& rLabel : aLabels)
 {
 try
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index aa7f2e778be9..fa5be8da164d 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -568,7 +568,7 @@ std::vector 
ClassificationDialog::getResult()
 if (pClassificationField)
 {
 aClassificationResults.push_back({ 
pClassificationField->meType, pClassificationField->msFullClassName,
-   sDisplayString, 
pClassificationField->msIdentifier });
+   
pClassificationField->msDescription, pClassificationField->msIdentifier });
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/source

[Caolán McNamara]

 vcl/source/gdi/jobset.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 385fe413094fa56278ce3a21fa42f091496962be
Author: Caolán McNamara 
Date:   Sun Dec 17 13:57:46 2017 +

ofz: ensure null termination

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

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 57c02b95b557..0e2e3c96a372 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -256,7 +256,9 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 
 ImplJobSetup& rJobData = rJobSetup.ImplGetData();
 
+pData->cPrinterName[SAL_N_ELEMENTS(pData->cPrinterName) - 1] = 0;
 rJobData.SetPrinterName( OStringToOUString(pData->cPrinterName, 
aStreamEncoding) );
+pData->cDriverName[SAL_N_ELEMENTS(pData->cDriverName) - 1] = 0;
 rJobData.SetDriver( OStringToOUString(pData->cDriverName, 
aStreamEncoding) );
 
 // Are these our new JobSetup files?
@@ -347,9 +349,9 @@ SvStream& WriteJobSetup( SvStream& rOStream, const 
JobSetup& rJobSetup )
 ImplOldJobSetupData aOldData;
 memset( &aOldData, 0, sizeof( aOldData ) );
 OString aPrnByteName(OUStringToOString(rJobData.GetPrinterName(), 
RTL_TEXTENCODING_UTF8));
-strncpy( aOldData.cPrinterName, aPrnByteName.getStr(), 63 );
+strncpy(aOldData.cPrinterName, aPrnByteName.getStr(), 
SAL_N_ELEMENTS(aOldData.cPrinterName) - 1);
 OString aDriverByteName(OUStringToOString(rJobData.GetDriver(), 
RTL_TEXTENCODING_UTF8));
-strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 );
+strncpy(aOldData.cDriverName, aDriverByteName.getStr(), 
SAL_N_ELEMENTS(aOldData.cDriverName) - 1);
 int nPos = rOStream.Tell();
 rOStream.WriteUInt16( 0 );
 rOStream.WriteUInt16( nSystem );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/gdi/jobset.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 80785f935455f3e740c57febc33410f1ee81f12a
Author: Caolán McNamara 
Date:   Sun Dec 17 13:57:46 2017 +

ofz: ensure null termination

Change-Id: I6b6b0763e85a41d03f9e03c6abc17c6c311f6519
Reviewed-on: https://gerrit.libreoffice.org/46642
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index cc8712a48615..fe7cbb2936d9 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -256,7 +256,9 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 
 ImplJobSetup& rJobData = rJobSetup.ImplGetData();
 
+pData->cPrinterName[SAL_N_ELEMENTS(pData->cPrinterName) - 1] = 0;
 rJobData.SetPrinterName( OStringToOUString(pData->cPrinterName, 
aStreamEncoding) );
+pData->cDriverName[SAL_N_ELEMENTS(pData->cDriverName) - 1] = 0;
 rJobData.SetDriver( OStringToOUString(pData->cDriverName, 
aStreamEncoding) );
 
 // Are these our new JobSetup files?
@@ -345,9 +347,9 @@ SvStream& WriteJobSetup( SvStream& rOStream, const 
JobSetup& rJobSetup )
 ImplOldJobSetupData aOldData;
 memset( &aOldData, 0, sizeof( aOldData ) );
 OString aPrnByteName(OUStringToOString(rJobData.GetPrinterName(), 
RTL_TEXTENCODING_UTF8));
-strncpy( aOldData.cPrinterName, aPrnByteName.getStr(), 63 );
+strncpy(aOldData.cPrinterName, aPrnByteName.getStr(), 
SAL_N_ELEMENTS(aOldData.cPrinterName) - 1);
 OString aDriverByteName(OUStringToOString(rJobData.GetDriver(), 
RTL_TEXTENCODING_UTF8));
-strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 );
+strncpy(aOldData.cDriverName, aDriverByteName.getStr(), 
SAL_N_ELEMENTS(aOldData.cDriverName) - 1);
 int nPos = rOStream.Tell();
 rOStream.WriteUInt16( 0 );
 rOStream.WriteUInt16( JOBSET_FILE605_SYSTEM );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-5.3-36' created by Andras Timar  at 
2017-12-18 13:25 +

cp-5.3-36

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

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

[Christian Lohmaier]

Tag 'cp-5.3-36' created by Andras Timar  at 
2017-12-18 13:25 +

cp-5.3-36

Changes since cp-5.3-10:
Christian Lohmaier (1):
  update translations for 5.3.3 rc2

---
 source/am/cui/source/options.po|8 
 source/am/cui/source/tabpages.po   |8 
 source/am/cui/uiconfig/ui.po   |8 
 source/am/fpicker/source/office.po |   10 
 source/am/officecfg/registry/data/org/openoffice/Office.po |6 
 source/am/sc/source/ui/src.po  |8 
 source/am/sfx2/source/dialog.po|   12 
 source/am/svtools/source/dialogs.po|8 
 source/am/svtools/source/misc.po   |8 
 source/am/svx/source/stbctrls.po   |8 
 source/am/svx/uiconfig/ui.po   |   10 
 source/bg/sc/uiconfig/scalc/ui.po  |   20 
 source/bg/sfx2/source/dialog.po|   12 
 source/bg/svx/source/dialog.po |   30 
 source/bg/svx/source/form.po   |   10 
 source/bg/svx/source/stbctrls.po   |8 
 source/bg/svx/source/tbxctrls.po   |6 
 source/bg/svx/uiconfig/ui.po   |  289 
 source/bg/sw/source/ui/utlui.po|   21 
 source/bg/sw/source/uibase/utlui.po|6 
 source/bg/sw/uiconfig/swriter/ui.po|5 
 source/br/cui/uiconfig/ui.po   |   70 -
 source/br/extensions/source/bibliography.po|   12 
 source/br/extensions/source/propctrlr.po   |  152 ++--
 source/br/sc/source/ui/src.po  |   12 
 source/ca/helpcontent2/source/text/scalc/00.po |   20 
 source/ca/helpcontent2/source/text/scalc/01.po |8 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   10 
 source/ca/helpcontent2/source/text/shared/01.po|6 
 source/ca/helpcontent2/source/text/shared/guide.po |5 
 source/ca/helpcontent2/source/text/shared/optionen.po  |8 
 source/ca/helpcontent2/source/text/simpress/guide.po   |   10 
 source/ca/helpcontent2/source/text/swriter/01.po   |   13 
 source/ca/helpcontent2/source/text/swriter/guide.po|   25 
 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/ca/sc/uiconfig/scalc/ui.po  |6 
 source/ca/svx/uiconfig/ui.po   |   12 
 source/cy/cui/uiconfig/ui.po   |8 
 source/cy/sfx2/source/dialog.po|   12 
 source/cy/sfx2/uiconfig/ui.po  |   15 
 source/cy/svtools/source/dialogs.po|8 
 source/cy/svtools/source/misc.po   |8 
 source/cy/svx/source/stbctrls.po   |   10 
 source/cy/svx/uiconfig/ui.po   |   10 
 source/da/cui/uiconfig/ui.po   |8 
 source/da/helpcontent2/source/text/scalc/01.po |   12 
 source/da/sfx2/source/dialog.po|   14 
 source/da/sfx2/uiconfig/ui.po  |   17 
 source/da/svtools/source/dialogs.po|   10 
 source/da/svtools/source/java.po   |   12 
 source/da/svtools/source/misc.po   |   10 
 source/da/svx/source/stbctrls.po   |8 
 source/da/svx/uiconfig/ui.po   |   12 
 source/de/editeng/source/items.po  |   10 
 source/de/formula/source/core/resource.po  |8 
 source/de/helpcontent2/source/auxiliary.po |6 
 source/de/helpcontent2/source/text/sbasic/shared/01.po |   10 
 source/de/helpcontent2/source/text/scalc.po|6 
 source/de/helpcontent2/source/text/scalc/00.po |6 
 source/de/helpcontent2/source/text/scalc/01.po |  100 +-
 source/de/helpcontent2/source/text/scalc/guide.po  |   34 
 source/de/helpcontent2/source/text/schart/01.po|6 
 source/de/helpcontent2/source/text/shared/00.po|   10 
 source/de/helpcontent2/source/text/shared/01.po|   12 
 source/de/helpcontent2/source/text/shared/explorer/database.po |8 
 source/de/helpcontent2/source/text/shared/guide.po |   16 
 source/de/helpcontent2/source/text/shared/optionen.po

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

[Olivier R]

Tag 'cp-5.3-36' created by Andras Timar  at 
2017-12-18 13:25 +

cp-5.3-36

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-5.3-36' created by Andras Timar  at 
2017-12-18 13:25 +

cp-5.3-36

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

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

[Marco Cecchetti]

 loleaflet/src/control/Control.Header.js |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e3b893dbc69aad870b7101d48e6230b0690953f2
Author: Marco Cecchetti 
Date:   Sun Dec 17 18:58:01 2017 +0100

calc: fixing auto optimal size on double-click

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

diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 261b2958..8593052d 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -423,6 +423,10 @@ L.Control.Header = L.Control.extend({
this.onDragMove(this._item, this._start, this._offset, e);
},
 
+   _resetClickCount: function () {
+   this._clicks = 0;
+   },
+
_onMouseUp: function (e) {
// disable mouse events used on dragging
L.DomEvent.off(document, 'mousemove', 
this._onMouseMoveForDragging, this);
@@ -439,7 +443,7 @@ L.Control.Header = L.Control.extend({
this._clicks = 0;
} else {
this.onDragClick(this._item, ++this._clicks, e);
-   setTimeout(L.bind(this.initialize, this), 400);
+   setTimeout(L.bind(this._resetClickCount, this), 400);
}
 
this._item = this._start = this._offset = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Paul Trojahn]

 include/oox/export/drawingml.hxx|4 +-
 oox/inc/drawingml/textparagraph.hxx |2 +
 oox/source/drawingml/textparagraph.cxx  |   14 +++
 oox/source/drawingml/textparagraphproperties.cxx|8 
 oox/source/drawingml/textparagraphpropertiescontext.cxx |2 -
 oox/source/export/drawingml.cxx |   30 ++--
 sd/qa/unit/data/odp/tdf90626.odp|binary
 sd/qa/unit/data/pptx/tdf90626.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   17 +
 sd/qa/unit/import-tests.cxx |   19 ++
 10 files changed, 74 insertions(+), 22 deletions(-)

New commits:
commit 3b4f14f4da046dab25362114db737968634cd720
Author: Paul Trojahn 
Date:   Mon Nov 13 18:27:22 2017 +0100

tdf#90626 PPTX: Fix image bullet size

This solution comes with a few limitations. The bullet isn't centered in
Powerpoint and has to be between 25% and 400% of the size of the first
character in the paragraph. This isn't optimal, but should produce
acceptable results under most circumstances.

Change-Id: I6c37169282aa351b81d78e06678424203b78f6d7
Reviewed-on: https://gerrit.libreoffice.org/44911
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 69d1d6657fad..14bd8eae4664 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -204,8 +204,8 @@ public:
 void WriteText( const css::uno::Reference< css::uno::XInterface >& 
rXIface, const OUString& presetWarp, bool bBodyPr, bool bText = true, sal_Int32 
nXmlNamespace = 0);
 void WriteParagraph( const css::uno::Reference< css::text::XTextContent >& 
rParagraph,
  bool& rbOverridingCharHeight, sal_Int32& rnCharHeight 
);
-void WriteParagraphProperties( const css::uno::Reference< 
css::text::XTextContent >& rParagraph );
-void WriteParagraphNumbering( const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet,
+void WriteParagraphProperties(const css::uno::Reference< 
css::text::XTextContent >& rParagraph, float fFirstCharHeight);
+void WriteParagraphNumbering(const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet, float fFirstCharHeight,
   sal_Int16 nLevel );
 void WriteRun( const css::uno::Reference< css::text::XTextRange >& rRun,
bool& rbOverridingCharHeight, sal_Int32& rnCharHeight );
diff --git a/oox/inc/drawingml/textparagraph.hxx 
b/oox/inc/drawingml/textparagraph.hxx
index 10eb0ee35468..ec0d57686e1b 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -29,6 +29,8 @@
 #include 
 #include 
 
+// The height the bullet is relative to is different in OOXML
+#define OOX_BULLET_LIST_SCALE_FACTOR 0.7f
 
 namespace oox { namespace formulaimport {
 class XmlStreamBuilder;
diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 02e5efa54f03..8f1e5d1b061c 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -133,6 +134,19 @@ void TextParagraph::insertAt(
 aioBulletList.setProperty( PROP_BulletColor, 
(*maRuns.begin())->getTextCharacterProperties().maFillProperties.getBestSolidColor().getColor(
 rFilterBase.getGraphicHelper() ));
 if( !aioBulletList.hasProperty( PROP_BulletColor ) && 
aTextCharacterStyle.maFillProperties.moFillType.has() )
 aioBulletList.setProperty( PROP_BulletColor, 
aTextCharacterStyle.maFillProperties.getBestSolidColor().getColor( 
rFilterBase.getGraphicHelper() ));
+if( !aioBulletList.hasProperty( PROP_GraphicSize ) && 
maRuns.size() > 0
+&& aParaProp.getBulletList().maGraphic.hasValue())
+{
+float fFirstCharHeight = 
maRuns.front()->getTextCharacterProperties().getCharHeightPoints(12);
+long nFirstCharHeightMm = TransformMetric(fFirstCharHeight * 
100.f, FUNIT_POINT, FUNIT_MM);
+float fBulletSizeRel = 1.f;
+if( aParaProp.getBulletList().mnSize.hasValue() )
+fBulletSizeRel = 
aParaProp.getBulletList().mnSize.get() / 100.f;
+
+css::awt::Size aBulletSize;
+aBulletSize.Width = aBulletSize.Height = 
std::lround(fBulletSizeRel * nFirstCharHeightMm * OOX_BULLET_LIST_SCALE_FACTOR);
+aioBulletList.setProperty( PROP_GraphicSize, aBulletSize);
+}
 
 float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( 
nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 12 );
 aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, 
&pTextParagraphStyle->

[Libreoffice-commits] core.git: external/mdds

[Stephan Bergmann]

 external/mdds/UnpackedTarball_mdds.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b8de27a2a92cf8a3d125720d2f22645c3ae2d1d9
Author: Stephan Bergmann 
Date:   Mon Dec 18 15:47:28 2017 +0100

Mark external/mdds/c++17.patch upstreamed

Change-Id: I5cce6fd2438323149c723408f0f599ca7c688eab

diff --git a/external/mdds/UnpackedTarball_mdds.mk 
b/external/mdds/UnpackedTarball_mdds.mk
index 93eb3e6214fd..4f6db6b24e7b 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -13,6 +13,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 
+# c++17.patch upstreamed as  
"Remove some
+# unnecessary uses of obsolete std::unary_function":
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
 external/mdds/c++17.patch \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 wsd/FileServer.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 75c2147b7f774afccf55bb93f7fae79efb615361
Author: Pranav Kant 
Date:   Mon Dec 18 19:18:43 2017 +0530

Explicit is better than implicit; avoid invalid mem access

The form.get function is something like this:

const std::string& get(const std::string& abc) { return abc; }

passing a string literal implicitly gets converted to temporary
std::string whose reference is then returned and used. This causes
crash, atleast for me, on building online with GCC 7

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

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index a0e74a2c..501966ba 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -439,10 +439,10 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 std::string preprocess = *getUncompressedFile(relPath);
 
 HTMLForm form(request, message);
-const std::string& accessToken = form.get("access_token", "");
-const std::string& accessTokenTtl = form.get("access_token_ttl", "");
+const std::string accessToken = form.get("access_token", "");
+const std::string accessTokenTtl = form.get("access_token_ttl", "");
 LOG_TRC("access_token=" << accessToken << ", access_token_ttl=" << 
accessTokenTtl);
-const std::string& accessHeader = form.get("access_header", "");
+const std::string accessHeader = form.get("access_header", "");
 LOG_TRC("access_header=" << accessHeader);
 
 // Escape bad characters in access token.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/FileServer.cpp

[Pranav Kant]

 wsd/FileServer.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0d4bc145ba957982194808a8f43688d01885f6c3
Author: Pranav Kant 
Date:   Mon Dec 18 19:18:43 2017 +0530

Explicit is better than implicit; avoid invalid mem access

The form.get function is something like this:

const std::string& get(const std::string& abc) { return abc; }

passing a string literal implicitly gets converted to temporary
std::string whose reference is then returned and used. This causes
crash, atleast for me, on building online with GCC 7

Change-Id: I09d0aeea57a3dbeeefd1bb28ff645723714aa6b4
Reviewed-on: https://gerrit.libreoffice.org/46727
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 75c2147b7f774afccf55bb93f7fae79efb615361)
Reviewed-on: https://gerrit.libreoffice.org/46730
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index a0e74a2c..501966ba 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -439,10 +439,10 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 std::string preprocess = *getUncompressedFile(relPath);
 
 HTMLForm form(request, message);
-const std::string& accessToken = form.get("access_token", "");
-const std::string& accessTokenTtl = form.get("access_token_ttl", "");
+const std::string accessToken = form.get("access_token", "");
+const std::string accessTokenTtl = form.get("access_token_ttl", "");
 LOG_TRC("access_token=" << accessToken << ", access_token_ttl=" << 
accessTokenTtl);
-const std::string& accessHeader = form.get("access_header", "");
+const std::string accessHeader = form.get("access_header", "");
 LOG_TRC("access_header=" << accessHeader);
 
 // Escape bad characters in access token.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/source

[Tamas Bunth]

 sw/source/filter/ww8/wrtw8nds.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 615586daaed2c708bf4fe4159d5d850141e2acdf
Author: Tamas Bunth 
Date:   Fri Dec 8 17:51:54 2017 +0100

fix for empty paragraphs

Change-Id: I0a7432059d5e6f680d4fe2e3cac0f12062533511
Reviewed-on: https://gerrit.libreoffice.org/46100
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/46723
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index c727ca145e18..97ffba47dbd4 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2248,7 +2248,9 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 do
 {
 sal_Int32 nAktPos = *aBreakIt;
-++aBreakIt;
+
+if( softBreakList.size() > 1 ) // not for empty paragpraph
+++aBreakIt;
 
 AttrOutput().StartParagraph( pTextNodeInfo );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa

[Tamas Bunth]

 sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78ee96864ff96acb5ccb24d4123002c0488bfb86
Author: Tamas Bunth 
Date:   Fri Dec 15 11:56:21 2017 +0100

sw: Modifiy paragraph-split unit test to also..

..assert that no section break is inserted after the paragraph which had
to be split and which contains a section break between its parts.

Change-Id: I5bf2f313202c1dcc2acdf66b2457152b8d44be81
Reviewed-on: https://gerrit.libreoffice.org/46525
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/46594
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt 
b/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt
index 1d0b96f8bb96..8a6e4aeb4704 100644
Binary files a/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt 
and b/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 60701a264805..4da51b6b87a1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -106,10 +106,10 @@ 
DECLARE_OOXMLEXPORT_TEST(testParagraphSplitOnSectionBorder, "parasplit-on-sectio
 if(!pXmlDoc)
 return;
 
-// Test document has only one paragraph. After splitting, it should contain
-// two of them.
+// Test document has only two paragraphs. After splitting, it should 
contain
+// three of them.
 assertXPath(pXmlDoc, "//w:sectPr", 2);
-assertXPath(pXmlDoc, "//w:p", 2);
+assertXPath(pXmlDoc, "//w:p", 3);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf44832_testSectionWithDifferentHeader, 
"tdf44832_section_new_header.odt")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fwd: Re: offline help replacement

[Olivier Hallot]

Hi All

To integrate the new offline help in LibreOffice we need to call the
browser from LibreOffice passing the help page parameters.

The job is ready for the online help (*) and is in line 523 of the file
below.

sfx2/source/appl/sfxhelp.cxx.

For the offline help we still need a way to call the browser passing the
right url to

${Install}/help/

in the same sfxhelp.cxx file

David Tardon has prepared a set of makefiles for the new html help with
some new params as

Usage: --with-helpbuild the old local help
   --without-help no local help (default)
   --with-help=html   build the new HTML local help
   --with-help=online build the new HTML online help
   --with-help=common bundle common files for the local
   help but do not build the whole help

Below are some findings we have from previous discussion on how to
address the issue.

Any help is appreciated

Kind regards
Olivier


 Mensagem encaminhada 
Assunto: Re: offline help replacement
Data: Tue, 26 Sep 2017 10:29:02 +0200
De: Jan Holesovsky 
Para: Olivier Hallot 

Hi Olivier,

Olivier Hallot píše v Po 25. 09. 2017 v 14:46 -0300:

> Simply replacing the URL + protocol does not work so easy because the
> protocols are handled by different applications: http:// is handled
> by
> the browser and file:// is handled by a file manager, or undefined.
> 
> in my linux system the command invokes
> 
> xdg-open: file
> '/home/tdf/git/core/instdir/help3/help.html?swriter/sfx/ui/startcente
> r/open_all?Language=fr&System=UNIX&Version=6.0'
> does not exist

Oh yes, the problem is that xdg-open is confused about the parameters
there - it thinks it is still part of the filename :-(

But if you do 'xdg-open file:///some/file/ending_with.html' , it opens
that in the browser; so I think whenever the help file is supposed to
be open, the easiest will be to write a temporary redirectXYZABC.html
file like:







window.location.href =
"file:///<...>?Language=fr&System=UNIX&Version=6.0"

Help Page Redirection


... a short explanation about the help maybe? ...

If you are not redirected automatically, follow this link to
example.



and let xdg-open open that one.

I've tested here, and xdg-open opens this in the webbrowser & the
redirect works fine :-)  So that + some proper cleanup of the temp
directory will do that I hope.

All the best,
Kendy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Stahl]

 writerfilter/source/rtftok/rtfdispatchdestination.cxx |9 -
 writerfilter/source/rtftok/rtfsdrimport.cxx   |1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 706728df38830536354ba902978cc8297f787dfc
Author: Michael Stahl 
Date:   Mon Dec 18 17:17:44 2017 +0100

tdf#114303 writerfilter: RTF import: fix default vert orient of shapes

The bugdoc is affected by the change of default vertical alignment, it
doesn't contain anything that would set the VertOrient property.

(regression from c79467ba954987f1d239c594c1e1b3af3f5515f6)

Setting the AnchorType property before adding the shape is actually not
as effective as expected: it does cause the old default vertical
alignment to be used, but does not actually set the anchor type because
there is no anchor position and so SwXDrawPage::add resets the anchor
type to FLY_AT_PAGE; it's less confusing to set the VertOrient
property instead.

Change-Id: Ib0a71d20d479776ab5e4c21c3dd13c0c307a045e

diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx 
b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index f844de1bf94c..0f795c7d50e0 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -11,7 +11,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -598,11 +598,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 if (xDrawSupplier.is())
 {
 uno::Reference xShape(xGroupShape, 
uno::UNO_QUERY);
-// set AnchorType before inserting
+// set default VertOrient before inserting
 uno::Reference(xShape, 
uno::UNO_QUERY)
-->setPropertyValue(
-"AnchorType",
-
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+->setPropertyValue("VertOrient",
+   
uno::makeAny(text::VertOrientation::NONE));
 xDrawSupplier->getDrawPage()->add(xShape);
 }
 m_pSdrImport->pushParent(xGroupShape);
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 5605f5cfb27d..b79d37123399 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -341,6 +341,7 @@ int 
RTFSdrImport::initShape(uno::Reference& o_xShape,
 o_xPropSet->setPropertyValue(
 "FillColor",
 uno::makeAny(sal_uInt32(0xff))); // White in Word, kind of 
blue in Writer.
+o_xPropSet->setPropertyValue("VertOrient", 
uno::makeAny(text::VertOrientation::NONE));
 }
 
 return nType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 oox/source/drawingml/textparagraphpropertiescontext.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e98bad89ddff5bebc3f26d944c1e1be6afe2b6f2
Author: Michael Stahl 
Date:   Mon Dec 18 17:52:46 2017 +0100

oox: try to fix Android build, no std::lround there

Change-Id: I47e1df5d27e788ef5aa48c3a09daf9888c33f920

diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx 
b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index fdc9c3f210a9..5b7477a39a0c 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source

[Noel Grandin]

 include/svx/grfflt.hxx |8 
 sc/source/ui/drawfunc/graphsh.cxx  |2 +-
 sd/source/ui/view/GraphicObjectBar.cxx |2 +-
 svx/source/dialog/grfflt.cxx   |   10 +-
 sw/source/uibase/shells/grfsh.cxx  |2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit d7602d052dd12b6764942890ea7c11247e2bd222
Author: Noel Grandin 
Date:   Mon Dec 18 10:46:57 2017 +0200

convert SVX_GRAPHICFILTER constants to scoped enum

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

diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index fc60cd256a05..b3896c0e1387 100644
--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -23,9 +23,9 @@
 #include 
 #include 
 
-#define SVX_GRAPHICFILTER_ERRCODE_NONE  0x
-#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE   0x0001
-#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT  0x0002
+enum class SvxGraphicFilterResult {
+NONE, UnsupportedGraphicType, UnsupportedSlot
+};
 
 class SfxRequest;
 class SfxItemSet;
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter
 {
 public:
 
-static sal_uLongExecuteGrfFilterSlot( SfxRequest const & rReq, 
GraphicObject& rFilterObject );
+static SvxGraphicFilterResult ExecuteGrfFilterSlot( SfxRequest const & 
rReq, GraphicObject& rFilterObject );
 static void DisableGraphicFilterSlots( SfxItemSet& rSet );
 };
 
diff --git a/sc/source/ui/drawfunc/graphsh.cxx 
b/sc/source/ui/drawfunc/graphsh.cxx
index e13638fe2e06..02e7a0b4cbb8 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -115,7 +115,7 @@ void ScGraphicShell::ExecuteFilter( const SfxRequest& rReq )
 {
 GraphicObject aFilterObj( 
static_cast(pObj)->GetGraphicObject() );
 
-if( SVX_GRAPHICFILTER_ERRCODE_NONE ==
+if( SvxGraphicFilterResult::NONE ==
 SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj ) )
 {
 SdrPageView* pPageView = pView->GetSdrPageView();
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx 
b/sd/source/ui/view/GraphicObjectBar.cxx
index 38794f9c8e34..64105642182e 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -123,7 +123,7 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest const & 
rReq )
 {
 GraphicObject aFilterObj( 
static_cast(pObj)->GetGraphicObject() );
 
-if( SVX_GRAPHICFILTER_ERRCODE_NONE ==
+if( SvxGraphicFilterResult::NONE ==
 SvxGraphicFilter::ExecuteGrfFilterSlot( rReq, aFilterObj ) )
 {
 SdrPageView* pPageView = mpView->GetSdrPageView();
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 0f9d7cbd1f0c..2d008bec558a 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -31,10 +31,10 @@
 #include 
 
 
-sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest const & rReq, 
GraphicObject& rFilterObject )
+SvxGraphicFilterResult SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest 
const & rReq, GraphicObject& rFilterObject )
 {
 const Graphic&  rGraphic = rFilterObject.GetGraphic();
-sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
+SvxGraphicFilterResult nRet = 
SvxGraphicFilterResult::UnsupportedGraphicType;
 
 if( rGraphic.GetType() == GraphicType::Bitmap )
 {
@@ -251,14 +251,14 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( 
SfxRequest const & rReq, Gra
 case SID_GRFFILTER :
 {
 // do nothing; no error
-nRet = SVX_GRAPHICFILTER_ERRCODE_NONE;
+nRet = SvxGraphicFilterResult::NONE;
 break;
 }
 
 default:
 {
 OSL_FAIL( "SvxGraphicFilter: selected filter slot not yet 
implemented" );
-nRet = SVX_GRAPHICFILTER_UNSUPPORTED_SLOT;
+nRet = SvxGraphicFilterResult::UnsupportedSlot;
 }
 break;
 }
@@ -266,7 +266,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( 
SfxRequest const & rReq, Gra
 if( aGraphic.GetType() != GraphicType::NONE )
 {
 rFilterObject.SetGraphic( aGraphic );
-nRet = SVX_GRAPHICFILTER_ERRCODE_NONE;
+nRet = SvxGraphicFilterResult::NONE;
 }
 }
 
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index 2b3a7a8d13d3..bda2b2b395ff 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -707,7 +707,7 @@ void SwGrfShell::ExecAttr( SfxRequest const &rReq )
 if ( pFilterObj )
 {
 GraphicObject aFilterObj( *pFilterObj );
-if( SVX_G

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - include/svx svx/source sw/inc sw/source

[Tor Lillqvist]

 include/svx/svdobj.hxx  |3 +
 svx/source/svdraw/svdobj.cxx|5 ++
 sw/inc/textboxhelper.hxx|2 -
 sw/source/core/doc/textboxhelper.cxx|   21 
 sw/source/core/draw/dflyobj.cxx |6 +++
 sw/source/core/inc/dflyobj.hxx  |2 +
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 -
 7 files changed, 25 insertions(+), 16 deletions(-)

New commits:
commit e2b76eb07f03fdd6552cdbd8627fa88109f9c4d6
Author: Tor Lillqvist 
Date:   Mon Dec 18 17:49:59 2017 +0200

Get rid of a dynamic_cast

Add a virtual member function instead. This improves performance. The
time to load a specific pathological customer document dropped from
1min 16s to 1min 8s on my machine. Not hugely, but clearly.

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

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 3e75235abc9d..304f403cdfd4 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -948,6 +948,9 @@ public:
 
 virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
+/// Is this a textbox of a drawinglayer shape?
+virtual bool IsTextBox() const;
+
 protected:
 /// Sets a new UNO shape
 ///
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index daaf8f0c37e6..09e0a3486fa7 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -3108,6 +3108,11 @@ bool SdrObject::HasText() const
 return false;
 }
 
+bool SdrObject::IsTextBox() const
+{
+return false;
+}
+
 SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* 
pNewPage, SdrModel* pNewModel)
 {
 nInventor=nInvent;
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 32fc2167c72a..a9a35f35aa35 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -86,8 +86,6 @@ public:
  *  Valid types are RES_DRAWFRMFMT and RES_FLYFRMFMT.
  */
 static bool isTextBox(const SwFrameFormat* pFormat, sal_uInt16 nType);
-/// Is pObject a textbox of a drawinglayer shape?
-static bool isTextBox(const SdrObject* pObject);
 
 /// Count number of shapes in the document, excluding TextBoxes.
 static sal_Int32 getCount(const SwDoc* pDoc);
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 23033eaeea38..a642de0c1299 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -148,20 +148,13 @@ bool SwTextBoxHelper::isTextBox(const SwFrameFormat* 
pShape, sal_uInt16 nType)
return true;
 }
 
-bool SwTextBoxHelper::isTextBox(const SdrObject* pObject)
-{
-const SwVirtFlyDrawObj* pVirtFlyDrawObj = dynamic_cast(pObject);
-if (!pVirtFlyDrawObj)
-return false;
-return isTextBox(pVirtFlyDrawObj->GetFormat(), RES_FLYFRMFMT);
-}
-
 sal_Int32 SwTextBoxHelper::getCount(SdrPage* pPage)
 {
 sal_Int32 nRet = 0;
 for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
 {
-if (isTextBox(pPage->GetObj(i)))
+SdrObject* p = pPage->GetObj(i);
+if (p && p->IsTextBox())
 continue;
 ++nRet;
 }
@@ -189,11 +182,12 @@ uno::Any SwTextBoxHelper::getByIndex(SdrPage* pPage, 
sal_Int32 nIndex) throw(lan
 sal_Int32 nCount = 0; // Current logical index.
 for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
 {
-if (isTextBox(pPage->GetObj(i)))
+SdrObject* p = pPage->GetObj(i);
+if (p && p->IsTextBox())
 continue;
 if (nCount == nIndex)
 {
-pRet = pPage->GetObj(i);
+pRet = p;
 break;
 }
 ++nCount;
@@ -212,9 +206,10 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* 
pObject)
 sal_Int32 nOrder = 0; // Current logical order.
 for (std::size_t i = 0; i < pPage->GetObjCount(); ++i)
 {
-if (isTextBox(pPage->GetObj(i)))
+SdrObject* p = pPage->GetObj(i);
+if (p && p->IsTextBox())
 continue;
-if (pPage->GetObj(i) == pObject)
+if (p == pObject)
 return nOrder;
 ++nOrder;
 }
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 19d0372b92e2..dafd5b1bfdc3 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -47,6 +47,7 @@
 #include "grfatr.hxx"
 #include "pagefrm.hxx"
 #include "rootfrm.hxx"
+#include "textboxhelper.hxx"
 #include "wrtsh.hxx"
 #include 
 #include 
@@ -1135,4 +1136,9 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const 
SdrObjMacroHitRec& rRec ) cons
 return SdrObject::CheckMacroHit( rRe

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

[Kohei Yoshida]

 sc/inc/table.hxx|2 
 sc/source/core/data/documen3.cxx|   14 +--
 sc/source/core/data/documentimport.cxx  |   12 --
 sc/source/core/data/table2.cxx  |   15 +++
 sc/source/filter/inc/orcusinterface.hxx |   21 -
 sc/source/filter/orcus/interface.cxx|  130 +++-
 6 files changed, 140 insertions(+), 54 deletions(-)

New commits:
commit ecfb22783f2462ba264e8793e3798c676dc9b727
Author: Kohei Yoshida 
Date:   Sat Dec 9 14:32:30 2017 -0500

Handle per-cell settings of cell formats.

Change-Id: I500d01921d436643499a24d375d40a607d8fd576
Reviewed-on: https://gerrit.libreoffice.org/46663
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index d85308732fea..e8c216308941 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -644,9 +644,13 @@ void ScOrcusSheet::set_date_time(
 cellInserted();
 }
 
-void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t 
xf_index)
+void ScOrcusSheet::set_format(os::row_t row, os::col_t col, size_t xf_index)
 {
 SAL_INFO("sc.orcus.style", "set format: " << xf_index);
+
+ScPatternAttr aPattern(mrDoc.getDoc().GetPool());
+mrStyles.applyXfToItemSet(aPattern.GetItemSet(), xf_index);
+mrDoc.getDoc().ApplyPattern(col, row, mnTab, aPattern);
 }
 
 void ScOrcusSheet::set_format(os::row_t row_start, os::col_t col_start,
commit c7529c1ecab2d22ed10e83627884da6b08f84e6d
Author: Kohei Yoshida 
Date:   Sat Dec 9 13:38:27 2017 -0500

Implement a reference resolver for orcus.

Orcus uses this to resolve cell addresses for some ops.

Change-Id: I6ee9667ad994fb830e545ba3368004866a048c25
Reviewed-on: https://gerrit.libreoffice.org/46662
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index af5020c8ace4..e502d49296b1 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -47,6 +47,8 @@ class XStatusIndicator;
 class ScOrcusGlobalSettings : public 
orcus::spreadsheet::iface::import_global_settings
 {
 ScDocumentImport& mrDoc;
+formula::FormulaGrammar::Grammar meCalcGrammar;
+orcus::spreadsheet::formula_grammar_t meOrcusGrammar;
 
 public:
 ScOrcusGlobalSettings(ScDocumentImport& rDoc);
@@ -55,6 +57,22 @@ public:
 
 virtual void 
set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) 
override;
 virtual orcus::spreadsheet::formula_grammar_t 
get_default_formula_grammar() const override;
+
+formula::FormulaGrammar::Grammar getCalcGrammar() const
+{
+return meCalcGrammar;
+}
+};
+
+class ScOrcusRefResolver : public 
orcus::spreadsheet::iface::import_reference_resolver
+{
+const ScOrcusGlobalSettings& mrGlobalSettings;
+
+public:
+ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS );
+
+orcus::spreadsheet::address_t resolve_address(const char* p, size_t n) 
override;
+orcus::spreadsheet::range_t resolve_range(const char* p, size_t n) 
override;
 };
 
 class ScOrcusSharedStrings : public 
orcus::spreadsheet::iface::import_shared_strings
@@ -202,7 +220,7 @@ class ScOrcusSheet : public 
orcus::spreadsheet::iface::import_sheet
 public:
 ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory);
 
-virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() 
override { return &maAutoFilter; }
+virtual orcus::spreadsheet::iface::import_auto_filter* get_auto_filter() 
override;
 virtual orcus::spreadsheet::iface::import_table* get_table() override;
 virtual orcus::spreadsheet::iface::import_sheet_properties* 
get_sheet_properties() override;
 virtual orcus::spreadsheet::iface::import_conditional_format* 
get_conditional_format() override;
@@ -497,6 +515,7 @@ class ScOrcusFactory : public 
orcus::spreadsheet::iface::import_factory
 
 StringCellCaches maStringCells;
 ScOrcusGlobalSettings maGlobalSettings;
+ScOrcusRefResolver maRefResolver;
 ScOrcusSharedStrings maSharedStrings;
 std::vector< std::unique_ptr > maSheets;
 ScOrcusStyles maStyles;
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index ec93824093a2..d85308732fea 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -58,20 +58,103 @@ using namespace com::sun::star;
 
 namespace os = orcus::spreadsheet;
 
-ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc) : 
mrDoc(rDoc) {}
+namespace {
+
+formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( 
os::formula_grammar_t grammar )
+{
+formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_ODFF;
+switch(grammar)
+{
+case orcus::spreadsheet::formula_grammar_t::ods:
+e

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svl sc/source

[Markus Mohrhard]

 include/svl/hint.hxx  |1 +
 sc/source/filter/xml/xmlimprt.cxx |5 +
 sc/source/ui/unoobj/chart2uno.cxx |5 +
 3 files changed, 11 insertions(+)

New commits:
commit 43b5d6b4a5cdafd63866046b1949431d75d7192c
Author: Markus Mohrhard 
Date:   Mon Dec 18 00:48:36 2017 +0100

clear the data provider cache after import, tdf#111960

This might also fix some problems with normal ODS files and not just
with FODS files when we recompile formulas after the whole import.

Change-Id: Iec05d2052ca5ce3bdf03abf02d502e4537fd3082
Reviewed-on: https://gerrit.libreoffice.org/46672
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit f9d8fe959d88011d63fc047a8cc00ded1dd2fda1)
Reviewed-on: https://gerrit.libreoffice.org/46689

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index bce91f5462ae..e547afa3768d 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -89,6 +89,7 @@ enum class SfxHintId {
 ScKillEditViewNoPaint,
 ScHiddenRowsChanged,
 ScSelectionChanged,
+ScClearCache,
 
 // SC accessibility hints
 ScAccTableChanged,
diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index 1bf8d576fe38..3adf318b6ad8 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1868,6 +1868,11 @@ void SAL_CALL ScXMLImport::endDocument()
 }
 SvXMLImport::endDocument();
 
+if (pDoc)
+{
+pDoc->BroadcastUno(SfxHint(SfxHintId::ScClearCache));
+}
+
 if(pDoc && bSelfImportingXMLSet)
 ScModelObj::getImplementation(GetModel())->AfterXMLLoading();
 }
diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index f42fd4f1fff6..00cb7cded6a9 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2871,6 +2871,11 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& 
/*rBC*/, const SfxHint& rHint
 if ( !m_aValueListeners.empty() )
 m_bGotDataChangedHint = true;
 }
+else if (nId == SfxHintId::ScClearCache)
+{
+// necessary after import
+m_aDataArray.clear();
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/dbdata.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ee872acfe6ae0e2fd59f2e9b5e3cecdccbae21c7
Author: Eike Rathke 
Date:   Fri Dec 15 16:27:54 2017 +0100

Resolves: tdf#113537 don't keep nEndRow=MAXROW if data ends above

Change-Id: I186034cada9718c067fa4dc7f72e2ca55ac06f83
(cherry picked from commit fa100e0abc83b876ca18b4178c44fb1dfc452a5d)
Reviewed-on: https://gerrit.libreoffice.org/46566
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 1f2e7703f271..6422c7c33c3f 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -625,7 +625,12 @@ void ScDBData::ExtendDataArea(ScDocument* pDoc)
 SCCOL nOldCol1 = nStartCol, nOldCol2 = nEndCol;
 SCROW nOldEndRow = nEndRow;
 pDoc->GetDataArea(nTable, nStartCol, nStartRow, nEndCol, nEndRow, false, 
true);
-nEndRow = std::max(nEndRow, nOldEndRow);
+// nOldEndRow==MAXROW may easily happen when selecting whole columns and
+// setting an AutoFilter (i.e. creating an anonymous database-range). We
+// certainly don't want to iterate over nearly a million empty cells, but
+// keep only an intentionally user selected range.
+if (nOldEndRow < MAXROW && nEndRow < nOldEndRow)
+nEndRow = nOldEndRow;
 if (nStartCol != nOldCol1 || nEndCol != nOldCol2)
 {
 SAL_WARN_IF( !maTableColumnNames.empty(), "sc.core", 
"ScDBData::ExtendDataArea - invalidating column names/offsets");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 tools/source/generic/config.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit a52782591051ab3d61047e2d2c4514ada8c46440
Author: Noel Grandin 
Date:   Mon Dec 18 10:54:06 2017 +0200

sal_uIntPtr->sal_uInt32 in Config

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

diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 3175f3654f45..b5f392de5556 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -54,8 +54,8 @@ struct ImplConfigData
 {
 ImplGroupData*  mpFirstGroup;
 OUStringmaFileName;
-sal_uIntPtr mnDataUpdateId;
-sal_uIntPtr mnTimeStamp;
+sal_uInt32  mnDataUpdateId;
+sal_uInt32  mnTimeStamp;
 LineEnd meLineEnd;
 boolmbModified;
 boolmbRead;
@@ -78,9 +78,9 @@ static OUString toUncPath( const OUString& rPath )
 return aFileURL;
 }
 
-static sal_uIntPtr ImplSysGetConfigTimeStamp( const OUString& rFileName )
+static sal_uInt32 ImplSysGetConfigTimeStamp( const OUString& rFileName )
 {
-sal_uIntPtr nTimeStamp = 0;
+sal_uInt32 nTimeStamp = 0;
 ::osl::DirectoryItem aItem;
 ::osl::FileStatus aStatus( osl_FileStatus_Mask_ModifyTime );
 
@@ -94,7 +94,7 @@ static sal_uIntPtr ImplSysGetConfigTimeStamp( const OUString& 
rFileName )
 }
 
 static sal_uInt8* ImplSysReadConfig( const OUString& rFileName,
-sal_uInt64& rRead, bool& rbRead, bool& 
rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
+sal_uInt64& rRead, bool& rbRead, bool& 
rbIsUTF8BOM, sal_uInt32& rTimeStamp )
 {
 sal_uInt8*  pBuf = nullptr;
 ::osl::File aFile( rFileName );
@@ -138,7 +138,7 @@ static sal_uInt8* ImplSysReadConfig( const OUString& 
rFileName,
 }
 
 static bool ImplSysWriteConfig( const OUString& rFileName,
-const sal_uInt8* pBuf, sal_uIntPtr nBufLen, 
bool rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
+const sal_uInt8* pBuf, sal_uInt32 nBufLen, 
bool rbIsUTF8BOM, sal_uInt32& rTimeStamp )
 {
 bool bSuccess = false;
 bool bUTF8BOMSuccess = false;
@@ -361,14 +361,14 @@ static void ImplMakeConfigList( ImplConfigData* pData,
 }
 }
 
-static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, 
sal_uIntPtr& rLen )
+static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, 
sal_uInt32& rLen )
 {
 sal_uInt8*  pWriteBuf;
 sal_uInt8*  pBuf;
 sal_uInt8   aLineEndBuf[2] = {0, 0};
 ImplKeyData*pKey;
 ImplGroupData*  pGroup;
-unsigned intnBufLen;
+sal_uInt32  nBufLen;
 sal_uInt32  nValueLen;
 sal_uInt32  nKeyLen;
 sal_uInt32  nLineEndLen;
@@ -513,7 +513,7 @@ static sal_uInt8* ImplGetConfigBuffer( const 
ImplConfigData* pData, sal_uIntPtr&
 
 static void ImplReadConfig( ImplConfigData* pData )
 {
-sal_uIntPtr nTimeStamp = 0;
+sal_uInt32   nTimeStamp = 0;
 sal_uInt64  nRead = 0;
 boolbRead = false;
 boolbIsUTF8BOM = false;
@@ -539,7 +539,7 @@ static void ImplWriteConfig( ImplConfigData* pData )
 "tools.generic", "Config overwrites modified configfile: " << 
pData->maFileName );
 
 // Read config list from buffer
-sal_uIntPtr nBufLen;
+sal_uInt32 nBufLen;
 sal_uInt8*  pBuf = ImplGetConfigBuffer( pData, nBufLen );
 if ( pBuf )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 oox/source/drawingml/textparagraph.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 600ec55f1c28f0a1cd17a0a960fdfa07a1c952d7
Author: Miklos Vajna 
Date:   Mon Dec 18 20:04:57 2017 +0100

oox: fix Android build

Change-Id: Iad0d51311ba0e74e1fbc33ee3fb09c8c9a89b0c0

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 8f1e5d1b061c..f63b73024824 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   25 
+-
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit de344874203caf5a528ff3e74508451de4341142
Author: Yousuf Philips 
Date:   Thu Dec 14 00:04:58 2017 +0400

tdf#113590 Unify labels between both special character controls

Change-Id: I40a3d53b6d7052d4c09b4906022d5d142e1dd298
Reviewed-on: https://gerrit.libreoffice.org/46422
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c903fe8b9d21..57fadcf37f38 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4009,17 +4009,6 @@
   true
 
   
-  
-
-  Charmap
-
-
-  Insert Special Characters
-
-
-  1
-
-  
   
 
   Rotation Pivot Point X
@@ -4802,6 +4791,20 @@
   1
 
   
+  
+
+  Symbol
+
+
+  S~pecial Character...
+
+
+  Insert Special Characters
+
+
+  1
+
+  
   
 
   ~Data Sources
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/htmlgrin.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit ff2f33a9b9b2c4ca797193696d76c28344cee9f0
Author: Caolán McNamara 
Date:   Mon Dec 18 12:32:49 2017 +

ofz: reject graphics with bad anchors

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

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 53842661bd95..53ec083588ce 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -715,6 +715,10 @@ IMAGE_SETEVENT:
 aFrameSize.SetHeightPercent( nPrcHeight );
 aFrameSet.Put( aFrameSize );
 
+const SwNodeType eNodeType = m_pPam->GetNode().GetNodeType();
+if (eNodeType != SwNodeType::Text && eNodeType != SwNodeType::Table)
+return;
+
 // passing empty sGrfNm here, means we don't want the graphic to be linked
 SwFrameFormat *const pFlyFormat =
 m_xDoc->getIDocumentContentOperations().InsertGraphic(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/form/navigatortree.cxx  |4 ++--
 svx/source/form/navigatortreemodel.cxx |2 +-
 svx/source/inc/fmexpl.hxx  |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9906db915184b83ef292eae9cba6cbdd4952b051
Author: Caolán McNamara 
Date:   Mon Dec 18 10:01:26 2017 +

sal_uLong->sal_uInt32

the position here is cast to sal_uInt32 so begin as sal_uInt32 initially

Change-Id: I221d97961292988e90a23091ffc9324d42fc366e
Reviewed-on: https://gerrit.libreoffice.org/46698
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/form/navigatortree.cxx 
b/svx/source/form/navigatortree.cxx
index 0528be0da8ac..c530948ea002 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1343,7 +1343,7 @@ namespace svxform
 
 
 // insert form
-GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, true );
+GetNavModel()->Insert(pNewFormData, SAL_MAX_UINT32, true);
 
 
 // set new form as active
@@ -1394,7 +1394,7 @@ namespace svxform
 
 
 // insert FormComponent
-GetNavModel()->Insert( pNewFormControlData, TREELIST_APPEND, true );
+GetNavModel()->Insert(pNewFormControlData, SAL_MAX_UINT32, true);
 GetNavModel()->SetModified();
 
 if (bEditName)
diff --git a/svx/source/form/navigatortreemodel.cxx 
b/svx/source/form/navigatortreemodel.cxx
index 8c8cedd6f0a4..3d54e3aea7f7 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -250,7 +250,7 @@ namespace svxform
 }
 
 
-void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, 
bool bAlterModel)
+void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uInt32 nRelPos, 
bool bAlterModel)
 {
 if (IsListening(*m_pFormModel))
 EndListening(*m_pFormModel);
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 31d4668e3b55..469b9edf35be 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -348,9 +348,9 @@ namespace svxform
 void FillBranch( FmFormData* pParentData );
 void UpdateContent( FmFormShell* pNewShell );
 
-void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = 
CONTAINER_APPEND,
-  bool bAlterModel = false );
-void Remove( FmEntryData* pEntryData, bool bAlterModel = false );
+void Insert(FmEntryData* pEntryData, sal_uInt32 nRelPos = 
SAL_MAX_UINT32,
+ bool bAlterModel = false);
+void Remove(FmEntryData* pEntryData, bool bAlterModel = false);
 
 static bool Rename( FmEntryData* pEntryData, const OUString& rNewText 
);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

tdf#109202 Add mimetype to image element

[Regina Henschel]

Hi Samuel, hi Thorsten, hi all,

I try to bring the requested mime-type attribute to ODF. In the 
discussion in the TC it was suggested, to make such attribute not an 
attribute of the  element but to make it an attribute of the 
 element.


I have thought about that proposal and see these advantage/disadvantages:

The advantage would be, that the mime-type would be also available for 
other places, where a  element is used, without 
adding it to all these places individually. Such elements are 
 or  for example.


The disadvantage is, that in case the xlink-attributes are used to 
reference an external image, the mime-type is not available. [In case 
the xlink-attributes refer to an image inside the package, the mime-type 
is available via the manifest. In case of flat file format, the image is 
always base64encoded into a  element.]


Any other arguments?

What do you think about the problem?

https://cgit.freedesktop.org/libreoffice/core/commit/?id=4469b29faeb8dbf7793a5d81d9c5ddebacf3015f
https://bugs.documentfoundation.org/show_bug.cgi?id=109202
https://issues.oasis-open.org/browse/OFFICE-3943
https://lists.oasis-open.org/archives/office/201712/msg00025.html

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

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

[Miklos Vajna]

 sw/source/core/access/accfrmobjmap.hxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 877ede68f31a25a76c89d47389a190b75df1757d
Author: Miklos Vajna 
Date:   Mon Dec 18 09:11:16 2017 +0100

sw: prefix members of SwAccessibleChildMapKey

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

diff --git a/sw/source/core/access/accfrmobjmap.hxx 
b/sw/source/core/access/accfrmobjmap.hxx
index ed0b520e8c41..ed4ecafece0f 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -36,34 +36,34 @@ public:
 enum LayerId { INVALID, HELL, TEXT, HEAVEN, CONTROLS, XWINDOW };
 
 SwAccessibleChildMapKey()
-: eLayerId( INVALID )
-, nOrdNum( 0 )
-, nPosNum( 0, 0 )
+: m_eLayerId( INVALID )
+, m_nOrdNum( 0 )
+, m_nPosNum( 0, 0 )
 {}
 
 SwAccessibleChildMapKey( LayerId eId, sal_uInt32 nOrd )
-: eLayerId( eId )
-, nOrdNum( nOrd )
-, nPosNum( 0, 0 )
+: m_eLayerId( eId )
+, m_nOrdNum( nOrd )
+, m_nPosNum( 0, 0 )
 {}
 
 bool operator()( const SwAccessibleChildMapKey& r1,
 const SwAccessibleChildMapKey& r2 ) const
 {
-if(r1.eLayerId == r2.eLayerId)
+if(r1.m_eLayerId == r2.m_eLayerId)
 {
-if(r1.nPosNum == r2.nPosNum)
-return r1.nOrdNum < r2.nOrdNum;
+if(r1.m_nPosNum == r2.m_nPosNum)
+return r1.m_nOrdNum < r2.m_nOrdNum;
 else
 {
-if(r1.nPosNum.getY() == r2.nPosNum.getY())
-return r1.nPosNum.getX() < r2.nPosNum.getX();
+if(r1.m_nPosNum.getY() == r2.m_nPosNum.getY())
+return r1.m_nPosNum.getX() < r2.m_nPosNum.getX();
 else
-return r1.nPosNum.getY() < r2.nPosNum.getY();
+return r1.m_nPosNum.getY() < r2.m_nPosNum.getY();
 }
 }
 else
-return r1.eLayerId < r2.eLayerId;
+return r1.m_eLayerId < r2.m_eLayerId;
 }
 
 /* MT: Need to get this position parameter stuff in dev300 somehow...
@@ -77,9 +77,9 @@ public:
 */
 
 private:
-LayerId eLayerId;
-sal_uInt32 nOrdNum;
-Point nPosNum;
+LayerId m_eLayerId;
+sal_uInt32 m_nOrdNum;
+Point m_nPosNum;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - debian/changelog debian/control loolwsd.spec.in

[Andras Timar]

 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a2977258366364371e8a886aba024928e397af1b
Author: Andras Timar 
Date:   Mon Dec 18 21:52:03 2017 +0100

Bump package version to 3.0.0-4

Change-Id: I21a77edf799720c0070918e91974cc41b6374f4a

diff --git a/debian/changelog b/debian/changelog
index 1046f7a9..e87841d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.0.0-4) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool30
+
+ -- Andras Timar   Mon, 18 Dec 2017 21:20:00 +0100
+
 loolwsd (3.0.0-3) unstable; urgency=medium
 
   * see the git log: http://col.la/cool30
diff --git a/debian/control b/debian/control
index 5078a941..5b69ec62 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.35), 
collaboraofficebasis5.3-core (>= 5.3.10.35), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.35), 
collaboraofficebasis5.3-images (>= 5.3.10.35), collaboraofficebasis5.3-impress 
(>= 5.3.10.35), collaboraofficebasis5.3-ooofonts (>= 5.3.10.35), 
collaboraofficebasis5.3-writer (>= 5.3.10.35), collaboraoffice5.3 (>= 
5.3.10.35), collaboraoffice5.3-ure (>= 5.3.10.35), 
collaboraofficebasis5.3-en-us (>= 5.3.10.35), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.35), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.35), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.35), collaboraofficebasis5.3-draw 
(>= 5.3.10.35), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.35), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.35)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.36), 
collaboraofficebasis5.3-core (>= 5.3.10.36), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.36), 
collaboraofficebasis5.3-images (>= 5.3.10.36), collaboraofficebasis5.3-impress 
(>= 5.3.10.36), collaboraofficebasis5.3-ooofonts (>= 5.3.10.36), 
collaboraofficebasis5.3-writer (>= 5.3.10.36), collaboraoffice5.3 (>= 
5.3.10.36), collaboraoffice5.3-ure (>= 5.3.10.36), 
collaboraofficebasis5.3-en-us (>= 5.3.10.36), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.36), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.36), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.36), collaboraofficebasis5.3-draw 
(>= 5.3.10.36), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.36), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.36)
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 3dcb07f5..2e635a53 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:3%{?dist}
+Release:4%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel 
systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.35 collaboraoffice5.3-ure >= 
5.3.10.35 collaboraofficebasis5.3-core >= 5.3.10.35 
collaboraofficebasis5.3-writer >= 5.3.10.35 collaboraofficebasis5.3-impress >= 
5.3.10.35 collaboraofficebasis5.3-graphicfilter >= 5.3.10.35 
collaboraofficebasis5.3-en-US >= 5.3.10.35 collaboraofficebasis5.3-calc >= 
5.3.10.35 collaboraofficebasis5.3-en-US-res >= 5.3.10.35 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.35 
collaboraofficebasis5.3-ooofonts >= 5.3.10.35 collaboraofficebasis5.3-images >= 
5.3.10.35 collaboraofficebasis5.3-noto-fonts >= 5.3.10.35 
collaboraofficebasis5.3-draw >= 5.3.10.35 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.35 
collaboraofficebasis5.3-filter-data >= 5.3.10.35
+Requires:   collaboraoffice5.3 >= 5.3.10.36 collaboraoffice5.3-ure >= 
5.3.10.36 collaboraofficebasis5.3-core >= 5.3.10.36 
collaboraofficebasis5.3-writer >= 5.3.10.36 collaboraofficebasis5.3-impress >= 
5.3.10.36 collaboraofficebasis5.3-graphicfilter >= 5.3.10.36 
collaboraofficebasis5.3-en-US >= 5.3.10.36 collaboraofficebasis5.3-calc >= 
5.3.10.36 collaboraofficebasis5.3-en-US-res >= 5.3.10.36 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.36 
collaboraofficebasis5.3-ooofonts >= 5.3.10.36 collaboraofficebasis5.3-images >= 
5.3.10.36 collaboraofficebasis5.3-noto-fonts >= 5.3.10.36 
collaboraofficebasis5.3-draw >= 5.3.10.36 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.36 
collab

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

[Marco Cecchetti]

 loleaflet/src/control/Control.Header.js |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 149acb23aa7df0b25380486246b0e501d8c2199b
Author: Marco Cecchetti 
Date:   Sun Dec 17 19:03:51 2017 +0100

calc: fixing auto optimal size on double-click

Change-Id: I6341c617037cd876667681d4495f77e75cad8388
Reviewed-on: https://gerrit.libreoffice.org/46718
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 261b2958..8593052d 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -423,6 +423,10 @@ L.Control.Header = L.Control.extend({
this.onDragMove(this._item, this._start, this._offset, e);
},
 
+   _resetClickCount: function () {
+   this._clicks = 0;
+   },
+
_onMouseUp: function (e) {
// disable mouse events used on dragging
L.DomEvent.off(document, 'mousemove', 
this._onMouseMoveForDragging, this);
@@ -439,7 +443,7 @@ L.Control.Header = L.Control.extend({
this._clicks = 0;
} else {
this.onDragClick(this._item, ++this._clicks, e);
-   setTimeout(L.bind(this.initialize, this), 400);
+   setTimeout(L.bind(this._resetClickCount, this), 400);
}
 
this._item = this._start = this._offset = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#109202 Add mimetype to image element

[Michael Stahl]

On 18.12.2017 21:37, Regina Henschel wrote:
> The disadvantage is, that in case the xlink-attributes are used to 
> reference an external image, the mime-type is not available.

i don't see this as a disadvantage: the content of an ODF package cannot
make assumptions about what some URL that points outside the ODF package
refers to; dereferencing the URL might result in a different file than
when the ODF package was created, or it might be a 404 because the file
has been removed.

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

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

[Caolán McNamara]

 include/svx/galctrl.hxx  |2 -
 include/svx/galtheme.hxx |   66 +++
 svx/inc/galbrws2.hxx |6 +--
 svx/source/gallery2/galbrws2.cxx |   44 +-
 svx/source/gallery2/galtheme.cxx |   66 +++
 svx/source/gengal/gengal.cxx |2 -
 6 files changed, 93 insertions(+), 93 deletions(-)

New commits:
commit a7c772566bb8ac6a088b808cf0ef550e7b06560b
Author: Caolán McNamara 
Date:   Mon Dec 18 09:54:02 2017 +

coverity#1426163 Improper use of negative value

started life as sal_uIntPtr and the various checks are typically
nPos < thing.size() just checking one bound, so sal_uInt32 looks safer
after all

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

diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 6c1091c420c7..1ca339904fb8 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -118,7 +118,7 @@ private:
 
 Link  maSelectHdl;
 GalleryTheme*   mpTheme;
-longmnCurRow;
+sal_uInt32  mnCurRow;
 
 voidInitSettings();
 
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 903ed7e451bf..f720ce184d12 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -85,29 +85,29 @@ private:
 GalleryThemeEntry*  pThm;
 sal_uInt32  mnThemeLockCount;
 sal_uInt32  mnBroadcasterLockCount;
-sal_Int32   nDragPos;
+sal_uInt32  nDragPos;
 boolbDragging;
 boolbAbortActualize;
 
 SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
 SgaObject*  ImplReadSgaObject( GalleryObject const * 
pEntry );
-SAL_DLLPRIVATE bool ImplWriteSgaObject( const SgaObject& rObj, 
sal_Int32 nPos, GalleryObject* pExistentEntry );
+SAL_DLLPRIVATE bool ImplWriteSgaObject(const SgaObject& rObj, 
sal_uInt32 nPos, GalleryObject* pExistentEntry);
 SAL_DLLPRIVATE void ImplWrite();
-SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject( sal_Int32 nPos ) 
const
-{ return ( nPos >= 0 && nPos < 
sal_Int32(aObjectList.size()) ) ? aObjectList[nPos] : nullptr; }
+SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject(sal_uInt32 nPos) 
const
+{ return ( nPos < aObjectList.size() ) ? 
aObjectList[ nPos ] : nullptr; }
 const GalleryObject*ImplGetGalleryObject( const INetURLObject& 
rURL );
 
-SAL_DLLPRIVATE sal_Int32ImplGetGalleryObjectPos( const GalleryObject* 
pObj ) const
+SAL_DLLPRIVATE sal_uInt32   ImplGetGalleryObjectPos( const GalleryObject* 
pObj ) const
 {
-for ( size_t i = 0, n = 
aObjectList.size(); i < n; ++i )
+for (sal_uInt32 i = 0, n = 
aObjectList.size(); i < n; ++i)
 if ( pObj == aObjectList[ i ] )
 return i;
-return -1;
+return SAL_MAX_UINT32;
 }
 SAL_DLLPRIVATE static INetURLObject ImplGetURL( const GalleryObject* 
pObject );
 SAL_DLLPRIVATE INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, 
ConvertDataFormat nFormat = ConvertDataFormat::Unknown );
 SAL_DLLPRIVATE void ImplSetModified( bool bModified );
-SAL_DLLPRIVATE void ImplBroadcast( sal_Int32 nUpdatePos );
+SAL_DLLPRIVATE void ImplBroadcast(sal_uInt32 nUpdatePos);
 
 SAL_DLLPRIVATE  GalleryTheme( Gallery* pGallery, 
GalleryThemeEntry* pThemeEntry );
 
@@ -120,14 +120,14 @@ public:
 
 SAL_DLLPRIVATE static GalleryThemeEntry* CreateThemeEntry( const 
INetURLObject& rURL, bool bReadOnly );
 
-SAL_DLLPRIVATE sal_Int32GetObjectCount() const { return 
aObjectList.size(); }
+SAL_DLLPRIVATE sal_uInt32   GetObjectCount() const { return 
aObjectList.size(); }
 
-SgaObject*  AcquireObject( sal_Int32 nPos );
-static void ReleaseObject( SgaObject* pObj );
+SgaObject*  AcquireObject(sal_uInt32 nPos);
+static void ReleaseObject(SgaObject* pObj);
 
-boolInsertObject( const SgaObject& rObj, sal_Int32 
nPos = SAL_MAX_INT32 );
-boolRemoveObject( sal_Int32 nPos );
-SAL_DLLPRIVATE bool ChangeObjectPos( sal_Int32 nOldPos, sal_Int32 
nNewPos );
+boolInsertObject(const SgaObject& rObj, sal_uInt32 
nPos = SAL_MAX_UINT32);
+bool   

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

[Michael Stahl]

 sw/source/core/text/porfly.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdcbf601410f29642aa27e2b8fab312f929d569f
Author: Michael Stahl 
Date:   Mon Dec 18 21:38:48 2017 +0100

tdf#114212 sw: fix layout of as-char anchored text-frame of shape

Commit c79467ba954987f1d239c594c1e1b3af3f5515f6 changed the vertical
orientation of the shape, and the effect on shapes with text-frames
(or TextBox) is surprising: the shape itself, as imported from DOCX,
now has the "top" vertical orientation, where it previously had
"from-bottom", which was wrong, because it was different from Word.

However the associated text-frame now is positioned wrongly, stacked
on top of the shape; the problem is in SwFlyCntPortion::SetBase()
where the text-frame is manually positioned depending on the
shape's position; using "top" there does not actually result in
the correct position because it disables the use of the computed
vertical offset; fix the offset so it looks right.

Change-Id: I2ff38577d0cae2e9f796402545503cc6351a9d2b

diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index e9cf3900f0d2..b3903a53cf48 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -363,7 +363,7 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, 
const Point &rBase,
 
 SwFormatVertOrient aVert(pTextBox->GetVertOrient());
 aVert.SetVertOrient(css::text::VertOrientation::NONE);
-sal_Int32 nTop = aTextRectangle.getY() - 
rFrame.getFrameArea().Top() - nFlyAsc;
+sal_Int32 const nTop = aTextRectangle.getY() - 
rFrame.getFrameArea().Top();
 aVert.SetPos(nTop);
 
 pTextBox->LockModify();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/more_fonts Makefile.fetch Repository.mk

[Yousuf Philips]

 Makefile.fetch  |2 --
 Repository.mk   |2 --
 download.lst|4 
 external/more_fonts/ExternalPackage_opensans.mk |   19 ---
 external/more_fonts/ExternalPackage_ptserif.mk  |   19 ---
 external/more_fonts/Module_more_fonts.mk|4 
 external/more_fonts/UnpackedTarball_opensans.mk |   14 --
 external/more_fonts/UnpackedTarball_ptserif.mk  |   14 --
 8 files changed, 78 deletions(-)

New commits:
commit 6030c822c968be79b493de70c68a0bd51760e52f
Author: Yousuf Philips 
Date:   Wed Dec 6 16:15:35 2017 +0400

tdf#103080 Dont package Open Sans and PT_Serif fonts

Change-Id: Iac1d572f19372465e9cc369454480d9b621bcd66
Reviewed-on: https://gerrit.libreoffice.org/45169
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 0ce173b50fd12342979cf3f8f9b2d92267552060)
Reviewed-on: https://gerrit.libreoffice.org/46617

diff --git a/Makefile.fetch b/Makefile.fetch
index 3944ac75c7b2..e3095eee699f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -173,8 +173,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call 
fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_OPENSANS_TARBALL) \
-   $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 70d842f95d17..4bc9a34d87dc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -955,8 +955,6 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_liberation_narrow \
fonts_libertineg \
fonts_noto \
-   fonts_opensans \
-   fonts_ptserif \
fonts_sourcecode \
fonts_sourcesans \
) \
diff --git a/download.lst b/download.lst
index 7f8ae9c6e9ec..89f458c015e1 100644
--- a/download.lst
+++ b/download.lst
@@ -62,10 +62,6 @@ export FONT_LIBERATION_SHA256SUM := 
7890278a6cd17873c57d9cd785c2d230d9abdea837e9
 export FONT_LIBERATION_TARBALL := 
5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
 export FONT_LINLIBERTINEG_SHA256SUM := 
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
 export FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-export FONT_OPENSANS_SHA256SUM := 
cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8
-export FONT_OPENSANS_TARBALL := 
7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz
-export FONT_PTSERIF_SHA256SUM := 
6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa
-export FONT_PTSERIF_TARBALL := 
c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz
 export FONT_SOURCECODE_SHA256SUM := 
09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
 export FONT_SOURCECODE_TARBALL := 
907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
 export FONT_SOURCESANS_SHA256SUM := 
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
diff --git a/external/more_fonts/ExternalPackage_opensans.mk 
b/external/more_fonts/ExternalPackage_opensans.mk
deleted file mode 100644
index adbf9230304f..
--- a/external/more_fonts/ExternalPackage_opensans.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
-
-$(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
-   OpenSans-BoldItalic.ttf \
-   OpenSans-Bold.ttf \
-   OpenSans-Italic.ttf \
-   OpenSans-Regular.ttf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/more_fonts/ExternalPackage_ptserif.mk 
b/external/more_fonts/ExternalPackage_ptserif.mk
deleted file mode 100644
index 41dedfc8e486..
--- a/external/more_fonts/ExternalPackage_ptserif.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. I

[Libreoffice-commits] core.git: download.lst external/more_fonts

[Yousuf Philips]

 download.lst|4 ++--
 external/more_fonts/ExternalPackage_noto.mk |   18 ++
 2 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit e45e2c4897933f14c90a65fa74d0ad2a0b620ede
Author: Yousuf Philips 
Date:   Sat Dec 16 16:18:18 2017 +0400

tdf#103080 October 2017 update to Noto fonts

In addition to updates to the already bundled fonts, Condensed and Light
weights of English Noto Sans and Noto Serif have been added, as well as
the addition of the Noto Sans Arabic

Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e
Reviewed-on: https://gerrit.libreoffice.org/46596
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/download.lst b/download.lst
index 358fbdad747c..21c99fe3082b 100644
--- a/download.lst
+++ b/download.lst
@@ -68,8 +68,8 @@ export FONT_SOURCESANS_SHA256SUM := 
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc
 export FONT_SOURCESANS_TARBALL := 
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
 export FONT_EMOJIONE_COLOR_SHA256SUM := 
d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
-export FONT_NOTO_SHA256SUM := 
8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8
-export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz
+export FONT_NOTO_SHA256SUM := 
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
+export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
 export FONT_CULMUS_SHA256SUM := 
dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
 export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz
 export FONT_LIBRE_HEBREW_SHA256SUM := 
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
diff --git a/external/more_fonts/ExternalPackage_noto.mk 
b/external/more_fonts/ExternalPackage_noto.mk
index adbb88fd4f6d..dd52ac956265 100644
--- a/external/more_fonts/ExternalPackage_noto.mk
+++ b/external/more_fonts/ExternalPackage_noto.mk
@@ -15,10 +15,20 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoMono-Regular.ttf \
NotoNaskhArabic-Bold.ttf \
NotoNaskhArabic-Regular.ttf \
+   NotoNaskhArabicUI-Bold.ttf \
+   NotoNaskhArabicUI-Regular.ttf \
+   NotoSansArabic-Bold.ttf \
+   NotoSansArabic-Regular.ttf \
+   NotoSansArabicUI-Bold.ttf \
+   NotoSansArabicUI-Regular.ttf \
NotoSansArmenian-Bold.ttf \
NotoSansArmenian-Regular.ttf \
NotoSans-Bold.ttf \
NotoSans-BoldItalic.ttf \
+   NotoSans-Condensed.ttf \
+   NotoSans-CondensedBold.ttf \
+   NotoSans-CondensedBoldItalic.ttf \
+   NotoSans-CondensedItalic.ttf \
NotoSansGeorgian-Bold.ttf \
NotoSansGeorgian-Regular.ttf \
NotoSansHebrew-Bold.ttf \
@@ -26,12 +36,18 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSans-Italic.ttf \
NotoSansLao-Bold.ttf \
NotoSansLao-Regular.ttf \
+   NotoSans-Light.ttf \
+   NotoSans-LightItalic.ttf \
NotoSansLisu-Regular.ttf \
NotoSans-Regular.ttf \
NotoSerifArmenian-Bold.ttf \
NotoSerifArmenian-Regular.ttf \
NotoSerif-Bold.ttf \
NotoSerif-BoldItalic.ttf \
+   NotoSerif-Condensed.ttf \
+   NotoSerif-CondensedBold.ttf \
+   NotoSerif-CondensedBoldItalic.ttf \
+   NotoSerif-CondensedItalic.ttf \
NotoSerifGeorgian-Bold.ttf \
NotoSerifGeorgian-Regular.ttf \
NotoSerifHebrew-Bold.ttf \
@@ -39,6 +55,8 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD
NotoSerif-Italic.ttf \
NotoSerifLao-Bold.ttf \
NotoSerifLao-Regular.ttf \
+   NotoSerif-Light.ttf \
+   NotoSerif-LightItalic.ttf \
NotoSerif-Regular.ttf \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/documentimport.hxx   |   10 -
 sc/source/core/data/documentimport.cxx  |   42 +++-
 sc/source/filter/inc/orcusinterface.hxx |   64 +-
 sc/source/filter/orcus/interface.cxx|  319 +---
 4 files changed, 362 insertions(+), 73 deletions(-)

New commits:
commit 1c7fa9528f7373e6798b597a42abe38f20a306aa
Author: Kohei Yoshida 
Date:   Wed Dec 13 22:27:03 2017 -0500

Defer cell value insertion until later.

Because Calc's formula engine expects all named expressions to be
present at the time of re-calculations, we need to delay insertion
of cell values until after the named expressions are inserted into
the document.

Change-Id: I54c7d3dc86b3e2c5c192337b1cebfbdfb901ab1f
Reviewed-on: https://gerrit.libreoffice.org/46665
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index b4c35e1f99b5..d881da37cf2d 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -96,7 +96,15 @@ public:
 void setNumericCell(const ScAddress& rPos, double fVal);
 void setStringCell(const ScAddress& rPos, const OUString& rStr);
 void setEditCell(const ScAddress& rPos, EditTextObject* pEditText);
-void setFormulaCell(const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar);
+
+void setFormulaCell(
+const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar,
+const double* pResult = nullptr );
+
+void setFormulaCell(
+const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar,
+const OUString& rResult );
+
 void setFormulaCell(const ScAddress& rPos, ScTokenArray* pArray);
 void setFormulaCell(const ScAddress& rPos, ScFormulaCell* pCell);
 
diff --git a/sc/source/core/data/documentimport.cxx 
b/sc/source/core/data/documentimport.cxx
index 183f3e1650af..6208789f416e 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -25,9 +25,7 @@
 
 #include 
 #include 
-
-#include 
-#include 
+#include 
 
 namespace {
 
@@ -271,7 +269,35 @@ void ScDocumentImport::setEditCell(const ScAddress& rPos, 
EditTextObject* pEditT
 }
 
 void ScDocumentImport::setFormulaCell(
-const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar)
+const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar,
+const double* pResult )
+{
+ScTable* pTab = mpImpl->mrDoc.FetchTable(rPos.Tab());
+if (!pTab)
+return;
+
+sc::ColumnBlockPosition* pBlockPos = mpImpl->getBlockPosition(rPos.Tab(), 
rPos.Col());
+
+if (!pBlockPos)
+return;
+
+std::unique_ptr pFC =
+o3tl::make_unique(&mpImpl->mrDoc, rPos, rFormula, 
eGrammar);
+
+if (pResult)
+{
+// Set cached result to this formula cell.
+pFC->SetResultDouble(*pResult);
+}
+
+sc::CellStoreType& rCells = pTab->aCol[rPos.Col()].maCells;
+pBlockPos->miCellPos =
+rCells.set(pBlockPos->miCellPos, rPos.Row(), pFC.release());
+}
+
+void ScDocumentImport::setFormulaCell(
+const ScAddress& rPos, const OUString& rFormula, 
formula::FormulaGrammar::Grammar eGrammar,
+const OUString& rResult )
 {
 ScTable* pTab = mpImpl->mrDoc.FetchTable(rPos.Tab());
 if (!pTab)
@@ -282,9 +308,15 @@ void ScDocumentImport::setFormulaCell(
 if (!pBlockPos)
 return;
 
+std::unique_ptr pFC =
+o3tl::make_unique(&mpImpl->mrDoc, rPos, rFormula, 
eGrammar);
+
+// Set cached result to this formula cell.
+pFC->SetHybridString(mpImpl->mrDoc.GetSharedStringPool().intern(rResult));
+
 sc::CellStoreType& rCells = pTab->aCol[rPos.Col()].maCells;
 pBlockPos->miCellPos =
-rCells.set(pBlockPos->miCellPos, rPos.Row(), new 
ScFormulaCell(&mpImpl->mrDoc, rPos, rFormula, eGrammar));
+rCells.set(pBlockPos->miCellPos, rPos.Row(), pFC.release());
 }
 
 void ScDocumentImport::setFormulaCell(const ScAddress& rPos, ScTokenArray* 
pArray)
diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index 851271f9806a..07c35fa78dfe 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -273,6 +273,8 @@ public:
 virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
 
 SCTAB getIndex() const { return mnTab; }
+
+const sc::SharedFormulaGroups& getSharedFormulaGroups() const;
 };
 
 class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
@@ -508,28 +510,51 @@ public:
 
 class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory
 {
-struct StringCellCache
+struct CellStoreToken
 {
+enum class Type
+{
+Auto,
+Numeric,
+String,
+Formula,
+FormulaWithResult,

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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|7 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
 sc/uiconfig/scalc/menubar/menubar.xml|   51 
++
 3 files changed, 41 insertions(+), 22 deletions(-)

New commits:
commit 04b50d4b6fd944313fd5164598f64ef787645692
Author: Yousuf Philips 
Date:   Sun Dec 17 04:13:22 2017 +0400

tdf#91820 Round of improvements to Calc's menus for 6.0

Change-Id: Ia738456e5b351cc92777cd9795a3bfc641c454bc
Reviewed-on: https://gerrit.libreoffice.org/46582
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 41e71a7c6f10eeca0d7bc083fc68dc85d9f2a986)
Reviewed-on: https://gerrit.libreoffice.org/46713
Tested-by: Jenkins 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index d4fd477c22e6..8df4a8049d3d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1430,7 +1430,7 @@
   
   
 
-  ~Hide Sheets
+  ~Hide Sheet
 
 
   1
@@ -1918,10 +1918,7 @@
   
   
 
-  Edit Lin~ks...
-
-
-  Lin~ks...
+  Lin~ks to External Files...
 
   
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 791ebefce51b..9ae90f080953 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6438,6 +6438,11 @@
   ~Restart in Safe Mode...
 
   
+  
+
+  Navigate
+
+  
 
   
 
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 0a4136d3c242..9144b9b37e73 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -97,6 +97,7 @@
 
 
 
+
 
 
 
@@ -132,7 +133,6 @@
 
 
 
-
 
 
 
@@ -171,7 +171,7 @@
 
 
 
-
+
 
 
 
@@ -240,7 +240,6 @@
 
 
 
-
 
 
 
@@ -249,6 +248,7 @@
 
 
 
+
 
 
 
@@ -278,6 +278,7 @@
 
 
 
+
 
 
 
@@ -287,9 +288,6 @@
 
 
 
-
-
-
 
 
 
@@ -298,10 +296,15 @@
 
 
 
-
 
+
+
+
+
 
 
+
+
 
 
 
@@ -447,12 +450,6 @@
 
 
 
-
-
-
-
-
-
 
 
 
@@ -582,14 +579,17 @@
 
 
 
-
 
 
 
 
-
-
-
+
+
+
+
+
+
+
 
 
 
@@ -714,6 +714,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
9 -
 sd/uiconfig/simpress/menubar/menubar.xml |   
68 +-
 2 files changed, 41 insertions(+), 36 deletions(-)

New commits:
commit 7386847ba4ab9521a658068c5940a72b77352c8b
Author: Yousuf Philips 
Date:   Sun Dec 17 04:56:34 2017 +0400

tdf#91857 Round of improvements to Impress's menus for 6.0

Change-Id: I844b8396a55820da904d4813cbb84c56c33af51c
Reviewed-on: https://gerrit.libreoffice.org/46583
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 7c6117780a8feb0b4ffcbaeaf649f4f6bc8470ec)
Reviewed-on: https://gerrit.libreoffice.org/46714
Tested-by: Yousuf Philips 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index c91b33b9fe9e..6340812888e4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -24,11 +24,6 @@
   S~lide
 
   
-  
-
-  Navigate
-
-  
   
 
   Move
@@ -670,7 +665,7 @@
   
   
 
-  Lin~ks...
+  Lin~ks to External Files...
 
   
   
@@ -741,7 +736,7 @@
   
   
 
-  Import Slides...
+  Insert Slide from File...
 
 
   .uno:ImportFromFile
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index c146eb1ac5ca..d1e1c34a484e 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -62,13 +62,13 @@
 
 
 
-
 
 
 
 
 
 
+
 
 
 
@@ -81,6 +81,7 @@
 
 
 
+
 
 
 
@@ -98,7 +99,6 @@
 
 
 
-
 
 
 
@@ -150,7 +150,7 @@
 
 
 
-
+
 
 
 
@@ -217,7 +217,6 @@
 
 
 
-
 
 
 
@@ -225,6 +224,7 @@
 
 
 
+
 
 
 
@@ -260,6 +260,7 @@
 
 
 
+
 
 
 
@@ -269,10 +270,6 @@
 
 
 
-
-
-
-
 
 
 
@@ -280,11 +277,13 @@
 
 
 
-
 
+
+
+
+
 
 
-
 
 
 
@@ -413,12 +412,6 @@
 
 
 
-
-
-
-
-
-
 
 
 
@@ -488,6 +481,9 @@
 
 
 
+
+
+
 
 
 
@@ -522,22 +518,10 @@
 
 
 
+
 
 
-
-
-
-
 
-
-  
-
-
-
-
-  
-
-
 
   
 
@@ -546,6 +530,15 @@
 
   
 
+
+  
+
+
+
+
+  
+
+
 
 
 
@@ -584,6 +577,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#109202 Add mimetype to image element

[Thorsten Behrens]

Michael Stahl wrote:
> i don't see this as a disadvantage: the content of an ODF package
> cannot make assumptions about what some URL that points outside the
> ODF package refers to; dereferencing the URL might result in a
> different file than when the ODF package was created, or it might be
> a 404 because the file has been removed.
> 
Yep, agreeing with Michael - there's an established way to transfer
the mime type of linked content, and that's the responsibility of the
server. Best is to leave that to the remote side, content could be
generated on the fly, depend on the user agent, preferred language etc
etc.

All the best,

-- Thorsten


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

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

[Caolán McNamara]

 vcl/unx/generic/plugadapt/salplug.cxx |   20 
 1 file changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 184ce84226b49a1b4b693f3bb8cc8569c76d864d
Author: Caolán McNamara 
Date:   Mon Dec 18 10:49:43 2017 +

coverity#1426314 silence Resource leak

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

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index a1195dbde18a..c76077a776b4 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 
 #include 
@@ -75,21 +75,20 @@ static SalInstance* tryInstance( const OUString& 
rModuleBase, bool bForce = fals
 #endif
 "vclplug_" + rModuleBase + "lo" SAL_DLLEXTENSION );
 
-oslModule aMod = osl_loadModuleRelative(
-reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
-SAL_LOADMODULE_GLOBAL );
-if( aMod )
+osl::Module aMod;
+if (aMod.loadRelative(reinterpret_cast(&tryInstance), 
aModule, SAL_LOADMODULE_GLOBAL))
 {
-salFactoryProc aProc = 
reinterpret_cast(osl_getAsciiFunctionSymbol( aMod, 
"create_SalInstance" ));
-if( aProc )
+salFactoryProc aProc = 
reinterpret_cast(aMod.getFunctionSymbol("create_SalInstance"));
+if (aProc)
 {
 pInst = aProc();
 SAL_INFO(
 "vcl.plugadapt",
 "sal plugin " << aModule << " produced instance " << pInst);
-if( pInst )
+if (pInst)
 {
-pCloseModule = aMod;
+pCloseModule = static_cast(aMod);
+aMod.release();
 
 #ifndef ANDROID
 /*
@@ -106,8 +105,6 @@ static SalInstance* tryInstance( const OUString& 
rModuleBase, bool bForce = fals
 }
 #endif
 }
-else
-osl_unloadModule( aMod );
 }
 else
 {
@@ -115,7 +112,6 @@ static SalInstance* tryInstance( const OUString& 
rModuleBase, bool bForce = fals
 "vcl.plugadapt",
 "could not load symbol create_SalInstance from shared object "
 << aModule);
-osl_unloadModule( aMod );
 }
 }
 else if (bForce)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/sifr icon-themes/tango officecfg/registry sw/uiconfig

[Yousuf Philips]

 icon-themes/breeze/links.txt |2 
 icon-themes/sifr/links.txt   |4 
 icon-themes/tango/links.txt  |3 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   20 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   67 
+-
 sw/uiconfig/swriter/menubar/menubar.xml  |   25 ++-
 6 files changed, 107 insertions(+), 14 deletions(-)

New commits:
commit 35589bc4e390282f1e26b9900addc3742e61b3ff
Author: Yousuf Philips 
Date:   Fri Dec 15 01:54:52 2017 +0400

tdf#91781 Round of improvements to Writer's menus for 6.0

Change-Id: I17c1edc2e14146144868df51a1f5a71e323eead6
Reviewed-on: https://gerrit.libreoffice.org/46451
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 67d245adca298134fc8ab4364acbe880b4e0911a)
Reviewed-on: https://gerrit.libreoffice.org/46616
Tested-by: Jenkins 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 314c6f4fd05b..a12de86cda03 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -708,6 +708,8 @@ cmd/sc_presentation.png cmd/sc_dia.png
 # Style
 cmd/lc_editstyled.png cmd/lc_editstyle.png
 cmd/sc_editstyled.png cmd/sc_editstyle.png
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
 
 # Outline
 cmd/lc_outlineright.png cmd/lc_decrementlevel.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 08af510ca16f..e2dae945a9ca 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -218,3 +218,7 @@ cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
 cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
 cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
 cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
+
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e73922a59a92..b483e5fa819d 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -624,3 +624,6 @@ cmd/sc_formatframemenu.png cmd/sc_inserttextframe.png
 cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
 cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
 
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9ae90f080953..18954711014e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2643,7 +2643,7 @@
   
   
 
-  Doc~ument...
+  Text from File...
 
 
   1
@@ -2779,6 +2779,17 @@
   1
 
   
+  
+
+  Styles
+
+
+  .uno:DesignerDialog
+
+
+  1
+
+  
   
 
   Demote
@@ -4806,6 +4817,11 @@
   Send via ~Bluetooth...
 
   
+  
+
+  ~Export As
+
+  
   
 
   PDF
@@ -4839,7 +4855,7 @@
   EPUB
 
 
-  ~Export as EPUB...
+  Export as E~PUB...
 
 
   Export as EPUB
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 67877a3b5539..c0071633ec82 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -55,7 +55,7 @@
   
   
 
-  ~Hidden Paragraphs
+  Field ~Hidden Paragraphs
 
 
   8
@@ -1330,7 +1330,7 @@
   
   
 
-  Lin~ks...
+  Lin~ks to External Files...
 
   
   
@@ -3140,17 +3140,55 @@
   11
 
   
+  
+
+  Alphabet Uppercase List
+
+  
+  
+
+  Alphabet Uppercase List
+
+
+  Alphabet Uppercase List Style
+
+
+  .uno:StyleApply?Style:string=Numbering 
ABC&FamilyName:string=NumberingStyles
+
+
+  11
+
+  
+  
+
+  Alphabet Lowercase List
+
+  
+  
+
+  Alphabet Lowercase List
+
+
+  Alphabet Lowercase List Style
+
+
+  .uno:StyleApply?Style:string=Numbering 
abc&FamilyName:string=NumberingStyles
+
+
+  11
+
+  
   

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/uiconfig sd/uiconfig sw/uiconfig

[Yousuf Philips]

 sc/uiconfig/scalc/toolbar/formcontrols.xml|   21 ++
 sc/uiconfig/scalc/toolbar/moreformcontrols.xml|   17 +-
 sd/uiconfig/sdraw/toolbar/formcontrols.xml|   24 +
 sd/uiconfig/sdraw/toolbar/moreformcontrols.xml|   22 ++-
 sd/uiconfig/simpress/toolbar/formcontrols.xml |   24 +
 sd/uiconfig/simpress/toolbar/moreformcontrols.xml |   22 ++-
 sw/uiconfig/sglobal/toolbar/formcontrols.xml  |   22 ---
 sw/uiconfig/sglobal/toolbar/moreformcontrols.xml  |   22 ++-
 sw/uiconfig/swform/toolbar/formcontrols.xml   |   22 ---
 sw/uiconfig/swform/toolbar/moreformcontrols.xml   |   22 ++-
 sw/uiconfig/swreport/toolbar/formcontrols.xml |   22 ---
 sw/uiconfig/swreport/toolbar/moreformcontrols.xml |   22 ++-
 sw/uiconfig/swriter/toolbar/formcontrols.xml  |   22 ---
 sw/uiconfig/swriter/toolbar/moreformcontrols.xml  |   22 ++-
 sw/uiconfig/swxform/toolbar/formcontrols.xml  |   25 ++
 sw/uiconfig/swxform/toolbar/moreformcontrols.xml  |   17 --
 16 files changed, 173 insertions(+), 175 deletions(-)

New commits:
commit e027dc4629db2959e2c62b97b463c1846849dbd7
Author: Yousuf Philips 
Date:   Thu Dec 7 02:34:43 2017 +0400

tdf#81475 Organize the form toolbars

Change-Id: Ic79b326c4c15f656ce533eb37bbd27853b8f4af7
Reviewed-on: https://gerrit.libreoffice.org/43861
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit f894386a8fe58639c295048fe7894f68613a0df1)
Reviewed-on: https://gerrit.libreoffice.org/46465
Tested-by: Yousuf Philips 

diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml 
b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index 3a5cbb2b889b..70b962a73894 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml
@@ -21,26 +21,29 @@
  
  
  
- 
- 
+ 
+ 
  
- 
+ 
  
  
- 
- 
- 
+ 
  
- 
  
+ 
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
  
- 
  
+ 
  
  
 
diff --git a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml 
b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
index 796529fd550d..70bd84f6db41 100644
--- a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
@@ -18,20 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
- 
- 
- 
- 
  
- 
  
- 
  
+ 
  
- 
- 
- 
- 
  
+ 
  
-
\ No newline at end of file
+ 
+ 
+ 
+
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml 
b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index 3905ded90a70..f40d374ec59a 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
@@ -21,23 +21,29 @@
  
  
  
- 
- 
+ 
+ 
  
- 
+ 
  
  
- 
- 
- 
+ 
  
- 
  
+ 
  
- 
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
+ 
  
  
 
diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml 
b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..14f2d133dc05 100644
--- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
- 
- 
- 
- 
- 
- 
- 
- 
- 
  
- 
+ 
  
- 
  
+ 
  
- 
- 
+ 
+ 
  
- 
-
\ No newline at end of file
+ 
+ 
+
diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml 
b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index 3905ded90a70..f40d374ec59a 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml
@@ -21,23 +21,29 @@
  
  
  
- 
- 
+ 
+ 
  
- 
+ 
  
  
- 
- 
- 
+ 
  
- 
  
+ 
  
- 
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
+ 
  
  
 
diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml 
b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..14f2d133dc05 100644
--- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar">
- 
- 
- 
- 
- 
- 
- 
- 
- 
  
- 
+ 
  
- 
  
+ 
  
- 
- 
+ 
+ 
  
- 
-
\ No newline at end of file
+ 
+ 
+
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml 
b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index 17eaa87e0f27..f40d374ec59a 100644
--- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
@@ -21,20 +21,26 @@
  
  
  
- 
- 
+ 
+ 
  
- 
+ 
  
  
- 
- 
- 
+ 
  
- 
  
+ 
  
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
  
  
diff --git a/sw/uiconfig

[Libreoffice-commits] core.git: officecfg/registry

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/VCL.xcu |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a2158c6ca2ba831665019827889f01e98dc93394
Author: Yousuf Philips 
Date:   Sat Dec 16 17:35:03 2017 +0400

tdf#113538 New font order for hebrew fonts

Change-Id: I6e820886204a53de3b29f30b42bb6503cfcc8e35
Reviewed-on: https://gerrit.libreoffice.org/45065
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index e47e4134a449..d759ef68509f 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -177,19 +177,19 @@
 Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany 
AMT;Albany;Arial;Nimbus Sans L;Interface 
User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans 
Serif
   
   
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
+Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial 
Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS
   
   
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
+Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial 
Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS
   
   
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
+Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial 
Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS
   
   
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
+Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial 
Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS
   
   
-Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin 
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS
+David Libre;David CLM;Frank Ruehl CLM;Liberation 
Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/filter/inc/orcusinterface.hxx |7 ++-
 sc/source/filter/orcus/interface.cxx|   17 ++---
 2 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 40e1cb217396c7183ea3a7379a8a15c8df3aea2e
Author: Kohei Yoshida 
Date:   Sun Dec 17 14:24:57 2017 -0500

Pick up sheet-local named expressions as well.

Change-Id: I8a081b5f81740fa91f43ac152a950d73d031ed10
Reviewed-on: https://gerrit.libreoffice.org/4
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/filter/inc/orcusinterface.hxx 
b/sc/source/filter/inc/orcusinterface.hxx
index 07c35fa78dfe..5d6cc1f55135 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -79,9 +79,10 @@ class ScOrcusNamedExpression : public 
orcus::spreadsheet::iface::import_named_ex
 {
 ScDocumentImport& mrDoc;
 const ScOrcusGlobalSettings& mrGlobalSettings;
+SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named 
expressions.
 
 public:
-ScOrcusNamedExpression( ScDocumentImport& rDoc, const 
ScOrcusGlobalSettings& rGS );
+ScOrcusNamedExpression( ScDocumentImport& rDoc, const 
ScOrcusGlobalSettings& rGS, SCTAB nTab = -1 );
 
 virtual void define_name(const char* p_name, size_t n_name, const char* 
p_exp, size_t n_exp) override;
 };
@@ -223,6 +224,7 @@ class ScOrcusSheet : public 
orcus::spreadsheet::iface::import_sheet
 ScOrcusAutoFilter maAutoFilter;
 ScOrcusSheetProperties maProperties;
 ScOrcusConditionalFormat maConditionalFormat;
+ScOrcusNamedExpression maNamedExpressions;
 
 int mnCellCount;
 
@@ -235,6 +237,7 @@ public:
 virtual orcus::spreadsheet::iface::import_table* get_table() override;
 virtual orcus::spreadsheet::iface::import_sheet_properties* 
get_sheet_properties() override;
 virtual orcus::spreadsheet::iface::import_conditional_format* 
get_conditional_format() override;
+virtual orcus::spreadsheet::iface::import_named_expression* 
get_named_expression() override;
 
 // Orcus import interface
 virtual void set_auto(orcus::spreadsheet::row_t row, 
orcus::spreadsheet::col_t col, const char* p, size_t n) override;
@@ -594,6 +597,8 @@ public:
 void incrementProgress();
 
 void setStatusIndicator(const 
css::uno::Reference& rIndicator);
+
+const ScOrcusGlobalSettings& getGlobalSettings() const;
 };
 
 #endif
diff --git a/sc/source/filter/orcus/interface.cxx 
b/sc/source/filter/orcus/interface.cxx
index 04581dc70d72..89f65027a3e4 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -158,15 +158,15 @@ os::range_t ScOrcusRefResolver::resolve_range(const char* 
p, size_t n)
 }
 
 ScOrcusNamedExpression::ScOrcusNamedExpression(
-ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS ) :
-mrDoc(rDoc), mrGlobalSettings(rGS) {}
+ScDocumentImport& rDoc, const ScOrcusGlobalSettings& rGS, SCTAB nTab ) :
+mrDoc(rDoc), mrGlobalSettings(rGS), mnTab(nTab) {}
 
 void ScOrcusNamedExpression::define_name(const char* p_name, size_t n_name, 
const char* p_exp, size_t n_exp)
 {
 OUString aName(p_name, n_name, RTL_TEXTENCODING_UTF8);
 OUString aExpr(p_exp, n_exp, RTL_TEXTENCODING_UTF8);
 
-ScRangeName* pNames = mrDoc.getDoc().GetRangeName();
+ScRangeName* pNames = mnTab >= 0 ? mrDoc.getDoc().GetRangeName(mnTab) : 
mrDoc.getDoc().GetRangeName();
 if (!pNames)
 return;
 
@@ -554,6 +554,11 @@ void ScOrcusFactory::setStatusIndicator(const 
uno::Referencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 cui/source/inc/cuioptgenrl.hxx  |6 
 cui/source/options/optgenrl.cxx |   56 ++--
 cui/uiconfig/ui/optuserpage.ui  |   27 +--
 3 files changed, 73 insertions(+), 16 deletions(-)

New commits:
commit e0c3e356fd9151819db13d844f87ec200e2dbee3
Author: Katarina Behrens 
Date:   Tue Dec 12 14:03:05 2017 +0100

List private GPG keys in crypto config dialog

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

diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 0c56b6cdcde6..b612ccf687ff 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -40,6 +41,10 @@ class SvxGeneralTabPage : public SfxTabPage
 private:
 // the "Use data for document properties" checkbox
 VclPtr m_pUseDataCB;
+VclPtr m_pCryptoFrame;
+VclPtr m_pSigningKeyLB;
+VclPtr m_pEncryptionKeyLB;
+VclPtr m_pEncryptToSelfCB;
 // rows
 struct Row;
 std::vector > vRows;
@@ -56,6 +61,7 @@ private:
 voidSetData_Impl();
 
 void InitControls ();
+void InitCryptography();
 void SetLinks ();
 
 protected:
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 5750cc9ff7a0..b63fbf580b69 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -211,22 +212,20 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* 
pParent, const SfxItemSet& rCo
 : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet)
 {
 get(m_pUseDataCB, "usefordocprop");
+
+get(m_pCryptoFrame, "cryptography");
+get(m_pSigningKeyLB, "signingkey");
+get(m_pEncryptionKeyLB, "encryptionkey");
+get(m_pEncryptToSelfCB, "encrypttoself");
 InitControls();
-SetExchangeSupport(); // this page needs ExchangeSupport
-SetLinks();
 #if HAVE_FEATURE_GPGME
-// unused yet, I just wanted to see if this delivers the desired results
-uno::Reference< xml::crypto::XSEInitializer > xSEInitializer;
-try
-{
-xSEInitializer = xml::crypto::GPGSEInitializer::create( 
comphelper::getProcessComponentContext() );
-uno::Reference xSC = 
xSEInitializer->createSecurityContext( OUString() );
-// completely bogus, this is just to appease loplugins
-xSEInitializer->freeSecurityContext( xSC );
-}
-catch ( uno::Exception const & )
-{}
+InitCryptography();
+#else
+m_pCryptoFrame->Hide();
 #endif
+
+SetExchangeSupport(); // this page needs ExchangeSupport
+SetLinks();
 }
 
 SvxGeneralTabPage::~SvxGeneralTabPage()
@@ -237,6 +236,10 @@ SvxGeneralTabPage::~SvxGeneralTabPage()
 void SvxGeneralTabPage::dispose()
 {
 m_pUseDataCB.clear();
+m_pSigningKeyLB.clear();
+m_pEncryptionKeyLB.clear();
+m_pEncryptToSelfCB.clear();
+m_pCryptoFrame.clear();
 SfxTabPage::dispose();
 }
 
@@ -295,6 +298,33 @@ void SvxGeneralTabPage::InitControls ()
 }
 }
 
+void SvxGeneralTabPage::InitCryptography()
+{
+#if HAVE_FEATURE_GPGME
+m_pCryptoFrame->Show();
+// unused yet, I just wanted to see if this delivers the desired results
+uno::Reference< xml::crypto::XSEInitializer > xSEInitializer;
+try
+{
+xSEInitializer = xml::crypto::GPGSEInitializer::create( 
comphelper::getProcessComponentContext() );
+uno::Reference xSC = 
xSEInitializer->createSecurityContext( OUString() );
+uno::Reference xSE = 
xSC->getSecurityEnvironment();
+uno::Sequence> xCertificates = 
xSE->getPersonalCertificates();
+
+if (xCertificates.hasElements())
+{
+for (auto& xCert : xCertificates)
+{
+m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
+m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+}
+}
+}
+catch ( uno::Exception const & )
+{}
+#endif
+
+}
 
 void SvxGeneralTabPage::SetLinks ()
 {
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index ad893936cb0f..96c0a77cfad0 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -2,6 +2,17 @@
 
 
   
+  
+
+  
+  
+
+
+  
+No 
key
+  
+
+  
   
 True
 False
@@ -825,7 +836,8 @@
   
 
 
-  
+  
+True
 False
 0
 none
@@ -837,11 +849,13 @@
 12
 
   
+True
 False
 6
 12
 
   
+True
 False
 end
 OpenPGP signing key:
@@ -855,6 +869,7

[Libreoffice-commits] core.git: 3 commits - cui/source include/unotools unotools/source xmlsecurity/inc xmlsecurity/source

[Katarina Behrens]

 cui/source/options/optgenrl.cxx   |   38 ++-
 include/unotools/useroptions.hxx  |9 +++
 unotools/source/config/useroptions.cxx|   54 --
 xmlsecurity/inc/certificatechooser.hxx|2 
 xmlsecurity/source/dialogs/certificatechooser.cxx |   29 +++
 5 files changed, 123 insertions(+), 9 deletions(-)

New commits:
commit 5c66c0711286bcfa9d3ab4a8c2af9e1c25d9
Author: Katarina Behrens 
Date:   Thu Dec 14 13:14:02 2017 +0100

Read/write 'encrypt to self' bit

use some template functions to avoid duplicate code

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

diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 83a98e60c7b0..c25144f04266 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -443,11 +443,14 @@ bool SvxGeneralTabPage::GetData_Impl()
: m_pSigningKeyLB->GetSelectedEntry();
 OUString aEK = m_pEncryptionKeyLB->GetSelectedEntryPos() == 0 ? OUString()
: m_pEncryptionKeyLB->GetSelectedEntry();
+
 aUserOpt.SetToken( UserOptToken::SigningKey, aSK );
 aUserOpt.SetToken( UserOptToken::EncryptionKey, aEK );
+aUserOpt.SetBoolValue( UserOptToken::EncryptToSelf, 
m_pEncryptToSelfCB->IsChecked() );
 
-bModified |= m_pSigningKeyLB->IsValueChangedFromSaved();
-bModified |= m_pEncryptionKeyLB->IsValueChangedFromSaved();
+bModified |= m_pSigningKeyLB->IsValueChangedFromSaved() ||
+ m_pEncryptionKeyLB->IsValueChangedFromSaved() ||
+ m_pEncryptToSelfCB->IsValueChangedFromSaved();
 #endif
 
 return bModified;
@@ -489,6 +492,8 @@ void SvxGeneralTabPage::SetData_Impl()
 OUString aEK = aUserOpt.GetToken(UserOptToken::EncryptionKey);
 aEK.isEmpty() ? m_pEncryptionKeyLB->SelectEntryPos( 0 ) //i.e. 'No Key'
   : m_pEncryptionKeyLB->SelectEntry( aEK );
+
+m_pEncryptToSelfCB->Check( aUserOpt.GetEncryptToSelf() );
 #endif
 }
 
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 946ba8d34c10..60c18df65ae2 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -47,7 +47,8 @@ enum class UserOptToken
 Apartment  = 16,
 SigningKey = 17,
 EncryptionKey  = 18,
-LAST   = EncryptionKey,
+EncryptToSelf  = 19,
+LAST   = EncryptToSelf,
 };
 
 // class SvtUserOptions --
@@ -78,12 +79,14 @@ public:
 OUString GetEmail  () const;
 OUString GetSigningKey () const;
 OUString GetEncryptionKey  () const;
+bool GetEncryptToSelf  () const;
 
 OUString GetFullName   () const;
 
 bool  IsTokenReadonly (UserOptToken nToken) const;
 OUString  GetToken (UserOptToken nToken) const;
 void  SetToken (UserOptToken nToken, OUString const& rNewToken);
+void  SetBoolValue (UserOptToken nToken, bool bNewValue);
 
 private:
 class Impl;
diff --git a/unotools/source/config/useroptions.cxx 
b/unotools/source/config/useroptions.cxx
index e19168da2885..adf58180204a 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -67,7 +67,8 @@ static o3tl::enumarray 
vOptionNames = {
 "fathersname",   // UserOptToken::FathersName
 "apartment", // UserOptToken::Apartment
 "signingkey",// UserOptToken::SigningKey
-"encryptionkey"  // UserOptToken::EncryptionKey
+"encryptionkey", // UserOptToken::EncryptionKey
+"encrypttoself"  // UserOptToken::EncryptToSelf
 };
 
 std::weak_ptr SvtUserOptions::xSharedImpl;
@@ -96,12 +97,19 @@ public:
 bool IsTokenReadonly (UserOptToken nToken) const;
 OUString GetToken (UserOptToken nToken) const;
 void SetToken (UserOptToken nToken, OUString const& rNewToken);
+bool GetBoolValue (UserOptToken nToken) const;
+void SetBoolValue (UserOptToken nToken, bool& bNewValue);
 void Notify ();
 
 private:
 uno::Reference m_xChangeListener;
 uno::Reference m_xCfg;
 uno::Referencem_xData;
+
+template < typename ValueType >
+ValueType GetValue_Impl( UserOptToken nToken ) const;
+template < typename ValueType >
+void SetValue_Impl( UserOptToken nToken, ValueType const& rNewValue );
 };
 
 void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent 
const& rEvent)
@@ -153,9 +161,10 @@ SvtUserOptions::Impl::Impl() :
 }
 }
 
-OUString SvtUserOptions::Impl::GetToken (UserOptToken nToken) const
+template < typename ValueType >
+ValueType SvtUserOptions::Impl::GetValue_Impl (UserOptToken nToken) const
 {
-OUString sToken;
+ValueType sT

Re: tdf#109202 Add mimetype to image element

[Regina Henschel]

Hi Thorsten, hi Michael,

so do you see any reason to have the mime-type attribute in the 
 element? Or is the  indeed a better place?


Kind regards
Regina


Thorsten Behrens schrieb am 18.12.2017 um 23:38:

Michael Stahl wrote:

i don't see this as a disadvantage: the content of an ODF package
cannot make assumptions about what some URL that points outside the
ODF package refers to; dereferencing the URL might result in a
different file than when the ODF package was created, or it might be
a 404 because the file has been removed.


Yep, agreeing with Michael - there's an established way to transfer
the mime type of linked content, and that's the responsibility of the
server. Best is to leave that to the remote side, content could be
generated on the fly, depend on the user agent, preferred language etc
etc.

All the best,

-- Thorsten



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

[Libreoffice-commits] core.git: Branch 'private/kohei/excel-2003-xml-orcus-filter' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

make screenshot broken since Friday - any obvious breaking change?

[Thorsten Behrens]

Dear fellow hackers,

anything obviously fishy in this list of commits:
https://ci.libreoffice.org/job/lo_tb_master_win_screenshot/251/changes ?

Since screenshot daily build is broken since Dec 15:
https://ci.libreoffice.org/job/lo_tb_master_win_screenshot/251/console

(would otherwise bisect that, just no spare cpu cycles at this moment)

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - cui/source cui/uiconfig

[Katarina Behrens]

 cui/source/inc/cuioptgenrl.hxx  |6 
 cui/source/options/optgenrl.cxx |   56 ++--
 cui/uiconfig/ui/optuserpage.ui  |   27 +--
 3 files changed, 73 insertions(+), 16 deletions(-)

New commits:
commit 5aa5843d4dc668899776192d8200b06a6156
Author: Katarina Behrens 
Date:   Tue Dec 12 14:03:05 2017 +0100

List private GPG keys in crypto config dialog

Change-Id: I7cb6a14adcc5424b432589120c66deeddf86b652
Reviewed-on: https://gerrit.libreoffice.org/46691
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit e0c3e356fd9151819db13d844f87ec200e2dbee3)
Reviewed-on: https://gerrit.libreoffice.org/46758
Tested-by: Jenkins 

diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 0c56b6cdcde6..b612ccf687ff 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -40,6 +41,10 @@ class SvxGeneralTabPage : public SfxTabPage
 private:
 // the "Use data for document properties" checkbox
 VclPtr m_pUseDataCB;
+VclPtr m_pCryptoFrame;
+VclPtr m_pSigningKeyLB;
+VclPtr m_pEncryptionKeyLB;
+VclPtr m_pEncryptToSelfCB;
 // rows
 struct Row;
 std::vector > vRows;
@@ -56,6 +61,7 @@ private:
 voidSetData_Impl();
 
 void InitControls ();
+void InitCryptography();
 void SetLinks ();
 
 protected:
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 5750cc9ff7a0..b63fbf580b69 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -211,22 +212,20 @@ SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* 
pParent, const SfxItemSet& rCo
 : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet)
 {
 get(m_pUseDataCB, "usefordocprop");
+
+get(m_pCryptoFrame, "cryptography");
+get(m_pSigningKeyLB, "signingkey");
+get(m_pEncryptionKeyLB, "encryptionkey");
+get(m_pEncryptToSelfCB, "encrypttoself");
 InitControls();
-SetExchangeSupport(); // this page needs ExchangeSupport
-SetLinks();
 #if HAVE_FEATURE_GPGME
-// unused yet, I just wanted to see if this delivers the desired results
-uno::Reference< xml::crypto::XSEInitializer > xSEInitializer;
-try
-{
-xSEInitializer = xml::crypto::GPGSEInitializer::create( 
comphelper::getProcessComponentContext() );
-uno::Reference xSC = 
xSEInitializer->createSecurityContext( OUString() );
-// completely bogus, this is just to appease loplugins
-xSEInitializer->freeSecurityContext( xSC );
-}
-catch ( uno::Exception const & )
-{}
+InitCryptography();
+#else
+m_pCryptoFrame->Hide();
 #endif
+
+SetExchangeSupport(); // this page needs ExchangeSupport
+SetLinks();
 }
 
 SvxGeneralTabPage::~SvxGeneralTabPage()
@@ -237,6 +236,10 @@ SvxGeneralTabPage::~SvxGeneralTabPage()
 void SvxGeneralTabPage::dispose()
 {
 m_pUseDataCB.clear();
+m_pSigningKeyLB.clear();
+m_pEncryptionKeyLB.clear();
+m_pEncryptToSelfCB.clear();
+m_pCryptoFrame.clear();
 SfxTabPage::dispose();
 }
 
@@ -295,6 +298,33 @@ void SvxGeneralTabPage::InitControls ()
 }
 }
 
+void SvxGeneralTabPage::InitCryptography()
+{
+#if HAVE_FEATURE_GPGME
+m_pCryptoFrame->Show();
+// unused yet, I just wanted to see if this delivers the desired results
+uno::Reference< xml::crypto::XSEInitializer > xSEInitializer;
+try
+{
+xSEInitializer = xml::crypto::GPGSEInitializer::create( 
comphelper::getProcessComponentContext() );
+uno::Reference xSC = 
xSEInitializer->createSecurityContext( OUString() );
+uno::Reference xSE = 
xSC->getSecurityEnvironment();
+uno::Sequence> xCertificates = 
xSE->getPersonalCertificates();
+
+if (xCertificates.hasElements())
+{
+for (auto& xCert : xCertificates)
+{
+m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
+m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+}
+}
+}
+catch ( uno::Exception const & )
+{}
+#endif
+
+}
 
 void SvxGeneralTabPage::SetLinks ()
 {
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index ad893936cb0f..96c0a77cfad0 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -2,6 +2,17 @@
 
 
   
+  
+
+  
+  
+
+
+  
+No 
key
+  
+
+  
   
 True
 False
@@ -825,7 +836,8 @@
   
 
 
-  
+  
+True
 False
 0
 none
@@ -837,11 +849,13 @@
 12
 
   
+True
 False
 6
 12
 
 

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

[Tomaž Vajngerl]

 include/vcl/menu.hxx |2 +-
 vcl/source/window/menu.cxx   |9 +
 vcl/source/window/menubarwindow.cxx  |   25 ++---
 vcl/source/window/menufloatingwindow.cxx |4 ++--
 4 files changed, 26 insertions(+), 14 deletions(-)

New commits:
commit e11234d8d8d8ff2744b77a128f845dbe8e6faa1e
Author: Tomaž Vajngerl 
Date:   Mon Dec 18 17:42:00 2017 +0900

menu: pass paint size to ImplPaint and account for buttons

When a menu bar is painted it needs to take into account that
the buttons (close) is positioned at the right side of the paint
area. To do this we need to pass what the output size is when
painting (ImplPaint) on the common menu code, instead of assuming
the whole area can be used.

Change-Id: I2e9d6c686929fe1cd7e28368a8055c1e2df13c49
Reviewed-on: https://gerrit.libreoffice.org/46710
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index a45eed9e6c70..aa3ee35d2c49 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -169,7 +169,7 @@ protected:
 SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const;
 SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const;
 SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const;
-SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext,
+SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, Size 
const & rSize,
   sal_uInt16 nBorder, long nOffY = 0, 
MenuItemData const * pThisDataOnly = nullptr,
   bool bHighlighted = false, bool bLayout = 
false, bool bRollover = false ) const;
 SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const 
tools::Rectangle& rRect) const;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index f2f45eadd965..b6b2faa5206b 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1661,7 +1661,7 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext& 
rRenderContext, const tools::R
 rRenderContext.SetBackground(aOldBackground);
 }
 
-void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
+void Menu::ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize,
  sal_uInt16 nBorder, long nStartY, MenuItemData const * 
pThisItemOnly,
  bool bHighlighted, bool bLayout, bool bRollover) const
 {
@@ -1686,7 +1686,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
 }
 
 // for the computations, use size of the underlying window, not of 
RenderContext
-Size aOutSz = pWindow->GetOutputSizePixel();
+Size aOutSz(rSize);
 
 size_t nCount = pItemList->size();
 if (bLayout)
@@ -2135,12 +2135,13 @@ void Menu::ImplFillLayoutData() const
 mpLayoutData = new MenuLayoutData;
 if (IsMenuBar())
 {
-ImplPaint(*pWindow, 0, 0, nullptr, false, true); // FIXME
+ImplPaint(*pWindow, pWindow->GetOutputSizePixel(), 0, 0, nullptr, 
false, true); // FIXME
 }
 else
 {
 MenuFloatingWindow* pFloat = 
static_cast(pWindow.get());
-ImplPaint(*pWindow, pFloat->nScrollerHeight, 
pFloat->ImplGetStartY(), nullptr, false, true); //FIXME
+ImplPaint(*pWindow, pWindow->GetOutputSizePixel(), 
pFloat->nScrollerHeight, pFloat->ImplGetStartY(),
+  nullptr, false, true); //FIXME
 }
 }
 }
diff --git a/vcl/source/window/menubarwindow.cxx 
b/vcl/source/window/menubarwindow.cxx
index 6486ffb86a9c..0b4e6b7df5bc 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -574,6 +574,10 @@ void MenuBarWindow::HighlightItem(vcl::RenderContext& 
rRenderContext, sal_uInt16
 
 long nX = 0;
 size_t nCount = pMenu->pItemList->size();
+
+Size aOutputSize = GetOutputSizePixel();
+aOutputSize.Width() -= aCloseBtn->GetSizePixel().Width();
+
 for (size_t n = 0; n < nCount; n++)
 {
 MenuItemData* pData = pMenu->pItemList->GetDataFromPos( n );
@@ -582,7 +586,7 @@ void MenuBarWindow::HighlightItem(vcl::RenderContext& 
rRenderContext, sal_uInt16
 if (pData->eType != MenuItemType::SEPARATOR)
 {
 // #107747# give menuitems the height of the menubar
-tools::Rectangle aRect = tools::Rectangle(Point(nX, 1), 
Size(pData->aSz.Width(), GetOutputSizePixel().Height() - 2));
+tools::Rectangle aRect = tools::Rectangle(Point(nX, 1), 
Size(pData->aSz.Width(), aOutputSize.Height() - 2));
 rRenderContext.Push(PushFlags::CLIPREGION);
 rRenderContext.IntersectClipRegion(aRect);
 bool bRollover, bHighlight;
@@ -607,12 +611,12 @@ void MenuBarWindow::HighlightItem(vcl::RenderContext& 
rRenderContext, sal_uInt16
  Erase(rRenderContext);
   

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

[Tomaž Vajngerl]

 include/vcl/menu.hxx|1 
 vcl/source/window/menu.cxx  |   88 +++-
 vcl/source/window/menubarwindow.cxx |   41 +++-
 vcl/source/window/menubarwindow.hxx |1 
 vcl/source/window/menuitemlist.hxx  |3 +
 5 files changed, 130 insertions(+), 4 deletions(-)

New commits:
commit 9f3b61e51f7f9de11436b0e4eaec164f2656fbdd
Author: Tomaž Vajngerl 
Date:   Mon Dec 18 19:30:06 2017 +0900

show rest of the menu bar in a pop-up if the are is too small

In case when the window is to small to show the whole menu then
the use couldn't access the rest of the items in the menu. This
change adds a button in the end (using the ">>" marker as in
toolbar) which on click adds a pop-up that shows the rest of the
menu items.

Change-Id: I9218dba504464bdd44d61ebb383f7674f3df760f
Reviewed-on: https://gerrit.libreoffice.org/46711
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index aa3ee35d2c49..428484d0859c 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -164,6 +164,7 @@ protected:
 SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId );
 SAL_DLLPRIVATE Size  ImplCalcSize( vcl::Window* pWin );
 SAL_DLLPRIVATE bool  ImplIsVisible( sal_uInt16 nPos ) const;
+SAL_DLLPRIVATE bool  ImplCurrentlyHiddenOnGUI(sal_uInt16 nPos) const;
 SAL_DLLPRIVATE bool  ImplIsSelectable( sal_uInt16 nPos ) const;
 SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
 SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index b6b2faa5206b..983a25a11ad6 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -121,8 +121,50 @@ void ImplClosePopupToolBox( const VclPtr& 
pWin )
 }
 }
 
+// TODO: Move to common code with the same function in toolbox
+// Draw the ">>" - more indictor at the coordinates
+void lclDrawMoreIndicator(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect)
+{
+rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+rRenderContext.SetLineColor();
+
+if 
(rRenderContext.GetSettings().GetStyleSettings().GetFaceColor().IsDark())
+rRenderContext.SetFillColor(Color(COL_WHITE));
+else
+rRenderContext.SetFillColor(Color(COL_BLACK));
+float fScaleFactor = rRenderContext.GetDPIScaleFactor();
+
+int linewidth = 1 * fScaleFactor;
+int space = 4 * fScaleFactor;
+
+long width = 8 * fScaleFactor;
+long height = 5 * fScaleFactor;
+
+//Keep odd b/c drawing code works better
+if ( height % 2 == 0 )
+height--;
+
+long heightOrig = height;
+
+long x = rRect.Left() + (rRect.getWidth() - width)/2 + 1;
+long y = rRect.Top() + (rRect.getHeight() - height)/2 + 1;
+while( height >= 1)
+{
+rRenderContext.DrawRect( tools::Rectangle( x, y, x + linewidth, y ) );
+x += space;
+rRenderContext.DrawRect( tools::Rectangle( x, y, x + linewidth, y ) );
+x -= space;
+y++;
+if( height <= heightOrig / 2 + 1) x--;
+elsex++;
+height--;
+}
+rRenderContext.Pop();
 }
 
+} // end anonymouse namespace
+
+
 Menu::Menu()
 : mpFirstDel(nullptr),
   pItemList(new MenuItemList),
@@ -1138,6 +1180,22 @@ Menu& Menu::operator=( const Menu& rMenu )
 return *this;
 }
 
+// Returns true if the item is completely hidden on the GUI and shouldn't
+// be possible to interact with
+bool Menu::ImplCurrentlyHiddenOnGUI(sal_uInt16 nPos) const
+{
+MenuItemData* pData = pItemList->GetDataFromPos(nPos);
+if (pData)
+{
+MenuItemData* pPreviousData = pItemList->GetDataFromPos( nPos - 1 );
+if (pPreviousData && pPreviousData->bHiddenOnGUI)
+{
+return true;
+}
+}
+return false;
+}
+
 bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
 {
 bool bVisible = true;
@@ -1696,6 +1754,8 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, 
Size const & rSize,
 if (!pThisItemOnly && !IsMenuBar() && nTitleHeight > 0)
 ImplPaintMenuTitle(rRenderContext, tools::Rectangle(aTopLeft, aOutSz));
 
+bool bHiddenItems = false; // are any items on the GUI hidden
+
 for (size_t n = 0; n < nCount; n++)
 {
 MenuItemData* pData = pItemList->GetDataFromPos( n );
@@ -1921,7 +1981,25 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, 
Size const & rSize,
 {
 nMaxItemTextWidth -= nFontHeight - nExtra;
 }
-OUString aItemText(getShortenedString(pData->aText, 
rRenderContext, nMaxItemTextWidth));
+
+OUString aItemText(pData->aText);
+pData->bHiddenOnGUI = false;
+
+if (IsMenuBar()) // In case of menubar if we are out of 
bounds we shouldn't paint the item
+   

[Libreoffice-commits] core.git: dbaccess/source drawinglayer/source dtrans/source framework/source include/basic include/salhelper jurt/com odk/examples sc/source sd/source sfx2/source sw/source UnoCo

[Andrea Gelmini]

 UnoControls/source/controls/progressbar.cxx   
|2 +-
 dbaccess/source/core/api/RowSetBase.cxx   
|4 ++--
 drawinglayer/source/processor2d/vclprocessor2d.cxx
|2 +-
 dtrans/source/win32/dtobj/Fetc.hxx
|2 +-
 dtrans/source/win32/dtobj/XTDataObject.hxx
|2 +-
 dtrans/source/win32/workbench/XTDo.hxx
|2 +-
 framework/source/dispatch/closedispatcher.cxx 
|2 +-
 include/basic/sbuno.hxx   
|2 +-
 include/salhelper/singletonref.hxx
|2 +-
 jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java   
|2 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java 
|2 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java  
|4 ++--
 sc/source/core/data/global.cxx
|2 +-
 sc/source/ui/undo/undocell.cxx
|2 +-
 sd/source/ui/inc/framework/Pane.hxx   
|2 +-
 sfx2/source/dialog/basedlgs.cxx   
|2 +-
 sw/source/core/doc/docbm.cxx  
|2 +-
 sw/source/core/layout/trvlfrm.cxx 
|2 +-
 vcl/source/gdi/gdimtf.cxx 
|2 +-
 vcl/source/gdi/pdfwriter_impl.cxx 
|2 +-
 vcl/win/window/salframe.cxx   
|2 +-
 xmloff/source/text/txtftne.cxx
|2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 8efd39be747c729a7f5b40cbca3e2a93585f9413
Author: Andrea Gelmini 
Date:   Tue Dec 19 00:00:46 2017 +0100

Fix typos

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

diff --git a/UnoControls/source/controls/progressbar.cxx 
b/UnoControls/source/controls/progressbar.cxx
index d94409e5e337..dc1757a46cf9 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -204,7 +204,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, 
sal_Int32 nMax )
 
 // save impossible cases
 // This method is only defined for valid values
-// If you ignore this, the release version wil produce an error "division 
by zero" in "ProgressBar::setValue()"!
+// If you ignore this, the release version will produce an error "division 
by zero" in "ProgressBar::setValue()"!
 DBG_ASSERT ( ( nMin != nMax ) , "ProgressBar::setRange()\nValues for MIN 
and MAX are the same. This is not allowed!\n" );
 
 // Ready for multithreading
diff --git a/dbaccess/source/core/api/RowSetBase.cxx 
b/dbaccess/source/core/api/RowSetBase.cxx
index 5d2b11e20a6e..48226e2d61c8 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1374,7 +1374,7 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
 ,m_bWasModified( false )
 {
 
-OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. 
This wil crash." );
+OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. 
This will crash." );
 
 // remember the "inserted" and "modified" state for later firing
 m_bWasNew   = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() );
@@ -1392,7 +1392,7 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* 
_pRowSet,const ORowSetValueVector
 ,m_bWasModified( false )
 {
 
-OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. 
This wil crash." );
+OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. 
This will crash." );
 m_pImpl->aRow = i_aRow; // yes, create a copy to store the old values
 }
 
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index e1cf42b0f42c..0240cd988dad 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -650,7 +650,7 @@ namespace drawinglayer
 // tools::PolyPolygon is filled. 
Create the bitmap tile area in object
 // coordinates. For this, the object 
transformation needs to be created
 // from the already scaled 
PolyPolygon. The tile area in object
-// coordinates wil 

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

[Andrea Gelmini]

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

New commits:
commit dbb50f3fe9692dc0ccd7225158fad353e7eab0b5
Author: Andrea Gelmini 
Date:   Mon Dec 18 23:58:18 2017 +0100

Fix typo

Change-Id: Ib0773324983985f061e390a44702d426c06e18e4
Reviewed-on: https://gerrit.libreoffice.org/46667
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sc/source/core/data/grouptokenconverter.cxx 
b/sc/source/core/data/grouptokenconverter.cxx
index 9697b4cbe14a..5fc6b292214e 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -167,7 +167,7 @@ bool ScGroupTokenConverter::convert( const ScTokenArray& 
rCode, sc::FormulaLogge
 {
 /* FIXME: this simply does not work, it doesn't know
  * a) the context of implicit intersection, for which creating
-  two arrays dows not only result in huge unnecessary 
matrix
+  two arrays does not only result in huge unnecessary 
matrix
   operations but also produces wrong results, e.g. =B:B/C:C
  * b) when to keep a reference as a reference depending on the
   expected parameter type, e.g. INDEX(), OFFSET() and
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source compilerplugins/clang dbaccess/source editeng/source include/editeng include/svl include/svx include/vcl sc/source svgio/inc vcl/source xmloff/source

[Noel Grandin]

 basic/source/sbx/sbxobj.cxx |3 
 basic/source/sbx/sbxvalue.cxx   |2 
 compilerplugins/clang/unusedenumconstants.readonly.results  |  788 
 compilerplugins/clang/unusedenumconstants.untouched.results |  270 +++-
 dbaccess/source/filter/xml/xmlEnums.hxx |1 
 editeng/source/editeng/impedit.cxx  |2 
 editeng/source/outliner/outlvw.cxx  |2 
 include/editeng/editdata.hxx|4 
 include/svl/hint.hxx|3 
 include/svx/cube3d.hxx  |   16 
 include/svx/deflt3d.hxx |2 
 include/vcl/throbber.hxx|2 
 sc/source/filter/xml/xmlimprt.hxx   |   74 -
 svgio/inc/svgstyleattributes.hxx|7 
 vcl/source/control/throbber.cxx |3 
 xmloff/source/style/ImageStyle.cxx  |3 
 16 files changed, 832 insertions(+), 350 deletions(-)

New commits:
commit be359b156b2be7624121a2f2ec5bc6c2d6a195a8
Author: Noel Grandin 
Date:   Mon Dec 18 08:57:55 2017 +0200

loplugin:unusedenumconstants

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

diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 56bec717b8aa..5fa4023f9a23 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -414,7 +414,6 @@ SbxVariable* SbxObject::Make( const OUString& rName, 
SbxClassType ct, SbxDataTyp
 SetModified( true );
 // The object listen always
 StartListening( pVar->GetBroadcaster(), true );
-Broadcast( SfxHintId::BasicObjectChanged );
 return pVar;
 }
 
@@ -458,7 +457,6 @@ void SbxObject::Insert( SbxVariable* pVar )
 pVar->SetParent( this );
 }
 SetModified( true );
-Broadcast( SfxHintId::BasicObjectChanged );
 #ifdef DBG_UTIL
 static const char* pCls[] =
 { 
"DontCare","Array","Value","Variable","Method","Property","Object" };
@@ -558,7 +556,6 @@ void SbxObject::Remove( SbxVariable* pVar )
 pVar_->SetParent( nullptr );
 }
 SetModified( true );
-Broadcast( SfxHintId::BasicObjectChanged );
 }
 }
 
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 39df414fbdcd..06fd0c30192a 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -133,7 +133,6 @@ SbxValue& SbxValue::operator=( const SbxValue& r )
 
 SbxValue::~SbxValue()
 {
-Broadcast( SfxHintId::BasicDying );
 SetFlag( SbxFlagBits::Write );
 SbxValue::Clear();
 }
@@ -817,7 +816,6 @@ bool SbxValue::Convert( SbxDataType eTo )
 Put( aNew );
 SetModified( true );
 }
-Broadcast( SfxHintId::BasicConverted );
 return true;
 }
 else
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results 
b/compilerplugins/clang/unusedenumconstants.readonly.results
index d9497092a5ec..88cdf8789e37 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -5,60 +5,194 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:78
 bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:79
 enum x86_64_reg_class X86_64_X87UP_CLASS
 chart2/source/inc/CharacterProperties.hxx:120
-enum chart::CharacterProperties::(anonymous at 
chart2/source/inc/CharacterProperties.hxx:41:5) FAST_PROPERTY_ID_END_CHAR_PROP
+enum chart::CharacterProperties::(anonymous at 
/home/noel/libo3/chart2/source/inc/CharacterProperties.hxx:41:5) 
FAST_PROPERTY_ID_END_CHAR_PROP
+chart2/source/inc/FastPropertyIdRanges.hxx:27
+enum chart::FastPropertyIdRanges FAST_PROPERTY_ID_START
 chart2/source/inc/TitleHelper.hxx:47
 enum chart::TitleHelper::eTitleType NORMAL_TITLE_END
 configmgr/source/access.hxx:454
-enum configmgr::Access::(anonymous at configmgr/source/access.hxx:453:5) 
IS_EXTENSIBLE
+enum configmgr::Access::(anonymous at 
/home/noel/libo3/configmgr/source/access.hxx:453:5) IS_EXTENSIBLE
 configmgr/source/access.hxx:454
-enum configmgr::Access::(anonymous at configmgr/source/access.hxx:453:5) 
IS_SET
+enum configmgr::Access::(anonymous at 
/home/noel/libo3/configmgr/source/access.hxx:453:5) IS_SET
 configmgr/source/access.hxx:455
-enum configmgr::Access::(anonymous at configmgr/source/access.hxx:453:5) 
IS_SET_MEMBER
+enum configmgr::Access::(anonymous at 
/home/noel/libo3/configmgr/source/access.hxx:453:5) IS_GROUP_MEMBER
 configmgr/source/access.hxx:455
-enum configmgr::Access::(anonymous at configmgr/source/access.hxx:453:5) 
IS_GROUP_MEMBER
+enum configmgr::Access::(anonymous

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

[Noel Grandin]

 compilerplugins/clang/singlevalfields.results |   76 ++
 sc/source/ui/inc/undodat.hxx  |2 
 sc/source/ui/undo/undodat.cxx |   11 ---
 3 files changed, 21 insertions(+), 68 deletions(-)

New commits:
commit 150af593ce1dee2a04dd56d9de67b3e0c4581811
Author: Noel Grandin 
Date:   Mon Dec 18 09:13:25 2017 +0200

loplugin:singevalfields

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

diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index b99868b50374..823de7ba50d7 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -1,21 +1,21 @@
-avmedia/source/viewer/mediawindow_impl.hxx:150
-avmedia::priv::MediaWindowImpl mbEventTransparent
-1
 chart2/source/model/main/DataPoint.hxx:107
 chart::DataPoint m_bNoParentPropAllowed
 0
 chart2/source/view/inc/GL3DRenderer.hxx:161
 chart::opengl3D::TextInfoBatch batchNum
 512
-connectivity/source/inc/odbc/OBoundParam.hxx:113
-connectivity::odbc::OBoundParam paramLength
-0
-cui/source/inc/cfgutil.hxx:132
-SfxConfigGroupListBox m_pImageProvider
-0
 include/basic/sbxvar.hxx:67
 SbxValues::(anonymous) pData
 0
+include/editeng/charsetcoloritem.hxx:35
+SvxCharSetColorItem eFrom
+0
+include/filter/msfilter/dffpropset.hxx:33
+DffPropFlags bSet
+0
+include/filter/msfilter/dffpropset.hxx:35
+DffPropFlags bBlip
+1
 include/o3tl/vector_pool.hxx:93
 o3tl::detail::struct_from_value::type nextFree
 -1
@@ -25,9 +25,6 @@ include/svtools/svparser.hxx:74
 include/svtools/svparser.hxx:75
 SvParser::TokenStackType bTokenHasValue
 0
-include/vcl/field.hxx:99
-PatternFormatter mbInPattKeyInput
-0
 include/vcl/filter/pdfdocument.hxx:173
 vcl::filter::PDFNameElement m_nLength
 0
@@ -67,14 +64,11 @@ sax/source/tools/fastserializer.hxx:231
 sc/inc/compiler.hxx:108
 ScRawToken::(anonymous union)::(anonymous) eInForceArray
 0
-sc/inc/recursionhelper.hxx:56
-ScRecursionHelper bConverging
-0
 sc/qa/unit/ucalc.hxx:41
 Test::RangeNameDef mnIndex
 1
-sc/source/ui/inc/undodat.hxx:448
-ScUndoDataForm nEndChangeAction
+sc/source/ui/inc/undodat.hxx:447
+ScUndoDataForm nStartChangeAction
 0
 sd/inc/sdpptwrp.hxx:42
 SdPPTFilter pBas
@@ -82,9 +76,6 @@ sd/inc/sdpptwrp.hxx:42
 sd/source/filter/html/htmlex.hxx:114
 HtmlExport mbAutoSlide
 1
-sd/source/ui/remotecontrol/DiscoveryService.hxx:43
-sd::DiscoveryService zService
-0
 sfx2/source/appl/lnkbase2.cxx:76
 sfx2::ImplBaseLinkData::tDDEType pItem
 0
@@ -97,9 +88,6 @@ sfx2/source/doc/doctemplates.cxx:136
 sfx2/source/view/ipclient.cxx:78
 SfxBooleanFlagGuard m_bLifeValue
 1
-shell/source/sessioninstall/SyncDbusSessionHelper.cxx:26
-(anonymous namespace)::GErrorWrapper m_pError
-0
 soltools/cpp/cpp.h:120
 includelist deleted
 1
@@ -109,9 +97,6 @@ soltools/mkdepend/def.h:130
 soltools/mkdepend/def.h:132
 inclist i_searched
 1
-starmath/inc/node.hxx:104
-SmNode mnFlags
-0
 stoc/source/inspect/introspection.cxx:1533
 (anonymous namespace)::Cache::Data hits
 1
@@ -124,24 +109,9 @@ sw/inc/pagepreviewlayout.hxx:49
 sw/source/core/inc/frmtool.hxx:260
 SwBorderAttrs m_bBorderDist
 1
-sw/source/core/inc/swfont.hxx:158
-SwFont m_nToxCount
-0
-sw/source/core/inc/swfont.hxx:159
-SwFont m_nRefCount
-0
-sw/source/core/inc/swfont.hxx:160
-SwFont m_nMetaCount
-0
-sw/source/core/inc/swfont.hxx:161
-SwFont m_nInputFieldCount
-0
 sw/source/core/inc/UndoSort.hxx:38
 SwSortUndoElement::(anonymous union)::(anonymous) nKenn
 4294967295
-sw/source/core/text/porlay.hxx:239
-SwParaPortion m_nDelta
-0
 sw/source/filter/html/htmlcss1.cxx:77
 SwCSS1ItemIds nFormatBreak
 93
@@ -157,15 +127,15 @@ sw/source/filter/html/svxcss1.hxx:199
 sw/source/filter/inc/rtf.hxx:30
 RTFSurround::(anonymous union)::(anonymous) nJunk
 0
-sw/source/filter/ww8/ww8par2.hxx:58
-WW8SwFlyPara eAnchor
-0
-sw/source/filter/ww8/ww8par.hxx:650
+sw/source/filter/ww8/ww8par.hxx:651
 WW8FormulaControl mfUnknown
 0
-sw/source/filter/ww8/ww8par.hxx:659
+sw/source/filter/ww8/ww8par.hxx:660
 WW8FormulaControl mhpsCheckBox
 20
+sw/source/uibase/lingu/sdrhhcwrap.hxx:33
+SdrHHCWrapper pTextObj
+0
 vcl/inc/salprn.hxx:41
 SalPrinterQueueInfo mnStatus
 0
@@ -175,24 +145,18 @@ vcl/inc/salprn.hxx:42
 vcl/inc/salprn.hxx:43
 SalPrinterQueueInfo mpSysData
 0
-vcl/inc/svdata.hxx:267
+vcl/inc/svdata.hxx:268
 ImplSVNWFData mnStatusBarLowerRightOffset
 0
-vcl/inc/svdata.hxx:283
+vcl/inc/svdata.hxx:284
 ImplSVNWFData mbCenteredTabs
 0
-vcl/inc/svdata.hxx:284
+vcl/inc/svdata.hxx:285
 ImplSVNWFData mbNoAc

[Libreoffice-commits] core.git: 3 commits - cui/source include/svl svl/source svl/unx svtools/source

[Noel Grandin]

 cui/source/dialogs/iconcdlg.cxx |   10 -
 include/svl/svdde.hxx   |7 ++-
 svl/source/svdde/ddeimp.hxx |2 -
 svl/source/svdde/ddesvr.cxx |   29 +---
 svl/unx/source/svdde/ddedummy.cxx   |5 ++
 svtools/source/graphic/grfcache.cxx |   64 +---
 6 files changed, 35 insertions(+), 82 deletions(-)

New commits:
commit 327a3ac9b320552ee778b5fb5d1f0d5966d8ea7b
Author: Noel Grandin 
Date:   Mon Dec 18 12:55:05 2017 +0200

fix bug in IconChoiceDialog::dispose

after
commit 12bb4bc980863d4338725cf5a5dcaf3acbfddc09
convert HyperLinkPageType to scoped enum

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

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index acf04885b488..1b1009389595 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -224,16 +224,6 @@ void IconChoiceDialog::dispose()
 }
 maPageList.clear();
 
-if (m_pIconCtrl)
-{
-// remove Userdata from Icons
-for ( sal_Int32 i=0; i < m_pIconCtrl->GetEntryCount(); i++)
-{
-SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( i );
-delete static_cast(pEntry->GetUserData());
-}
-}
-
 delete pRanges;
 pRanges = nullptr;
 delete pOutSet;
commit 28e1f3c77fe19091cddf527f7758386dddcdad34
Author: Takeshi Abe 
Date:   Sat Nov 18 22:43:41 2017 +0900

svl: Fix possible memleak at deleting DdeService

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

diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 003a14f83923..2f07eb768117 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -48,7 +48,7 @@ struct Conversation;
 
 typedef ::std::vector< DdeService* > DdeServices;
 typedef ::std::vector< long > DdeFormats;
-typedef ::std::vector< Conversation* > ConvList;
+typedef std::vector> ConvList;
 
 
 class SVL_DLLPUBLIC DdeData
@@ -297,7 +297,7 @@ private:
 DdeFormats  aFormats;
 DdeTopic*   pSysTopic;
 DdeString*  pName;
-ConvList*   pConv;
+ConvListm_vConv;
 short   nStatus;
 
 SVL_DLLPRIVATE bool HasCbFormat( sal_uInt16 );
@@ -306,6 +306,9 @@ public:
 DdeService( SAL_UNUSED_PARAMETER const OUString& );
 virtual~DdeService();
 
+DdeService( const DdeService& ) = delete;
+DdeService& operator= ( const DdeService& ) = delete;
+
 const OUString  GetName() const;
 short   GetError()  { return nStatus; }
 
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 22df0864002e..3e6cf02483b4 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -37,8 +37,6 @@ struct Conversation
 DdeTopic*   pTopic;
 };
 
-typedef ::std::vector< Conversation* > ConvList;
-
 
 class DdeInternal
 {
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index ce26573988b4..45098bec4764 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -153,7 +153,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback(
 pC = new Conversation;
 pC->hConv = hConv;
 pC->pTopic = pTopic;
-pService->pConv->push_back( pC );
+pService->m_vConv.emplace_back( pC );
 }
 }
 return nullptr;
@@ -162,9 +162,9 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback(
 for (DdeServices::iterator aI = rAll.begin(); aI != rAll.end(); ++aI)
 {
 pService = *aI;
-for ( size_t i = 0, n = pService->pConv->size(); i < n; ++i )
+for ( size_t i = 0, n = pService->m_vConv.size(); i < n; ++i )
 {
-pC = (*pService->pConv)[ i ];
+pC = pService->m_vConv[ i ].get();
 if ( pC->hConv == hConv )
 goto found;
 }
@@ -176,14 +176,13 @@ found:
 if ( nCode == XTYP_DISCONNECT)
 {
 DisconnectTopic(*pC->pTopic, hConv);
-for ( ConvList::iterator it = pService->pConv->begin();
-  it != pService->pConv->end();
+for ( ConvList::iterator it = pService->m_vConv.begin();
+  it != pService->m_vConv.end();
   ++it
 ) {
-if ( *it == pC )
+if ( it->get() == pC )
 {
-delete *it;
-pService->pConv->erase( it );
+pService->m_vConv.erase( it );
 break;
 }
 }
@@ -435,8 +434,6 @@ DdeService::DdeService( const OUString& rService )
 else
 nStatus = DMLERR_NO_ERROR;
 
-pConv = new ConvList;

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - xmlsecurity/inc xmlsecurity/source

[Katarina Behrens]

 xmlsecurity/inc/certificatechooser.hxx|2 +
 xmlsecurity/source/dialogs/certificatechooser.cxx |   29 --
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 253c11a0c31a1034a5b90e0f3389301a681fc07a
Author: Katarina Behrens 
Date:   Thu Dec 14 18:12:56 2017 +0100

Do things with preferred GPG keys

For signing, preselect the key in the list of available keys.
For encryption, when 'encrypt to self' bit is set, add user's key
to the list of keys to encryption.

Change-Id: I5bbfd0e2cc97b76c1304a2a345a51cf83bc5949e
Reviewed-on: https://gerrit.libreoffice.org/46694
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit ee40674b4c9343db5e69cd5118bdbcf8e6edad6d)
Reviewed-on: https://gerrit.libreoffice.org/46759
Tested-by: Jenkins 

diff --git a/xmlsecurity/inc/certificatechooser.hxx 
b/xmlsecurity/inc/certificatechooser.hxx
index be3828b5c5e9..6049eb4a3869 100644
--- a/xmlsecurity/inc/certificatechooser.hxx
+++ b/xmlsecurity/inc/certificatechooser.hxx
@@ -73,6 +73,8 @@ private:
 
 boolmbInitialized;
 UserAction  meAction;
+OUStringmsPreferredKey;
+css::uno::Reference mxEncryptToSelf;
 
 DECL_LINK(ViewButtonHdl, Button*, void);
 DECL_LINK(CertificateHighlightHdl, SvTreeListBox*, void );
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx 
b/xmlsecurity/source/dialogs/certificatechooser.cxx
index bf100c6d0401..5a1edcae872d 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include 
 #include 
 #include 
 #include 
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace css;
 
@@ -159,11 +160,14 @@ void CertificateChooser::ImplInitialize()
 if ( mbInitialized )
 return;
 
+SvtUserOptions aUserOpts;
+
 switch (meAction)
 {
 case UserAction::Sign:
 m_pFTSign->Show();
 m_pOKBtn->SetText( get("str_sign")->GetText() );
+msPreferredKey = aUserOpts.GetSigningKey();
 break;
 
 case UserAction::Encrypt:
@@ -172,6 +176,7 @@ void CertificateChooser::ImplInitialize()
 m_pDescriptionED->Hide();
 m_pCertLB->SetSelectionMode( SelectionMode::Multiple );
 m_pOKBtn->SetText( get("str_encrypt")->GetText() );
+msPreferredKey = aUserOpts.GetEncryptionKey();
 break;
 
 }
@@ -210,6 +215,7 @@ void CertificateChooser::ImplInitialize()
 }
 }
 
+
 // fill list of certificates; the first entry will be selected
 for ( sal_Int32 nC = 0; nC < nCertificates; ++nC )
 {
@@ -218,12 +224,26 @@ void CertificateChooser::ImplInitialize()
 userData->xSecurityContext = secContext;
 userData->xSecurityEnvironment = secEnvironment;
 mvUserData.push_back(userData);
+
+OUString sIssuer = XmlSec::GetContentPart( xCerts[ nC 
]->getIssuerName() );
 SvTreeListEntry* pEntry = m_pCertLB->InsertEntry( 
XmlSec::GetContentPart( xCerts[ nC ]->getSubjectName() )
-+ "\t" + XmlSec::GetContentPart( xCerts[ nC ]->getIssuerName() 
)
++ "\t" + sIssuer
 + "\t" + XmlSec::GetCertificateKind( xCerts[ nC 
]->getCertificateKind() )
 + "\t" + XmlSec::GetDateString( xCerts[ nC 
]->getNotValidAfter() )
 + "\t" + UsageInClearText( xCerts[ nC ]->getCertificateUsage() 
) );
 pEntry->SetUserData( userData.get() );
+
+#if HAVE_FEATURE_GPGME
+// only GPG has preferred keys
+if ( sIssuer == msPreferredKey )
+{
+if ( meAction == UserAction::Sign )
+m_pCertLB->Select( pEntry );
+else if ( meAction == UserAction::Encrypt &&
+  aUserOpts.GetEncryptToSelf() )
+mxEncryptToSelf = xCerts[nC];
+}
+#endif
 }
 }
 
@@ -259,6 +279,11 @@ uno::Sequence > CertificateChooser
 aRet.push_back( xCert );
 }
 
+#if HAVE_FEATURE_GPGME
+if ( mxEncryptToSelf.is())
+aRet.push_back( mxEncryptToSelf );
+#endif
+
 return comphelper::containerToSequence(aRet);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - cui/source include/unotools unotools/source

[Katarina Behrens]

 cui/source/options/optgenrl.cxx|   38 ++-
 include/unotools/useroptions.hxx   |9 -
 unotools/source/config/useroptions.cxx |   54 ++---
 3 files changed, 94 insertions(+), 7 deletions(-)

New commits:
commit 9c885a05430cf284512e0cb79fc2a996a294aa30
Author: Katarina Behrens 
Date:   Thu Dec 14 13:14:02 2017 +0100

Read/write 'encrypt to self' bit

use some template functions to avoid duplicate code

Change-Id: Ia178ea3a0561e34e0431749262f5f8f1f49b4fe7
Reviewed-on: https://gerrit.libreoffice.org/46693
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/46762

diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 83a98e60c7b0..c25144f04266 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -443,11 +443,14 @@ bool SvxGeneralTabPage::GetData_Impl()
: m_pSigningKeyLB->GetSelectedEntry();
 OUString aEK = m_pEncryptionKeyLB->GetSelectedEntryPos() == 0 ? OUString()
: m_pEncryptionKeyLB->GetSelectedEntry();
+
 aUserOpt.SetToken( UserOptToken::SigningKey, aSK );
 aUserOpt.SetToken( UserOptToken::EncryptionKey, aEK );
+aUserOpt.SetBoolValue( UserOptToken::EncryptToSelf, 
m_pEncryptToSelfCB->IsChecked() );
 
-bModified |= m_pSigningKeyLB->IsValueChangedFromSaved();
-bModified |= m_pEncryptionKeyLB->IsValueChangedFromSaved();
+bModified |= m_pSigningKeyLB->IsValueChangedFromSaved() ||
+ m_pEncryptionKeyLB->IsValueChangedFromSaved() ||
+ m_pEncryptToSelfCB->IsValueChangedFromSaved();
 #endif
 
 return bModified;
@@ -489,6 +492,8 @@ void SvxGeneralTabPage::SetData_Impl()
 OUString aEK = aUserOpt.GetToken(UserOptToken::EncryptionKey);
 aEK.isEmpty() ? m_pEncryptionKeyLB->SelectEntryPos( 0 ) //i.e. 'No Key'
   : m_pEncryptionKeyLB->SelectEntry( aEK );
+
+m_pEncryptToSelfCB->Check( aUserOpt.GetEncryptToSelf() );
 #endif
 }
 
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 946ba8d34c10..60c18df65ae2 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -47,7 +47,8 @@ enum class UserOptToken
 Apartment  = 16,
 SigningKey = 17,
 EncryptionKey  = 18,
-LAST   = EncryptionKey,
+EncryptToSelf  = 19,
+LAST   = EncryptToSelf,
 };
 
 // class SvtUserOptions --
@@ -78,12 +79,14 @@ public:
 OUString GetEmail  () const;
 OUString GetSigningKey () const;
 OUString GetEncryptionKey  () const;
+bool GetEncryptToSelf  () const;
 
 OUString GetFullName   () const;
 
 bool  IsTokenReadonly (UserOptToken nToken) const;
 OUString  GetToken (UserOptToken nToken) const;
 void  SetToken (UserOptToken nToken, OUString const& rNewToken);
+void  SetBoolValue (UserOptToken nToken, bool bNewValue);
 
 private:
 class Impl;
diff --git a/unotools/source/config/useroptions.cxx 
b/unotools/source/config/useroptions.cxx
index e19168da2885..adf58180204a 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -67,7 +67,8 @@ static o3tl::enumarray 
vOptionNames = {
 "fathersname",   // UserOptToken::FathersName
 "apartment", // UserOptToken::Apartment
 "signingkey",// UserOptToken::SigningKey
-"encryptionkey"  // UserOptToken::EncryptionKey
+"encryptionkey", // UserOptToken::EncryptionKey
+"encrypttoself"  // UserOptToken::EncryptToSelf
 };
 
 std::weak_ptr SvtUserOptions::xSharedImpl;
@@ -96,12 +97,19 @@ public:
 bool IsTokenReadonly (UserOptToken nToken) const;
 OUString GetToken (UserOptToken nToken) const;
 void SetToken (UserOptToken nToken, OUString const& rNewToken);
+bool GetBoolValue (UserOptToken nToken) const;
+void SetBoolValue (UserOptToken nToken, bool& bNewValue);
 void Notify ();
 
 private:
 uno::Reference m_xChangeListener;
 uno::Reference m_xCfg;
 uno::Referencem_xData;
+
+template < typename ValueType >
+ValueType GetValue_Impl( UserOptToken nToken ) const;
+template < typename ValueType >
+void SetValue_Impl( UserOptToken nToken, ValueType const& rNewValue );
 };
 
 void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent 
const& rEvent)
@@ -153,9 +161,10 @@ SvtUserOptions::Impl::Impl() :
 }
 }
 
-OUString SvtUserOptions::Impl::GetToken (UserOptToken nToken) const
+template < typename ValueType >
+ValueType SvtUserOptions::Impl::GetValue_Impl (UserOptToken nToken) const
 {
-OUString sToken;
+ValueType sToken = ValueType();
 try
 {
 if (m_xData.is())
@@ -168,7 +177,8 @@ OUStr

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - Makefile.am

[Andras Timar]

 Makefile.am |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ec80b91ca9bc7d4d469a786314f7223a6c329eb6
Author: Andras Timar 
Date:   Tue Dec 19 08:35:32 2017 +0100

add scripts/unocommands.py to tarball

Change-Id: I548ff5c076a66281497f419574e2a21aaf073e75

diff --git a/Makefile.am b/Makefile.am
index 3bfb3fc8..0fc8900c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,7 +224,8 @@ EXTRA_DIST = discovery.xml \
  debian/loolwsd.postrm \
  etc/key.pem \
  etc/cert.pem \
- etc/ca-chain.cert.pem
+ etc/ca-chain.cert.pem \
+ scripts/unocommands.py
 
 if HAVE_LO_PATH
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: README.md

[Stephan Bergmann]

 README.md |4 
 1 file changed, 4 insertions(+)

New commits:
commit fa7b7f73938e837af2765f8a03f07e404046877b
Author: Stephan Bergmann 
Date:   Fri Dec 15 11:20:53 2017 +0100

Document that Clang 3.4.2 is known to be too old



"Clang baseline bump"

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

diff --git a/README.md b/README.md
index 7896ac44f326..475509abeac1 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,10 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: 11.0 (only support for newer i devices == 64 bit)
 * Build: Xcode 9.0 and iPhone SDK 11.1
 
+At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
+C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
+that it does not understand).
+
 If you want to use Clang with the LibreOffice compiler plugins, the minimal
 version of Clang is 3.4. Since Xcode doesn't provide the compiler plugin
 headers, you have to compile your own Clang to use them on macOS.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 extras/source/autocorr/emoji/emoji.ulf | 1767 +++--
 1 file changed, 1708 insertions(+), 59 deletions(-)

New commits:
commit 87ada8fe44c6caf21f1fd9a0f78aa2c26f1607f2
Author: László Németh 
Date:   Mon Dec 18 13:48:38 2017 +0100

Add emojis of Unicode 7, 8, 9 and 10

for translation of the new shortcodes,
(also fixing a few older ones).

Note: only translations are added to the autocorrection,
so there won't be untranslated strings in a non-en-US
autocorrection table.

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

diff --git a/extras/source/autocorr/emoji/emoji.ulf 
b/extras/source/autocorr/emoji/emoji.ulf
index f06b2e0a9fb1..929b4ac40bcf 100644
--- a/extras/source/autocorr/emoji/emoji.ulf
+++ b/extras/source/autocorr/emoji/emoji.ulf
@@ -4,6 +4,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
+
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
@@ -757,11 +758,11 @@ en-US = "star2"
 
 [LIGHTNING]
 x-comment = "☇ (U+02607), see http://wiki.documentfoundation.org/Emoji";
-en-US = "lighting"
+en-US = "lightning3"
 
 [THUNDERSTORM]
 x-comment = "☈ (U+02608), see http://wiki.documentfoundation.org/Emoji";
-en-US = "storm"
+en-US = "storm2"
 
 [SUN]
 x-comment = "☉ (U+02609), see http://wiki.documentfoundation.org/Emoji";
@@ -913,7 +914,7 @@ en-US = "Moon2"
 
 [MERCURY]
 x-comment = "☿ (U+0263F), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Mercury"
+en-US = "mercury"
 
 [FEMALE_SIGN]
 x-comment = "♀ (U+02640), see http://wiki.documentfoundation.org/Emoji";
@@ -921,7 +922,7 @@ en-US = "female"
 
 [EARTH]
 x-comment = "♁ (U+02641), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Earth"
+en-US = "earth"
 
 [MALE_SIGN]
 x-comment = "♂ (U+02642), see http://wiki.documentfoundation.org/Emoji";
@@ -929,71 +930,71 @@ en-US = "male"
 
 [JUPITER]
 x-comment = "♃ (U+02643), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Jupiter"
+en-US = "jupiter"
 
 [SATURN]
 x-comment = "♄ (U+02644), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Saturn"
+en-US = "saturn"
 
 [URANUS]
 x-comment = "♅ (U+02645), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Uranus"
+en-US = "uranus"
 
 [NEPTUNE]
 x-comment = "♆ (U+02646), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Neptune"
+en-US = "neptune"
 
 [PLUTO]
 x-comment = "♇ (U+02647), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Pluto"
+en-US = "pluto"
 
 [ARIES]
 x-comment = "♈ (U+02648), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Aries"
+en-US = "aries"
 
 [TAURUS]
 x-comment = "♉ (U+02649), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Taurus"
+en-US = "taurus"
 
 [GEMINI]
 x-comment = "♊ (U+0264A), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Gemini"
+en-US = "gemini"
 
 [CANCER]
 x-comment = "♋ (U+0264B), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Cancer"
+en-US = "cancer"
 
 [LEO]
 x-comment = "♌ (U+0264C), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Leo"
+en-US = "leo"
 
 [VIRGO]
 x-comment = "♍ (U+0264D), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Virgo"
+en-US = "virgo"
 
 [LIBRA]
 x-comment = "♎ (U+0264E), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Libra"
+en-US = "libra"
 
 [SCORPIUS]
 x-comment = "♏ (U+0264F), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Scorpius"
+en-US = "scorpius"
 
 [SAGITTARIUS]
 x-comment = "♐ (U+02650), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Sagittarius"
+en-US = "sagittarius"
 
 [CAPRICORN]
 x-comment = "♑ (U+02651), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Capricorn"
+en-US = "capricorn"
 
 [AQUARIUS]
 x-comment = "♒ (U+02652), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Aquarius"
+en-US = "aquarius"
 
 [PISCES]
 x-comment = "♓ (U+02653), see http://wiki.documentfoundation.org/Emoji";
-en-US = "Pisces"
+en-US = "pisces"
 
 [WHITE_CHESS_KING]
 x-comment = "♔ (U+02654), see http://wiki.documentfoundation.org/Emoji";
@@ -1153,11 +1154,11 @@ en-US = "dice6"
 
 [WHITE_FLAG]
 x-comment = "⚐ (U+02690), see http://wiki.documentfoundation.org/Emoji";
-en-US = "flag"
+en-US = "flag4"
 
 [BLACK_FLAG]
 x-comment = "⚑ (U+02691), see http://wiki.documentfoundation.org/Emoji";
-en-US = "flag2"
+en-US = "flag3"
 
 [HAMMER_AND_PICK]
 x-comment = "⚒ (U+02692), see http://wiki.documentfoundation.org/Emoji";
@@ -1293,7 +1294,7 @@ en-US = "pentagram"
 
 [BLACK_CROSS_ON_SHIELD]
 x-comment = "⛨ (U+026E8), see http://wiki.documentfoundation.org/Emoji";
-en-US = "shield"
+en-US = "shield2"
 
 [CHURCH]
 x-comment = "⛪ (U+026EA), see http://wiki.documentfoundation.org/Emoji";
@@ -1313,7 +1314