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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/popupmenu/colheader.xml |6 +-
 sc/uiconfig/scalc/popupmenu/rowheader.xml |6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c3a9a5cb958e37cc8dd7cde307d07c92453167ca
Author: andreas kainz 
AuthorDate: Fri Nov 2 00:02:12 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 2 07:32:45 2018 +0100

tdf#119713 Calc Contextmenu: row and col header update

Change-Id: I353cc4fff6ea48cf69bf1f25371c9ac70dd9b4c2
Reviewed-on: https://gerrit.libreoffice.org/62765
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/popupmenu/colheader.xml 
b/sc/uiconfig/scalc/popupmenu/colheader.xml
index 32650ff8b2fa..af0afeb7ed43 100644
--- a/sc/uiconfig/scalc/popupmenu/colheader.xml
+++ b/sc/uiconfig/scalc/popupmenu/colheader.xml
@@ -18,10 +18,14 @@
   
   
   
-  
   
   
   
   
   
+  
+  
+  
+  
+  
 
diff --git a/sc/uiconfig/scalc/popupmenu/rowheader.xml 
b/sc/uiconfig/scalc/popupmenu/rowheader.xml
index 3027b3003721..aa02292daf45 100644
--- a/sc/uiconfig/scalc/popupmenu/rowheader.xml
+++ b/sc/uiconfig/scalc/popupmenu/rowheader.xml
@@ -18,10 +18,14 @@
   
   
   
-  
   
   
   
   
   
+  
+  
+  
+  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/popupmenu/sheettab.xml |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit ca00509dfe59d3ba1ced995d3340101a45f370b9
Author: andreas kainz 
AuthorDate: Thu Nov 1 23:54:18 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 2 07:32:25 2018 +0100

tdf#119713 Calc Contextmenu: sheettab.xml update

Change-Id: Id5724783be913d81d04bf6de218bc63133adf393
Reviewed-on: https://gerrit.libreoffice.org/62764
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/popupmenu/sheettab.xml 
b/sc/uiconfig/scalc/popupmenu/sheettab.xml
index fea1a32da913..4bfaf376552f 100644
--- a/sc/uiconfig/scalc/popupmenu/sheettab.xml
+++ b/sc/uiconfig/scalc/popupmenu/sheettab.xml
@@ -8,24 +8,20 @@
  *
 -->
 http://openoffice.org/2001/menu";>
-  
-  
-  
-  
   
   
   
   
+  
+  
   
-  
   
-  
-  
-  
-  
   
   
   
-  
-  
+  
+  
+  
+  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/gallery2/galbrws2.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1cc819c340885aebd9a8031f34e405a9f689db83
Author: Jim Raykowski 
AuthorDate: Thu Nov 1 13:23:22 2018 -0800
Commit: Noel Grandin 
CommitDate: Fri Nov 2 07:22:52 2018 +0100

Don't use ToolBox::KeyInput for escape key press in GalleryToolBox

GalleryToolBox is used in the Gallery deck/panel in the sidebar.
Guidelines for keyboard navigation in the sidebar are that Escape from
content moves focus to content panel title or in absence of panel title
to the deck title or if sidebar is floating and the deck has only one
panel move focus to the tab bar settings menu button. This patch removes
ToolBox key input method from being used to handle escape key input in
GalleryToolBox. This allows sidebar focus manger to provide the correct
behavior.

Change-Id: Iaf6fb404aae784b1119b5477948c4edb674a972a
Reviewed-on: https://gerrit.libreoffice.org/62768
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3f045541d924..1337951b9894 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -364,7 +364,10 @@ GalleryToolBox::GalleryToolBox( GalleryBrowser2* pParent ) 
:
 void GalleryToolBox::KeyInput( const KeyEvent& rKEvt )
 {
 if( !static_cast< GalleryBrowser2* >( GetParent() )->KeyInput( rKEvt, this 
) )
-ToolBox::KeyInput( rKEvt );
+{
+if( KEY_ESCAPE != rKEvt.GetKeyCode().GetCode() )
+ToolBox::KeyInput(rKEvt);
+}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 android/source/src/java/org/libreoffice/FontController.java  |5 -
 android/source/src/java/org/libreoffice/InvalidationHandler.java |6 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 2f88877af05e1a277f68b07faabba0ccc3d86b3b
Author: Mert Tumer 
AuthorDate: Thu Nov 1 19:49:35 2018 +0300
Commit: Gülşah Köse 
CommitDate: Fri Nov 2 07:03:27 2018 +0100

[Pardus] fix highlight color in Presentation On Android

This patch is sponsored by ULAKBIM/Pardus project.
Signed-off-by: Mert Tumer 

Change-Id: Ic56991b2957be91822d040d776a3dfcef2d5b451
Reviewed-on: https://gerrit.libreoffice.org/62753
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/android/source/src/java/org/libreoffice/FontController.java 
b/android/source/src/java/org/libreoffice/FontController.java
index 250a67bbd8c9..1ac8fd6cf90f 100644
--- a/android/source/src/java/org/libreoffice/FontController.java
+++ b/android/source/src/java/org/libreoffice/FontController.java
@@ -160,7 +160,10 @@ public class FontController implements 
AdapterView.OnItemSelectedListener {
 if(mActivity.isSpreadsheet()){
 json.put("BackgroundColor", valueJson);
 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, 
".uno:BackgroundColor", json.toString()));
-} else {
+}else if(mActivity.getTileProvider().isPresentation()){
+json.put("CharBackColor", valueJson);
+LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, 
".uno:CharBackColor", json.toString()));
+}else {
 json.put("BackColor", valueJson);
 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, 
".uno:BackColor", json.toString()));
 }
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index 0f72e7272004..436b5c513c3b 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -320,7 +320,11 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 
mContext.getFormattingController().onToggleStateChanged(Document.NUMBERED_LIST, 
pressed);
 } else if (parts[0].equals(".uno:Color")) {
 
mContext.getFontController().colorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
-} else if (parts[0].equals(".uno:BackColor")) {
+} else if (mContext.getTileProvider().isTextDocument() && 
parts[0].equals(".uno:BackColor")) {
+
mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
+} else if (mContext.getTileProvider().isPresentation() && 
parts[0].equals(".uno:CharBackColor")) {
+
mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
+} else if (mContext.getTileProvider().isSpreadsheet() && 
parts[0].equals(".uno:BackgroundColor")) {
 
mContext.getFontController().backColorPaletteListener.updateColorPickerPosition(Integer.parseInt(value));
 } else if (parts[0].equals(".uno:StatePageNumber")) {
 // get the total page number and compare to the current value and 
update accordingly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source bridges/inc bridges/source chart2/source cli_ure/source codemaker/source configmgr/source connectivity/source dbaccess/source desktop/source dtrans/source

[Libreoffice Gerrit user]

 basctl/source/basicide/breakpoint.hxx  |2 -
 bridges/inc/bridge.hxx |4 +-
 bridges/inc/cppinterfaceproxy.hxx  |4 +-
 bridges/inc/unointerfaceproxy.hxx  |4 +-
 bridges/inc/vtablefactory.hxx  |4 +-
 bridges/source/jni_uno/jni_base.h  |   12 
+++---
 chart2/source/controller/accessibility/AccessibleViewForwarder.hxx |4 +-
 chart2/source/inc/ExplicitCategoriesProvider.hxx   |4 +-
 cli_ure/source/uno_bridge/cli_base.h   |4 +-
 codemaker/source/cppumaker/includes.hxx|4 +-
 codemaker/source/javamaker/classfile.hxx   |8 ++--
 configmgr/source/dconf.cxx |   20 
+-
 connectivity/source/inc/java/ContextClassLoader.hxx|4 +-
 connectivity/source/inc/java/LocalRef.hxx  |4 +-
 connectivity/source/inc/java/lang/Object.hxx   |8 ++--
 dbaccess/source/core/inc/DatabaseDataProvider.hxx  |4 +-
 desktop/source/app/officeipcthread.cxx |4 +-
 desktop/source/deployment/gui/dp_gui_dependencydialog.hxx  |4 +-
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx |4 +-
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx  |8 ++--
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx   |4 +-
 desktop/source/deployment/manager/dp_activepackages.hxx|4 +-
 dtrans/source/win32/dnd/target.hxx |4 +-
 emfio/inc/mtftools.hxx |4 +-
 framework/inc/services/uriabbreviation.hxx |4 +-
 include/codemaker/exceptiontree.hxx|8 ++--
 include/codemaker/generatedtypeset.hxx |4 +-
 include/comphelper/asyncnotification.hxx   |4 +-
 include/editeng/swafopt.hxx|2 -
 include/jvmaccess/unovirtualmachine.hxx|4 +-
 include/jvmaccess/virtualmachine.hxx   |8 ++--
 include/registry/writer.hxx|4 +-
 include/sfx2/basedlgs.hxx  |   12 
+++---
 include/sfx2/dockwin.hxx   |4 +-
 include/sfx2/printer.hxx   |2 -
 include/sfx2/tbxctrl.hxx   |4 +-
 include/svtools/editbrowsebox.hxx  |4 +-
 include/svtools/javacontext.hxx|4 +-
 include/svx/sdr/table/tablecontroller.hxx  |4 +-
 include/svx/tbxcolorupdate.hxx |4 +-
 include/unoidl/unoidl.hxx  |4 +-
 include/unotools/options.hxx   |4 +-
 include/vcl/uitest/uiobject.hxx|4 +-
 include/vcl/vclevent.hxx   |8 ++--
 include/xmloff/SchXMLExportHelper.hxx  |4 +-
 include/xmloff/prstylei.hxx|4 +-
 include/xmloff/txtparae.hxx|2 -
 include/xmloff/xmlimppr.hxx|4 +-
 include/xmloff/xmlstyle.hxx|4 +-
 jvmfwk/inc/elements.hxx|4 +-
 linguistic/source/gciterator.hxx   |4 +-
 lotuswordpro/inc/xfilter/xffontfactory.hxx |2 -
 oox/source/shape/ShapeContextHandler.hxx   |4 +-
 registry/source/reflread.hxx   |4 +-
 registry/source/reflwrit.hxx   |4 +-
 reportdesign/inc/PropertyForward.hxx   |4 +-
 reportdesign/inc/RptObject.hxx |4 +-
 reportdesign/inc/UndoActions.hxx   |4 +-
 reportdesign/source/core/inc/ReportControlModel.hxx|4 +-
 reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx|4 +-
 reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx|4 +-
 reportdesign/source/ui/inc/DataProviderHandler.hxx |4 +-
 reportdesign/source/ui/inc/DesignView.hxx  |4 +-
 reportdesign/source/ui/inc/EndMarker.hxx  

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

[Libreoffice Gerrit user]

 android/source/src/java/org/libreoffice/FormattingController.java |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ec1f722caedbeb04f96258f23442f8ee92a42be
Author: Mert Tumer 
AuthorDate: Thu Nov 1 20:11:37 2018 +0300
Commit: Gülşah Köse 
CommitDate: Fri Nov 2 07:02:28 2018 +0100

[Pardus] fix missing break in switch case on Android

missing break causes bug on buttons on Formatting tab
This patch is sponsored by ULAKBIM/Pardus project.
Signed-off-by: Mert Tumer 

Change-Id: I8a20b542aa319591e9dea5591ed554954222d690
Reviewed-on: https://gerrit.libreoffice.org/62756
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/android/source/src/java/org/libreoffice/FormattingController.java 
b/android/source/src/java/org/libreoffice/FormattingController.java
index 63b4cc53ad35..20a5cf3b7944 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -141,10 +141,11 @@ class FormattingController implements 
View.OnClickListener {
 break;
 case R.id.button_insert_picture:
 insertPicture();
+break;
 case R.id.button_insert_table:
 insertTable();
 break;
-case R.id.button_delete_table:
+case R.id.button_delete_table:
 deleteTable();
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 android/source/src/java/org/libreoffice/ui/FileUtilities.java |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit fb5b8c524ea793638d2db6bf884553e728ac6a55
Author: Mert Tumer 
AuthorDate: Thu Nov 1 19:59:13 2018 +0300
Commit: Gülşah Köse 
CommitDate: Fri Nov 2 07:01:25 2018 +0100

[Pardus] removed ignore hidden files on Android

ignore hidden files statment is obsolete because
we put option on settings whether they are shown or not
This patch is sponsored by ULAKBIM/Pardus project.
Signed-off-by: Mert Tumer 

Change-Id: Ibba7ed76c20a189cff04e330a4493b3e84e5dba2
Reviewed-on: https://gerrit.libreoffice.org/62754
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java 
b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
index 44a9ac0b4c2c..7a58486004cd 100644
--- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java
+++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
@@ -166,9 +166,6 @@ public class FileUtilities {
 if (filename == null)
 return false;
 
-if (byMode == ALL && byFilename.equals("")) {
-return !filename.startsWith("."); //ignore hidden files
-}
 // check extension
 if (byMode != ALL) {
 if (mExtnMap.get (getExtension (filename)) != byMode)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 android/source/res/values-tr/strings.xml |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit cb08cddf8af6f093e3084c62c6f5cbda5d889c1d
Author: Gulsah Kose 
AuthorDate: Fri Nov 2 07:18:12 2018 +0300
Commit: Gülşah Köse 
CommitDate: Fri Nov 2 07:00:42 2018 +0100

[Pardus] language improvements on Android

This patch is sponsored by ULAKBIM/Pardus project.

Change-Id: Ia890f8c3f8d638beb4c06bf1c73d49f7b0fac72a
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/62769
Tested-by: Jenkins

diff --git a/android/source/res/values-tr/strings.xml 
b/android/source/res/values-tr/strings.xml
index 518780657a40..bb914081c749 100644
--- a/android/source/res/values-tr/strings.xml
+++ b/android/source/res/values-tr/strings.xml
@@ -20,7 +20,7 @@
 Yeni Sunum
 Yeni Hesap Tablosu
 Yeni Çizim
-başlıksız
+adsız
 
 LibreOffice Tarayıcı
 Ara
@@ -39,7 +39,7 @@
 Alfabetik Sırala
 Tarihe Göre Sırala
 Seçenekler
-fileicon
+dosya_simgesi
 Son açılan dosyalar
 Tüm dosyalar
 
@@ -48,7 +48,7 @@
 Dosya Gezgini Ayarları
 Genel
 Deneysel Mod
-Deneysel editleme modunu 
etkinleştirin. Kullanım riski size aittir.
+Deneysel düzenleme modunu 
etkinleştirin. Kullanım riski size aittir.
 Gizli Dosyalar ve Dizinler
 Gizli dosyalar ve dizinleri 
göstermeyi etkinleştir.
 Geliştirici Modu
@@ -95,14 +95,14 @@
 Kaydet
 Biçimlendirmeyi etkinleştir.
 Ara
-UNO Komutu yolla
+UNO komutu yolla
 
 
 Kaydetme tamamlandı.
 Belge kaydediliyor…
 Kayıt tamamlanmadı. Değişiklik 
yapıldı mı?
-"Yeni dosya yaratıldı - "
-Yeni dosya yaratma başarısız. Lütfen 
dosya ismini kontrol ediniz.
+"Yeni dosya oluşturuldu - "
+Yeni dosya oluşturma başarısız. 
Lütfen dosya ismini kontrol ediniz.
 
 
 Depolama sağlayıcısı 
ayarları
@@ -214,12 +214,12 @@
 Karakter
 Paragraf
 Ekle
-Stil
+Biçim
 Tamam
 İptal
 Daha fazla ilerlenemiyor.
 Şuan ki UNO komutu
-Dosyaların nasıl sıralanacağını seçiniz. 
A-Z, Z-A yada boyutsal.
+Dosyaların nasıl sıralanacağını seçiniz. 
A-Z, Z-A ya da boyuta göre.
 Dosyaları grid veya liste şeklinde 
görüntüle.
 Dosya Gezgini
 Dosya Sıralaması
@@ -227,16 +227,16 @@
 Varsayılan dosya filtrelemesini 
seç
 Uygulama Dili
 Varsayılan dili değiştir
-Unable to export to pdf
-Exported to PDF at
-Your device does not support 
printing
+Pdf dışa aktarılamıyor.
+Şu konumda pdf'e aktarıldı: 
+Cihazınız yazdırmayı 
desteklemiyor.
 Hata
 Bölüm ismi girin.
 Bmp boş!
 Dizin kaydedilmedi.
 Sayfa
 Tablo
-Slide
+Slayt
 Bölüm
 Vurgulama Rengi
 Metin Rengi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source

[Libreoffice Gerrit user]

 include/test/container/xenumerationaccess.hxx|   
34 ++
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv   |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAutoFormatObj.csv  |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv|
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv  |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTablesObj.csv |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDatabaseRangesObj.csv  |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFunctionListObj.csv|
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScLabelRangesObj.csv |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScScenariosObj.csv   |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv |
2 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableConditionalFormat.csv |
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetsObj.csv |
1 
 sc/qa/extras/scannotationsobj.cxx|
7 +-
 sc/qa/extras/scarealinksobj.cxx  |
7 +-
 sc/qa/extras/scautoformatobj.cxx |
9 ++
 sc/qa/extras/sccellobj.cxx   |
5 +
 sc/qa/extras/sccellrangesobj.cxx |
5 +
 sc/qa/extras/scdatabaserangesobj.cxx |
8 ++
 sc/qa/extras/scdatapilottablesobj.cxx|
8 ++
 sc/qa/extras/scfunctionlistobj.cxx   |
8 ++
 sc/qa/extras/sclabelrangesobj.cxx|
8 ++
 sc/qa/extras/scscenariosobj.cxx  |
8 ++
 sc/qa/extras/scsubtotaldescriptorbaseobj.cxx |   
10 ++
 sc/qa/extras/sctableconditionalformatobj.cxx |
8 ++
 sc/qa/extras/sctablesheetsobj.cxx|
9 ++
 sc/qa/extras/sctabviewobj.cxx|
5 +
 test/Library_subsequenttest.mk   |
1 
 test/source/container/xenumerationaccess.cxx |   
32 +
 31 files changed, 159 insertions(+), 28 deletions(-)

New commits:
commit 9329d18235d21a00dbc724ba3251e95fbb675588
Author: Rahul Gurung 
AuthorDate: Sat Oct 13 00:18:58 2018 +0530
Commit: Markus Mohrhard 
CommitDate: Fri Nov 2 06:29:58 2018 +0100

tdf#45904 Move _XEnumerationAccess Java Tests to C++

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

diff --git a/include/test/container/xenumerationaccess.hxx 
b/include/test/container/xenumerationaccess.hxx
new file mode 100644
index ..272172c8d519
--- /dev/null
+++ b/include/test/container/xenumerationaccess.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+* 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/.
+*/
+
+#ifndef INCLUDED_TEST_CONTAINER_XENUMERATIONACCESS_HXX
+#define INCLUDED_TEST_CONTAINER_XENUMERATIONACCESS_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XEnumerationAccess
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testCreateEnumeration();
+
+protected:
+~XEnumerationAccess() {}
+};
+}
+
+#endif // INCLUDED_TEST_CONTAINER_XENUMERATIONACCESS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
index 09c3b94d5afd..1a785cf0f365 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationsObj.csv
@@ -2,4 +2,3 @@
 "ScAnnotationsObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
 
"ScAnnotationsObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScAnnotationsObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScAnnotationsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAreaLinksObj.csv 
b/qadevOOo/objds

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

[Libreoffice Gerrit user]

 sc/inc/editutil.hxx   |   42 +++---
 sc/source/core/tool/editutil.cxx  |6 ++---
 sc/source/filter/rtf/eeimpars.cxx |2 -
 sc/source/ui/app/transobj.cxx |2 -
 sc/source/ui/view/viewfun2.cxx|2 -
 sc/source/ui/view/viewfun4.cxx|2 -
 sc/source/ui/view/viewfunc.cxx|2 -
 7 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 68af083f9a8e3904aa3c341da5c598212da68f6f
Author: Paul Trojahn 
AuthorDate: Sat Oct 27 14:52:42 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Nov 2 06:22:33 2018 +0100

tdf#115317 Fix empty url representation

ScTabEditEngine doesn't override CalcFieldValue, so the function in
EditEngine returns a single space as representation. By inheriting from
ScFieldEditEngine the representation is calculated correctly.

Change-Id: I6f3be8bd2c3936acf9f3d082c25c080bd3cbee76
Reviewed-on: https://gerrit.libreoffice.org/62428
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 8d4a8a9fc282..a6d96ef73c49 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -171,15 +171,33 @@ public:
 voidRepeatDefaults();
 };
 
+// for field commands (or just fields?) in a table
+class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter
+{
+private:
+ScDocument* const mpDoc;
+bool bExecuteURL;
+
+public:
+ScFieldEditEngine(
+ScDocument* pDoc, SfxItemPool* pEnginePool, SfxItemPool* 
pTextObjectPool = nullptr,
+bool bDeleteEnginePool = false);
+
+void SetExecuteURL(bool bSet){ bExecuteURL = bSet; }
+
+virtual voidFieldClicked( const SvxFieldItem& rField, sal_Int32, 
sal_Int32 ) override;
+virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 
nPara, sal_Int32 nPos, boost::optional& rTxtColor, 
boost::optional& rFldColor ) override;
+};
+
 // 1/100 mm
-class SC_DLLPUBLIC ScTabEditEngine : public ScEditEngineDefaulter
+class SC_DLLPUBLIC ScTabEditEngine : public ScFieldEditEngine
 {
 private:
 voidInit(const ScPatternAttr& rPattern);
 public:
 ScTabEditEngine( ScDocument* pDoc );// Default
-ScTabEditEngine( const ScPatternAttr& rPattern,
-SfxItemPool* pEnginePool,
+ScTabEditEngine(const ScPatternAttr& rPattern,
+SfxItemPool *pEngineItemPool, ScDocument *pDoc,
 SfxItemPool* pTextObjectPool = nullptr );
 };
 
@@ -197,24 +215,6 @@ struct ScHeaderFieldData
 ScHeaderFieldData();
 };
 
-// for field commands (or just fields?) in a table
-class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter
-{
-private:
-ScDocument* const mpDoc;
-bool bExecuteURL;
-
-public:
-ScFieldEditEngine(
-ScDocument* pDoc, SfxItemPool* pEnginePool, SfxItemPool* 
pTextObjectPool = nullptr,
-bool bDeleteEnginePool = false);
-
-void SetExecuteURL(bool bSet){ bExecuteURL = bSet; }
-
-virtual voidFieldClicked( const SvxFieldItem& rField, sal_Int32, 
sal_Int32 ) override;
-virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 
nPara, sal_Int32 nPos, boost::optional& rTxtColor, 
boost::optional& rFldColor ) override;
-};
-
 // for headers/footers with fields
 class SC_DLLPUBLIC ScHeaderEditEngine : public ScEditEngineDefaulter
 {
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 78c46e5f76cc..7b2b7c864d2f 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -694,15 +694,15 @@ void ScEditEngineDefaulter::RemoveParaAttribs()
 }
 
 ScTabEditEngine::ScTabEditEngine( ScDocument* pDoc )
-: ScEditEngineDefaulter( pDoc->GetEnginePool() )
+: ScFieldEditEngine( pDoc, pDoc->GetEnginePool() )
 {
 SetEditTextObjectPool( pDoc->GetEditPool() );
 Init(pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN));
 }
 
 ScTabEditEngine::ScTabEditEngine( const ScPatternAttr& rPattern,
-SfxItemPool* pEnginePoolP, SfxItemPool* pTextObjectPool )
-: ScEditEngineDefaulter( pEnginePoolP )
+SfxItemPool* pEngineItemPool, ScDocument* pDoc, SfxItemPool* 
pTextObjectPool )
+: ScFieldEditEngine( pDoc, pEngineItemPool, pTextObjectPool )
 {
 if ( pTextObjectPool )
 SetEditTextObjectPool( pTextObjectPool );
diff --git a/sc/source/filter/rtf/eeimpars.cxx 
b/sc/source/filter/rtf/eeimpars.cxx
index da23becae30c..0cfc8456cd97 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -68,7 +68,7 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& 
rRange ) :
 {
 const ScPatternAttr* pPattern = mpDoc->GetPattern(
 maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
-mpEngine.reset( new ScTabEditEngine(*pPattern, mpDoc->GetEditPool(), 
mpDoc->GetEditPool()) );
+mpEngine.reset( new ScTabEditEngine(*pPattern, mpDoc-

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

[Libreoffice Gerrit user]

 offapi/com/sun/star/rendering/XCanvas.idl |   24 
 1 file changed, 4 insertions(+), 20 deletions(-)

New commits:
commit 7d571ce7956d843c4f7ef442abc736b5b0c74c08
Author: Mark Hung 
AuthorDate: Mon Oct 29 21:02:09 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Nov 2 06:14:17 2018 +0100

offapi: update XCanvas::createFont parameter description.

Recognized parameters of aExtraFontProperties were not implemented as
documented. Update the document to reflect current implementation.

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

diff --git a/offapi/com/sun/star/rendering/XCanvas.idl 
b/offapi/com/sun/star/rendering/XCanvas.idl
index 28e2a8fe232e..e393854b756b 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -464,26 +464,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 @param aExtraFontProperties
 Additional font properties to be applied when selecting this
 font. Normally, you should not need this parameter. Currently,
-the following properties are recognized:
-
--   Kerning: a double between 0 and 1, where
-0 completely disables kerning. Whether kerning is on or
-off by default is font-dependent.
-
--   IsEmphasisMarks: a boolean, where `TRUE`
-enables automatic placements of emphasis marks, e.g. for
-Hebrew. The default value, if this property is not
-specified, is `FALSE`.
-
--   ExpandedSpacing: a double value which is added
-between all cell distances for this font. The default value for
-this property is zero. Use negative values for condensed output,
-and positive values for expanded output.
-
--   OptionalLayoutFeatures: a sequence of
-::com::sun::star::beans::PropertyValue listing
-font-specific optional layout features, like glyph
-variants.
+the following property is recognized:
+
+-   EmphasisMark: long integer that represents the emphasis mark.
+@see ::com::sun::star::awt::FontEmphasisMark
 
 @param aFontMatrix
 Font-specific transformation matrix, which affects both the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 extras/source/gallery/arrows/A25-CurvedArrow-DarkBlue.svg |  123 +-
 1 file changed, 122 insertions(+), 1 deletion(-)

New commits:
commit 872f6652b3a04e5aace520d0cff91262cdf4cff4
Author: andreas kainz 
AuthorDate: Wed Oct 24 17:26:28 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Nov 2 06:08:29 2018 +0100

tdf#120038 Fix broken svg galler arrow A25

Change-Id: I833e4d7bddec89d83ea09fbf677c818988c149ce
Reviewed-on: https://gerrit.libreoffice.org/62312
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 8e8d89b27167a524d7e591d00e5d1ed20288c964)
Reviewed-on: https://gerrit.libreoffice.org/62514
Tested-by: Xisco Faulí 
Reviewed-by: Markus Mohrhard 

diff --git a/extras/source/gallery/arrows/A25-CurvedArrow-DarkBlue.svg 
b/extras/source/gallery/arrows/A25-CurvedArrow-DarkBlue.svg
index ff85f8dd7117..68d6d9f8eaab 100644
--- a/extras/source/gallery/arrows/A25-CurvedArrow-DarkBlue.svg
+++ b/extras/source/gallery/arrows/A25-CurvedArrow-DarkBlue.svg
@@ -1 +1,122 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   enable-background="new 0 0 90.958 92.554"
+   height="92.554"
+   viewBox="0 0 90.958 92.554"
+   width="90.958"
+   version="1.1"
+   id="svg30"
+   sodipodi:docname="A25-CurvedArrow-DarkBlue.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+
+  
+  
+
+
+  
+  
+
+
+  
+
+  
+
+
+  
+  
+
+  
+  
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/tabpages/tparea.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 925d71995028dd0fa7fe0e120a8cf6a26960641b
Author: Tamás Zolnai 
AuthorDate: Thu Nov 1 12:59:11 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Fri Nov 2 06:06:11 2018 +0100

tdf#121083: EDITOR UI Hatch background color not read back from editor

Reviewed-on: https://gerrit.libreoffice.org/62735
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 56d799764d394c906936f7a042dfd3e4219d7063)

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

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index dbceed157716..a922ed1b0b78 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -201,6 +201,8 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
 case drawing::FillStyle_HATCH:
 {
 m_rXFSet.Put( rSet.Get(XATTR_FILLHATCH) );
+m_rXFSet.Put( rSet.Get(XATTR_FILLBACKGROUND) );
+m_rXFSet.Put( rSet.Get(XATTR_FILLCOLOR) );
 SelectFillTypeHdl_Impl( m_pBtnHatch );
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 external/libepubgen/UnpackedTarball_libepubgen.mk |1 
 external/libepubgen/tdf-120491.patch  |   33 ++
 2 files changed, 34 insertions(+)

New commits:
commit a9b3f8ca95bffe3617da914be99d0ffddb2896ba
Author: Miklos Vajna 
AuthorDate: Wed Oct 24 09:25:35 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Nov 2 06:05:21 2018 +0100

tdf#120491 EPUB export: fix IngramSpark validator error

(cherry picked from commit 548e60a8c47e270aba79a5f4e5911cbb35462814)

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

diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk 
b/external/libepubgen/UnpackedTarball_libepubgen.mk
index 14efadb337c0..7553e825284f 100644
--- a/external/libepubgen/UnpackedTarball_libepubgen.mk
+++ b/external/libepubgen/UnpackedTarball_libepubgen.mk
@@ -8,6 +8,7 @@
 #
 
 epubgen_patches :=
+epubgen_patches += tdf-120491.patch
 
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
diff --git a/external/libepubgen/tdf-120491.patch 
b/external/libepubgen/tdf-120491.patch
new file mode 100644
index ..2a02a66e4808
--- /dev/null
+++ b/external/libepubgen/tdf-120491.patch
@@ -0,0 +1,33 @@
+From 92760e4b0b8da126029c5ff858ebec27df4acfa8 Mon Sep 17 00:00:00 2001
+Subject: [PATCH] tdf#120491 EPUBHTMLGenerator: remove not needed 
+
+IngramSpark flags this as an error, and not writing it still passes
+epubcheck.
+---
+ src/lib/EPUBHTMLGenerator.cpp | 7 +--
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
+index a950ea5..f6c2527 100644
+--- src/lib/EPUBHTMLGenerator.cpp
 src/lib/EPUBHTMLGenerator.cpp
+@@ -579,14 +579,9 @@ void EPUBHTMLGenerator::endDocument()
+ m_impl->m_document.openElement("title", RVNGPropertyList());
+ m_impl->m_document.closeElement("title");
+   }
+-  RVNGPropertyList metaAttrs;
+-  metaAttrs.insert("http-equiv", "content-type");
+-  metaAttrs.insert("content", "text/html; charset=UTF-8");
+-  m_impl->m_document.openElement("meta", metaAttrs);
+-  m_impl->m_document.closeElement("meta");
+   if (m_impl->m_version >= 30 && m_impl->m_layoutMethod == 
EPUB_LAYOUT_METHOD_FIXED)
+   {
+-metaAttrs.clear();
++RVNGPropertyList metaAttrs;
+ metaAttrs.insert("name", "viewport");
+ std::stringstream content;
+ if (const librevenge::RVNGProperty *pageWidth = 
m_impl->m_actualPageProperties["fo:page-width"])
+-- 
+2.16.4
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: examples/simple include/cppunit

[Libreoffice Gerrit user]

 examples/simple/ExampleTestCase.cpp   |   15 +++
 include/cppunit/extensions/HelperMacros.h |   23 +++
 2 files changed, 38 insertions(+)

New commits:
commit 48145587c4c2dc4f1e07d83073e136336c81ce79
Author: Miklos Vajna 
AuthorDate: Fri Oct 12 21:34:07 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Nov 2 06:03:13 2018 +0100

extensions: add CPPUNIT_TEST_FIXTURE()

This is similar to googletest's TEST_F() macro, allows to avoid spelling
out the test name in a suite only once, not 3 times.

Change-Id: I90804d271d046d8158678617d8db75ed6ca7c420
Reviewed-on: https://gerrit.libreoffice.org/61732
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/examples/simple/ExampleTestCase.cpp 
b/examples/simple/ExampleTestCase.cpp
index c45109f..823a8df 100644
--- a/examples/simple/ExampleTestCase.cpp
+++ b/examples/simple/ExampleTestCase.cpp
@@ -45,3 +45,18 @@ void ExampleTestCase::testEquals()
   CPPUNIT_ASSERT_EQUAL( 12, 13 );
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 12.0, 11.99, 0.5 );
 }
+
+class FixtureTest : public CPPUNIT_NS::TestFixture
+{
+};
+
+CPPUNIT_TEST_FIXTURE(FixtureTest, testEquals)
+{
+  CPPUNIT_ASSERT_EQUAL( 12, 12 );
+}
+
+CPPUNIT_TEST_FIXTURE(FixtureTest, testAdd)
+{
+  double result = 2.0 + 2.0;
+  CPPUNIT_ASSERT( result == 4.0 );
+}
diff --git a/include/cppunit/extensions/HelperMacros.h 
b/include/cppunit/extensions/HelperMacros.h
index 4c30319..34be2ca 100644
--- a/include/cppunit/extensions/HelperMacros.h
+++ b/include/cppunit/extensions/HelperMacros.h
@@ -240,6 +240,29 @@ public:
   \
   private: /* dummy typedef so that the macro can still end with ';'*/ 
\
 typedef int CppUnitDummyTypedefForSemiColonEnding__
 
+/*! \brief Define test suite with a single test.
+ *
+ * This macro declares a new test suite with a single test and a single parent
+ * class.  Use CPPUNIT_TEST_SUITE(), CPPUNIT_TEST() and
+ * CPPUNIT_TEST_SUITE_END() instead if you wish to include more tests in the
+ * suite. The benefit of using this macro is that you don't have to declare,
+ * register and define your test name manually, so you don't repeat yourself.
+ *
+ * \param TestClass Base class. This type \b MUST be derived from TestFixture.
+ * \param TestName Name of the test.
+ * \see CPPUNIT_TEST_SUITE, CPPUNIT_TEST, CPPUNIT_TEST_SUITE_END
+ */
+#define CPPUNIT_TEST_FIXTURE(TestClass, TestName)  
\
+class TestName : public TestClass  
\
+{  
\
+public:
\
+void TestBody();   
\
+CPPUNIT_TEST_SUITE(TestName);  
\
+CPPUNIT_TEST(TestBody);
\
+CPPUNIT_TEST_SUITE_END();  
\
+}; 
\
+CPPUNIT_TEST_SUITE_REGISTRATION(TestName); 
\
+void TestName::TestBody()
 
 /*! \brief Add a test to the suite (for custom test macro).
  *
___
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' - 2 commits - loolwsd-systemplate-setup

[Libreoffice Gerrit user]

 loolwsd-systemplate-setup |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d861ccb30ce9bf78a76ed6deea4fe14eb22fc5bc
Author: Andras Timar 
AuthorDate: Thu Nov 1 17:20:10 2018 +0100
Commit: Aron Budea 
CommitDate: Fri Nov 2 05:11:57 2018 +0100

systemplate: without /etc/nsswitch.conf, /etc/hosts is not read

Change-Id: Id2bee15425f65064db3125042108a8d0f78fa384
Reviewed-on: https://gerrit.libreoffice.org/62745
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index c1ff66781..5fbeeb12a 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -22,7 +22,7 @@ cd / || exit 1
 
 # First essential files and shared objects
 find etc/passwd etc/group etc/hosts \
- etc/resolv.conf \
+ etc/resolv.conf etc/nsswitch.conf \
  lib/ld-* lib64/ld-* \
  lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
  lib/libattr* lib/*-linux-gnu/libattr* \
commit 0e74617c26f53786f8fd0331a26bf5ff3fafacde
Author: Andras Timar 
AuthorDate: Tue Oct 30 21:17:53 2018 +0100
Commit: Aron Budea 
CommitDate: Fri Nov 2 05:11:43 2018 +0100

/etc/resolv.conf can be a symlink

Change-Id: I23396e598306b7c8ab1498962ab5c09150c6795b
Reviewed-on: https://gerrit.libreoffice.org/62670
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 56ca87d20..c1ff66781 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -42,6 +42,7 @@ find etc/passwd etc/group etc/hosts \
 -type f
 
 find etc/fonts \
+ etc/resolv.conf \
  lib/ld-* lib64/ld-* \
  lib/libnss_* lib64/libnss_* lib/*-linux-gnu/libnss*\
  lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
___
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' - 2 commits - loleaflet/dist loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/dist/toolbar/toolbar.js |4 ++--
 loleaflet/src/control/Control.Tabs.js |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 07d865704e6c8b32bdda8489cef7aeafe6c3bb9b
Author: Andras Timar 
AuthorDate: Thu Nov 1 10:25:58 2018 +0100
Commit: Aron Budea 
CommitDate: Fri Nov 2 05:11:34 2018 +0100

Font size dropdown placeholder string 'Size' and its translations were too 
long and did not fit

Change-Id: I7950f2411f5f148043390277566b0ecd15961085
Reviewed-on: https://gerrit.libreoffice.org/62720
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index e7b4ed8b4..9833cfc91 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -805,7 +805,7 @@ function updateFontSizeList(font) {
data = 
data.concat(map.getToolbarCommandValues('.uno:CharFontName')[font]);
$('.fontsizes-select').select2({
data: data,
-   placeholder: _('Size'),
+   placeholder: ' ',
//Allow manually entered font size.
createTag: function(query) {
return {
@@ -1405,7 +1405,7 @@ function updateCommandValues() {
 
if ($('.fontsizes-select option').length === 0) {
$('.fontsizes-select').select2({
-   placeholder: _('Size'),
+   placeholder: ' ',
data: []
});
 
commit 431b307986cbd71ace4ee5894b606705f1e7dcb8
Author: Andras Timar 
AuthorDate: Thu Nov 1 11:21:30 2018 +0100
Commit: Aron Budea 
CommitDate: Fri Nov 2 05:11:22 2018 +0100

loleaflet: Rename Sheet dialog should have the current sheet name in input 
box

Change-Id: I944d4781d551ddb5212bd162935719897f121513
Reviewed-on: https://gerrit.libreoffice.org/62727
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 76e2f946e..d38f13f74 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -63,7 +63,7 @@ L.Control.Tabs = L.Control.extend({
var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);

vex.dialog.open({

message: _('Enter new sheet name'),
-   input: 
'',
+   input: 
'',

callback: function(data) {

map.renamePage(data.sheetname, nPos);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 android/source/res/layout/toolbar_bottom.xml   
   |4 +-
 android/source/res/values-tr/strings.xml   
   |   19 --
 android/source/res/values/arrays.xml   
   |4 +-
 android/source/res/values/strings.xml  
   |   13 ++
 android/source/src/java/org/libreoffice/FormattingController.java  
   |4 +-
 android/source/src/java/org/libreoffice/LOKitTileProvider.java 
   |   16 
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java   
   |6 +--
 android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java   
   |3 +
 
android/source/src/java/org/libreoffice/storage/external/BrowserSelectorActivity.java
 |3 +
 android/source/src/java/org/libreoffice/ui/PageView.java   
   |2 -
 10 files changed, 52 insertions(+), 22 deletions(-)

New commits:
commit 1239dce2595877ad64fd8c8fd927ea4285d69abe
Author: Mert Tumer 
AuthorDate: Thu Nov 1 22:03:31 2018 +0300
Commit: Gülşah Köse 
CommitDate: Fri Nov 2 01:33:22 2018 +0100

[Pardus] language improvements on Android

More hardcoded strings extrated to the resource file
Few Turkish language improvements
This patch is sponsored by ULAKBIM/Pardus project.
Signed-off-by: Mert Tumer 

Change-Id: I9c49d1b8ec3dfc88a19832a2cdea2c7cbaf2be42
Reviewed-on: https://gerrit.libreoffice.org/62757
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/android/source/res/layout/toolbar_bottom.xml 
b/android/source/res/layout/toolbar_bottom.xml
index bfe5f74828b3..6fc85ea96290 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -365,7 +365,7 @@
 
 Satırları öncekine ekle
 Satırları sonrakine ekle
-Kolonları öncekine ekle
-Kolonları sonrakine ekle
+Sütunları öncekine ekle
+Sütunları sonrakine ekle
 Tablo Ekle
 
 
 Satır Sil
-Kolon Sil
+Sütun Sil
 Tablo Sil
 
 
@@ -227,4 +227,17 @@
 Varsayılan dosya filtrelemesini 
seç
 Uygulama Dili
 Varsayılan dili değiştir
+Unable to export to pdf
+Exported to PDF at
+Your device does not support 
printing
+Hata
+Bölüm ismi girin.
+Bmp boş!
+Dizin kaydedilmedi.
+Sayfa
+Tablo
+Slide
+Bölüm
+Vurgulama Rengi
+Metin Rengi
 
diff --git a/android/source/res/values/arrays.xml 
b/android/source/res/values/arrays.xml
index 5912f08900b9..3b2c71c3dadc 100644
--- a/android/source/res/values/arrays.xml
+++ b/android/source/res/values/arrays.xml
@@ -26,8 +26,8 @@
 
 
 
-Grid
-List
+@string/grid_view
+@string/list_view
 
 
 0
diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index 99a6d809f042..123751b8ee3b 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -227,4 +227,17 @@
 Set which file filter should be used by 
default.
 Display Language
 Set the default display 
language
+Unable to export to pdf
+Exported to PDF at
+Your device does not support 
printing
+Error
+Enter a part name
+Bmp is null!
+Directory not saved.
+Page
+Sheet
+Slide
+Part
+Highlight Color
+Font Color
 
diff --git a/android/source/src/java/org/libreoffice/FormattingController.java 
b/android/source/src/java/org/libreoffice/FormattingController.java
index 691c3d06513f..63b4cc53ad35 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -305,7 +305,7 @@ class FormattingController implements View.OnClickListener {
 
 AlertDialog.Builder insertBuilder = new AlertDialog.Builder(mContext);
 insertBuilder.setTitle(R.string.select_insert_options);
-insertBuilder.setNeutralButton("Cancel", null);
+insertBuilder.setNeutralButton(R.string.alert_cancel, null);
 final int[] selectedItem = new int[1];
 
insertBuilder.setSingleChoiceItems(mContext.getResources().getStringArray(R.array.insertrowscolumns),
 -1, new DialogInterface.OnClickListener() {
 @Override
@@ -313,7 +313,7 @@ class FormattingController implements View.OnClickListener {
 selectedItem[0] = which;
 }
 });
-insertBuilder.setPositiveButton("OK", new 
DialogInterface.OnClickListener() {
+insertBuilder.setPositiveButton(R.string.alert_ok, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int which) {
 switch (selectedItem[0]){
di

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

[Libreoffice Gerrit user]

 
android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
 |3 ---
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java  
|   10 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 187a3db08ecc0e42787aa57d8b4ed67aa9c37e74
Author: Mert Tumer 
AuthorDate: Wed Oct 24 11:41:25 2018 +0300
Commit: Gülşah Köse 
CommitDate: Fri Nov 2 01:31:59 2018 +0100

Fix permission settings on Android Viewer

We ask READ_EXTERNAL_STORAGE permission on first start
then check WRITE_EXTERNAL_STORAGE permission on switching
between document providers. This causes problems on Android 8+
Signed-off-by: Mert Tumer 

Change-Id: Ia7290e33b2a55f5a2197374ca39c60998edfff72
Reviewed-on: https://gerrit.libreoffice.org/62269
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git 
a/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
 
b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
index c2e03dfc7bdd..15522e93a45e 100644
--- 
a/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
@@ -48,9 +48,6 @@ public class LocalDocumentsDirectoryProvider extends 
LocalDocumentsProvider {
 public IFile getRootDirectory(Context context) {
 File documentsDirectory = getDocumentsDir();
 if (!documentsDirectory.exists()) {
-// might be a little counter-intuitive: if we were granted READ 
permission already, we're also granted the write-permission
-// when we ask for it, since they are both in the same storage 
group (for 5.1 and lower it is granted at install-time already)
-// see 
https://developer.android.com/guide/topics/permissions/requesting.html#perm-groups
 if (ContextCompat.checkSelfPermission(context, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) == 
PackageManager.PERMISSION_GRANTED) {
 if(!documentsDirectory.mkdirs()) {
 // fallback to the toplevel dir - might be due to the dir 
not mounted/used as USB-Mass-Storage or similar
diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index d6501f08bd85..3fb715e46778 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -99,7 +99,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity 
implements Settings
 private String displayLanguage;
 
 // dynamic permissions IDs
-private static final int PERMISSION_READ_EXTERNAL_STORAGE = 0;
+private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 0;
 
 FileFilter fileFilter;
 FilenameFilter filenameFilter;
@@ -949,11 +949,11 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 @Override
 protected void onStart() {
 super.onStart();
-if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.READ_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
+if (ContextCompat.checkSelfPermission(this, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) != 
PackageManager.PERMISSION_GRANTED) {
 Log.i(LOGTAG, "no permission to read external storage - asking for 
permission");
 ActivityCompat.requestPermissions(this,
-new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
-PERMISSION_READ_EXTERNAL_STORAGE);
+new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+PERMISSION_WRITE_EXTERNAL_STORAGE);
 } else {
 
switchToDocumentProvider(documentProviderFactory.getDefaultProvider());
 setEditFABVisibility(View.VISIBLE);
@@ -1207,7 +1207,7 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 @Override
 public void onRequestPermissionsResult(int requestCode, @NonNull String[] 
permissions, @NonNull int[] grantResults) {
 switch(requestCode){
-case PERMISSION_READ_EXTERNAL_STORAGE:
+case PERMISSION_WRITE_EXTERNAL_STORAGE:
 if(permissions.length>0 && grantResults[0] == 
PackageManager.PERMISSION_GRANTED){
 
switchToDocumentProvider(documentProviderFactory.getDefaultProvider());
 setEditFABVisibility(View.VISIBLE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[Libreoffice Gerrit user]

 icon-themes/colibre/sc/res/sidebar/CellBorder.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_All_18x18.png
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_18x18.png 
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Empty_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_FourBorders_18x18.png
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Left_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Right_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png 
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Top_18x18.png
|binary
 icon-themes/colibre/svx/res/fr010.png  
|binary
 icon-themes/colibre/svx/res/fr011.png  
|binary
 icon-themes/colibre/svx/res/fr012.png  
|binary
 icon-themes/colibre/svx/res/fr02.png   
|binary
 icon-themes/colibre/svx/res/fr03.png   
|binary
 icon-themes/colibre/svx/res/fr04.png   
|binary
 icon-themes/colibre/svx/res/fr05.png   
|binary
 icon-themes/colibre/svx/res/fr06.png   
|binary
 icon-themes/colibre/svx/res/fr07.png   
|binary
 icon-themes/colibre/svx/res/fr08.png   
|binary
 icon-themes/colibre/svx/res/fr09.png   
|binary
 icon-themes/colibre/svx/res/pr01.png   
|binary
 icon-themes/colibre/svx/res/pr010.png  
|binary
 icon-themes/colibre/svx/res/pr011.png  
|binary
 icon-themes/colibre/svx/res/pr012.png  
|binary
 icon-themes/colibre/svx/res/pr013.png  
|binary
 icon-themes/colibre/svx/res/pr014.png  
|binary
 icon-themes/colibre/svx/res/pr015.png  
|binary
 icon-themes/colibre/svx/res/pr016.png  
|binary
 icon-themes/colibre/svx/res/pr017.png  
|binary
 icon-themes/colibre/svx/res/pr018.png  
|binary
 icon-themes/colibre/svx/res/pr019.png  
|binary
 icon-themes/colibre/svx/res/pr02.png   
|binary
 icon-themes/colibre/svx/res/pr020.png  
|binary
 icon-themes/colibre/svx/res/pr021.png  
|binary
 icon-themes/colibre/svx/res/pr03.png   
|binary
 icon-themes/colibre/svx/res/pr04.png   
|binary
 icon-themes/colibre/svx/res/pr05.png   
|binary
 icon-themes/colibre/svx/res/pr06.png   
|binary
 icon-themes/colibre/svx/res/pr07.png   
|binary
 icon-themes/colibre/svx/res/pr08.png   
|binary
 icon-themes/colibre/svx/res/pr09.png   
|binary
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder.svg  
|   44 +--
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_All_18x18.svg
|   61 +-
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Bottom_18x18.svg 
|2 
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Bottom_Double_18x18.svg  
|2 
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Bo

[Libreoffice-commits] online.git: 2 commits - configure.ac .gitignore Mobile/Mobile Mobile/Mobile.xcodeproj Mobile/README

[Libreoffice Gerrit user]

 .gitignore  |8 
 Mobile/Mobile.xcodeproj/project.pbxproj |  438 +++-
 Mobile/README   |   19 -
 configure.ac|  136 +
 4 files changed, 358 insertions(+), 243 deletions(-)

New commits:
commit d381540db56ad99d4e79862ac6fdb6ccffbb815f
Author: Tor Lillqvist 
AuthorDate: Fri Nov 2 01:13:17 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 2 01:13:17 2018 +0200

Update Mobile/README to match new configury mechanism for the iOS app

Change-Id: I7d7f1d53823f0215024537fa65f00a163c7b61e5

diff --git a/Mobile/README b/Mobile/README
index 989faa002..b2f62c3a8 100644
--- a/Mobile/README
+++ b/Mobile/README
@@ -50,20 +50,11 @@ Then run:
 
 and
 
-./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice"
+./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice" 
--with-lo-srcdir=$HOME/lo/ios --with-lo-builddir=$HOME/lo/ios 
--with-poco-includes=/opt/ios-poco/include --with-poco-libs=/opt/ios-poco/lib
 
-The only purpose of running the configure script in this tree is to
-get the app name as the CFBundleDisplayName property into the
-Mobile/Mobile/Info.plist file.
-
-Sure, as we require editing the project.pbxproj file anyway, we could
-as well also require editing the Info.plist file and avoid having to
-run the configure script.
-
-Or maybe the other way around, should we also have the configure
-script expand the project.pbxproj file, passing the configure script
-pointers to the LibreOffice source and build directories, and POCO and
-PNG install directories. Those would then expaned in project.pbxproj,
-and it wouldn't need to be hand-edited.
+The configure script puts the app name as the CFBundleDisplayName
+property into the Mobile/Mobile/Info.plist file, and set up some
+symbolic links that point to the LIbreOffice core source and build
+directories (which can be the same, of course).
 
 4) Now you can open the Mobile Xcode project, build it, and run it.
commit 5f2a6f6aa3a0d0ba8a6ba2fb833f98393f94bb9f
Author: Tor Lillqvist 
AuthorDate: Fri Nov 2 00:37:01 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 2 01:08:37 2018 +0200

Avoid need for manual editing of the iOS app Xcode project file

Since some days, you need to run the configure script in a tree where
you are going to build the iOS app anyway (to set the app's
user-visible name). Use the configure script to set up a couple of
symbolic links pointing to the LibreOffice core source and build
directories and the Poco installation. Use those symbolic links in the
project file.

Also, now a vendor-specific app icon set can be given with the
--with-iosapp-appicon option.

Change-Id: Ib936388a4cc680bd97ca6ef95a91e3296ab04d18

diff --git a/.gitignore b/.gitignore
index 72bc7664d..110ab9b6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,11 @@ docker/instdir
 docker/builddir
 
 Mobile/Mobile/Info.plist
+
+# symlinks created by configure for the iOS app Xcode project
+losrcdir-symlink
+lobuilddir-symlink
+pocoinclude-symlink
+pocolib-symlink
+ICU.dat
+Mobile/Mobile/Assets.xcassets/AppIcon.appiconset
diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index 8739933a2..e719f46d7 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -30,7 +30,7 @@
BE5EB5D421400DC100E0826C /* DocumentBroker.cpp in Sources */ = 
{isa = PBXBuildFile; fileRef = BE5EB5D321400DC100E0826C /* DocumentBroker.cpp 
*/; };
BE5EB5D621401E0F00E0826C /* Storage.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BE5EB5D521401E0F00E0826C /* Storage.cpp */; };
BE5EB5DA2140363100E0826C /* ios.mm in Sources */ = {isa = 
PBXBuildFile; fileRef = BE5EB5D92140363100E0826C /* ios.mm */; };
-   BE5EB5DC2140480B00E0826C /* icudt63l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = BE5EB5DB2140480B00E0826C /* icudt63l.dat */; };
+   BE5EB5DC2140480B00E0826C /* ICU.dat in Resources */ = {isa = 
PBXBuildFile; fileRef = BE5EB5DB2140480B00E0826C /* ICU.dat */; };
BE6362C22153B5B500F4237E /* MobileCoreServices.framework in 
Frameworks */ = {isa = PBXBuildFile; fileRef = BE6362C12153B5B500F4237E /* 
MobileCoreServices.framework */; };
BE8D772C2136762500AC58EA /* AppDelegate.mm in Sources */ = {isa 
= PBXBuildFile; fileRef = BE8D772B2136762500AC58EA /* AppDelegate.mm */; };
BE8D772F2136762500AC58EA /* DocumentBrowserViewController.mm in 
Sources */ = {isa = PBXBuildFile; fileRef = BE8D772E2136762500AC58EA /* 
DocumentBrowserViewController.mm */; };
@@ -72,52 +72,52 @@
BE00F89E21396585001CE2D4 /* images */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = images; path = 
../../../loleaflet/dist/images; sourceTree = ""; };
 

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

[Libreoffice Gerrit user]

 sw/uiconfig/sglobal/popupmenu/text.xml |   17 +
 sw/uiconfig/sweb/popupmenu/text.xml|   17 +
 sw/uiconfig/swriter/popupmenu/text.xml |   17 +
 sw/uiconfig/swxform/popupmenu/text.xml |   17 +
 4 files changed, 20 insertions(+), 48 deletions(-)

New commits:
commit 6acde4a63176e99c287c8d8ab9498c003e138025
Author: andreas kainz 
AuthorDate: Thu Nov 1 22:31:23 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Nov 1 23:56:04 2018 +0100

Context Menu: Remove Comment section in sw modules

Change-Id: Id82af299502f92fe9024ab552505f086dffe9c71
Reviewed-on: https://gerrit.libreoffice.org/62762
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml 
b/sw/uiconfig/sglobal/popupmenu/text.xml
index f93e1bf17f30..f3fda1a6973d 100644
--- a/sw/uiconfig/sglobal/popupmenu/text.xml
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -75,18 +75,11 @@
   
 
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
+  
+  
+  
+  
   
   
   
diff --git a/sw/uiconfig/sweb/popupmenu/text.xml 
b/sw/uiconfig/sweb/popupmenu/text.xml
index f93e1bf17f30..f3fda1a6973d 100644
--- a/sw/uiconfig/sweb/popupmenu/text.xml
+++ b/sw/uiconfig/sweb/popupmenu/text.xml
@@ -75,18 +75,11 @@
   
 
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
+  
+  
+  
+  
   
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index f93e1bf17f30..f3fda1a6973d 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -75,18 +75,11 @@
   
 
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
+  
+  
+  
+  
   
   
   
diff --git a/sw/uiconfig/swxform/popupmenu/text.xml 
b/sw/uiconfig/swxform/popupmenu/text.xml
index f93e1bf17f30..f3fda1a6973d 100644
--- a/sw/uiconfig/swxform/popupmenu/text.xml
+++ b/sw/uiconfig/swxform/popupmenu/text.xml
@@ -75,18 +75,11 @@
   
 
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
+  
+  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bee3790d547506500dc195eebfa8735bb8fba2d9
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 23:28:03 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 2 00:35:10 2018 +0200

We now use a fixed name ICU data file in the iOS app

That makes it much easier to use the same Xcode project file when
building against different versions of LibreOffice, with different ICU
data files. The configure script in the "online" directory creates a
ICU.dat symlink to the ICU data file (with a name like icudt60l.dat in
a 6.0 branch, or icudt63l.dat in a current master) in the LibreOffice
build directory, and that is what gets copied into the app bundle.

Change-Id: Ibe2ca85f66e2d4973d6ba3c52fc4d60e113d8f9a

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 040218c1e314..fca76934088c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4103,9 +4103,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 // to use that.
 NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
 
-int fd = open([[bundlePath 
stringByAppendingPathComponent:@U_ICUDATA_NAME".dat"] UTF8String], O_RDONLY);
+int fd = open([[bundlePath stringByAppendingPathComponent:@"ICU.dat"] 
UTF8String], O_RDONLY);
 if (fd == -1)
-NSLog(@"Could not open ICU data file %s", [[bundlePath 
stringByAppendingPathComponent:@U_ICUDATA_NAME".dat"] UTF8String]);
+NSLog(@"Could not open ICU data file %s", [[bundlePath 
stringByAppendingPathComponent:@"ICU.dat"] UTF8String]);
 else
 {
 struct stat st;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 9cdcc1b7df5bbd0262a1335bd2f3bc8713e19c97
Author: Tor Lillqvist 
AuthorDate: Fri Nov 2 00:05:02 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 2 00:06:08 2018 +0200

Fix iOS build

Change-Id: I7e7ca6290929629db04472129bf80ea204cf0d69

diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index d3aa10ebd1b3..55b1fbd5136e 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -19,7 +19,7 @@
 
 #include 
 
-#if (defined UNX && !defined MACOSX)
+#if (defined UNX && !defined MACOSX && !defined IOS)
 #include 
 #endif
 
@@ -62,7 +62,7 @@ bool SalGenericLayoutGlyphsImpl::IsValid() const
 return false;
 if (empty())
 return false;
-#if (defined UNX && !defined MACOSX)
+#if (defined UNX && !defined MACOSX && !defined IOS)
 const FreetypeFontInstance* pFFI = 
dynamic_cast(m_rFontInstance.get());
 if (pFFI && !pFFI->GetFreetypeFont())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - ios/source

[Libreoffice Gerrit user]

 ios/source/ios.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit a97e3a59644a8c30486e4ade1bd883ee26a0282d
Author: Tor Lillqvist 
AuthorDate: Wed Oct 31 20:30:24 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 22:32:39 2018 +0100

Handle also css::ucb::NameClashException

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

diff --git a/ios/source/ios.cxx b/ios/source/ios.cxx
index 36aaa245f76d..bc89150e7ed6 100644
--- a/ios/source/ios.cxx
+++ b/ios/source/ios.cxx
@@ -8,9 +8,11 @@
  */
 
 #include 
+#include 
 
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
+#include "com/sun/star/ucb/NameClashException.hpp"
 #include "ios/ios.hxx"
 
 namespace
@@ -28,8 +30,12 @@ void lo_ios_throwException(css::uno::Any const& aException)
 assert(aException.getValueTypeClass() == css::uno::TypeClass_EXCEPTION);
 
 tryThrow(aException);
+tryThrow(aException);
 tryThrow(aException);
 
+std::cerr << "lo_ios_throwException: Unhandled exception type " << 
aException.getValueTypeName()
+  << std::endl;
+
 assert(false);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit 0531d203ffd0ff085d10c308d929e8653dd29f70
Author: Tor Lillqvist 
AuthorDate: Wed Oct 31 20:27:45 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 22:31:04 2018 +0100

Current iOS SDK is 12.1

It sucks that configure.ac nowadays looks for exactly one specific
version of the iOS SDK. I don't understand why that was thought to be
a good idea.

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

diff --git a/configure.ac b/configure.ac
index 65b5dc8e9847..a964a00e44d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2863,7 +2863,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=12.0
+current_sdk_ver=12.1
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/menubar/menubar.xml |   54 +-
 1 file changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 4a93d8dbdce90c60b2b3c4eb176ccc66af4f69f3
Author: andreas kainz 
AuthorDate: Thu Nov 1 21:23:12 2018 +0100
Commit: andreas_kainz 
CommitDate: Thu Nov 1 22:24:58 2018 +0100

Draw menubar: Spahe section update

Change-Id: Ia378a3375ba8fb0e3a9b446bd891466dfcf4bdbf
Reviewed-on: https://gerrit.libreoffice.org/62758
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index b61dbf62b83d..64e2dd268bd3 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -487,20 +487,19 @@
 
   
   
-  
-  
+  
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
 
   
+  
+  
   
 
   
@@ -512,22 +511,25 @@
   
 
   
-  
-  
-  
-  
-  
-  
-  
-  
+  
 
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - configure.ac gtk/mobile.cpp gtk/README wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 configure.ac|   20 +++---
 gtk/README  |2 -
 gtk/mobile.cpp  |   62 +++-
 wsd/LOOLWSD.cpp |8 +++
 4 files changed, 70 insertions(+), 22 deletions(-)

New commits:
commit 698b806e232bdffb7f61ee0734f7a0079993f134
Author: Michael Meeks 
AuthorDate: Thu Nov 1 21:22:01 2018 +
Commit: Michael Meeks 
CommitDate: Thu Nov 1 21:23:15 2018 +

gtk: compile fixes for socket latency and version display.

Change-Id: I4ff4bcb54d8c1227feeb19b281c38e1769ed83e7

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 8d89e65e5..7af8b7311 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1330,10 +1330,12 @@ void LOOLWSD::handleOption(const std::string& 
optionName,
 if (masterPort)
 MasterPortNumber = std::stoi(masterPort);
 
+#ifndef MOBILEAPP
 static const char* latencyMs = std::getenv("LOOL_DELAY_SOCKET_MS");
 if (latencyMs)
 SimulatedLatencyMs = std::stoi(latencyMs);
 #endif
+#endif
 
 #ifdef FUZZER
 if (optionName == "dummy-lok")
@@ -1553,8 +1555,10 @@ bool LOOLWSD::createForKit()
 if (UnitWSD::get().hasKitHooks())
 args.push_back("--unitlib=" + UnitTestLibrary);
 
+#ifndef MOBILEAPP
 if (DisplayVersion)
 args.push_back("--version");
+#endif
 
 if (NoCapsForKit)
 args.push_back("--nocaps");
@@ -2807,8 +2811,10 @@ class SslSocketFactory final : public SocketFactory
 {
 int fd = physicalFd;
 
+#ifndef MOBILEAPP
 if (SimulatedLatencyMs > 0)
 fd = Delay::create(SimulatedLatencyMs, physicalFd);
+#endif
 
 return StreamSocket::create(
 fd, false, std::make_shared());
@@ -3052,6 +3058,7 @@ int LOOLWSD::innerMain()
 // down-pay all the forkit linking cost once & early.
 Environment::set("LD_BIND_NOW", "1");
 
+#ifndef MOBILEAPP
 if (DisplayVersion)
 {
 std::string version, hash;
@@ -3059,6 +3066,7 @@ int LOOLWSD::innerMain()
 LOG_INF("Loolwsd version details: " << version << " - " << hash);
 }
 #endif
+#endif
 
 initializeSSL();
 
commit 647150427e295f312deed6c9464f801b00820698
Author: Michael Meeks 
AuthorDate: Thu Nov 1 21:21:04 2018 +
Commit: Michael Meeks 
CommitDate: Thu Nov 1 21:23:12 2018 +

gtk: compile with older WebKit JS interface too.

Change-Id: I62ce96932b77ea8051cfb2862cb4f617d2804c1d

diff --git a/gtk/mobile.cpp b/gtk/mobile.cpp
index a819972cb..0797fd9c6 100644
--- a/gtk/mobile.cpp
+++ b/gtk/mobile.cpp
@@ -36,6 +36,9 @@
 
 #include 
 #include 
+#if !WEBKIT_CHECK_VERSION(2,22,0)
+#  include
+#endif
 
 #include "FakeSocket.hpp"
 #include "Log.hpp"
@@ -133,27 +136,55 @@ static void send2JS(const std::vector& buffer)
}, jscopy);
 }
 
-static void handle_debug_message(WebKitUserContentManager *manager,
- WebKitJavascriptResult   *js_result,
- gpointer  user_data)
+static char *js_result_as_gstring(WebKitJavascriptResult *js_result)
 {
+#if WEBKIT_CHECK_VERSION(2,22,0) // unclear when this API changed ...
 JSCValue *value = webkit_javascript_result_get_js_value(js_result);
 if (jsc_value_is_string(value))
-LOG_TRC_NOFILE("From JS: debug: " << jsc_value_to_string(value));
+return jsc_value_to_string(value);
+else
+return nullptr;
+#else // older Webkits
+JSValueRef value = webkit_javascript_result_get_value(js_result);
+JSContextRef ctx = webkit_javascript_result_get_global_context(js_result);
+if (JSValueIsString(ctx, value))
+{
+const JSStringRef js_str = JSValueToStringCopy(ctx, value, nullptr);
+size_t gstring_max = JSStringGetMaximumUTF8CStringSize(js_str);
+char *gstring = (char *)g_malloc(gstring_max);
+if (gstring)
+JSStringGetUTF8CString(js_str, gstring, gstring_max);
+else
+LOG_TRC_NOFILE("No string");
+JSStringRelease(js_str);
+return gstring;
+}
 else
-LOG_TRC_NOFILE("From JS: debug: some object");
+LOG_TRC_NOFILE("Unexpected object type " << JSValueGetType(ctx, 
value));
+return nullptr;
+#endif
+}
+
+static void handle_message(const char * type, WebKitJavascriptResult 
*js_result)
+{
+gchar *string_value = js_result_as_gstring(js_result);
+
+if (string_value)
+LOG_TRC_NOFILE("From JS: " << type << ": " << string_value);
+else
+LOG_TRC_NOFILE("From JS: " << type << ": some object");
+
+g_free(string_value);
 }
 
 static void handle_lool_message(WebKitUserContentManager *manager,
 WebKitJavascriptResult   *js_result,
 gpointer  user_data)
 {
-JSCValue *value = webkit_javascript_result_get_js_value(js_result);
+gchar *string_value = js_result_as_gstring(js_result);
 
-if (jsc_value_is_string(value))
+if (string_value)
 {
-

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

[Libreoffice Gerrit user]

 include/sfx2/basedlgs.hxx|   43 -
 include/sfx2/childwin.hxx|8 -
 include/vcl/dialog.hxx   |7 
 include/vcl/weld.hxx |6 
 sfx2/source/appl/childwin.cxx|   73 +++--
 sfx2/source/appl/workwin.cxx |   85 +--
 sfx2/source/dialog/basedlgs.cxx  |  126 
 sfx2/source/inc/workwin.hxx  |   11 +
 sw/inc/swabstdlg.hxx |4 
 sw/inc/viewsh.hxx|   14 -
 sw/source/core/view/viewsh.cxx   |   30 ++-
 sw/source/ui/dialog/swdlgfact.cxx|   19 +-
 sw/source/ui/dialog/swdlgfact.hxx|   17 +-
 sw/source/ui/dialog/wordcountdialog.cxx  |  114 +--
 sw/source/uibase/dialog/wordcountwrapper.cxx |   10 -
 sw/source/uibase/inc/wordcountdialog.hxx |   41 ++---
 sw/source/uibase/uiview/viewport.cxx |4 
 sw/uiconfig/swriter/ui/wordcount.ui  |8 -
 vcl/inc/qt5/Qt5Frame.hxx |1 
 vcl/inc/salframe.hxx |5 
 vcl/inc/unx/gtk/gtkframe.hxx |1 
 vcl/inc/window.h |4 
 vcl/qt5/Qt5Frame.cxx |7 
 vcl/source/app/salvtables.cxx|   43 +
 vcl/source/window/builder.cxx|   14 +
 vcl/source/window/dialog.cxx |  203 +++
 vcl/source/window/syswin.cxx |4 
 vcl/unx/gtk3/gtk3gtkframe.cxx|7 
 vcl/unx/gtk3/gtk3gtkinst.cxx |  101 -
 29 files changed, 725 insertions(+), 285 deletions(-)

New commits:
commit 26c375671aa362b2f59d84645784938677ae1719
Author: Caolán McNamara 
AuthorDate: Thu Oct 4 12:41:22 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 22:12:33 2018 +0100

weld SwWordCountFloatDlg

enable modeless dialogs to emit a response so runAsync can be used with
them and get something called when the dialog is dismissed

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

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index d4279599fe4b..1c3e2b37caa6 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -107,6 +107,41 @@ public:
 DECL_LINK(TimerHdl, Timer *, void);
 };
 
+class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController
+{
+private:
+DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, 
vcl::ILibreOfficeKitNotifier*);
+public:
+SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const 
OString& rDialogId);
+};
+
+class SfxModelessDialog_Impl;
+class SFX2_DLLPUBLIC SfxModelessDialogController : public SfxDialogController
+{
+SfxBindings* m_pBindings;
+std::unique_ptr m_xImpl;
+
+SfxModelessDialogController(SfxModelessDialogController&) = delete;
+void operator =(SfxModelessDialogController&) = delete;
+
+void Init(SfxBindings *pBindinx, SfxChildWindow *pCW);
+
+DECL_DLLPRIVATE_LINK(FocusInHdl, weld::Widget&, void);
+DECL_DLLPRIVATE_LINK(FocusOutHdl, weld::Widget&, void);
+protected:
+SfxModelessDialogController(SfxBindings*, SfxChildWindow* pChildWin,
+weld::Window* pParent, const OUString& rUIXMLDescription, const 
OString& rID);
+virtual ~SfxModelessDialogController() override;
+
+public:
+virtual voidFillInfo(SfxChildWinInfo&) const;
+voidInitialize (SfxChildWinInfo const * pInfo);
+voidClose();
+voidDeInit();
+voidEndDialog();
+SfxBindings&GetBindings() { return *m_pBindings; }
+};
+
 // class SfxFloatingWindow --
 class SfxFloatingWindow_Impl;
 class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow
@@ -188,14 +223,6 @@ private:
 std::unique_ptr   pImpl;
 };
 
-class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController
-{
-private:
-DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, 
vcl::ILibreOfficeKitNotifier*);
-public:
-SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const 
OString& rDialogId);
-};
-
 class SFX2_DLLPUBLIC SfxSingleTabDialogController : public SfxDialogController
 {
 private:
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 8c46889e533f..9a12bf896071 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -143,9 +143,10 @@ public:
 
 class SFX2_DLLPUBLIC SfxChildWindow
 {
-VclPtrpParent;// parent window ( Topwindow )
-sal_uInt16 const   nType;  // ChildWindow-Id
+VclPtrpParent; // parent window ( Topwi

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

[Libreoffice Gerrit user]

 reportdesign/source/ui/dlg/DateTime.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d611d5535b818854f9c6c6d4c144c2e5a9155a1a
Author: Caolán McNamara 
AuthorDate: Thu Nov 1 17:07:43 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 22:12:19 2018 +0100

Resolves: tdf#121097 need an initial call to CBClickHdl

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

diff --git a/reportdesign/source/ui/dlg/DateTime.cxx 
b/reportdesign/source/ui/dlg/DateTime.cxx
index 5b04a35d7870..9b91d657d4c0 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -72,6 +72,7 @@ ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, 
const uno::Reference< r
 weld::CheckButton* aCheckBoxes[] = { m_xDate.get(), m_xTime.get() };
 for (weld::CheckButton* pCheckBox : aCheckBoxes)
 pCheckBox->connect_toggled(LINK(this,ODateTimeDialog,CBClickHdl));
+CBClickHdl(*m_xTime);
 }
 
 void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - net/FakeSocket.cpp net/FakeSocket.hpp net/ServerSocket.hpp test/fakesockettest.cpp

[Libreoffice Gerrit user]

 net/FakeSocket.cpp  |   28 ++--
 net/FakeSocket.hpp  |2 +-
 net/ServerSocket.hpp|2 +-
 test/fakesockettest.cpp |4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit f8a0fb4c321fadc6f0afcb4535aca63363a925cc
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 21:29:40 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 21:34:16 2018 +0200

WaE: -Werror=unused-parameter

Change-Id: Icadfcb19ce1fff2b5009d42acf33297cda6e36f2

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 0deb85558..a0e86f2a3 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -370,7 +370,7 @@ int fakeSocketConnect(int fd1, int fd2)
 return 0;
 }
 
-int fakeSocketAccept4(int fd, int flags)
+int fakeSocketAccept4(int fd)
 {
 std::vector& fds = getFds();
 std::unique_lock lock(theMutex);
diff --git a/net/FakeSocket.hpp b/net/FakeSocket.hpp
index 0f80e0a23..11470f6da 100644
--- a/net/FakeSocket.hpp
+++ b/net/FakeSocket.hpp
@@ -34,7 +34,7 @@ int fakeSocketListen(int fd);
 
 int fakeSocketConnect(int fd1, int fd2);
 
-int fakeSocketAccept4(int fd, int flags);
+int fakeSocketAccept4(int fd);
 
 int fakeSocketPeer(int fd);
 
diff --git a/net/ServerSocket.hpp b/net/ServerSocket.hpp
index 7799d8c73..7606e86ce 100644
--- a/net/ServerSocket.hpp
+++ b/net/ServerSocket.hpp
@@ -69,7 +69,7 @@ public:
 socklen_t addrlen = sizeof(clientInfo);
 const int rc = ::accept4(getFD(), (struct sockaddr *)&clientInfo, 
&addrlen, SOCK_NONBLOCK);
 #else
-const int rc = fakeSocketAccept4(getFD(), SOCK_NONBLOCK);
+const int rc = fakeSocketAccept4(getFD());
 #endif
 LOG_DBG("Accepted socket #" << rc << ", creating socket object.");
 try
diff --git a/test/fakesockettest.cpp b/test/fakesockettest.cpp
index 8ae3542b3..5d7efc2c4 100644
--- a/test/fakesockettest.cpp
+++ b/test/fakesockettest.cpp
@@ -102,8 +102,8 @@ void FakeSocketTest::testBasic()
 std::thread t0([&] {
 // Cannot use CPPUNIT_ASSERT here as that throws and this thread 
has no Cppunit
 // exception handler. We check below after joining this thread.
-s3 = fakeSocketAccept4(s0, 0);
-s4 = fakeSocketAccept4(s0, 0);
+s3 = fakeSocketAccept4(s0);
+s4 = fakeSocketAccept4(s0);
 });
 
 // Connect s1 and s2 to s0 (that is, to the sockets produced by accepting 
connections to
commit 9a0decc406b535bae5787f2fdef795a814702d90
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 21:26:13 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 21:30:16 2018 +0200

WaE: -Werror=sign-compare

Change-Id: Iaac48bd91864d44ce9442dd68aa26ec74fb5507a

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 0a4419110..0deb85558 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -192,7 +192,7 @@ static bool checkForPoll(std::vector& fds, 
struct pollfd *pollfd
 const int K = ((pollfds[i].fd)&1);
 const int N = 1 - K;
 
-if (pollfds[i].fd < 0 || pollfds[i].fd/2 >= fds.size())
+if (pollfds[i].fd < 0 || static_cast(pollfds[i].fd/2) >= 
fds.size())
 {
 pollfds[i].revents = POLLNVAL;
 retval = true;
@@ -292,7 +292,7 @@ int fakeSocketListen(int fd)
 {
 std::vector& fds = getFds();
 std::unique_lock lock(theMutex);
-if (fd < 0 || fd/2 >= fds.size() || fds[fd/2].fd[fd&1] == -1)
+if (fd < 0 || static_cast(fd/2) >= fds.size() || 
fds[fd/2].fd[fd&1] == -1)
 {
 loggingBuffer << "FakeSocket EBADF: Listening on #" << fd << flush();
 errno = EBADF;
@@ -327,7 +327,7 @@ int fakeSocketConnect(int fd1, int fd2)
 {
 std::vector& fds = getFds();
 std::unique_lock lock(theMutex);
-if (fd1 < 0 || fd2 < 0 || fd1/2 >= fds.size() || fd2/2 >= fds.size())
+if (fd1 < 0 || fd2 < 0 || static_cast(fd1/2) >= fds.size() || 
static_cast(fd2/2) >= fds.size())
 {
 loggingBuffer << "FakeSocket EBADF: Connect #" << fd1 << " to #" << 
fd2 << flush();
 errno = EBADF;
@@ -374,7 +374,7 @@ int fakeSocketAccept4(int fd, int flags)
 {
 std::vector& fds = getFds();
 std::unique_lock lock(theMutex);
-if (fd < 0 || fd/2 >= fds.size())
+if (fd < 0 || static_cast(fd/2) >= fds.size())
 {
 loggingBuffer << "FakeSocket EBADF: Accept #" << fd << flush();
 errno = EBADF;
@@ -401,7 +401,7 @@ int fakeSocketAccept4(int fd, int flags)
 theCV.wait(lock);
 
 assert(pair.connectingFd >= 0);
-assert(pair.connectingFd/2 < fds.size());
+assert(static_cast(pair.connectingFd/2) < fds.size());
 assert((pair.connectingFd&1) == 0);
 
 FakeSocketPair& pair2 = fds[pair.connectingFd/2];
@@ -424,7 +424,7 @@ int fakeSocketPeer(int fd)
 {
 std::vector& fds = getFds();
 std::unique_lock lock(theMutex);
-if (fd < 0 || fd/2 >= fds.size())
+if (fd < 0 || static_cast(fd/2) >= fds.size())
 {
 loggingBuffer << "FakeSo

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

[Libreoffice Gerrit user]

 svx/source/svdraw/svdobj.cxx |   57 +--
 1 file changed, 55 insertions(+), 2 deletions(-)

New commits:
commit f05a551a6b49916241696481567e32b320c6749b
Author: Armin Le Grand 
AuthorDate: Wed Oct 31 20:47:49 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:35:10 2018 +0100

tdf#120728 support SvxShape for SdrShape if not inserted

Added a fallback to allow correct SvxShape construction
when SdrObject is not yet inserted - or has no SdrPage yet.
This is needed ue to the paradigm change that a SdrObject
only has a SdrPage when it is inserted.
For more info and a discussion, see added comments.

Change-Id: I2c1a4b1bbb531501ee73ab1c98c13321c5c0b050
Reviewed-on: https://gerrit.libreoffice.org/62710
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 52bbb04f1e39b2d778275c91f77b6c0714ecd0d0)
Reviewed-on: https://gerrit.libreoffice.org/62738
Tested-by: Xisco Faulí 
Reviewed-by: Thorsten Behrens 

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5b313c907358..7300dbe2f5b8 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2815,9 +2815,58 @@ css::uno::Reference< css::uno::XInterface > 
SdrObject::getUnoShape()
 if( !xShape.is() )
 {
 OSL_ENSURE( mpSvxShape == nullptr, "SdrObject::getUnoShape: XShape 
already dead, but still an IMPL pointer!" );
-if ( getSdrPageFromSdrObject() )
+
+// try to access SdrPage from this SdrObject. This will only exist if 
the SdrObject is
+// inserted in a SdrObjList (page/group/3dScene)
+SdrPage* pPageCandidate(getSdrPageFromSdrObject());
+
+// tdf#12152, tdf#120728
+//
+// With the paradigm change to only get a SdrPage for a SdrObject when 
the SdrObject
+// is *inserted*, the functionality for creating 1:1 associated UNO 
API implementation
+// SvxShapes was partially broken: The used ::CreateShape relies on 
the SvxPage being
+// derived and the CreateShape method overloaded, implementing 
additional SdrInventor
+// types as needed.
+//
+// The fallback to use SvxDrawPage::CreateShapeByTypeAndInventor is a 
trap: It's only
+// a static fallback that handles the SdrInventor types 
SdrInventor::E3d and
+// SdrInventor::Default. Due to that, e.g. the ReportDesigner broke in 
various conditions.
+//
+// That again has to do with the ReportDesigner being implemented 
using the UNO API
+// aspects of SdrObjects early during their construction, not just 
after these are
+// inserted to a SdrPage - but that is not illegal or wrong, the 
SdrObject exists already.
+//
+// As a current solution, use the (now always available) SdrModel and 
any of the
+// existing SdrPages. The only important thing is to get a SdrPage 
where ::CreateShape is
+// overloaded and implemented as needed.
+//
+// Note for the future:
+// In a more ideal world there would be only one factory method for 
creating SdrObjects (not
+// ::CreateShape and ::CreateShapeByTypeAndInventor). This also would 
not be placed at
+// SdrPage/SvxPage at all, but at the Model where it belongs - where 
else would you expect
+// objects for the current Model to be constructed? To have this at 
the Page only would make
+// sense if different shapes would need to be constructed for 
different Pages in the same Model
+// - this is never the case.
+// At that Model extended functionality for that factory (or overloads 
and implementations)
+// should be placed. But to be realistic, migrating the factories to 
Model now is too much
+// work - maybe over time when melting SdrObject/SvxObject one day...
+if(nullptr == pPageCandidate)
+{
+// If not inserted, alternatively access a SdrPage using the 
SdrModel. There is
+// no reason not to create and return a UNO API XShape when the 
SdrObject is not
+// inserted - it may be in construction. Main paradigm is that it 
exists.
+if(0 != getSdrModelFromSdrObject().GetPageCount())
+{
+// Take 1st SdrPage. That may be e.g. a special page (in SD), 
but the
+// to-be-used method ::CreateShape will be correctly 
overloaded in
+// all cases
+pPageCandidate = getSdrModelFromSdrObject().GetPage(0);
+}
+}
+
+if(nullptr != pPageCandidate)
 {
-uno::Reference< uno::XInterface > xPage( 
getSdrPageFromSdrObject()->getUnoPage() );
+uno::Reference< uno::XInterface > 
xPage(pPageCandidate->getUnoPage());
 if( xPage.is() )
 {
 SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation(xPage);
@@ -

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/inc sc/source

[Libreoffice Gerrit user]

 sc/inc/column.hxx   |3 +
 sc/inc/table.hxx|1 
 sc/source/core/data/column2.cxx |   61 ++--
 sc/source/core/data/dociter.cxx |   14 +
 sc/source/core/data/table1.cxx  |   19 +++-
 sc/source/core/data/table3.cxx  |   15 +++--
 6 files changed, 88 insertions(+), 25 deletions(-)

New commits:
commit e5a1a12af28e27173e2d0902d8d6bac3360fd419
Author: Serge Krot 
AuthorDate: Wed Oct 24 15:38:17 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:34:14 2018 +0100

sc: fix: range/step calculation for progress bar

Change-Id: I733e4003b65b410d44d9a1132be4e9e10ac24c3e
Reviewed-on: https://gerrit.libreoffice.org/62305
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/62751
Tested-by: Thorsten Behrens 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index d0b52f329db4..77d8a616e87c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -370,7 +370,8 @@ public:
 ScFormulaCell * const * GetFormulaCellBlockAddress( SCROW nRow, size_t& 
rBlockSize ) const;
 CellTypeGetCellType( SCROW nRow ) const;
 SCSIZE  GetCellCount() const;
-sal_uInt32 GetWeightedCount() const;
+sal_uLong GetWeightedCount() const;
+sal_uLong GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const;
 sal_uInt32 GetCodeCount() const;   // RPN-Code in formulas
 sal_uInt16  GetErrCode( SCROW nRow ) const;
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b78adcc78971..6665354c1b1e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -238,6 +238,7 @@ public:
 
 sal_uLong   GetCellCount() const;
 sal_uLong   GetWeightedCount() const;
+sal_uLong   GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const;
 sal_uLong   GetCodeCount() const;   // RPN code in formula
 
 sal_uInt16 GetTextWidth(SCCOL nCol, SCROW nRow) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index fd884b9b49b9..704593fa9f5e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3262,48 +3262,91 @@ namespace {
 
 class WeightedCounter
 {
-size_t mnCount;
+sal_uLong mnCount;
 public:
 WeightedCounter() : mnCount(0) {}
 
 void operator() (const sc::CellStoreType::value_type& node)
 {
+mnCount += getWeight(node);
+}
+
+static sal_uLong getWeight(const sc::CellStoreType::value_type& node)
+{
 switch (node.type)
 {
 case sc::element_type_numeric:
 case sc::element_type_string:
-mnCount += node.size;
+return node.size;
 break;
 case sc::element_type_formula:
 {
+size_t nCount = 0;
 // Each formula cell is worth its code length plus 5.
 sc::formula_block::const_iterator it = 
sc::formula_block::begin(*node.data);
 sc::formula_block::const_iterator itEnd = 
sc::formula_block::end(*node.data);
 for (; it != itEnd; ++it)
 {
 const ScFormulaCell* p = *it;
-mnCount += 5 + p->GetCode()->GetCodeLen();
+nCount += 5 + p->GetCode()->GetCodeLen();
 }
+
+return nCount;
 }
 break;
 case sc::element_type_edittext:
 // each edit-text cell is worth 50.
-mnCount += node.size * 50;
+return node.size * 50;
 break;
 default:
-;
+return 0;
 }
 }
 
-size_t getCount() const { return mnCount; }
+sal_uLong getCount() const { return mnCount; }
 };
 
+class WeightedCounterWithRows
+{
+const SCROW mnStartRow;
+const SCROW mnEndRow;
+sal_uLong mnCount;
+
+public:
+WeightedCounterWithRows(SCROW nStartRow, SCROW nEndRow)
+: mnStartRow(nStartRow)
+, mnEndRow(nEndRow)
+, mnCount(0)
+{
+}
+
+void operator() (const sc::CellStoreType::value_type& node)
+{
+const SCROW nRow1 = node.position;
+const SCROW nRow2 = nRow1 + 1;
+
+if (! ((nRow2 < mnStartRow) || (nRow1 > mnEndRow)))
+{
+mnCount += WeightedCounter::getWeight(node);
+}
+}
+
+sal_uLong getCount() const { return mnCount; }
+};
+
+}
+
+sal_uLong ScColumn::GetWeightedCount() const
+{
+const WeightedCounter aFunc = std::for_each(maCells.begin(), maCells.end(),
+WeightedCounter());
+return aFunc.getCount();
 }
 
-sal_uInt32 ScColumn::GetWeightedCount() const
+sal_uLong ScColumn::GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const
 {
-WeightedCounter aFunc;
-std::for_each(maCells.begin(), maCells.end(), aFunc);
+const WeightedCounterWithRows aFunc = std::for_each(maCells.begin(), 
maCells.end(),
+W

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/table3.cxx |  104 +++--
 1 file changed, 71 insertions(+), 33 deletions(-)

New commits:
commit b9c956c4928924281315c838356f0b7c5d91782f
Author: Serge Krot 
AuthorDate: Tue Oct 9 10:16:18 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:33:54 2018 +0100

sc: speed-up: avoid usage of svl::SharedString where it is possible

Change-Id: I55a1a634927cb1d7a04267d02322fcfa41d390d0
Reviewed-on: https://gerrit.libreoffice.org/61572
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
Reviewed-on: https://gerrit.libreoffice.org/62750
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 91d3249deb57..56c85818015f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2399,65 +2399,78 @@ public:
 return std::pair(bOk, bTestEqual);
 }
 
-std::pair compareByString(
+   std::pair compareByString(
 ScRefCellValue& rCell, SCROW nRow, const ScQueryEntry& rEntry, const 
ScQueryEntry::Item& rItem)
 {
-bool bOk = false;
-bool bTestEqual = false;
-bool bMatchWholeCell = mbMatchWholeCell;
-svl::SharedString aCellStr;
-if (isPartialTextMatchOp(rEntry))
-// may have to do partial textural comparison.
-bMatchWholeCell = false;
-
 if (!rCell.isEmpty())
 {
 if (rCell.meType == CELLTYPE_FORMULA && 
rCell.mpFormula->GetErrCode())
 {
 // Error cell is evaluated as string (for now).
-aCellStr = 
mrStrPool.intern(ScGlobal::GetErrorString(rCell.mpFormula->GetErrCode()));
+const svl::SharedString aCellStr = 
mrStrPool.intern(ScGlobal::GetErrorString(rCell.mpFormula->GetErrCode()));
+return compareByStringComparator(rEntry, rItem, &aCellStr, 
nullptr);
 }
 else if (rCell.meType == CELLTYPE_STRING)
-aCellStr = *rCell.mpString;
+{
+return compareByStringComparator(rEntry, rItem, 
rCell.mpString, nullptr);
+}
 else
 {
 sal_uLong nFormat = mrTab.GetNumberFormat( 
static_cast(rEntry.nField), nRow );
 OUString aStr;
 ScCellFormat::GetInputString(rCell, nFormat, aStr, 
*mrDoc.GetFormatTable(), &mrDoc);
-aCellStr = mrStrPool.intern(aStr);
+return compareByStringComparator(rEntry, rItem, nullptr, 
&aStr);
 }
 }
 else
 {
 OUString aStr;
 mrTab.GetInputString(static_cast(rEntry.nField), nRow, 
aStr);
-aCellStr = mrStrPool.intern(aStr);
+return compareByStringComparator(rEntry, rItem, nullptr, &aStr);
 }
+}
+
+// Called from compareByString() method, where different sources of 
strings are checked.
+// The value is placed inside one parameter: [pValueSource1] or 
[pValueSource2] but never in both.
+std::pair compareByStringComparator(const ScQueryEntry& rEntry, 
const ScQueryEntry::Item& rItem,
+const svl::SharedString* pValueSource1, OUString * pValueSource2)
+{
+bool bOk = false;
+bool bTestEqual = false;
+bool bMatchWholeCell = mbMatchWholeCell;
+if (isPartialTextMatchOp(rEntry))
+// may have to do partial textural comparison.
+bMatchWholeCell = false;
 
-bool bRealWildOrRegExp = isRealWildOrRegExp(rEntry);
-bool bTestWildOrRegExp = isTestWildOrRegExp(rEntry);
+const bool bRealWildOrRegExp = isRealWildOrRegExp(rEntry);
+const bool bTestWildOrRegExp = isTestWildOrRegExp(rEntry);
+
+// [pValueSource1] or [pValueSource2] but never both of them or none 
of them
+assert((pValueSource1 != nullptr) != (pValueSource2 != nullptr));
 
 if ( bRealWildOrRegExp || bTestWildOrRegExp )
 {
+const OUString & rValue = pValueSource1 ? 
pValueSource1->getString() : *pValueSource2;
+
 sal_Int32 nStart = 0;
-sal_Int32 nEnd   = aCellStr.getLength();
+sal_Int32 nEnd   = rValue.getLength();
 
 // from 614 on, nEnd is behind the found text
 bool bMatch = false;
 if ( rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == 
SC_DOES_NOT_END_WITH )
 {
 nEnd = 0;
-nStart = aCellStr.getLength();
+nStart = rValue.getLength();
 bMatch = rEntry.GetSearchTextPtr( mrParam.eSearchType, 
mrParam.bCaseSens, bMatchWholeCell )
-->SearchBackward(aCellStr.getString(), &nStart, &nEnd);
+->SearchBackward(rValue, &nStart, &nEnd);
 }
 else
 {
 bMatch = rEntry.GetSearchTextPtr( mrParam.eSearchType, 
mrParam.bCaseSens, bMatchWholeCe

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - svl/source

[Libreoffice Gerrit user]

 svl/source/numbers/zforlist.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b8c475e83bc1804874a09e5bbcbf6954601ada02
Author: Serge Krot 
AuthorDate: Fri Oct 5 21:17:44 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:33:37 2018 +0100

sc: avoid checking for time formats in case of SvNumFormatType::NUMBER

Change-Id: I565506d58f2dd94a6c2c5e1c4a2000ce1f9752cf
Reviewed-on: https://gerrit.libreoffice.org/61445
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
Reviewed-on: https://gerrit.libreoffice.org/62749
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 0747e0c2a326..d2720444f5e7 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1468,6 +1468,9 @@ sal_uInt32 SvNumberFormatter::GetEditFormat( double 
fNumber, sal_uInt32 nFIndex,
 else
 nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
 break;
+case css::util::NumberFormat::NUMBER:
+nKey = GetStandardFormat( eType, eLang );
+break;
 default:
 nKey = GetStandardFormat( fNumber, nFIndex, eType, eLang );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/attarray.cxx |   62 +++
 1 file changed, 43 insertions(+), 19 deletions(-)

New commits:
commit 6818e8601402d006b85f1818f353fbbace6a6f62
Author: Serge Krot 
AuthorDate: Mon Oct 8 10:29:30 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:33:19 2018 +0100

sc: Enhance binary search for ScAttrArray

Change-Id: Idf417c452dbbadbede0e3f0860cce7a8a6fd308e
Reviewed-on: https://gerrit.libreoffice.org/61517
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
Reviewed-on: https://gerrit.libreoffice.org/62748
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index d22b868f0a22..8bee60392acc 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -170,35 +170,59 @@ bool ScAttrArray::Concat(SCSIZE nPos)
 return bRet;
 }
 
+/*
+ * nCount is the number of runs of different attribute combinations;
+ * no attribute in a column => nCount==1, one attribute somewhere => nCount == 
3
+ * (ie. one run with no attribute + one attribute + another run with no 
attribute)
+ * so a range of identical attributes is only one entry in ScAttrArray.
+ *
+ * Iterative implementation of Binary Search
+ * The same implementation was used inside ScMarkArray::Search().
+ */
+
 bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const
 {
+/*auto it = std::lower_bound(mvData.begin(), mvData.end(), nRow,
+[] (const ScAttrEntry &r1, SCROW nRow)
+{ return r1.nEndRow < nRow; } );
+if (it != mvData.end())
+nIndex = it - mvData.begin();
+return it != mvData.end(); */
+
+if (nCount == 1)
+{
+nIndex = 0;
+return true;
+}
+
 long nHi = static_cast(nCount) - 1;
 long i = 0;
-bool bFound = (nCount == 1);
 long nLo = 0;
-long nStartRow = 0;
-while ( !bFound && nLo <= nHi )
+
+while ( nLo <= nHi )
 {
 i = (nLo + nHi) / 2;
-if (i > 0)
-nStartRow = (long) pData[i - 1].nRow;
-else
-nStartRow = -1;
-const long nEndRow = (long) pData[i].nRow;
-if (nEndRow < (long) nRow)
-nLo = ++i;
+
+if (pData[i].nRow < nRow)
+{
+// If [nRow] greater, ignore left half
+nLo = i + 1;
+}
+else  if ((i > 0) && (pData[i - 1].nRow >= nRow))
+{
+// If [nRow] is smaller, ignore right half
+nHi = i - 1;
+}
 else
-if (nStartRow >= (long) nRow)
-nHi = --i;
-else
-bFound = true;
+{
+// found
+nIndex=static_cast(i);
+return true;
+}
 }
 
-if (bFound)
-nIndex=(SCSIZE)i;
-else
-nIndex=0;
-return bFound;
+nIndex=0;
+return false;
 }
 
 const ScPatternAttr* ScAttrArray::GetPattern( SCROW nRow ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/inc sc/qa sc/source

[Libreoffice Gerrit user]

 sc/inc/markmulti.hxx|2 
 sc/qa/unit/mark_test.cxx|  105 +++-
 sc/source/core/data/markarr.cxx |   47 +
 3 files changed, 129 insertions(+), 25 deletions(-)

New commits:
commit 22e5e094575fa3147fa8c8b93491e867f306752f
Author: Serge Krot 
AuthorDate: Thu Oct 4 15:20:05 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:32:39 2018 +0100

sc: Enhance binary search for ScMarkArray

Change-Id: I0fe6a0b8987fb3c3229c5aabcbf056cfb365650c
Reviewed-on: https://gerrit.libreoffice.org/61373
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
Reviewed-on: https://gerrit.libreoffice.org/62746
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/inc/markmulti.hxx b/sc/inc/markmulti.hxx
index 22f0ee5d1dad..4e284ed76263 100644
--- a/sc/inc/markmulti.hxx
+++ b/sc/inc/markmulti.hxx
@@ -58,7 +58,7 @@ public:
 void SetMarkArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW 
nEndRow, bool bMark );
 bool IsRowMarked( SCROW nRow ) const;
 bool IsRowRangeMarked( SCROW nStartRow, SCROW nEndRow ) const;
-bool IsEmpty() const { return ( !aMultiSelContainer.size() && 
!aRowSel.HasMarks() ); }
+bool IsEmpty() const { return ( aMultiSelContainer.empty() && 
!aRowSel.HasMarks() ); }
 ScMarkArray GetMarkArray( SCCOL nCol ) const;
 void Clear();
 void MarkAllCols( SCROW nStartRow, SCROW nEndRow );
diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx
index 957d5fe5b780..0b292f1377cd 100644
--- a/sc/qa/unit/mark_test.cxx
+++ b/sc/qa/unit/mark_test.cxx
@@ -97,6 +97,8 @@ public:
 void testDeleteTabBeforeSelected();
 void testDeleteTabAfterSelected();
 
+void testScMarkArraySearch();
+
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testSimpleMark_Simple);
 CPPUNIT_TEST(testSimpleMark_Column);
@@ -107,10 +109,11 @@ public:
 CPPUNIT_TEST(testInsertTabAfterSelected);
 CPPUNIT_TEST(testDeleteTabBeforeSelected);
 CPPUNIT_TEST(testDeleteTabAfterSelected);
+CPPUNIT_TEST(testScMarkArraySearch);
 CPPUNIT_TEST_SUITE_END();
 
 private:
-
+void testScMarkArraySearch_check(ScMarkArray & ar, SCROW nRow, bool 
expectStatus, SCSIZE nIndexExpect);
 };
 
 static void lcl_GetSortedRanges( const ScRangeList& rRangeList, ScRangeList& 
rRangeListOut )
@@ -846,6 +849,106 @@ void Test::testDeleteTabAfterSelected()
 CPPUNIT_ASSERT_EQUAL(SCTAB(0), aMark.GetFirstSelected());
 }
 
+void Test::testScMarkArraySearch_check(ScMarkArray & ar, SCROW nRow, bool 
expectStatus, SCSIZE nIndexExpect)
+{
+SCSIZE nIndex = 0;
+bool status = ar.Search(nRow, nIndex);
+CPPUNIT_ASSERT_EQUAL(expectStatus, status);
+CPPUNIT_ASSERT_EQUAL(nIndexExpect, nIndex);
+}
+
+void Test::testScMarkArraySearch()
+{
+// empty
+{
+ScMarkArray ar;
+testScMarkArraySearch_check(ar, -1, false, 0);
+testScMarkArraySearch_check(ar, 100, false, 0);
+}
+
+// one range
+{
+ScMarkArray ar;
+ar.SetMarkArea(10, 20, true);
+
+// 0-9,10-20,21+
+
+testScMarkArraySearch_check(ar, -100, true, 0);
+testScMarkArraySearch_check(ar, -1, true, 0);
+
+testScMarkArraySearch_check(ar, 0,  true, 0);
+testScMarkArraySearch_check(ar, 5,  true, 0);
+testScMarkArraySearch_check(ar, 9,  true, 0);
+testScMarkArraySearch_check(ar, 10, true, 1);
+testScMarkArraySearch_check(ar, 11, true, 1);
+testScMarkArraySearch_check(ar, 19, true, 1);
+testScMarkArraySearch_check(ar, 20, true, 1);
+testScMarkArraySearch_check(ar, 21, true, 2);
+testScMarkArraySearch_check(ar, 22, true, 2);
+}
+
+// three ranges
+{
+ScMarkArray ar;
+ar.SetMarkArea(10, 20, true);
+ar.SetMarkArea(21, 30, true);
+ar.SetMarkArea(50, 100, true);
+
+// 0-9,10-30,31-49,50-100,101+
+
+testScMarkArraySearch_check(ar, -100, true, 0);
+testScMarkArraySearch_check(ar, -1, true, 0);
+
+testScMarkArraySearch_check(ar, 5,  true, 0);
+testScMarkArraySearch_check(ar, 15, true, 1);
+testScMarkArraySearch_check(ar, 25, true, 1);
+testScMarkArraySearch_check(ar, 35, true, 2);
+testScMarkArraySearch_check(ar, 55, true, 3);
+testScMarkArraySearch_check(ar, 20, true, 1);
+testScMarkArraySearch_check(ar, 21, true, 1);
+}
+
+// three single-row ranges
+{
+ScMarkArray ar;
+ar.SetMarkArea(4, 4, true);
+ar.SetMarkArea(6, 6, true);
+ar.SetMarkArea(8, 8, true);
+
+testScMarkArraySearch_check(ar, -100, true, 0);
+testScMarkArraySearch_check(ar, -1, true, 0);
+
+testScMarkArraySearch_check(ar, 3,  true, 0);
+testScMarkArraySearch_check(ar, 4, true, 1);
+testScMarkArraySearch_check(ar, 5, true, 2);
+testScMarkArraySearch_check(ar, 6, true, 3);
+testScMarkArraySearch_

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/cellform.cxx |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 00dca13f5a6b0a033c823b2679f81a7034f38fd5
Author: Serge Krot 
AuthorDate: Fri Oct 5 21:21:58 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 19:32:55 2018 +0100

sc: speed-up: no usage of temp strings objects

Change-Id: I7d9812672e4cbefd7e422b5c70b54ee3ea50df2d
Reviewed-on: https://gerrit.libreoffice.org/61446
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/62747
Tested-by: Thorsten Behrens 

diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index a9877cec9c0a..d8f383585b88 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -51,7 +51,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, 
sal_uLong nFormat, OUString
 break;
 case CELLTYPE_VALUE:
 {
-double nValue = rCell.mfValue;
+const double & nValue = rCell.mfValue;
 if (!bNullVals && nValue == 0.0)
 rString.clear();
 else
@@ -95,7 +95,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, 
sal_uLong nFormat, OUString
 }
 else
 {
-sal_uInt16 nErrCode = pFCell->GetErrCode();
+const sal_uInt16 nErrCode = pFCell->GetErrCode();
 
 if (nErrCode != 0)
 rString = ScGlobal::GetErrorString(nErrCode);
@@ -141,36 +141,34 @@ OUString ScCellFormat::GetString(
 void ScCellFormat::GetInputString(
 ScRefCellValue& rCell, sal_uLong nFormat, OUString& rString, 
SvNumberFormatter& rFormatter, const ScDocument* pDoc )
 {
-OUString aString = rString;
 switch (rCell.meType)
 {
 case CELLTYPE_STRING:
 case CELLTYPE_EDIT:
-aString = rCell.getString(pDoc);
+rString = rCell.getString(pDoc);
 break;
 case CELLTYPE_VALUE:
-rFormatter.GetInputLineString(rCell.mfValue, nFormat, aString );
+rFormatter.GetInputLineString(rCell.mfValue, nFormat, rString );
 break;
 case CELLTYPE_FORMULA:
 {
 ScFormulaCell* pFC = rCell.mpFormula;
 if (pFC->IsEmptyDisplayedAsString())
-aString = EMPTY_OUSTRING;
+rString = EMPTY_OUSTRING;
 else if (pFC->IsValue())
-rFormatter.GetInputLineString(pFC->GetValue(), nFormat, 
aString);
+rFormatter.GetInputLineString(pFC->GetValue(), nFormat, 
rString);
 else
-aString = pFC->GetString().getString();
+rString = pFC->GetString().getString();
 
-sal_uInt16 nErrCode = pFC->GetErrCode();
+const sal_uInt16 nErrCode = pFC->GetErrCode();
 if (nErrCode != 0)
-aString = EMPTY_OUSTRING;
+rString = EMPTY_OUSTRING;
 }
 break;
 default:
-aString = EMPTY_OUSTRING;
+rString = EMPTY_OUSTRING;
 break;
 }
-rString = aString;
 }
 
 OUString ScCellFormat::GetOutputString( ScDocument& rDoc, const ScAddress& 
rPos, ScRefCellValue& rCell )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit c537d043eb373d03a5f49b71d8552276720c01c5
Author: Michael Stahl 
AuthorDate: Thu Nov 1 19:27:34 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 1 19:27:34 2018 +0100

sw_redlinehide_3: SwTextNode::AddToList ignore Undo-array nodes

The node is moved between undo-array and doc-array and each time
AddToList is called; it doesn't make sense to add a node that is
currently in undo-array to a list, and it leaks the mpNodeNum
because IsInList will return false because the SwNodeNum lacks a
parent, and it triggers some recently added asserts,
so just don't do that.

Change-Id: I75e51386806ce3845b7c61206020a59c092577fe

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 97c89d2eae06..5cd2a795b2eb 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4281,7 +4281,7 @@ void SwTextNode::AddToList()
 }
 
 SwList *const pList(FindList(this));
-if (pList)
+if (pList && GetNodes().IsDocNodes()) // not for undo nodes
 {
 assert(!mpNodeNum);
 mpNodeNum = new SwNodeNum(this, false);
commit 4bbbcfd57e10521efd7fd1d2261679d9416ad843
Author: Michael Stahl 
AuthorDate: Thu Nov 1 19:25:04 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 1 19:25:04 2018 +0100

sw_redlinehide_3: fix SwDoc::MoveParagraph copying of redlined text

If redlining is enabled, the selection is copied and so delete redlines
become insert redline; better to delete the delete redlines so the
insert redline consists only of the visible text.

Change-Id: I5f7da96dd957262ccc2b83d0abe6add258b7067f

diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4ca782e48ec2..260f437affc1 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2144,6 +2144,41 @@ bool SwDoc::MoveParagraphImpl(const SwPaM& rPam, long 
const nOffset,
 }
 
 getIDocumentContentOperations().CopyRange( aPam, aInsPos, 
/*bCopyAll=*/false, /*bCheckPos=*/true );
+
+#ifndef NDEBUG
+size_t 
nRedlines(getIDocumentRedlineAccess().GetRedlineTable().size());
+#endif
+if (nOffset > 0)
+assert(aPam.End()->nNode.GetIndex() - 
aPam.Start()->nNode.GetIndex() + nOffset == aInsPos.nNode.GetIndex() - 
aPam.End()->nNode.GetIndex());
+else
+assert(aPam.Start()->nNode.GetIndex() - 
aPam.End()->nNode.GetIndex() + nOffset == aInsPos.nNode.GetIndex() - 
aPam.End()->nNode.GetIndex());
+SwRedlineTable::size_type i;
+getIDocumentRedlineAccess().GetRedline(*aPam.End(), &i);
+for ( ; 0 < i; --i)
+{   // iterate backwards to get easy constant index arithmetic
+SwRangeRedline const*const pRedline = 
getIDocumentRedlineAccess().GetRedlineTable()[i - 1];
+if (*pRedline->End() < *aPam.Start())
+{
+break;
+}
+if (pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE)
+{
+assert(*aPam.Start() <= *pRedline->Start()); // caller's 
fault
+SwRangeRedline* pNewRedline;
+{
+SwPaM pam(*pRedline, nullptr);
+pam.GetPoint()->nNode += aInsPos.nNode.GetIndex() - 
aPam.End()->nNode.GetIndex();
+
pam.GetPoint()->nContent.Assign(pam.GetPoint()->nNode.GetNode().GetContentNode(),
 pam.GetPoint()->nContent.GetIndex());
+pam.GetMark()->nNode += aInsPos.nNode.GetIndex() - 
aPam.End()->nNode.GetIndex();
+
pam.GetMark()->nContent.Assign(pam.GetMark()->nNode.GetNode().GetContentNode(), 
pam.GetMark()->nContent.GetIndex());
+
+pNewRedline = new SwRangeRedline( 
nsRedlineType_t::REDLINE_DELETE, pam );
+}
+// note: effectively this will DeleteAndJoin the pam!
+getIDocumentRedlineAccess().AppendRedline(pNewRedline, 
true);
+assert(nRedlines == 
getIDocumentRedlineAccess().GetRedlineTable().size());
+}
+}
 if( bDelLastPara )
 {
 // We need to remove the last empty Node again
commit ed4d20ca9480adbd34aaad7d637851a57743ba8e
Author: Michael Stahl 
AuthorDate: Thu Nov 1 19:23:46 2018 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 1 19:23:46 2018 +0100

avoid SwIndex assert

Change-Id: I29644f2207880582f5712e41318381bbc7f1e043

diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 663e8c8ab08c..4ca782e48ec2 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2204,7 +2204,10 @@ bool SwDoc::MoveParagraphImpl(const SwPaM& rPam, long 
const nOffset,
 aPam.GetBound(false).nContent.

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

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/NumberingManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcba99488b2193b385bd8dd7d3a85f7e46e2e0ce
Author: Justin Luth 
AuthorDate: Sat Apr 21 11:35:31 2018 +0300
Commit: Aron Budea 
CommitDate: Thu Nov 1 18:16:41 2018 +0100

tdf#117137: DOCX import: don't try to set grab-bag as UNO prop

This modifies commit a6f2199e9888cb75960f1d35034bd44fb45e5565
"DOCX import: don't try to set grab-gag props as UNO props"

Perhaps that commit should simply be reverted, but I will trust
that the commit was mostly OK and simply adjust the logic so
that *InteropGrabBag is ignored as before.

Doing this resolves MSO being unable to open a specific document
and LO missing some numbering during LO round-tripping.
Probably these are just side-effects from other locations in the
code that couldn't deal with these unexpected properties. For
example, the numbering.xml file is malformed, since it is
missing the w14: namespace.

Unfortunately, I failed in my attempt to create a minimal
test document.

Change-Id: Idf88cd09d96546b7f03d326afb5f6e58439bcf20
Reviewed-on: https://gerrit.libreoffice.org/53271
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
(cherry picked from commit ac27f4e7abf5339f71d4f5f3fc09a13b25669fe4)
Reviewed-on: https://gerrit.libreoffice.org/62736
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index d9dfeb3d8efe..89e910102ac0 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -217,7 +217,7 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetCharStyleProperties( )
 {
 if (IgnoreForCharStyle(aValIter->Name))
 continue;
-else
+else if ( aValIter->Name != "CharInteropGrabBag" && aValIter->Name != 
"ParaInteropGrabBag" )
 rProperties.emplace_back(aValIter->Name, 0, aValIter->Value, 
beans::PropertyState_DIRECT_VALUE);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/filter/excel/xlformula.cxx |2 +-
 sc/source/filter/oox/formulabase.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ee11c3f55ec1285d8febc065bda44224052eaae
Author: Eike Rathke 
AuthorDate: Thu Nov 1 16:40:31 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Nov 1 18:01:26 2018 +0100

Add REGEX() 4th parameter also to Excel import/export, tdf#113977

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

diff --git a/sc/source/filter/excel/xlformula.cxx 
b/sc/source/filter/excel/xlformula.cxx
index 2af552318efc..459c913a400c 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -640,7 +640,7 @@ static const XclFunctionInfo saFuncTable_OOoLO[] =
 EXC_FUNCENTRY_OOO( ocForecast_ETS_PIM, 3,  7,  0,  
"ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ),
 EXC_FUNCENTRY_OOO( ocForecast_ETS_STM, 3,  6,  0,  
"ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ),
 EXC_FUNCENTRY_OOO( ocRoundSig,  2,  2,  0,  "ORG.LIBREOFFICE.ROUNDSIG" 
),
-EXC_FUNCENTRY_OOO( ocRegex, 2,  3,  0,  "ORG.LIBREOFFICE.REGEX" )
+EXC_FUNCENTRY_OOO( ocRegex, 2,  4,  0,  "ORG.LIBREOFFICE.REGEX" )
 };
 
 #undef EXC_FUNCENTRY_OOO_IBR
diff --git a/sc/source/filter/oox/formulabase.cxx 
b/sc/source/filter/oox/formulabase.cxx
index be09c75a6251..4a11eef0ff87 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -911,7 +911,7 @@ static const FunctionData saFuncTableOOoLO[] =
 { "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT",   
"ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT",   NOID,   NOID,   4,  7,  V, { VR, VA, 
VR }, FuncFlags::MACROCALL_NEW },
 { "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT", 
"ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT", NOID,   NOID,   3,  6,  V, { VR, VA, 
VR }, FuncFlags::MACROCALL_NEW },
 { "ORG.LIBREOFFICE.ROUNDSIG",   "ORG.LIBREOFFICE.ROUNDSIG", NOID, NOID,  
2,  2,  V, { RX }, FuncFlags::MACROCALL_NEW },
-{ "ORG.LIBREOFFICE.REGEX",  "ORG.LIBREOFFICE.REGEX", NOID, NOID,  2,  
3,  V, { RX }, FuncFlags::MACROCALL_NEW }
+{ "ORG.LIBREOFFICE.REGEX",  "ORG.LIBREOFFICE.REGEX", NOID, NOID,  2,  
4,  V, { RX }, FuncFlags::MACROCALL_NEW }
 
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - Mobile/Mobile Mobile/Mobile.xcodeproj

[Libreoffice Gerrit user]

 Mobile/Mobile.xcodeproj/project.pbxproj |  124 
 Mobile/Mobile/Info.plist.in |4 -
 2 files changed, 126 insertions(+), 2 deletions(-)

New commits:
commit aff35c92814b20238de996b393977bd1654b90f2
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 18:56:20 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 18:56:24 2018 +0200

Add some source files from sw

I got a crash report from SwDocShell::Edit. Let's see if adding those
source files to the Xcode project (but not to be compiled by Xcode)
means that Xcode will be able to show the actual crash location based
on such a report. (At least for crashes in the code that Xcode itself
compiles, I assume it works perfectly. But LibreOffice core code is
not built by Xcode.)

Change-Id: I1b6bf34e35a0e5652081a6dca40ba04312fbe20b

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index cfc4203e2..8739933a2 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -72,6 +72,52 @@
BE00F89E21396585001CE2D4 /* images */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = images; path = 
../../../loleaflet/dist/images; sourceTree = ""; };
BE00F8B4213ED543001CE2D4 /* libiconv.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
BE00F8B6213ED573001CE2D4 /* libz.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+   BE34D10F218B66B600815297 /* docsh.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docsh.cxx; 
path = "../../ios-device/sw/source/uibase/app/docsh.cxx"; sourceTree = 
""; };
+   BE34D110218B66B600815297 /* docstyle.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docstyle.cxx; 
path = "../../ios-device/sw/source/uibase/app/docstyle.cxx"; sourceTree = 
""; };
+   BE34D111218B66B600815297 /* docshdrw.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docshdrw.cxx; 
path = "../../ios-device/sw/source/uibase/app/docshdrw.cxx"; sourceTree = 
""; };
+   BE34D112218B66B600815297 /* docshini.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docshini.cxx; 
path = "../../ios-device/sw/source/uibase/app/docshini.cxx"; sourceTree = 
""; };
+   BE34D113218B66B600815297 /* swmodul1.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swmodul1.cxx; 
path = "../../ios-device/sw/source/uibase/app/swmodul1.cxx"; sourceTree = 
""; };
+   BE34D114218B66B600815297 /* swdllimpl.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = swdllimpl.hxx; 
path = "../../ios-device/sw/source/uibase/app/swdllimpl.hxx"; sourceTree = 
""; };
+   BE34D115218B66B600815297 /* swwait.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swwait.cxx; 
path = "../../ios-device/sw/source/uibase/app/swwait.cxx"; sourceTree = 
""; };
+   BE34D116218B66B600815297 /* swdll.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swdll.cxx; 
path = "../../ios-device/sw/source/uibase/app/swdll.cxx"; sourceTree = 
""; };
+   BE34D117218B66B600815297 /* apphdl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apphdl.cxx; 
path = "../../ios-device/sw/source/uibase/app/apphdl.cxx"; sourceTree = 
""; };
+   BE34D118218B66B600815297 /* appenv.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appenv.cxx; 
path = "../../ios-device/sw/source/uibase/app/appenv.cxx"; sourceTree = 
""; };
+   BE34D119218B66B600815297 /* appenv.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = appenv.hxx; path 
= "../../ios-device/sw/source/uibase/app/appenv.hxx"; sourceTree = ""; };
+   BE34D11A218B66B600815297 /* swmodule.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swmodule.cxx; 
path = "../../ios-device/sw/source/uibase/app/swmodule.cxx"; sourceTree = 
""; };
+   BE34D11B218B66B600815297 /* docst.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docst.cxx; 
path = "../../ios-device/sw/source/uibase/app/docst.cxx"; sourceTree = 
""; };
+   BE34D11C218B66B600815297 /* applab.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = applab.cxx; 
path = "../../ios-device/sw/source/uibase/app/applab.cxx"; sourceTree = 
""; };
+   BE34D11D218B66B600815297 /* docsh2.cxx */ = {isa = 

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

[Libreoffice Gerrit user]

 Mobile/Mobile/Info.plist.in |  367 
 kit/Kit.cpp |5 
 2 files changed, 204 insertions(+), 168 deletions(-)

New commits:
commit 2a12bf3371ce314ed56c206202cfe0f16a65dbe1
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 18:28:30 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 18:34:14 2018 +0200

Add xlsx to Info.plis(.in)

Added it to UTImportedTypeDeclarations, seemed to work. Not sure what
document types should be in UTImportedTypeDeclarations and what in
UTExportedTypeDeclarations. The documentation for document type
association is sadly rather vague.

I remember that some month ago I had horrible problems with this stuff
(see 26323fb92b3e860665c2a37deba049e9e310a7e9), but now adding xlsx
went without a hitch. Not sure if I was just lucky, or whether iOS
12.1 has some bug fix related to this...

Change-Id: I75483719bd20496e8b44f935c788455148655a88

diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index fd75c02e9..4f0af735f 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -70,6 +70,20 @@
 org.oasis-open.opendocument.spreadsheet
 
 
+
+CFBundleTypeIconFiles
+
+CFBundleTypeName
+Office Open XML spreadsheet
+CFBundleTypeRole
+Editor
+LSHandlerRank
+Alternate
+LSItemContentTypes
+
+org.openxmlformats.spreadsheetml.sheet
+
+
 
 CFBundleExecutable
 $(EXECUTABLE_NAME)
@@ -163,7 +177,30 @@
 
 
 UTImportedTypeDeclarations
-
+
+
+UTTypeConformsTo
+
+org.openxmlformats.openxml
+public.composite-content
+
+UTTypeDescription
+Office Open XML spreadsheet
+UTTypeIdentifier
+org.openxmlformats.spreadsheetml.sheet
+UTTypeTagSpecification
+
+public.filename-extension
+
+xlsx
+
+public.mime-type
+
+
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+
+
+
+
 NSCameraUsageDescription
 $(PRODUCT_NAME) camera use
 
commit 1fd5abc7828a59ec99c21b0d9b0925ae0fa57156
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 18:15:19 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 18:34:14 2018 +0200

Add Emacs mode line and untabify

Change-Id: I9995a78cf59104e546f289dbaf685d70f9ba302e

diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index dc078a396..fd75c02e9 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -1,170 +1,170 @@
-
+ 
 http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
 
 
-   CFBundleDevelopmentRegion
-   $(DEVELOPMENT_LANGUAGE)
-   CFBundleDisplayName
-   @IOSAPP_NAME@
-   CFBundleDocumentTypes
-   
-   
-   CFBundleTypeName
-   OpenDocument Flat Text
-   LSHandlerRank
-   Default
-   LSItemContentTypes
-   
-   com.collabora.office.uti.fodt
-   
-   
-   
-   CFBundleTypeIconFiles
-   
-   CFBundleTypeName
-   Plain Text
-   CFBundleTypeRole
-   Editor
-   LSHandlerRank
-   Alternate
-   LSItemContentTypes
-   
-   public.text
-   
-   
-   
-   CFBundleTypeName
-   OpenDocument Text
-   LSHandlerRank
-   Owner
-   LSItemContentTypes
-   
-   
org.oasis-open.opendocument.text
-   
-   
-   
-   CFBundleTypeIconFiles
-   
-   CFBundleTypeName
-   Microsoft Word Document
-   CFBundleTypeRole
-   Editor
-   LSHandlerRank
-   Alternate
-   LSItemContentTypes
-   
-   com.microsoft.word.doc
-   
-   
-   
-   CFBundleTypeIconFiles
-   
-   CFBundleTypeName
-   OpenDocument Spreadsheet
-   

[Libreoffice-commits] online.git: loolwsd-systemplate-setup

[Libreoffice Gerrit user]

 loolwsd-systemplate-setup |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c0ab7215568b53ce4a26de00900f9c6fa36b508
Author: Andras Timar 
AuthorDate: Thu Nov 1 17:25:44 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 17:25:44 2018 +0100

typo: missing backslash

Change-Id: I194420d64a2541000e6bc7eb52d3cec8883e32d4

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 527523dc6..adeedeb2d 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -21,7 +21,7 @@ cd / || exit 1
 # into the template tree of system files for the chroot jails.
 
 # First essential files and shared objects
-find etc/hosts etc/nsswitch.conf etc/resolv.conf
+find etc/hosts etc/nsswitch.conf etc/resolv.conf \
  etc/ld.so.* \
  lib/ld-* lib64/ld-* \
  lib64/libnss_* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd-systemplate-setup

[Libreoffice Gerrit user]

 loolwsd-systemplate-setup |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b4f15c714ae5fb5208f4267a76effe8c4f54a4e7
Author: Andras Timar 
AuthorDate: Thu Nov 1 17:17:40 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 17:17:40 2018 +0100

Fix networking in the chroot (again)

Change-Id: I60a6f5f99577e4336b1ec117e28650d677ed7d63

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index d68e8255a..527523dc6 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -21,7 +21,8 @@ cd / || exit 1
 # into the template tree of system files for the chroot jails.
 
 # First essential files and shared objects
-find etc/ld.so.* \
+find etc/hosts etc/nsswitch.conf etc/resolv.conf
+ etc/ld.so.* \
  lib/ld-* lib64/ld-* \
  lib64/libnss_* \
  var/cache/fontconfig \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
+ Kendy, Stephan, Caolan, Xisco, Olivier, Heiko, Eike, Andras,
  Thorsten, Michael

* Completed Action Items:
+ give Rizal Muttaqin commit access & welcome (Heiko)

* Pending Action Items:
+ investigate missing crash report signatures in 6.1.2 (Cloph)
  [ not yet sure what’s happening ]
+ add screenshot builder to basic build stats (Cloph)
  [ build still fails ]

* Release Engineering update (Christian, Xisco)
+ 6.0.7 rc3 status, release on Monday
+ 6.1.3 status, release on Monday
+ 6.2 Beta 1 & feature freeze due Nov 12th
+ Remotes
+ Android viewer
  + exception handling issue in libstdc++ ?
+ Online

 * Backport tdf#119020 "Icons are corrupted on Windows when scaling UI / OpenGL"
+ https://gerrit.libreoffice.org/#/c/62686/
+ 6.0 has been tagged so this patch comes to late
+ welcome for 6.1 as late feature

* Documentation (Olivier)
+ New Help
   + Corner cases of handling legacy PNG images, potential easy hack
   + will split the bug into multiple smaller bugs   
+ Help contents
   + updated pages in Base reports (olivier)
   + Fix typos, bugs (Fitoshido, olivier)
   + Add warning for experimental features (buovjaga)
+ Calc guide
   + Discussions WRT handling massive amount of styles in docs, e.g. 
updating the calc guides

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
254(254) (topicUI) bugs open, 297(297) (needsUXEval)
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added 14(3) 28(3) 47(-1)  96(-7) 
 commented 91(46)   201(43)   368(5) 1501(-33)
   removed  1(1)  1(1)  1(1)6(0)  
  resolved  4(2) 12(4) 27(-3) 128(-1) 
+ top 10 contributors:
  Thomas Lendo made 122 changes in 1 month, and 326 changes in 1 year
  Zolnai, Tamás made 96 changes in 1 month, and 200 changes in 1 year
  Tietze, Heiko made 70 changes in 1 month, and 525 changes in 1 year
  Foote, V Stuart made 37 changes in 1 month, and 223 changes in 1 year
  Kainz, Andreas made 28 changes in 1 month, and 139 changes in 1 year
  Xisco Faulí made 24 changes in 1 month, and 282 changes in 1 year
  Cor Nouws made 16 changes in 1 month, and 79 changes in 1 year
  Dieter Praas made 13 changes in 1 month, and 127 changes in 1 year
  Muhammet Kara made 13 changes in 1 month, and 15 changes in 1 year
  Roman Kuznetsov made 11 changes in 1 month, and 45 changes in 1 year
New needsUXEval between Oct/26-31

 * Access to the language property at paragraph settings
   + https://bugs.documentfoundation.org/show_bug.cgi?id=120932

 * Make font size field in styles dialogs toggleable between percentage and pt
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121011

 * Appearing of GtkSeparator on Notebookbars is different to standard rulers
   + https://bugs.documentfoundation.org/show_bug.cgi?id=121050

 * Toolbar: Remove oleobjectbar.xml and use frameobjectbar.xml
   + https://bugs.documentfoundation.org/show_bug.cgi?id=120985


* Crash Testing (Caolan)
+ 5 (+0) import failure, 4(+0) export failures
+ 8 (+0) coverity issues
+ HsqlBinaryImportText::testBinaryImport failure
+ didn’t get a build
+ Google / ossfuzz:
+ 15 issues, 1 serious, lots of timeout issues
+ did something get slower on our or their side ?
+ ForcePoint, round 9
+ 4 writer layout issues
+ couple of other issues
+ end of Jan. embargo for one lower prio issue.
   + hopefully Miklos can poke at it post spec. update.
   + connecting to other related developers.
+ another issue in progress at higher prio.
  Still struggling to agree an embargo with AOO
   + but got a reply
+ PVS Studio
 + mikekaganski fixing lots of the remaining minor nits.
 + can we get them to run it again at some stage ? ...

* Crash Reporting (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 421 (last 7 days) (-20)
+ http://crashreport.libreoffice.org/stats/version/6.0.6.2
 + 1076 (last 7 days) (-241)
+ http://crashreport.libreoffice.org/stats/version/6.1.0.3
 + 1127 (last 7 days) (-1114)
+ http://crashreport.libreoffice.org/stats/version/6.1.1.2
 + 1034 (last 7 days) (-192)
+ http://crashreport.libreoffice.org/stats/version/6.1.2.1
 + 4167 (last 7 days) (+144)

* Hackfests & Events (Thorsten)
   + Munich was nice, details & achievements on the wiki:   
https://wiki.documentfoundation.org/Hackfest/Muenchen2018
   + next year hackfests coming up:
+ FOSDEM in February
+ Tirana perhaps in March/April
+ Paris in summer
+ tentative Dresden: late autumn (past mid-October, for having students)
   + hope to have one each quarter.

* ment

[Libreoffice-commits] core.git: bin/lo-all-static-libs bin/update_pch bridges/Library_cpp_uno.mk chart2/Module_chart2.mk configure.ac connectivity/Module_connectivity.mk dbaccess/Module_dbaccess.mk de

[Libreoffice Gerrit user]

 Makefile.in |8 
 Repository.mk   |6 +++---
 bin/lo-all-static-libs  |4 ++--
 bin/update_pch  |6 +++---
 bridges/Library_cpp_uno.mk  |4 ++--
 chart2/Module_chart2.mk |2 +-
 configure.ac|4 ++--
 connectivity/Module_connectivity.mk |2 +-
 dbaccess/Module_dbaccess.mk |2 +-
 desktop/Library_sofficeapp.mk   |6 +++---
 desktop/Module_desktop.mk   |2 +-
 extensions/Module_extensions.mk |2 +-
 external/Module_external.mk |2 +-
 external/cairo/ExternalProject_cairo.mk |   12 ++--
 external/cairo/UnpackedTarball_cairo.mk |4 ++--
 external/cppunit/ExternalProject_cppunit.mk |2 +-
 external/curl/ExternalProject_curl.mk   |2 +-
 external/epoxy/Library_epoxy.mk |2 +-
 external/harfbuzz/ExternalProject_harfbuzz.mk   |2 +-
 external/hunspell/ExternalProject_hunspell.mk   |4 ++--
 external/hyphen/ExternalProject_hyphen.mk   |2 +-
 external/icu/ExternalProject_icu.mk |6 +++---
 external/libnumbertext/ExternalProject_libnumbertext.mk |4 ++--
 external/liborcus/ExternalProject_liborcus.mk   |2 +-
 external/libwps/ExternalProject_libwps.mk   |2 +-
 external/libxslt/ExternalProject_libxslt.mk |2 +-
 external/nss/ExternalPackage_nss.mk |2 +-
 external/nss/ExternalProject_nss.mk |4 ++--
 external/nss/UnpackedTarball_nss.mk |2 +-
 external/openssl/ExternalProject_openssl.mk |6 +++---
 external/redland/ExternalProject_raptor.mk  |2 +-
 external/xmlsec/ExternalProject_xmlsec.mk   |2 +-
 i18npool/CustomTarget_breakiterator.mk  |2 +-
 i18npool/Executable_gendict.mk  |2 +-
 i18npool/Module_i18npool.mk |2 +-
 ios/Module_ios.mk   |2 +-
 oox/Library_oox.mk  |2 +-
 postprocess/Rdb_services.mk |2 +-
 registry/Module_registry.mk |4 ++--
 sal/Library_sal.mk  |8 
 salhelper/Module_salhelper.mk   |2 +-
 sc/Module_sc.mk |4 ++--
 solenv/gbuild/LinkTarget.mk |2 +-
 solenv/gbuild/gbuild.mk |   13 +
 solenv/gbuild/platform/iOS.mk   |2 +-
 sw/Module_sw.mk |2 +-
 toolkit/Library_tk.mk   |2 +-
 vcl/Library_vcl.mk  |6 +++---
 vcl/Module_vcl.mk   |2 +-
 vcl/StaticLibrary_vclmain.mk|2 +-
 50 files changed, 82 insertions(+), 93 deletions(-)

New commits:
commit a626bdd56d7116efa57e65403ad51b56657148c3
Author: Michael Stahl 
AuthorDate: Wed Oct 31 19:06:30 2018 +0100
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 16:39:54 2018 +0100

gbuild: rename value OS=IOS to OS=iOS

This gets rid of the horrible hack in gbuild.mk to accomodate the
case-incorrect iOS platform makefiles that cannot be renamed without
upsetting git on file systems that sadly lack the case sensitivity
feature.

Keep the macro defined to IOS though.

Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234
Reviewed-on: https://gerrit.libreoffice.org/62705
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/Makefile.in b/Makefile.in
index a18121d200ca..393e94fda331 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,7 +178,7 @@ clean-host:
rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(WORKDIR)
-ifeq ($(OS),IOS)
+ifeq ($(OS),iOS)
rm -fr $(SRCDIR)/ios/generated
 endif
 
@@ -284,7 +284,7 @@ build: bootstrap fetch $(if 
$(CROSS_COMPILING),cross-toolset) \
 $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if 
$(LODE_HOME),clang-format-check))) \
 install-gdb-printers
$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(build_goal)
-ifeq ($(OS),IOS)
+ifeq ($(OS),iOS)
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
 endif
 
@

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

[Libreoffice Gerrit user]

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

New commits:
commit 4bd701a306c8068911203f976145adc717f015d2
Author: Stephan Bergmann 
AuthorDate: Thu Nov 1 14:26:56 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 1 16:35:54 2018 +0100

tdf#92848: SvxTableShape doesn't implement css::text::XTextAppend

...so don't let it announce that in getTypes().

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

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 44e33d61df0a..5bc8092bf346 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -785,6 +785,7 @@ uno::Sequence< uno::Type > SvxShape::_getTypes()
 case E3D_EXTRUDEOBJ_ID|E3D_INVENTOR_FLAG:
 case E3D_POLYGONOBJ_ID|E3D_INVENTOR_FLAG:
 case OBJ_MEDIA:
+case OBJ_TABLE:
 {
 static css::uno::Sequence< css::uno::Type > aTypeSequence;
 
@@ -1005,7 +1006,6 @@ uno::Sequence< uno::Type > SvxShape::_getTypes()
 case OBJ_GRAF:
 case OBJ_TEXT:
 case OBJ_CAPTION:
-case OBJ_TABLE:
 case OBJ_OLE2: // #i118485# Moved to shapes with text
 default:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5AccessibleWidget.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit f08d54535b3cec6d5dce4a763c738b88cc96351c
Author: Thorsten Behrens 
AuthorDate: Thu Nov 1 14:37:09 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 16:30:17 2018 +0100

kde5: fix build

Change-Id: Ife5a5075fcfbfd83425c021b9f535c1f5e3e8d7e
Reviewed-on: https://gerrit.libreoffice.org/62740
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index dd50a3ef57ab..5e2b43ad906e 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -743,24 +743,24 @@ namespace
 OUString lcl_convertFontWeight(double fontWeight)
 {
 if (fontWeight == awt::FontWeight::THIN || fontWeight == 
awt::FontWeight::ULTRALIGHT)
-return "100";
+return OUString("100");
 if (fontWeight == awt::FontWeight::LIGHT)
-return "200";
+return OUString("200");
 if (fontWeight == awt::FontWeight::SEMILIGHT)
-return "300";
+return OUString("300");
 if (fontWeight == awt::FontWeight::NORMAL)
-return "normal";
+return OUString("normal");
 if (fontWeight == awt::FontWeight::SEMIBOLD)
-return "500";
+return OUString("500");
 if (fontWeight == awt::FontWeight::BOLD)
-return "bold";
+return OUString("bold");
 if (fontWeight == awt::FontWeight::ULTRABOLD)
-return "800";
+return OUString("800");
 if (fontWeight == awt::FontWeight::BLACK)
-return "900";
+return OUString("900");
 
 // awt::FontWeight::DONTKNOW || fontWeight == awt::FontWeight::NORMAL
-return "normal";
+return OUString("normal");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice Impress Presentation Server

[Sergi Baila]

Thanks for the responses to my previous mail. Below I'm replying to specific 
messages. I have some paths to research now.

> From: Miklos Vajna vmik...@collabora.co.uk
> Can you build this on top of
> https://wiki.documentfoundation.org/Development/Impress_Remote_Protocol?
>

I've seen that. It's interesting and certainly does solve some of my 
requirements so It's worth a deeper look. I'll do it. Thanks for the clue.


> From: Thorsten Behrens t...@libreoffice.org

>
> Pretty much anything in LibreOffice can be remote-controlled from a
> different process (even from a different box), via a protocol called
> UNO (quite similar to COM).
>
> Here's an example in python (but the UNO API calls are really quite
> similar for Java):
>
> https://stackoverflow.com/questions/33092424/control-libreoffice-impress-from-python
>

Very interesting. Thanks for the reference. I will certainly use that.

> That leaves the question on how to dynamically generate slide content,
> but that also works via UNO (you can even send Impress files over the
> wire). There's documentation for that, e.g. Andrew's macro book linked
> from the article above: http://www.pitonyak.org/oo.php

Thanks. Each POS station will have some files ready to send so the sending of 
files over the wire seems a perfect fit.



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

[Libreoffice-commits] online.git: test/fakesockettest.cpp

[Libreoffice Gerrit user]

 test/fakesockettest.cpp |   75 
 1 file changed, 69 insertions(+), 6 deletions(-)

New commits:
commit 60ee631a9e128c124b63e7f8f047de0a52bdb33a
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 16:50:42 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 16:52:06 2018 +0200

More FakeSocket tests

Actually, I should expand on this and write a test that makes sure the
FakeSocket API semantics does in fact match that of the real socket
API... A fakefakesockettest. Later.

Change-Id: I5cf885a956d6d795976a4369448be04e88837c19

diff --git a/test/fakesockettest.cpp b/test/fakesockettest.cpp
index 78ff8ae45..8ae3542b3 100644
--- a/test/fakesockettest.cpp
+++ b/test/fakesockettest.cpp
@@ -59,6 +59,23 @@ public:
 
 void FakeSocketTest::testBasic()
 {
+int rc;
+char buf[100];
+
+// First check invalid fds.
+
+rc = fakeSocketListen(10);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EBADF);
+
+rc = fakeSocketWrite(20, "hah", 3);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EBADF);
+
+rc = fakeSocketRead(30, buf, 3);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EBADF);
+
 // Create three sockets: s0, s1 and s2.
 int s0 = fakeSocketSocket();
 CPPUNIT_ASSERT(s0 >= 0);
@@ -77,17 +94,16 @@ void FakeSocketTest::testBasic()
 CPPUNIT_ASSERT(s1 >= 0);
 
 // Listen on s0
-int rc = fakeSocketListen(s0);
+rc = fakeSocketListen(s0);
 CPPUNIT_ASSERT(rc != -1);
 
 // Start a thread that accepts two connections to s0, producing sockets s3 
and s4.
 int s3 = -1, s4 = -1;
 std::thread t0([&] {
+// Cannot use CPPUNIT_ASSERT here as that throws and this thread 
has no Cppunit
+// exception handler. We check below after joining this thread.
 s3 = fakeSocketAccept4(s0, 0);
-CPPUNIT_ASSERT(s3 >= 0);
-
 s4 = fakeSocketAccept4(s0, 0);
-CPPUNIT_ASSERT(s4 >= 0);
 });
 
 // Connect s1 and s2 to s0 (that is, to the sockets produced by accepting 
connections to
@@ -119,8 +135,6 @@ void FakeSocketTest::testBasic()
 rc = fakeSocketWrite(s2, "moin", 4);
 CPPUNIT_ASSERT(rc != -1);
 
-char buf[100];
-
 rc = fakeSocketAvailableDataLength(s3);
 CPPUNIT_ASSERT(rc == 5);
 
@@ -201,6 +215,55 @@ void FakeSocketTest::testBasic()
 
 rc = fakeSocketRead(pipe[0], buf, 1);
 CPPUNIT_ASSERT(rc == 0);
+
+rc = fakeSocketClose(pipe[0]);
+CPPUNIT_ASSERT(rc == 0);
+
+rc = fakeSocketClose(pipe[0]);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EBADF);
+
+rc = fakeSocketClose(pipe[1]);
+CPPUNIT_ASSERT(rc == 0);
+
+rc = fakeSocketClose(pipe[1]);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EBADF);
+
+// Create a pipe again.
+
+rc = fakeSocketPipe2(pipe);
+CPPUNIT_ASSERT(rc == 0);
+
+rc = fakeSocketAvailableDataLength(pipe[0]);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EAGAIN);
+
+rc = fakeSocketAvailableDataLength(pipe[1]);
+CPPUNIT_ASSERT(rc == -1);
+CPPUNIT_ASSERT(errno == EAGAIN);
+
+// Test poll functionality.
+
+struct pollfd pollfds[4];
+
+pollfds[0].fd = s0;
+pollfds[0].events = POLLIN | POLLOUT;
+pollfds[1].fd = s1;
+pollfds[1].events = POLLIN | POLLOUT;
+pollfds[2].fd = s2;
+pollfds[2].events = POLLIN | POLLOUT;
+pollfds[3].fd = 40;
+pollfds[3].events = POLLIN | POLLOUT;
+
+rc = fakeSocketPoll(pollfds, 4, -1);
+// Hmm, does a real poll() set POLLIN for a listening socket? Probably 
only if there is a
+// connection in progress, and that is not the case here for s0.
+CPPUNIT_ASSERT(rc == 3);
+CPPUNIT_ASSERT(pollfds[0].revents == 0);
+CPPUNIT_ASSERT(pollfds[1].revents == POLLIN);
+CPPUNIT_ASSERT(pollfds[2].revents == POLLOUT);
+CPPUNIT_ASSERT(pollfds[3].revents == POLLNVAL);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FakeSocketTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Libreoffice Gerrit user]

 dev/null   |binary
 icon-themes/elementary/cmd/32/mailmergecreatedocuments.png |binary
 icon-themes/elementary/cmd/32/mailmergeemaildocuments.png  |binary
 icon-themes/elementary/cmd/32/mailmergeprintdocuments.png  |binary
 icon-themes/elementary/cmd/32/mailmergesavedocuments.png   |binary
 icon-themes/elementary/cmd/lc_controlcodes.png |binary
 icon-themes/elementary/cmd/lc_mailmergecreatedocuments.png |binary
 icon-themes/elementary/cmd/lc_mailmergeemaildocuments.png  |binary
 icon-themes/elementary/cmd/lc_mailmergeprintdocuments.png  |binary
 icon-themes/elementary/cmd/lc_mailmergesavedocuments.png   |binary
 icon-themes/elementary/cmd/lc_setborderstyle.png   |binary
 icon-themes/elementary/cmd/sc_changedatabasefield.png  |binary
 icon-themes/elementary/cmd/sc_datasubtotals.png|binary
 icon-themes/elementary/cmd/sc_dbformdelete.png |binary
 icon-themes/elementary/cmd/sc_dbquerydelete.png|binary
 icon-themes/elementary/cmd/sc_dbreportdelete.png   |binary
 icon-themes/elementary/cmd/sc_dbtabledelete.png|binary
 icon-themes/elementary/cmd/sc_deletecolumns.png|binary
 icon-themes/elementary/cmd/sc_deletemasterpage.png |binary
 icon-themes/elementary/cmd/sc_deleteprintarea.png  |binary
 icon-themes/elementary/cmd/sc_deleterows.png   |binary
 icon-themes/elementary/cmd/sc_deleteslide.png  |binary
 icon-themes/elementary/cmd/sc_deletetable.png  |binary
 icon-themes/elementary/cmd/sc_mailmergecreatedocuments.png |binary
 icon-themes/elementary/cmd/sc_mailmergeemaildocuments.png  |binary
 icon-themes/elementary/cmd/sc_mailmergeprintdocuments.png  |binary
 icon-themes/elementary/cmd/sc_mailmergesavedocuments.png   |binary
 icon-themes/elementary/cmd/sc_setborderstyle.png   |binary
 icon-themes/elementary/cmd/sc_stylenewbyexample.png|binary
 icon-themes/elementary/cmd/sc_styleupdatebyexample.png |binary
 icon-themes/elementary/cmd/sc_validation.png   |binary
 icon-themes/elementary/framework/res/folder_32.png |binary
 icon-themes/elementary/links.txt   |   35 +
 icon-themes/elementary/sc/res/icon-set-circles1-gray.png   |binary
 icon-themes/elementary/sc/res/icon-set-circles1-green.png  |binary
 icon-themes/elementary/sc/res/icon-set-circles1-red.png|binary
 icon-themes/elementary/sc/res/icon-set-circles1-yellow.png |binary
 icon-themes/elementary/sc/res/icon-set-circles2-dark-gray.png  |binary
 icon-themes/elementary/sc/res/icon-set-circles2-dark-red.png   |binary
 icon-themes/elementary/sc/res/icon-set-circles2-light-gray.png |binary
 icon-themes/elementary/sc/res/icon-set-circles2-light-red.png  |binary
 icon-themes/elementary/sc/res/icon-set-stars-empty.png |binary
 icon-themes/elementary/sc/res/icon-set-stars-full.png  |binary
 icon-themes/elementary/sc/res/icon-set-stars-half.png  |binary
 icon-themes/elementary/sc/res/na03.png |binary
 icon-themes/elementary/sc/res/nc01.png |binary
 icon-themes/elementary/sc/res/paste_transpose.png  |binary
 icon-themes/elementary/svx/res/dsth_cen.png|binary
 icon-themes/elementary/svx/res/dsth_dst.png|binary
 icon-themes/elementary/svx/res/light.png   |binary
 icon-themes/elementary/svx/res/pr010.png   |binary
 icon-themes/elementary/svx/res/pr011.png   |binary
 icon-themes/elementary/svx/res/pr013.png   |binary
 icon-themes/elementary/svx/res/pr014.png   |binary
 icon-themes/elementary/svx/res/pr015.png   |binary
 icon-themes/elementary/svx/res/pr016.png   |binary
 icon-themes/elementary/svx/res/pr017.png   |binary
 icon-themes/elementary/svx/res/pr018.png   |binary
 icon-themes/elementary/svx/res/pr019.png   |binary
 icon-themes/elementary/svx/res/pr02.png|binary
 icon-themes/elementary/svx/res/pr020.png   |binary
 icon-themes/elementary/svx/res/pr021.png   |binary
 icon-themes/elementary/svx/res/pr03.png|binary
 icon-themes/elementary/svx/res/pr04.png|binary
 icon-themes/elementary/svx/res/pr05.png|binary
 icon-themes/elementary/svx/res/pr06.png  

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

[Libreoffice Gerrit user]

 sw/qa/extras/odfexport/data/tdf118393.odt   |binary
 sw/qa/extras/odfexport/odfexport.cxx|   50 ++-
 sw/qa/extras/ooxmlexport/data/tdf118393.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|   51 
 sw/source/filter/ww8/wrtw8sty.cxx   |7 +++
 sw/source/filter/ww8/wrtww8.cxx |1 
 sw/source/filter/ww8/wrtww8.hxx |1 
 sw/source/filter/ww8/ww8atr.cxx |   29 +++
 8 files changed, 137 insertions(+), 2 deletions(-)

New commits:
commit 8f648a4efad512627a3113dff4fb08111bd369b1
Author: Serge Krot 
AuthorDate: Wed Jun 27 11:18:41 2018 +0200
Commit: Michael Stahl 
CommitDate: Thu Nov 1 15:07:09 2018 +0100

tdf#118393: FILESAVE: DOCX Export loses header/footer

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

Change-Id: If47a2e4953e4b98f41c9115779522a755eea8192
Reviewed-on: https://gerrit.libreoffice.org/60873
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/odfexport/data/tdf118393.odt 
b/sw/qa/extras/odfexport/data/tdf118393.odt
new file mode 100755
index ..ff8d5400950b
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf118393.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 7ddb4d9af097..01327898daa0 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -59,7 +59,8 @@ public:
 "fdo86963.odt",
 "shape-relsize.odt",
 "fdo60769.odt",
-"fdo38244.odt"
+"fdo38244.odt",
+"tdf118393.odt"
 };
 
 return std::find(aBlacklist.begin(), aBlacklist.end(), filename) == 
aBlacklist.end();
@@ -1407,6 +1408,53 @@ DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
 }
 
+// Check for correct header/footer with special first page with TOC inside:
+// - DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
+// - DECLARE_OOXMLEXPORT_TEST(testTdf118393, "tdf118393.odt")
+DECLARE_ODFEXPORT_TEST(testTdf118393, "tdf118393.odt")
+{
+CPPUNIT_ASSERT_EQUAL( 7, getPages() );
+
+// First page has no header/footer
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// check first page
+xmlXPathObjectPtr pXmlPage1Header = getXPathNode(pXmlDoc, 
"/root/page[1]/header");
+CPPUNIT_ASSERT_EQUAL(0, 
xmlXPathNodeSetGetLength(pXmlPage1Header->nodesetval));
+
+xmlXPathObjectPtr pXmlPage1Footer = getXPathNode(pXmlDoc, 
"/root/page[1]/footer");
+CPPUNIT_ASSERT_EQUAL(0, 
xmlXPathNodeSetGetLength(pXmlPage1Footer->nodesetval));
+
+// check second page in the same way
+xmlXPathObjectPtr pXmlPage2Header = getXPathNode(pXmlDoc, 
"/root/page[2]/header");
+CPPUNIT_ASSERT_EQUAL(1, 
xmlXPathNodeSetGetLength(pXmlPage2Header->nodesetval));
+
+xmlXPathObjectPtr pXmlPage2Footer = getXPathNode(pXmlDoc, 
"/root/page[2]/footer");
+CPPUNIT_ASSERT_EQUAL(1, 
xmlXPathNodeSetGetLength(pXmlPage2Footer->nodesetval));
+   }
+
+// All other pages should have header/footer
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[2]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[2]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[3]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[3]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[4]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[4]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[5]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[5]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[6]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[6]/footer/txt/text()"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[7]/header/txt/text()"));
+CPPUNIT_ASSERT_EQUAL(OUString("Seite * von *"),   
parseDump("/root/page[7]/footer/txt/text()"));
+}
+
 DECLARE_ODFEXPORT_TEST(testGerrit13858, "gerrit13858.odt")
 {
 // Just make sure the output is valid.
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118393.odt 
b/sw/qa/extras/ooxmlexport/data/tdf118393.odt
new file mode 100644
index ..ff8d5400950b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf118393.odt differ
diff --git a/sw/q

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

[Libreoffice Gerrit user]

 include/svx/spacinglistbox.hxx |3 +
 svx/inc/spacing.hrc|   62 +
 svx/source/dialog/spacinglistbox.cxx   |   30 ++--
 sw/inc/pageformatpanel.hrc |   43 +
 sw/source/uibase/sidebar/PageFooterPanel.cxx   |5 ++
 sw/source/uibase/sidebar/PageFormatPanel.cxx   |   14 +
 sw/source/uibase/sidebar/PageHeaderPanel.cxx   |5 ++
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx |4 +
 sw/uiconfig/swriter/ui/pageformatpanel.ui  |   10 
 9 files changed, 154 insertions(+), 22 deletions(-)

New commits:
commit 6d9a2557a0f0366fff169f3c3581414b3cec80bd
Author: Caolán McNamara 
AuthorDate: Wed Oct 31 15:14:47 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 14:37:43 2018 +0100

Resolves: tdf#105081 and tdf#113420

separate translations for Spacing: vs Margins:
separate translations for Inch vs cm

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

diff --git a/include/svx/spacinglistbox.hxx b/include/svx/spacinglistbox.hxx
index 2e2ca5280398..59ece06a10a9 100644
--- a/include/svx/spacinglistbox.hxx
+++ b/include/svx/spacinglistbox.hxx
@@ -23,11 +23,14 @@
 #include 
 #include 
 
+enum class SpacingType { SPACING_INCH, MARGINS_INCH, SPACING_CM, MARGINS_CM };
+
 /// Custom Widget ListBox to hold entries for Spacing & Margin settings of 
Header/Footer
 class SVX_DLLPUBLIC SpacingListBox : public ListBox
 {
 public:
 SpacingListBox( vcl::Window* pParent );
+void Init(SpacingType eType);
 Size GetOptimalSize() const override;
 };
 
diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 2e41d505015f..2f2b219f5242 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -13,16 +13,60 @@
 
 #define NC_(Context, String) (Context "\004" u8##String)
 
-const std::pair RID_SVXSTRARY_SPACING[] =
+// To translators: this is a listbox labelled by "Spacing:", inch units
+const std::pair RID_SVXSTRARY_SPACING_INCH[] =
 {
-{ NC_("RID_SVXSTRARY_SPACING", "None"),0 },
-{ NC_("RID_SVXSTRARY_SPACING", "Extra Small (1/16\")"),   91 },
-{ NC_("RID_SVXSTRARY_SPACING", "Small (1/8\")"), 181 },
-{ NC_("RID_SVXSTRARY_SPACING", "Small Medium (1/4\")"),  363 },
-{ NC_("RID_SVXSTRARY_SPACING", "Medium (3/8\")"),539 },
-{ NC_("RID_SVXSTRARY_SPACING", "Medium Large (1/2\")"),  720 },
-{ NC_("RID_SVXSTRARY_SPACING", "Large (3/4\")"),1077 },
-{ NC_("RID_SVXSTRARY_SPACING", "Extra Large (1\")"),1440 }
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "None"),0 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Small (1/16\")"),   91 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small (1/8\")"), 181 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Small Medium (1/4\")"),  363 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium (3/8\")"),539 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Medium Large (1/2\")"),  720 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Large (3/4\")"),1077 },
+{ NC_("RID_SVXSTRARY_SPACING_INCH", "Extra Large (1\")"),1440 },
+{ nullptr, 0 }
+};
+
+// To translators: this is a listbox labelled by "Spacing:", cm units
+const std::pair RID_SVXSTRARY_SPACING_CM[] =
+{
+{ NC_("RID_SVXSTRARY_SPACING_CM", "None"),0 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Small (0.16cm)"),   91 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Small (0.32cm)"),181 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Small Medium (0.64cm)"), 363 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium (0.95cm)"),   539 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Medium Large (1.27cm)"), 720 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Large (1.9cm)"),1077 },
+{ NC_("RID_SVXSTRARY_SPACING_CM", "Extra Large (2.54cm)"), 1440 },
+{ nullptr, 0 }
+};
+
+// To translators: this is a listbox labelled by "Margins:", inch units
+const std::pair RID_SVXSTRARY_MARGINS_INCH[] =
+{
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "None"),0 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Small (1/16\")"),   91 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small (1/8\")"), 181 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Small Medium (1/4\")"),  363 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium (3/8\")"),539 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Medium Large (1/2\")"),  720 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Large (3/4\")"),1077 },
+{ NC_("RID_SVXSTRARY_MARGINS_INCH", "Extra Large (1\")"),1440 },
+{ nullptr, 0 }
+};
+
+// To translators: this is a listbox labelled by "Margins:", cm units
+const std::pair RID_SVXSTRARY_MARGINS_CM[] =
+{
+{ NC_("RID_SVXSTRARY_MARGINS_CM", "None"),0 },
+

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

[Libreoffice Gerrit user]

 canvas/source/opengl/ogl_canvasfont.cxx   |6 --
 canvas/source/opengl/ogl_canvasfont.hxx   |3 +++
 canvas/source/opengl/ogl_canvashelper.cxx |3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit beaba5f1abbb9a1461286fc831ea6a30131bb3b5
Author: Mark Hung 
AuthorDate: Tue Oct 30 23:43:10 2018 +0800
Commit: Mark Hung 
CommitDate: Thu Nov 1 14:28:00 2018 +0100

tdf#43671 set emphasis mark of vcl::Font (opengl).

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

diff --git a/canvas/source/opengl/ogl_canvasfont.cxx 
b/canvas/source/opengl/ogl_canvasfont.cxx
index 0434bb0856cb..18621b544930 100644
--- a/canvas/source/opengl/ogl_canvasfont.cxx
+++ b/canvas/source/opengl/ogl_canvasfont.cxx
@@ -11,22 +11,24 @@
 
 #include 
 #include 
+#include 
 
 #include "ogl_canvasfont.hxx"
 #include "ogl_textlayout.hxx"
 
-
 using namespace ::com::sun::star;
 
 namespace oglcanvas
 {
 CanvasFont::CanvasFont( const rendering::FontRequest&   
rFontRequest,
-const uno::Sequence< beans::PropertyValue >&
/*extraFontProperties*/,
+const uno::Sequence< beans::PropertyValue >&
extraFontProperties,
 const geometry::Matrix2D&   
fontMatrix ) :
 CanvasFontBaseT( m_aMutex ),
 maFontRequest( rFontRequest ),
+mnEmphasisMark(0),
 maFontMatrix( fontMatrix )
 {
+::canvas::tools::extractExtraFontProperties(extraFontProperties, 
mnEmphasisMark);
 }
 
 uno::Reference< rendering::XTextLayout > SAL_CALL 
CanvasFont::createTextLayout( const rendering::StringContext& aText,
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx 
b/canvas/source/opengl/ogl_canvasfont.hxx
index 1743bc3c985e..eb2307a7720e 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -50,8 +50,11 @@ namespace oglcanvas
 
 const css::geometry::Matrix2D& getFontMatrix() const { return 
maFontMatrix; }
 
+sal_uInt32 getEmphasisMark() const { return mnEmphasisMark; }
+
 private:
 css::rendering::FontRequestmaFontRequest;
+sal_uInt32 mnEmphasisMark;
 css::geometry::Matrix2DmaFontMatrix;
 };
 }
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index c4bfde0bed8e..2902c2e9b8db 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -701,6 +701,9 @@ namespace oglcanvas
 aFont.SetWeight( 
static_cast(rFontRequest.FontDescription.FontDescription.Weight) );
 aFont.SetItalic( 
(rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : 
ITALIC_NORMAL );
 
+if (pFont->getEmphasisMark())
+
aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
+
 // adjust to stretched font
 if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 canvas/source/directx/dx_canvasfont.cxx|6 --
 canvas/source/directx/dx_canvasfont.hxx|2 ++
 canvas/source/directx/dx_textlayout_drawhelper.cxx |8 
 canvas/source/tools/canvastools.cxx|   11 +++
 canvas/source/vcl/canvasfont.cxx   |9 -
 include/canvas/canvastools.hxx |7 +++
 6 files changed, 40 insertions(+), 3 deletions(-)

New commits:
commit 17cd7dd708631f7af9e66860b403627416e4545e
Author: Mark Hung 
AuthorDate: Wed Oct 24 00:04:56 2018 +0800
Commit: Mark Hung 
CommitDate: Thu Nov 1 14:27:31 2018 +0100

tdf#43671 set emphasis mark of vcl::Font (windows).

Process extra font properties of the canvas font to
set emphasis mark when creating vcl::Font.

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

diff --git a/canvas/source/directx/dx_canvasfont.cxx 
b/canvas/source/directx/dx_canvasfont.cxx
index 5bf74ccc0d2e..e306fe84b1af 100644
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.cxx
@@ -47,14 +47,14 @@ namespace dxcanvas
 }
 
 CanvasFont::CanvasFont( const rendering::FontRequest&   
rFontRequest,
-const uno::Sequence< beans::PropertyValue >&
/*extraFontProperties*/,
+const uno::Sequence< beans::PropertyValue >&
extraFontProperties,
 const geometry::Matrix2D&   
fontMatrix ) :
 CanvasFont_Base( m_aMutex ),
 mpGdiPlusUser( GDIPlusUser::createInstance() ),
-// TODO(F1): extraFontProperties, fontMatrix
 mpFontFamily(),
 mpFont(),
 maFontRequest( rFontRequest ),
+mnEmphasisMark(0),
 maFontMatrix( fontMatrix )
 {
 mpFontFamily.reset( new 
Gdiplus::FontFamily(o3tl::toW(rFontRequest.FontDescription.FamilyName.getStr()),nullptr)
 );
@@ -65,6 +65,8 @@ namespace dxcanvas
  
static_cast(rFontRequest.CellSize),
  calcFontStyle( rFontRequest ),
  Gdiplus::UnitWorld ));
+
+::canvas::tools::extractExtraFontProperties(extraFontProperties, 
mnEmphasisMark);
 }
 
 void SAL_CALL CanvasFont::disposing()
diff --git a/canvas/source/directx/dx_canvasfont.hxx 
b/canvas/source/directx/dx_canvasfont.hxx
index 7d463a386ae2..15b2fa8eef03 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -77,12 +77,14 @@ namespace dxcanvas
 double  getEmHeight() const;
 FontSharedPtr   getFont() const;
 const css::geometry::Matrix2D& getFontMatrix() const;
+sal_uInt32  getEmphasisMark() const { return mnEmphasisMark; }
 
 private:
 GDIPlusUserSharedPtrmpGdiPlusUser;
 FontFamilySharedPtr mpFontFamily;
 FontSharedPtr   mpFont;
 css::rendering::FontRequestmaFontRequest;
+sal_uInt32 mnEmphasisMark;
 css::geometry::Matrix2DmaFontMatrix;
 };
 
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx 
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index f4d51e9d8d73..7441bbbf933b 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -125,6 +125,10 @@ namespace dxcanvas
 aFont.SetColor( aColor );
 aFont.SetFillColor( aColor );
 
+CanvasFont::ImplRef pFont(tools::canvasFontFromXFont(rCanvasFont));
+if (pFont.is() && pFont->getEmphasisMark())
+
aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
+
 // adjust to stretched font
 if(!::rtl::math::approxEqual(rFontMatrix.m00, rFontMatrix.m11))
 {
@@ -270,6 +274,10 @@ namespace dxcanvas
 aFont.SetAverageFontWidth( nNewWidth );
 }
 
+CanvasFont::ImplRef pFont(tools::canvasFontFromXFont(rCanvasFont));
+if (pFont.is() && pFont->getEmphasisMark())
+aFont.SetEmphasisMark(FontEmphasisMark(pFont->getEmphasisMark()));
+
 // set font
 xVirtualDevice->SetFont(aFont);
 
diff --git a/canvas/source/tools/canvastools.cxx 
b/canvas/source/tools/canvastools.cxx
index 189efe4a2e75..55e2cfcdf13a 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1309,6 +1309,17 @@ namespace canvas
 p2ndOutDev->SetClipRegion( aClipRegion );
 }
 }
+
+void extractExtraFontProperties(const 
uno::Sequence& rExtraFontProperties,
+sal_uInt32 &rEmphasisMark)
+{
+

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

[Libreoffice Gerrit user]

 cui/source/tabpages/tparea.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 56d799764d394c906936f7a042dfd3e4219d7063
Author: Tamás Zolnai 
AuthorDate: Thu Nov 1 12:59:11 2018 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Nov 1 14:25:42 2018 +0100

tdf#121083: EDITOR UI Hatch background color not read back from editor

Change-Id: Ic64fda8184a4cac244fe992dd72db9d67d35870c
Reviewed-on: https://gerrit.libreoffice.org/62735
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 55f35c096dc0..33e4137b470e 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -188,6 +188,8 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
 case drawing::FillStyle_HATCH:
 {
 m_rXFSet.Put( rSet.Get(XATTR_FILLHATCH) );
+m_rXFSet.Put( rSet.Get(XATTR_FILLBACKGROUND) );
+m_rXFSet.Put( rSet.Get(XATTR_FILLCOLOR) );
 SelectFillTypeHdl_Impl(*m_xBtnHatch);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |   16 
+++---
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 39e0bbfdf77cf9653ec68ffcb4374d929838b2a8
Author: Tamas Bunth 
AuthorDate: Wed Oct 31 15:00:09 2018 +0100
Commit: Tamás Bunth 
CommitDate: Thu Nov 1 14:23:20 2018 +0100

mysqlc: filter schema in getColumns

Filter schema in XDatabaseMetaData::getColumns so it would show correct
results in case there are more tables with the same name in different
schemas.

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

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 507ce0b91e45..bd58d9cb1f5e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -696,12 +696,12 @@ Reference
 }
 
 Reference SAL_CALL ODatabaseMetaData::getColumns(const Any& 
/*catalog*/,
- const OUString& 
/*schemaPattern*/,
+ const OUString& 
schemaPattern,
  const OUString& 
tableNamePattern,
  const OUString& 
columnNamePattern)
 {
-OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1
-"TABLE_SCHEMA AS TABLE_SCHEM, " // 2
+OUStringBuffer queryBuf("SELECT TABLE_CATALOG, " // 1
+"TABLE_SCHEMA, " // 2
 "TABLE_NAME, " // 3
 "COLUMN_NAME, " // 4
 "DATA_TYPE, " // 5
@@ -720,7 +720,6 @@ Reference SAL_CALL 
ODatabaseMetaData::getColumns(const Any& /*catalo
 "COLUMN_TYPE " // 14
 "FROM INFORMATION_SCHEMA.COLUMNS "
 "WHERE (1 = 1) ");
-
 if (!tableNamePattern.isEmpty())
 {
 OUString sAppend;
@@ -730,6 +729,15 @@ Reference SAL_CALL 
ODatabaseMetaData::getColumns(const Any& /*catalo
 sAppend = "AND TABLE_NAME = '%' ";
 queryBuf.append(sAppend.replaceAll("%", tableNamePattern));
 }
+if (!schemaPattern.isEmpty())
+{
+OUString sAppend;
+if (tableNamePattern.match("%"))
+sAppend = "AND TABLE_SCHEMA LIKE '%' ";
+else
+sAppend = "AND TABLE_SCHEMA = '%' ";
+queryBuf.append(sAppend.replaceAll("%", schemaPattern));
+}
 if (!columnNamePattern.isEmpty())
 {
 OUString sAppend;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - desktop/inc desktop/source vcl/inc vcl/unx

[Libreoffice Gerrit user]

 desktop/inc/app.hxx|1 +
 desktop/source/app/app.cxx |9 +
 desktop/source/app/sofficemain.cxx |4 
 vcl/inc/opengl/x11/glxtest.hxx |2 ++
 vcl/unx/glxtest.cxx|   18 +-
 5 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 7b3cf21513bd878dc719cf6e8089b8d4bc937653
Author: Stephan Bergmann 
AuthorDate: Thu Apr 19 13:59:16 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 13:46:40 2018 +0100

tdf#95843: Wait for fire_glxtest_process also in --headless mode

Discussed with mmeeks on IRC that fire_glxtest_process is probably called as
early as possible so that its reuslt is ready by the time it is needed in 
the
non-headless case.  So best fix for headless is probably to just wait for 
the
sub-process at an opportune point, instead of redesigning the whole mess so 
that
fire_glxtest_process would only be called once its result is actually 
needed.

Reviewed-on: https://gerrit.libreoffice.org/53154
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4bacf58f4af44ac8c4632b43289ccfcc07e5820c)

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

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index c90bfdb0d7d7..76c4f590dd3b 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -195,6 +195,7 @@ OUString ReplaceStringHookProc(const OUString& rStr);
 
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
!defined LIBO_HEADLESS
 bool fire_glxtest_process();
+void reap_glxtest_process();
 #endif
 
 #endif // INCLUDED_DESKTOP_INC_APP_HXX
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f95e6cf1bf54..9a59b0a9712e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1617,6 +1617,15 @@ int Desktop::Main()
 CheckOpenCLCompute(xDesktop);
 #endif
 
+// In headless mode, reap the process started by 
fire_glxtest_process() early in soffice_main
+// (desktop/source/app/sofficemain.cxx), in a code block that needs to 
be covered by the same
+// #if condition as this code block:
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
!defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
+if (rCmdLineArgs.IsHeadless()) {
+reap_glxtest_process();
+}
+#endif
+
 // Release solar mutex just before we wait for our client to connect
 {
 SolarMutexReleaser aReleaser;
diff --git a/desktop/source/app/sofficemain.cxx 
b/desktop/source/app/sofficemain.cxx
index 4534f3aba885..0c263bb3f721 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -125,6 +125,10 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && 
!defined(LIBO_HEADLESS) && HAVE_FEATURE_OPENGL
 /* Run test for OpenGL support in own process to avoid crash with broken
  * OpenGL drivers. Start process as early as possible.
+ * In non-headless mode, the process will be reaped in 
X11OpenGLDeviceInfo::GetData
+ * (vcl/opengl/x11/X11DeviceInfo.cxx).  In headless mode, the process will 
be reaped late in
+ * Desktop::Main (desktop/source/app/app.cxx), in a code block that needs 
to be covered by the
+ * same #if condition as this code block.
  */
 bool bSuccess = fire_glxtest_process();
 SAL_WARN_IF(!bSuccess, "desktop.opengl", "problems with glxtest");
diff --git a/vcl/inc/opengl/x11/glxtest.hxx b/vcl/inc/opengl/x11/glxtest.hxx
index 979f795de139..d74436aae111 100644
--- a/vcl/inc/opengl/x11/glxtest.hxx
+++ b/vcl/inc/opengl/x11/glxtest.hxx
@@ -18,6 +18,8 @@ VCL_DLLPUBLIC pid_t* getGlxPid();
 
 bool fire_glxtest_process();
 
+void reap_glxtest_process();
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx
index efe55910d164..23b8032441a5 100644
--- a/vcl/unx/glxtest.cxx
+++ b/vcl/unx/glxtest.cxx
@@ -26,7 +26,9 @@
 #include "stdint.h"
 #include 
 
-#include "opengl/x11/glxtest.hxx"
+#include 
+
+#include 
 
 #ifdef __SUNPRO_CC
 #include 
@@ -35,6 +37,8 @@
 #include "X11/Xlib.h"
 #include "X11/Xutil.h"
 
+#include 
+
 // stuff from glx.h
 typedef struct __GLXcontextRec *GLXContext;
 typedef XID GLXPixmap;
@@ -273,3 +277,15 @@ bool fire_glxtest_process()
   *glxtest_pid = pid;
   return true;
 }
+
+void reap_glxtest_process() {
+pid_t * pid = getGlxPid();
+if (*pid != 0) {
+// Use WNOHANG, as it is probably better to have a (rather harmless) 
zombie child process
+// hanging around for the duration of the calling process, than to 
potentially block the
+// calling process here:
+pid_t e = waitpid(*pid, nullptr, WNOHANG);
+  

[Libreoffice-commits] core.git: connectivity/Library_mysqlc.mk sal/osl

[Libreoffice Gerrit user]

 connectivity/Library_mysqlc.mk |4 ++--
 sal/osl/unx/pipe.cxx   |2 ++
 sal/osl/unx/socket.cxx |4 
 sal/osl/unx/system.hxx |2 --
 sal/osl/unx/uunxapi.cxx|2 ++
 5 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 4326fb3ef3ddd7c6f9d08ba96add4f4736503ceb
Author: Kacper Kasper 
AuthorDate: Thu Sep 20 19:19:33 2018 +0200
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 13:44:47 2018 +0100

Fix build on Haiku

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

diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 3d9d9150b9ea..42a10e40cdf8 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -22,8 +22,8 @@ $(eval $(call gb_Library_set_include,mysqlc,\
 ))
 
 $(eval $(call gb_Library_add_libs,mysqlc,\
-   $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz 
-lm,\
-   -rdynamic -lz -lcrypt -lm)) \
+   $(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
+   -lz -lm,-rdynamic -lz -lcrypt -lm)) \
$(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
 ))
 
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 3af20aad5284..c38ab152dada 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -51,7 +51,9 @@ static struct
 { EPROTOTYPE,  osl_Pipe_E_NoProtocol},  /* Protocol wrong type 
for socket */
 { ENOPROTOOPT, osl_Pipe_E_NoProtocol},  /* Protocol not 
available */
 { EPROTONOSUPPORT, osl_Pipe_E_NoProtocol},  /* Protocol not 
supported */
+#ifdef ESOCKTNOSUPPORT
 { ESOCKTNOSUPPORT, osl_Pipe_E_NoProtocol},  /* Socket type not 
supported */
+#endif
 { EPFNOSUPPORT,osl_Pipe_E_NoProtocol},  /* Protocol family not 
supported */
 { EAFNOSUPPORT,osl_Pipe_E_NoProtocol},  /* Address family not 
supported by */
 /* protocol family */
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 698de982e181..e4a70b5083a1 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -212,7 +212,9 @@ static const struct
 { EPROTOTYPE,  osl_Socket_E_Prototype }, /* Protocol wrong 
type for socket */
 { ENOPROTOOPT, osl_Socket_E_NoProtocol}, /* Protocol not 
available */
 { EPROTONOSUPPORT, osl_Socket_E_ProtocolNoSupport }, /* Protocol not 
supported */
+#ifdef ESOCKTNOSUPPORT
 { ESOCKTNOSUPPORT, osl_Socket_E_TypeNoSupport }, /* Socket type not 
supported */
+#endif
 { EOPNOTSUPP,  osl_Socket_E_OpNotSupport  }, /* Operation not 
supported on socket */
 { EPFNOSUPPORT,osl_Socket_E_PfNoSupport   }, /* Protocol family 
not supported */
 { EAFNOSUPPORT,osl_Socket_E_AfNoSupport   }, /* Address family not 
supported by
@@ -229,7 +231,9 @@ static const struct
 { EISCONN, osl_Socket_E_IsConnected   }, /* Socket is already 
connected */
 { ENOTCONN,osl_Socket_E_NotConnected  }, /* Socket is not 
connected */
 { ESHUTDOWN,   osl_Socket_E_Shutdown  }, /* Can't send after 
socket shutdown */
+#ifdef ETOOMANYREFS
 { ETOOMANYREFS,osl_Socket_E_TooManyRefs   }, /* Too many 
references: can't splice */
+#endif
 { ETIMEDOUT,   osl_Socket_E_TimedOut  }, /* Connection timed 
out */
 { ECONNREFUSED,osl_Socket_E_ConnRefused   }, /* Connection refused 
*/
 { EHOSTDOWN,   osl_Socket_E_HostDown  }, /* Host is down */
diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx
index 6a92f291e833..57c418070a73 100644
--- a/sal/osl/unx/system.hxx
+++ b/sal/osl/unx/system.hxx
@@ -107,8 +107,6 @@
 #   define ETIME ETIMEDOUT
 #   endif
 #   define SIGIOT SIGABRT
-#   define ESOCKTNOSUPPORT ENOTSUP
-#   define ETOOMANYREFS EOPNOTSUPP
 #   define SOCK_RDM 0
 //  hack: Haiku defines SOL_SOCKET as -1, but this makes GCC complain about
 //  narrowing conversion
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index ea48309c3b94..c3cccabb4d9e 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -445,8 +445,10 @@ std::string UnixErrnoString(int nErrno)
 return "EACCES";
 case EFAULT:
 return "EFAULT";
+#ifdef ENOTBLK
 case ENOTBLK:
 return "ENOTBLK";
+#endif
 case EBUSY:
 return "EBUSY";
 case EEXIST:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit aabf08487fb205f82ec0b5e642236b78134ce5d5
Author: Kacper Kasper 
AuthorDate: Thu Sep 20 19:25:18 2018 +0200
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 13:43:20 2018 +0100

Tweak stack protector check

* There were concerns that current program could fail if -Werror
  is enabled and incorrectly report stack protector availability.
* Remove "return 0;" since configure adds it automatically.
* Add -O0 to build options, otherwise the function is optimized
  away and it doesn't trigger linker failure.

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

diff --git a/configure.ac b/configure.ac
index e0ab079b011b..912f5f346e62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5928,8 +5928,8 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 
 AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
 save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; return 0; ]])],[ 
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
+CFLAGS="$CFLAGS -O0 -Werror -fstack-protector-strong"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; a[7] = 0; ]])],[ 
HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
 CFLAGS=$save_CFLAGS
 if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [TDF infra] Announcing Gitiles VCS browser (gitweb replacement) and https:// anon git URIs

[Eike Rathke]

Hi Guilhem,

On Friday, 2018-10-26 15:44:53 +0200, Guilhem Moulin wrote:

> On Wed, 17 Oct 2018 at 21:03:45 +0200, Guilhem Moulin wrote:
> > On Wed, 17 Oct 2018 at 14:05:27 +0200, Eike Rathke wrote:
> >> For diffs I much prefer the gerrit view because it highlights changes
> >> within changed lines, for example
> >> 
> >> https://gerrit.libreoffice.org/plugins/gitiles/core/+/9672d034b9e760f24ac9a6652ab45dee15ee260a%5E%21/
> >> vs
> >> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=9672d034b9e760f24ac9a6652ab45dee15ee260a
> >> 
> >> Would that be possible also with gitiles?
> 
> They both show marked changes now :-)

Hey great, thanks!

> Unfortunately that change is most likely not upstreamable since I had to
> abuse the JGit API quite heavily… :-/

Nice work however, appreciated.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

Re: LibreOffice ESC call, Thur - 16:00 central European (local) time

[Jan-Marek Glogowski]

Am October 30, 2018 9:29:57 AM UTC schrieb Michael Meeks 
:

>* Release Engineering update (Christian, Xisco)
>+ 6.0.7 rc3 status

I was told yesterday that 6.0.7 final is already tagged and out. If not, I ask 
to include the fix for tdf#119020 "Icons are corrupted on Windows when scaling 
UI / OpenGL" https://gerrit.libreoffice.org/#/c/62686/
It's actually not Windows specific and the fix is simple IMHO.

I have two additional bugs / patches for icon handling, where I would like to 
get input. Would appreciate some input from design and marketing. /me hopes for 
not much bike-shedding, so I added some proposals, which are hopefully 
acceptable.

1. Change the icon scaling algorithm quality from ::Fast to ::Default or ::Best 
quality in https://bugs.documentfoundation.org/show_bug.cgi?id=121082
* Proposal: just try ::BestQuality in 6.2 and eventually revert, if it turns 
out to be too slow?
* Is a slow first start acceptable, like comments in tdf#119020 suggest?

2. Deliver SVG icon sets
 * SVG icons supported since 5.3, but we don't ship the icon sets
 ** https://bugs.documentfoundation.org/show_bug.cgi?id=51733
 * Initial WIP patch: https://gerrit.libreoffice.org/#/c/62706/
 ** See long commit message and additional comments
 * Proposal for 6.2: ship extra SVG variants, so a user can select them 
manually but still switch to PNGs on problems?
 ** Defaults to pixelated PNG scaling, as status quo
 * Current patch provides zips for the SVG directories and automates links.txt 
creation for them
 ** Should a user explicitly select SVG themes?
 ** Should SVG be the default, so we can get rid of the PNG icon sets, if SVGs 
exist?
  ** Or automatic fallback, when we need to scale, so we combine both types in 
a zip? Icon may change when scaling.
  ** Are the PNG variants actually pre-created from SVG?
  ** For OpenGL scaling is actually done in HW with shaders.

I won't make it to ESC today.

Jan-Marek

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

[Libreoffice-commits] core.git: cui/source desktop/source drawinglayer/source extensions/source filter/source libreofficekit/qa lotuswordpro/source opencl/source scaddins/source sc/source sdext/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx  |2 +-
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx   |2 +-
 drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx |2 +-
 extensions/source/bibliography/bibconfig.cxx|2 +-
 filter/source/graphicfilter/ipict/shape.cxx |2 +-
 filter/source/msfilter/escherex.cxx |3 ++-
 libreofficekit/qa/tilebench/tilebench.cxx   |   12 ++--
 lotuswordpro/source/filter/lwpnumericfmt.cxx|2 +-
 opencl/source/opencl_device.cxx |2 +-
 sc/source/core/opencl/formulagroupcl.cxx|2 +-
 sc/source/core/tool/scmatrix.cxx|8 
 scaddins/source/analysis/analysishelper.cxx |2 +-
 sdext/source/pdfimport/filterdet.cxx|2 +-
 sdext/source/pdfimport/pdfparse/pdfentries.cxx  |4 ++--
 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx  |2 +-
 svl/source/numbers/zformat.cxx  |8 
 svx/source/dialog/ClassificationDialog.cxx  |2 +-
 svx/source/dialog/srchdlg.cxx   |2 +-
 svx/source/dialog/svxruler.cxx  |4 ++--
 svx/source/form/fmshimp.cxx |2 +-
 sw/source/uibase/docvw/PostItMgr.cxx|4 ++--
 vcl/backendtest/outputdevice/common.cxx |4 ++--
 vcl/headless/svpgdi.cxx |4 ++--
 vcl/source/gdi/impvect.cxx  |6 --
 vcl/source/gdi/pdfwriter_impl2.cxx  |6 --
 vcl/source/gdi/regionband.cxx   |2 +-
 vcl/win/gdi/salgdi2.cxx |2 +-
 winaccessibility/source/UAccCOM/MAccessible.cxx |4 ++--
 28 files changed, 52 insertions(+), 47 deletions(-)

New commits:
commit 26ccd00bc96c585b7065af0dcce246b5bfaae5e1
Author: Tamás Zolnai 
AuthorDate: Wed Oct 31 17:20:46 2018 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Nov 1 13:02:26 2018 +0100

clang-tidy: (WIP) bugprone-too-small-loop-variable findings

Change-Id: Iaa255b39928ac45dec1ed37e368c149d6027f561
Reviewed-on: https://gerrit.libreoffice.org/62701
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 212995580787..d87f6dedc6ee 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1320,7 +1320,7 @@ static void lcl_Update(std::unique_ptr 
pInvalidItems[], std::unique
 while(pViewFrm)
 {
 SfxBindings& rBind = pViewFrm->GetBindings();
-for(sal_Int16 i = 0; i < nCount; i++)
+for(sal_uInt16 i = 0; i < nCount; i++)
 {
 if(pCurrentFrm == pViewFrm)
 rBind.InvalidateAll(false);
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx 
b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 852addaaa829..36d52750cf9e 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -849,7 +849,7 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool 
bRecheckOnly )
 if ( ! bRecheckOnly )
 {
 sal_Int32 nCount = 0;
-for ( sal_Int16 i = 0; i < m_pUpdates->getItemCount(); ++i )
+for ( sal_uInt16 i = 0; i < m_pUpdates->getItemCount(); ++i )
 {
 uno::Sequence< OUString > aItem(2);
 
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx 
b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 1e890358c25b..85cf4cd548fb 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -209,7 +209,7 @@ namespace drawinglayer
 // reuse first polygon, it's the second one
 aCombinedPolyPoly.remove(0);
 
-for(sal_uInt32 a(0); a < rEntries.size() - 1; a++)
+for(size_t a(0); a < rEntries.size() - 1; a++)
 {
 // create next inner polygon, combined with last one
 basegfx::B2DPolygon aNextPoly(rUnitPolygon);
diff --git a/extensions/source/bibliography/bibconfig.cxx 
b/extensions/source/bibliography/bibconfig.cxx
index e18d60a13aaa..aa340c391c8f 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -170,7 +170,7 @@ BibConfig::BibConfig()
 OUString sTempReal;
 sal_Int16 nSetMapping = 0;
 nFieldIdx = 0;
-for(sal_Int16 nFieldVal = 0; nFieldVal < 
aAssignmentValues.getLength() / 2; nFieldVal++)
+for(sal_Int3

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - desktop/unx

[Libreoffice Gerrit user]

 desktop/unx/source/pagein.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 11b4a0f2f2774be77a5c8f147ef2b2d2c08eb376
Author: David Tardon 
AuthorDate: Wed Mar 8 10:37:38 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 12:37:55 2018 +0100

WaE: include needed header

"error: In the GNU C Library, "major" is defined
by . For historical compatibility, it is
currently defined by  as well, but we plan to
remove this soon. To use "major", include 
directly. If you did not intend to use a system-defined macro
"major", you should undefine it after including ."

Change-Id: I7f5741d4c2eae277e316c5fc97aa73b9430fbdc1
(cherry picked from commit 01bf741a79241829b0d5c048e8f45e3cf6914d3e)
Reviewed-on: https://gerrit.libreoffice.org/62721
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 56baffa79ca3..a401419fc162 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 /* do_pagein */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/README

[Libreoffice Gerrit user]

 wsd/README |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f575f7611c011484a5f1f57a6ebecebf80afed83
Author: Andras Timar 
AuthorDate: Thu Nov 1 12:15:11 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 12:22:06 2018 +0100

--numprespawns switch has been deprecated since 2016

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

diff --git a/wsd/README b/wsd/README
index 3c42f674b..5e54a7c21 100644
--- a/wsd/README
+++ b/wsd/README
@@ -186,7 +186,7 @@ HTTPS is the default. HTTP-only mode can be enabled with 
--disable-ssl
 configure option.
 
 If you plan to hack on loolwsd, you probably want to familiarize
-yourself with loolwsd's --numprespawns switch, and the 'connect'
+yourself with loolwsd's --o:num_prespawn_children switch, and the 'connect'
 test program.
 
 For interactive testing, you can use the 'connect' program. It accepts
@@ -234,7 +234,7 @@ be obtained as described above.
 Debugging
 -
 
-When debugging, you want to add --numprespawns=1 to the loolwsd parameters to
+When debugging, you want to add --o:num_prespawn_children=1 to the loolwsd 
parameters to
 limit the amount of concurrently running processes.
 
 When the crash happens too early, you also want to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format vcl/Library_vcl.mk vcl/source

[Libreoffice Gerrit user]

 solenv/clang-format/blacklist   |1 
 vcl/Library_vcl.mk  |4 
 vcl/source/gdi/base14.cxx   |  679 
 vcl/source/gdi/pdfbuildin_fonts.cxx |  744 
 vcl/source/gdi/pdfbuildin_fonts.hxx |   82 +++
 vcl/source/gdi/pdfwriter_impl.cxx   |   95 +---
 vcl/source/gdi/pdfwriter_impl.hxx   |   57 --
 7 files changed, 863 insertions(+), 799 deletions(-)

New commits:
commit 0610c4439edf95b4cc4e16ee625b60ba606f7528
Author: Jan-Marek Glogowski 
AuthorDate: Wed Oct 31 11:56:28 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Nov 1 12:18:49 2018 +0100

Move PDF buildin font handling into extra file

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

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9299540f7a88..180b545ab6bc 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -18074,7 +18074,6 @@ vcl/source/gdi/CommonSalLayout.cxx
 vcl/source/gdi/VerticalOrientationData.cxx
 vcl/source/gdi/alpha.cxx
 vcl/source/gdi/animate.cxx
-vcl/source/gdi/base14.cxx
 vcl/source/gdi/bitmap3.cxx
 vcl/source/gdi/bitmap4.cxx
 vcl/source/gdi/bitmapex.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 8e8460c71ba9..5f55a3093cae 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -231,7 +231,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/outdev/map \
 vcl/source/gdi/alpha \
 vcl/source/gdi/animate \
-vcl/source/gdi/base14 \
 vcl/source/gdi/bitmap3 \
 vcl/source/gdi/bitmapex \
 vcl/source/gdi/bmpacc2 \
@@ -261,6 +260,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/metaact \
 vcl/source/gdi/octree \
 vcl/source/gdi/oldprintadaptor \
+vcl/source/gdi/pdfbuildin_fonts \
 vcl/source/gdi/pdfextoutdevdata \
 vcl/source/gdi/pdffontcache \
 vcl/source/gdi/pdfwriter \
@@ -316,7 +316,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/bitmap/BitmapMedianFilter \
 vcl/source/bitmap/BitmapInterpolateScaleFilter \
 vcl/source/bitmap/BitmapSeparableUnsharpenFilter \
-   vcl/source/bitmap/BitmapFastScaleFilter \
+vcl/source/bitmap/BitmapFastScaleFilter \
 vcl/source/bitmap/BitmapScaleSuperFilter \
 vcl/source/bitmap/BitmapScaleConvolutionFilter \
 vcl/source/bitmap/BitmapSymmetryCheck \
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
deleted file mode 100644
index 1e3dda522817..
--- a/vcl/source/gdi/base14.cxx
+++ /dev/null
@@ -1,679 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "pdfwriter_impl.hxx"
-#include 
-#include 
-
-using namespace vcl;
-
-OString PDFWriterImpl::BuiltinFont::getNameObject() const
-{
-OStringBuffer aBuf( 16 );
-aBuf.append( '/' );
-const char* pRun = m_pPSName;
-
-unsigned int nCopied = 0;
-while( *pRun )
-{
-if( *pRun >= 'A' && *pRun <= 'Z' )
-nCopied = 0;
-if( nCopied++ < 2 )
-aBuf.append( *pRun );
-pRun++;
-}
-return aBuf.makeStringAndClear();
-}
-
-const PDFWriterImpl::BuiltinFont PDFWriterImpl::m_aBuiltinFonts[ 14 ] = {
-{ "Courier", // family name
-  "Normal", // style
-  "Courier", // PSName
-  629, -157, // ascend, descend
-  FAMILY_MODERN, // family style
-  RTL_TEXTENCODING_MS_1252, // charset
-  PITCH_FIXED, // pitch
-  WIDTH_NORMAL, // width type
-  WEIGHT_NORMAL, // weight type
-  ITALIC_NONE, // italic type
-  { 0, 0, 0, 0, 0, 0, 0, 0, // 0 - 7
-0, 0, 0, 0, 0, 0, 0, 0, // 8 - 15
-0, 0, 0, 0, 0, 0, 0, 0, // 16 - 23
-0, 0, 0, 0, 0, 0, 0, 0, // 24 - 31
-600, 600, 600, 600, 600, 600, 600, 600, // 32 - 39
-600, 600, 600, 600, 600, 600, 600, 600, // 40 - 47
-600, 600, 600, 600, 600, 600, 600, 600, // 48 - 55
-600, 600, 600, 600, 600, 600, 600, 600, // 56 - 63
-600, 600, 600, 600, 600, 600, 600, 600, // 64 - 71
-600, 600, 600, 600, 600, 6

[Libreoffice-commits] online.git: test/fakesockettest.cpp

[Libreoffice Gerrit user]

 test/fakesockettest.cpp |  212 
 1 file changed, 109 insertions(+), 103 deletions(-)

New commits:
commit 781162fdddb29a07a9a225bb9b9c2dafb0fe2bc6
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 12:49:59 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 12:53:47 2018 +0200

Fix my misunderstanding of Cppunit exception use

I had no idea that the CPPUNIT_ASSERT* macros work by throwing
exceptions. They do, so one should thus not catch them, but let the
Cppunit code take care of that.

Also, make the tests a bit more specific and add some
fakeSocketAvailableDataLength() checks.

Change-Id: I9291822114331c21b774bb41116e8b2ff709dae2

diff --git a/test/fakesockettest.cpp b/test/fakesockettest.cpp
index be45c3ed5..78ff8ae45 100644
--- a/test/fakesockettest.cpp
+++ b/test/fakesockettest.cpp
@@ -59,143 +59,149 @@ public:
 
 void FakeSocketTest::testBasic()
 {
-try
-{
-// Create three sockets: s0, s1 and s2.
-int s0 = fakeSocketSocket();
-CPPUNIT_ASSERT(s0 >= 0);
-int s1 = fakeSocketSocket();
-CPPUNIT_ASSERT(s1 >= 0);
-int s2 = fakeSocketSocket();
-CPPUNIT_ASSERT(s2 >= 0);
+// Create three sockets: s0, s1 and s2.
+int s0 = fakeSocketSocket();
+CPPUNIT_ASSERT(s0 >= 0);
+int s1 = fakeSocketSocket();
+CPPUNIT_ASSERT(s1 >= 0);
+int s2 = fakeSocketSocket();
+CPPUNIT_ASSERT(s2 >= 0);
 
-CPPUNIT_ASSERT(s0 != s1);
-CPPUNIT_ASSERT(s1 != s2);
+CPPUNIT_ASSERT(s0 != s1);
+CPPUNIT_ASSERT(s1 != s2);
 
-// Close s1 and create it anew
-fakeSocketClose(s1);
+// Close s1 and create it anew
+fakeSocketClose(s1);
 
-s1 = fakeSocketSocket();
-CPPUNIT_ASSERT(s1 >= 0);
+s1 = fakeSocketSocket();
+CPPUNIT_ASSERT(s1 >= 0);
 
-// Listen on s0
-int rc = fakeSocketListen(s0);
-CPPUNIT_ASSERT(rc != -1);
+// Listen on s0
+int rc = fakeSocketListen(s0);
+CPPUNIT_ASSERT(rc != -1);
 
-// Start a thread that accepts two connections to s0, producing 
sockets s3 and s4.
-int s3 = -1, s4 = -1;
-std::thread t0([&] {
-s3 = fakeSocketAccept4(s0, 0);
-CPPUNIT_ASSERT(s3 >= 0);
+// Start a thread that accepts two connections to s0, producing sockets s3 
and s4.
+int s3 = -1, s4 = -1;
+std::thread t0([&] {
+s3 = fakeSocketAccept4(s0, 0);
+CPPUNIT_ASSERT(s3 >= 0);
 
-s4 = fakeSocketAccept4(s0, 0);
-CPPUNIT_ASSERT(s4 >= 0);
-});
+s4 = fakeSocketAccept4(s0, 0);
+CPPUNIT_ASSERT(s4 >= 0);
+});
 
-// Connect s1 and s2 to s0 (that is, to the sockets produced by 
accepting connections to
-// s0).
-rc = fakeSocketConnect(s1, s0);
-CPPUNIT_ASSERT(rc != -1);
+// Connect s1 and s2 to s0 (that is, to the sockets produced by accepting 
connections to
+// s0).
+rc = fakeSocketConnect(s1, s0);
+CPPUNIT_ASSERT(rc != -1);
 
-rc = fakeSocketConnect(s2, s0);
-CPPUNIT_ASSERT(rc != -1);
+rc = fakeSocketConnect(s2, s0);
+CPPUNIT_ASSERT(rc != -1);
 
-// Verify that we got the accepts.
-t0.join();
-CPPUNIT_ASSERT(s3 != -1);
-CPPUNIT_ASSERT(s4 != -1);
+// Verify that we got the accepts.
+t0.join();
+CPPUNIT_ASSERT(s3 != -1);
+CPPUNIT_ASSERT(s4 != -1);
 
-// s1 should now be connected to s3, and s2 to s4.
-CPPUNIT_ASSERT(fakeSocketPeer(s1) == s3);
-CPPUNIT_ASSERT(fakeSocketPeer(s3) == s1);
-CPPUNIT_ASSERT(fakeSocketPeer(s2) == s4);
-CPPUNIT_ASSERT(fakeSocketPeer(s4) == s2);
+// s1 should now be connected to s3, and s2 to s4.
+CPPUNIT_ASSERT(fakeSocketPeer(s1) == s3);
+CPPUNIT_ASSERT(fakeSocketPeer(s3) == s1);
+CPPUNIT_ASSERT(fakeSocketPeer(s2) == s4);
+CPPUNIT_ASSERT(fakeSocketPeer(s4) == s2);
 
-// Some writing and reading
-rc = fakeSocketWrite(s1, "hello", 5);
-CPPUNIT_ASSERT(rc != -1);
+// Some writing and reading
+rc = fakeSocketWrite(s1, "hello", 5);
+CPPUNIT_ASSERT(rc != -1);
 
-rc = fakeSocketWrite(s1, "there", 5);
-CPPUNIT_ASSERT(rc != -1);
+rc = fakeSocketWrite(s1, "greetings", 9);
+CPPUNIT_ASSERT(rc != -1);
 
-rc = fakeSocketWrite(s2, "moin", 4);
-CPPUNIT_ASSERT(rc != -1);
+rc = fakeSocketWrite(s2, "moin", 4);
+CPPUNIT_ASSERT(rc != -1);
 
-char buf[100];
+char buf[100];
 
-rc = fakeSocketRead(s3, buf, 100);
-CPPUNIT_ASSERT(rc != -1);
-CPPUNIT_ASSERT(rc > 0);
+rc = fakeSocketAvailableDataLength(s3);
+CPPUNIT_ASSERT(rc == 5);
 
-rc = fakeSocketRead(s4, buf, 100);
-CPPUNIT_ASSERT(rc != -1);
-CPPUNIT_ASSERT(rc > 0);
+rc = fakeSocketRead(s3, buf, 100);
+CPPUNIT_ASSERT(rc == 5);
 
-   

[Libreoffice-commits] online.git: TODO

[Libreoffice Gerrit user]

 TODO |   25 -
 1 file changed, 25 deletions(-)

New commits:
commit 1ecdcc65e5bce08396f979d7a0ec3fa1b9c07dcc
Author: Andras Timar 
AuthorDate: Thu Nov 1 11:45:40 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 11:46:15 2018 +0100

remove obsolete TODO

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

diff --git a/TODO b/TODO
deleted file mode 100644
index 3fdb40423..0
--- a/TODO
+++ /dev/null
@@ -1,25 +0,0 @@
-- Handle the file: and http: URLs also in TileCache.
-
-- Add a document part number parameter to the protocol where
-  appropriate. Needed at least for the key, mouse, selecttext and
-  selectgraphic client->server messages. Probably also the LOK
-  callback server->client messages.
-
-- Have MasterProcessSession::dispatchChild() wait for a child process
-  to become available, if none of those that have been (pre-)spawned
-  have initialised themselves and reported back yet.
-
-- Make child processes time out and go away when inactive for a while.
-
-- Make the "load" request actually take an URL, not a file name. (But
-  for now would always be a file: URL, sure.)
-
-- Investigate using "bind" mounts, remounted read-only, to set up the
-  chroot jail, instead of requiring the "sys" template tree to
-  traverse and hardlink into the jail.
-
-- Investigate using "seccomp". Not available in the Linux 3.7.10 in
-  openSUSE 12.3 for instance, though.
-
-- Add some intentional slowdown option to emulate slow network
-  connection.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: .gitignore

[Libreoffice Gerrit user]

 .gitignore |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0d07aa56654bebd84a4a76065cc989af5a09dd02
Author: Andras Timar 
AuthorDate: Thu Nov 1 11:36:02 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 11:39:56 2018 +0100

update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 29791ac3d..72bc7664d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,8 +51,9 @@ loolwsd.log
 *.log.*.gz
 *.lo
 
-# lolefalet
+# loleaflet
 loleaflet/dist
+loleaflet/npm-shrinkwrap.json
 
 connect
 lokitclient
@@ -78,3 +79,5 @@ test/TAGS
 
 docker/instdir
 docker/builddir
+
+Mobile/Mobile/Info.plist
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Tabs.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ba16df8c5b03ffe92bb37bb814d9bf065a7a167
Author: Andras Timar 
AuthorDate: Thu Nov 1 11:21:30 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 11:39:13 2018 +0100

loleaflet: Rename Sheet dialog should have the current sheet name in input 
box

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

diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 73e43b8d6..53cf0a3ff 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -65,7 +65,7 @@ L.Control.Tabs = L.Control.extend({
var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);

vex.dialog.open({

message: _('Enter new sheet name'),
-   input: 
'',
+   input: 
'',

callback: function(data) {

map.renamePage(data.sheetname, nPos);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - Makefile.am test/data

[Libreoffice Gerrit user]

 Makefile.am |   10 ++
 dev/null|binary
 test/data/hello.odp |binary
 test/data/hello.ods |binary
 4 files changed, 10 insertions(+)

New commits:
commit c50cd3b550a2143a4b88583da92a6006b247116c
Author: Andras Timar 
AuthorDate: Thu Nov 1 11:29:23 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 11:39:43 2018 +0100

take hello-world.ods and hello-world.odp out of version control

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

diff --git a/Makefile.am b/Makefile.am
index 3451489ae..50b9bf0ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -281,6 +281,8 @@ run: all @TILECACHE_PATH@ @JAILS_PATH@
@echo "Launching loolwsd"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
+   @cp $(abs_top_srcdir)/test/data/hello.ods 
$(abs_top_srcdir)/test/data/hello-world.ods
+   @cp $(abs_top_srcdir)/test/data/hello.odp 
$(abs_top_srcdir)/test/data/hello-world.odp
@echo
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
  --o:child_root_path="@JAILS_PATH@" 
--o:storage.filesystem[@allow]=true \
@@ -295,6 +297,8 @@ run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
+   @cp $(abs_top_srcdir)/test/data/hello.ods 
$(abs_top_srcdir)/test/data/hello-world.ods
+   @cp $(abs_top_srcdir)/test/data/hello.odp 
$(abs_top_srcdir)/test/data/hello-world.odp
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
  --o:child_root_path="@JAILS_PATH@" 
--o:storage.filesystem[@allow]=true \
@@ -309,6 +313,8 @@ run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
+   @cp $(abs_top_srcdir)/test/data/hello.ods 
$(abs_top_srcdir)/test/data/hello-world.ods
+   @cp $(abs_top_srcdir)/test/data/hello.odp 
$(abs_top_srcdir)/test/data/hello-world.odp
gdb --tui --args \
./loolwsd --o:security.capabilities="false" \
  --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
@@ -324,6 +330,8 @@ run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
+   @cp $(abs_top_srcdir)/test/data/hello.ods 
$(abs_top_srcdir)/test/data/hello-world.ods
+   @cp $(abs_top_srcdir)/test/data/hello.odp 
$(abs_top_srcdir)/test/data/hello-world.odp
valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes 
--num-callers=50 --error-limit=no --trace-children=yes \
./loolwsd --o:security.capabilities="false" \
  --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
@@ -339,6 +347,8 @@ run-strace: all @TILECACHE_PATH@ @JAILS_PATH@
@echo "Launching loolwsd under strace"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
+   @cp $(abs_top_srcdir)/test/data/hello.ods 
$(abs_top_srcdir)/test/data/hello-world.ods
+   @cp $(abs_top_srcdir)/test/data/hello.odp 
$(abs_top_srcdir)/test/data/hello-world.odp
strace -o strace.log -f -tt -s 256 \
./loolwsd --o:security.capabilities="false" \
  --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
diff --git a/test/data/hello-world.odp b/test/data/hello-world.odp
deleted file mode 100644
index 774b8e3c9..0
Binary files a/test/data/hello-world.odp and /dev/null differ
diff --git a/test/data/hello-world.ods b/test/data/hello-world.ods
deleted file mode 100644
index eccadf96a..0
Binary files a/test/data/hello-world.ods and /dev/null differ
diff --git a/test/data/hello.odp b/test/data/hello.odp
new file mode 100644
index 0..91d75c8b0
Binary files /dev/null and b/test/data/hello.odp differ
diff --git a/test/data/hello.ods b/test/data/hello.ods
new file mode 100644
index 0..f92a6ba26
Binary files /dev/null and b/test/data/hello.ods differ
commit 455cd4092ea7ba04f521137cbd0e9292a2d4cce8
Author: Andras Timar 
AuthorDate: Thu Nov 1 11:22:59 2018 +0100
Commi

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

[Libreoffice Gerrit user]

 include/vcl/glyphitem.hxx |4 ++--
 svtools/source/control/ruler.cxx  |2 +-
 sw/source/core/txtnode/fntcache.cxx   |2 +-
 vcl/inc/impglyphitem.hxx  |6 +-
 vcl/source/control/imp_listbox.cxx|2 +-
 vcl/source/gdi/impglyphitem.cxx   |   33 ++---
 vcl/source/gdi/sallayout.cxx  |4 ++--
 vcl/source/window/menu.cxx|2 +-
 vcl/source/window/menuitemlist.cxx|2 +-
 vcl/unx/generic/glyphs/glyphcache.cxx |2 ++
 10 files changed, 46 insertions(+), 13 deletions(-)

New commits:
commit 4a66d7f0dd40c54307b5f750723f68b53703b01a
Author: Jan-Marek Glogowski 
AuthorDate: Wed Oct 31 12:28:58 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 11:20:43 2018 +0100

tdf#121030 invalidate referenced FontInstances

This sets the FreetypeFont pointer of the FreetypeFontInstances
to nullptr when clearing the cache.
And it changes the interface functions of SalLayoutGlyphs to some
variant different from std::vector.

I don't know if we should prefer the mutable or the const font
instance. With mutable at least one can invalidate the font
instance when checking the IsValid(), so we can get rid of our
referenced font instance.

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

diff --git a/include/vcl/glyphitem.hxx b/include/vcl/glyphitem.hxx
index 75213a5b49c5..83625371fb3b 100644
--- a/include/vcl/glyphitem.hxx
+++ b/include/vcl/glyphitem.hxx
@@ -39,8 +39,8 @@ public:
 
 SalLayoutGlyphsImpl* Impl() const { return m_pImpl; }
 
-bool empty() const;
-void clear();
+bool IsValid() const;
+void Invalidate();
 };
 
 #endif // INCLUDED_VCL_GLYPHITEM_HXX
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 1cb397edd890..a27fb608d7b2 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -71,7 +71,7 @@ namespace
 SalLayoutGlyphs* lcl_GetRulerTextGlyphs(vcl::RenderContext& rRenderContext, 
const OUString& rText,
 SalLayoutGlyphs& rTextGlyphs)
 {
-if (!rTextGlyphs.empty())
+if (rTextGlyphs.IsValid())
 // Use pre-calculated result.
 return &rTextGlyphs;
 
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index bf365413f282..c93e51d0bf69 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -105,7 +105,7 @@ long EvalGridWidthAdd( const SwTextGridItem *const pGrid, 
const SwDrawTextInfo &
 SalLayoutGlyphs* lcl_CreateLayout(SwTextGlyphsKey& rKey, SalLayoutGlyphs& 
rTextGlyphs)
 {
 // Use pre-calculated result.
-if (!rTextGlyphs.empty())
+if (rTextGlyphs.IsValid())
 return &rTextGlyphs;
 
 if (rKey.m_nIndex >= rKey.m_aText.getLength())
diff --git a/vcl/inc/impglyphitem.hxx b/vcl/inc/impglyphitem.hxx
index 4c7673ed2077..009be6cc2506 100644
--- a/vcl/inc/impglyphitem.hxx
+++ b/vcl/inc/impglyphitem.hxx
@@ -98,13 +98,15 @@ protected:
 public:
 virtual ~SalLayoutGlyphsImpl();
 virtual SalLayoutGlyphsImpl* clone(SalLayoutGlyphs&) const = 0;
+virtual bool IsValid() const = 0;
+virtual void Invalidate() = 0;
 };
 
 class SalGenericLayoutGlyphsImpl : public SalLayoutGlyphsImpl
 {
 friend class GenericSalLayout;
 
-const rtl::Reference m_rFontInstance;
+mutable rtl::Reference m_rFontInstance;
 
 SalGenericLayoutGlyphsImpl(SalLayoutGlyphs& rGlyphs, LogicalFontInstance& 
rFontInstance)
 : m_rFontInstance(&rFontInstance)
@@ -115,6 +117,8 @@ class SalGenericLayoutGlyphsImpl : public 
SalLayoutGlyphsImpl
 public:
 SalLayoutGlyphsImpl* clone(SalLayoutGlyphs& rGlyphs) const override;
 LogicalFontInstance& GetFont() const { return *m_rFontInstance; }
+bool IsValid() const override;
+void Invalidate() override;
 };
 
 #endif // INCLUDED_VCL_IMPGLYPHITEM_HXX
diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index 6570fb34c578..265a9589ff63 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -618,7 +618,7 @@ struct ImplEntryMetrics
 
 SalLayoutGlyphs* ImplEntryType::GetTextGlyphs(OutputDevice* pOutputDevice)
 {
-if (!maStrGlyphs.empty())
+if (maStrGlyphs.IsValid())
 // Use pre-calculated result.
 return &maStrGlyphs;
 
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index 8955ea890a9f..d3aa10ebd1b3 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -19,6 +19,10 @@
 
 #include 
 
+#if (defined UNX && !defined MACOSX)
+#include 
+#endif
+
 SalLayoutGlyphs::SalLayoutGlyphs()
 : m_pImpl(nullptr)
 {
@@ -35,12 +39,12 @@ SalLayoutGlyphs& SalLayoutGlyphs::operator=(const 
Sal

[Libreoffice-commits] online.git: 2 commits - test/fakesockettest.cpp test/Makefile.am

[Libreoffice Gerrit user]

 test/Makefile.am|1 +
 test/fakesockettest.cpp |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 856965db9f034a65138569b0c8a55c7d58368daa
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 12:12:26 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 12:12:26 2018 +0200

Return correct exit value, 0 for success, 1 for failure

Change-Id: Ie3454cac318ce6a0e8c2c59ae9d3ae3c6658c0b8

diff --git a/test/fakesockettest.cpp b/test/fakesockettest.cpp
index 417c636a6..be45c3ed5 100644
--- a/test/fakesockettest.cpp
+++ b/test/fakesockettest.cpp
@@ -220,7 +220,7 @@ int main(int, char**)
 
 fakeSocketDumpState();
 
-return result.wasSuccessful();
+return result.wasSuccessful() ? 0 : 1;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3d408d43388de360c0de76bee62ca0f3e8d26a74
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 12:10:47 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 12:10:47 2018 +0200

Actually run the fakesockettest

Sad that this Makefile.am is so complicated, and that this needs to be
added explicitly like this.

Change-Id: I8b1b25761eb723e124cab96479f49478d3a75194

diff --git a/test/Makefile.am b/test/Makefile.am
index cd8a7c643..9b7d8def3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -112,6 +112,7 @@ endif
 
 if HAVE_LO_PATH
 check-local:
+   ./fakesockettest
@fc-cache "@LO_PATH@"/share/fonts/truetype
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/factory/dlgfact.cxx|   40 +-
 cui/source/factory/dlgfact.hxx|   16 -
 include/svx/svxdlg.hxx|2 -
 include/vcl/abstdlg.hxx   |9 ---
 include/vcl/dialog.hxx|3 --
 svx/source/gallery2/galbrws1.cxx  |   22 +-
 svx/source/gallery2/galbrws1.hxx  |   10 
 sw/inc/swabstdlg.hxx  |2 -
 sw/source/ui/dbui/mailmergewizard.cxx |2 -
 sw/source/ui/dialog/swdlgfact.cxx |   20 +
 sw/source/ui/dialog/swdlgfact.hxx |6 +
 sw/source/uibase/app/apphdl.cxx   |   10 
 vcl/source/window/abstdlg.cxx |5 
 vcl/source/window/dialog.cxx  |5 
 14 files changed, 36 insertions(+), 116 deletions(-)

New commits:
commit c86728655415ea507cb5f8d7f0588014db2d6098
Author: Caolán McNamara 
AuthorDate: Wed Oct 31 12:38:56 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 1 11:00:12 2018 +0100

replace VclAbstractDialog2 with VclAbstractDialog

and drop Dialog::GetResult as a consequence

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

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 067e91c7657b..ff95f66b2574 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -278,42 +278,6 @@ short AbstractSignSignatureLineDialog_Impl::Execute()
 IMPL_ABSTDLG_BASE(AbstractScreenshotAnnotationDlg_Impl);
 
 
-// VclAbstractDialog2_Impl
-
-
-// virtual
-VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl()
-{
-disposeOnce();
-}
-
-void VclAbstractDialog2_Impl::dispose()
-{
-m_pDlg.disposeAndClear();
-VclAbstractDialog2::dispose();
-}
-
-// virtual
-void  VclAbstractDialog2_Impl::StartExecuteModal( const Link& 
rEndDialogHdl )
-{
-m_aEndDlgHdl = rEndDialogHdl;
-m_pDlg->StartExecuteAsync([=](sal_Int32 nResult){
-EndDialogHdl(nResult);
-});
-}
-
-// virtual
-sal_Int32 VclAbstractDialog2_Impl::GetResult()
-{
-return m_pDlg->GetResult();
-}
-
-void VclAbstractDialog2_Impl::EndDialogHdl(sal_Int32 /*nResult*/)
-{
-m_aEndDlgHdl.Call( *m_pDlg );
-m_aEndDlgHdl = Link();
-}
-
 void CuiAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
 {
 pDlg->SetCurPageId( rName );
@@ -1154,12 +1118,12 @@ VclPtr 
AbstractDialogFactory_Impl::CreateGalleryIdDialo
return 
VclPtr::Create(o3tl::make_unique(pParent,
 pThm));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(vcl::Window* 
pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(vcl::Window* 
pParent,
 ExchangeData* pData,
 SfxItemSet* pItemSet)
 {
 VclPtrInstance pDlg(pParent, pData, pItemSet);
-return VclPtr::Create( pDlg );
+return VclPtr::Create( pDlg );
 }
 
 VclPtr AbstractDialogFactory_Impl::CreateURLDialog( 
vcl::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index d780da073e28..a662aa09ee07 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -80,20 +80,6 @@ bool 
Class::StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) \
 return pDlg->StartExecuteAsync(rCtx);   \
 }
 
-class VclAbstractDialog2_Impl : public VclAbstractDialog2
-{
-ScopedVclPtr m_pDlg;
-Link   m_aEndDlgHdl;
-public:
-explicitVclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {}
-virtual ~VclAbstractDialog2_Impl() override;
-virtual voiddispose() override;
-virtual voidStartExecuteModal( const Link& rEndDialogHdl 
) override;
-virtual sal_Int32 GetResult() override;
-private:
-void EndDialogHdl(sal_Int32 nResult);
-};
-
 class CuiVclAbstractDialog_Impl : public VclAbstractDialog
 {
 DECL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl,Dialog)
@@ -756,7 +742,7 @@ public:
 virtual VclPtr CreateTitleDialog(weld::Window* 
pParent, const OUString& rOldText) override;
 virtual VclPtr 
CreateGalleryIdDialog(weld::Window* pParent,
 GalleryTheme* pThm) override;
-virtual VclPtr 
CreateGalleryThemePropertiesDialog(vcl::Window* pParent,
+virtual VclPtr 
CreateGalleryThemePropertiesDialog(vcl::Window* pParent,
 ExchangeData* pData,
 SfxItemSet* pItemSet) override;
 virtual VclPtr CreateURLDialog( vcl::Window* pParent,
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 5e34bf61d165..97030fefefa1 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -359,7 +359,7 @@ public:
  const OUString& rOl

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

[Libreoffice Gerrit user]

 svx/source/svdraw/svdobj.cxx |   57 +--
 1 file changed, 55 insertions(+), 2 deletions(-)

New commits:
commit 52bbb04f1e39b2d778275c91f77b6c0714ecd0d0
Author: Armin Le Grand 
AuthorDate: Wed Oct 31 20:47:49 2018 +0100
Commit: Armin Le Grand 
CommitDate: Thu Nov 1 10:58:57 2018 +0100

tdf#120728 support SvxShape for SdrShape if not inserted

Added a fallback to allow correct SvxShape construction
when SdrObject is not yet inserted - or has no SdrPage yet.
This is needed ue to the paradigm change that a SdrObject
only has a SdrPage when it is inserted.
For more info and a discussion, see added comments.

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

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 4df3c375243f..ebd1784361e6 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2793,9 +2793,58 @@ css::uno::Reference< css::uno::XInterface > 
SdrObject::getUnoShape()
 if( !xShape.is() )
 {
 OSL_ENSURE( mpSvxShape == nullptr, "SdrObject::getUnoShape: XShape 
already dead, but still an IMPL pointer!" );
-if ( getSdrPageFromSdrObject() )
+
+// try to access SdrPage from this SdrObject. This will only exist if 
the SdrObject is
+// inserted in a SdrObjList (page/group/3dScene)
+SdrPage* pPageCandidate(getSdrPageFromSdrObject());
+
+// tdf#12152, tdf#120728
+//
+// With the paradigm change to only get a SdrPage for a SdrObject when 
the SdrObject
+// is *inserted*, the functionality for creating 1:1 associated UNO 
API implementation
+// SvxShapes was partially broken: The used ::CreateShape relies on 
the SvxPage being
+// derived and the CreateShape method overloaded, implementing 
additional SdrInventor
+// types as needed.
+//
+// The fallback to use SvxDrawPage::CreateShapeByTypeAndInventor is a 
trap: It's only
+// a static fallback that handles the SdrInventor types 
SdrInventor::E3d and
+// SdrInventor::Default. Due to that, e.g. the ReportDesigner broke in 
various conditions.
+//
+// That again has to do with the ReportDesigner being implemented 
using the UNO API
+// aspects of SdrObjects early during their construction, not just 
after these are
+// inserted to a SdrPage - but that is not illegal or wrong, the 
SdrObject exists already.
+//
+// As a current solution, use the (now always available) SdrModel and 
any of the
+// existing SdrPages. The only important thing is to get a SdrPage 
where ::CreateShape is
+// overloaded and implemented as needed.
+//
+// Note for the future:
+// In a more ideal world there would be only one factory method for 
creating SdrObjects (not
+// ::CreateShape and ::CreateShapeByTypeAndInventor). This also would 
not be placed at
+// SdrPage/SvxPage at all, but at the Model where it belongs - where 
else would you expect
+// objects for the current Model to be constructed? To have this at 
the Page only would make
+// sense if different shapes would need to be constructed for 
different Pages in the same Model
+// - this is never the case.
+// At that Model extended functionality for that factory (or overloads 
and implementations)
+// should be placed. But to be realistic, migrating the factories to 
Model now is too much
+// work - maybe over time when melting SdrObject/SvxObject one day...
+if(nullptr == pPageCandidate)
+{
+// If not inserted, alternatively access a SdrPage using the 
SdrModel. There is
+// no reason not to create and return a UNO API XShape when the 
SdrObject is not
+// inserted - it may be in construction. Main paradigm is that it 
exists.
+if(0 != getSdrModelFromSdrObject().GetPageCount())
+{
+// Take 1st SdrPage. That may be e.g. a special page (in SD), 
but the
+// to-be-used method ::CreateShape will be correctly 
overloaded in
+// all cases
+pPageCandidate = getSdrModelFromSdrObject().GetPage(0);
+}
+}
+
+if(nullptr != pPageCandidate)
 {
-uno::Reference< uno::XInterface > xPage( 
getSdrPageFromSdrObject()->getUnoPage() );
+uno::Reference< uno::XInterface > 
xPage(pPageCandidate->getUnoPage());
 if( xPage.is() )
 {
 SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation(xPage);
@@ -2809,6 +2858,10 @@ css::uno::Reference< css::uno::XInterface > 
SdrObject::getUnoShape()
 }
 else
 {
+// Fallback to static base functionality. CAUTION: Thi

[Libreoffice-commits] online.git: test/fakesockettest.cpp test/Makefile.am

[Libreoffice Gerrit user]

 test/Makefile.am|7 +
 test/fakesockettest.cpp |  226 
 2 files changed, 231 insertions(+), 2 deletions(-)

New commits:
commit 02d3ac47eebd48f2594a9a2325293114ea90a00c
Author: Tor Lillqvist 
AuthorDate: Thu Nov 1 11:18:07 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Nov 1 11:51:34 2018 +0200

Add a Cppunit test for the FakeSocket API

Based on Mobile/TestFakeSocket/TestFakeSocket/main.mm. Needs work,
does not really test the interesting semantic corner cases that have
been fixed only recently.

Change-Id: Ie2f3dbd2b478ab3acb4bfef0e0d3031c817d0f37

diff --git a/test/Makefile.am b/test/Makefile.am
index 7e59fa621..cd8a7c643 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,9 +5,9 @@ AUTOMAKE_OPTION = serial-tests
 # unittest: tests that do not need loolwsd running, and that are run during a
 # normal build
 # test: tests that need loolwsd running, and that are run via 'make check'
-check_PROGRAMS = test
+check_PROGRAMS = test fakesockettest
 
-noinst_PROGRAMS = test unittest
+noinst_PROGRAMS = test fakesockettest unittest
 
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS) -DTDOC=\"$(top_srcdir)/test/data\" \
-I${top_srcdir}/common -I${top_srcdir}/net -I${top_srcdir}/wsd 
-I${top_srcdir}/kit
@@ -77,6 +77,9 @@ test_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 test_SOURCES = $(test_all_source) test.cpp
 test_LDADD = $(CPPUNIT_LIBS)
 
+fakesockettest_SOURCES = fakesockettest.cpp ../net/FakeSocket.cpp
+fakesockettest_LDADD = $(CPPUNIT_LIBS)
+
 # unit test modules:
 unit_oob_la_SOURCES = UnitOOB.cpp
 unit_fuzz_la_SOURCES = UnitFuzz.cpp
diff --git a/test/fakesockettest.cpp b/test/fakesockettest.cpp
new file mode 100644
index 0..417c636a6
--- /dev/null
+++ b/test/fakesockettest.cpp
@@ -0,0 +1,226 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#define MOBILEAPP // A bit ugly, but currently FakeSocket.hpp is surrounded by 
a MOBILEAPP ifdef,
+  // and probably it is not a good idea to remove that?
+#include "FakeSocket.hpp"
+
+class FakeSocketTest : public CPPUNIT_NS::TestFixture
+{
+CPPUNIT_TEST_SUITE(FakeSocketTest);
+
+CPPUNIT_TEST(testBasic);
+
+CPPUNIT_TEST_SUITE_END();
+
+void testBasic();
+
+public:
+FakeSocketTest()
+{
+}
+
+void setUp()
+{
+fakeSocketSetLoggingCallback([](const std::string& line)
+ {
+ std::cerr << line << "\n";
+ });
+}
+
+void tearDown()
+{
+}
+};
+
+void FakeSocketTest::testBasic()
+{
+try
+{
+// Create three sockets: s0, s1 and s2.
+int s0 = fakeSocketSocket();
+CPPUNIT_ASSERT(s0 >= 0);
+int s1 = fakeSocketSocket();
+CPPUNIT_ASSERT(s1 >= 0);
+int s2 = fakeSocketSocket();
+CPPUNIT_ASSERT(s2 >= 0);
+
+CPPUNIT_ASSERT(s0 != s1);
+CPPUNIT_ASSERT(s1 != s2);
+
+// Close s1 and create it anew
+fakeSocketClose(s1);
+
+s1 = fakeSocketSocket();
+CPPUNIT_ASSERT(s1 >= 0);
+
+// Listen on s0
+int rc = fakeSocketListen(s0);
+CPPUNIT_ASSERT(rc != -1);
+
+// Start a thread that accepts two connections to s0, producing 
sockets s3 and s4.
+int s3 = -1, s4 = -1;
+std::thread t0([&] {
+s3 = fakeSocketAccept4(s0, 0);
+CPPUNIT_ASSERT(s3 >= 0);
+
+s4 = fakeSocketAccept4(s0, 0);
+CPPUNIT_ASSERT(s4 >= 0);
+});
+
+// Connect s1 and s2 to s0 (that is, to the sockets produced by 
accepting connections to
+// s0).
+rc = fakeSocketConnect(s1, s0);
+CPPUNIT_ASSERT(rc != -1);
+
+rc = fakeSocketConnect(s2, s0);
+CPPUNIT_ASSERT(rc != -1);
+
+// Verify that we got the accepts.
+t0.join();
+CPPUNIT_ASSERT(s3 != -1);
+CPPUNIT_ASSERT(s4 != -1);
+
+// s1 should now be connected to s3, and s2 to s4.
+CPPUNIT_ASSERT(fakeSocketPeer(s1) == s3);
+CPPUNIT_ASSERT(fakeSocketPeer(s3) == s1);
+CPPUNIT_ASSERT(fakeSocketPeer(s2) == s4);
+CPPUNIT_ASSERT(fakeSocketPeer(s4) == s2);
+
+// Some writing and reading
+rc = fakeSocketWrite(s1, "hello", 5);
+CPPUNIT_ASSERT(rc != -1);
+
+rc = fakeSocketWrite(s1, "there", 5);
+CPPUNIT_ASSERT(rc != -1);
+
+rc = fakeSocketWr

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

[Libreoffice Gerrit user]

 sfx2/source/dialog/navigat.cxx |1 +
 sfx2/source/sidebar/SidebarChildWindow.cxx |2 +-
 sw/source/uibase/utlui/navipi.cxx  |3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 88cbc3ea2db8358bbedff01361f95f972f2b0231
Author: Jim Raykowski 
AuthorDate: Mon Oct 22 17:38:31 2018 -0800
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 1 10:34:45 2018 +0100

tdf#49684 Don't focus on Navigator or Sidebar on show

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

diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 2c0e974e62de..d80d656ffd29 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -42,6 +42,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* 
pParentWnd ,
 
 static_cast( GetWindow() )->Initialize( pInfo );
 SetHideNotDelete( true );
+Show( ShowFlags::NoFocusChange );
 }
 
 SfxNavigator::SfxNavigator( SfxBindings* pBind ,
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx 
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 7153c1d461b1..9c96f17ccf5b 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -60,7 +60,7 @@ SidebarChildWindow::SidebarChildWindow (vcl::Window* 
pParentWindow, sal_uInt16 n
 }
 SetHideNotDelete(true);
 
-GetWindow()->Show();
+GetWindow()->Show(true, ShowFlags::NoFocusChange);
 }
 
 sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)
diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index 0a59be1f9bb1..cc6d60dcc06e 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -740,10 +740,7 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
 pActView->GetWrtShellPtr()->IsGlblDocSaveLinks());
 if (m_pConfig->IsGlobalActive())
 ToggleTree();
-m_aGlobalTree->GrabFocus();
 }
-else
-m_aContentTree->GrabFocus();
 UsePage();
 m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl));
 m_aPageChgIdle.SetPriority(TaskPriority::LOWEST);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddafb573ed5b86c9324f3f2e051f95f7db615833
Author: Andras Timar 
AuthorDate: Thu Nov 1 10:25:58 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Nov 1 10:29:34 2018 +0100

Font size dropdown placeholder string 'Size' and its translations were too 
long and did not fit

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

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index a1ebdea05..4391c8472 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1013,7 +1013,7 @@ function updateFontSizeList(font) {
data = 
data.concat(map.getToolbarCommandValues('.uno:CharFontName')[font]);
$('.fontsizes-select').select2({
data: data,
-   placeholder: _('Size'),
+   placeholder: ' ',
//Allow manually entered font size.
createTag: function(query) {
return {
@@ -1586,7 +1586,7 @@ function updateCommandValues() {
 
if ($('.fontsizes-select option').length === 0) {
$('.fontsizes-select').select2({
-   placeholder: _('Size'),
+   placeholder: ' ',
data: []
});
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/sidebar/FocusManager.cxx  |   35 +++---
 sfx2/source/sidebar/SidebarController.cxx |1 
 2 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 27ea5f66c788443aef38cfc5378ec6410d722a9f
Author: Jim Raykowski 
AuthorDate: Sat Sep 1 01:22:57 2018 -0800
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 1 10:18:54 2018 +0100

tdf#119631 Keyboard navigation: Skip hidden tabs in sidebar tab bar

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

diff --git a/sfx2/source/sidebar/FocusManager.cxx 
b/sfx2/source/sidebar/FocusManager.cxx
index a95b4405ffd0..b55c356364a2 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -453,21 +453,34 @@ void FocusManager::HandleKeyEvent (
 else if (IsDeckTitleVisible())
 FocusDeckTitle();
 else
-FocusButton(maButtons.size()-1);
+{
+// Focus the last button.
+sal_Int32 nIndex(maButtons.size()-1);
+while(!maButtons[nIndex].get()->IsVisible() && 
--nIndex > 0);
+FocusButton(nIndex);
+}
 break;
 
 case PC_DeckTitle:
 case PC_DeckToolBox:
+{
 // Focus the last button.
-FocusButton(maButtons.size()-1);
+sal_Int32 nIndex(maButtons.size()-1);
+while(!maButtons[nIndex].get()->IsVisible() && --nIndex > 
0);
+FocusButton(nIndex);
 break;
+}
 
 case PC_TabBar:
 // Go to previous tab bar item.
 if (aLocation.mnIndex == 0)
 FocusPanel(maPanels.size()-1, true);
 else
-FocusButton((aLocation.mnIndex + maButtons.size() - 1) 
% maButtons.size());
+{
+sal_Int32 nIndex((aLocation.mnIndex + maButtons.size() 
- 1) % maButtons.size());
+while(!maButtons[nIndex].get()->IsVisible() && 
--nIndex > 0);
+FocusButton(nIndex);
+}
 break;
 
 default:
@@ -501,13 +514,19 @@ void FocusManager::HandleKeyEvent (
 case PC_TabBar:
 // Go to next tab bar item.
 if (aLocation.mnIndex < 
static_cast(maButtons.size())-1)
-FocusButton(aLocation.mnIndex + 1);
-else
 {
-FocusPanel(0, true);
-if (IsDeckTitleVisible())
-FocusDeckTitle();
+sal_Int32 nIndex(aLocation.mnIndex + 1);
+while(!maButtons[nIndex].get()->IsVisible() && 
++nIndex < static_cast(maButtons.size()));
+if (nIndex < static_cast(maButtons.size()))
+{
+FocusButton(nIndex);
+break;
+}
 }
+if (IsDeckTitleVisible())
+FocusDeckTitle();
+else
+FocusPanel(0, true);
 break;
 
 default:
diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 82f4eceebd28..338fd9d6137d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1097,6 +1097,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, 
pMenu, bool)
 // Notify the tab bar about the updated set of decks.
 mpTabBar->SetDecks(aDecks);
 mpTabBar->HighlightDeck(mpCurrentDeck->GetId());
+mpTabBar->UpdateFocusManager(maFocusManager);
 }
 mpParentWindow->GrabFocusToDocument();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/window/dockwin.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ab58646b3eefcdee9e6ad786b8eed27390da4419
Author: Jim Raykowski 
AuthorDate: Wed Oct 24 01:01:21 2018 -0800
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 1 10:18:27 2018 +0100

Fix undocked window loses focus

Use any method to undock a docked window and the window loses focus.
This is a regression that began sometime after version 5.1.6.2

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

diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index ec203fc743bf..53a40c35c752 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -532,6 +532,8 @@ bool DockingWindow::EventNotify( NotifyEvent& rNEvt )
 if (!bDockingSupportCrippled && pMEvt->IsMod1() && 
(pMEvt->GetClicks() == 2) )
 {
 SetFloatingMode( !IsFloatingMode() );
+if ( IsFloatingMode() )
+ToTop( ToTopFlags::GrabFocusOnly );
 return true;
 }
 else if ( pMEvt->GetClicks() == 1 )
@@ -561,6 +563,8 @@ bool DockingWindow::EventNotify( NotifyEvent& rNEvt )
 rKey.IsShift() && rKey.IsMod1() && !bDockingSupportCrippled )
 {
 SetFloatingMode( !IsFloatingMode() );
+if ( IsFloatingMode() )
+ToTop( ToTopFlags::GrabFocusOnly );
 return true;
 }
 }
@@ -587,12 +591,11 @@ void DockingWindow::EndDocking( const tools::Rectangle& 
rRect, bool bFloatMode )
 
 if ( !IsDockingCanceled() )
 {
-bool bShow = false;
 if ( bFloatMode != IsFloatingMode() )
 {
-Show( false, ShowFlags::NoFocusChange );
 SetFloatingMode( bFloatMode );
-bShow = true;
+if ( IsFloatingMode() )
+ToTop( ToTopFlags::GrabFocusOnly );
 if ( bFloatMode && mpFloatWin )
 mpFloatWin->SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() 
);
 }
@@ -602,9 +605,6 @@ void DockingWindow::EndDocking( const tools::Rectangle& 
rRect, bool bFloatMode )
 aPos = GetParent()->ScreenToOutputPixel( aPos );
 Window::SetPosSizePixel( aPos, rRect.GetSize() );
 }
-
-if ( bShow )
-Show();
 }
 mbDocking = false;
 mbDockCanceled = bOrigDockCanceled;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1bab76b413346b54ee692b8e70e84b8e5367688d
Author: Ilhan Yesil 
AuthorDate: Mon Oct 29 12:33:25 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 1 10:15:01 2018 +0100

tdf#121013 External tool opens it's own dialog to update input fields

Instead calling function SwWrtShell::UpdateInputFields directly, use
an UNO command, so an external tool can catch the UNO call.

Change-Id: I978487e94b6f82a75b008bfcdc20bb025dc610f7
Reviewed-on: https://gerrit.libreoffice.org/62502
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit b8e260a9372de9ee1186e1f78ade29717e9b8026)
Reviewed-on: https://gerrit.libreoffice.org/62542
Tested-by: Thorsten Behrens 

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 804e358418ef..b63d52828ef9 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -94,6 +94,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -864,7 +865,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 bUpdateFields = false;
 if(bUpdateFields)
 {
-pWrtSh->UpdateInputFields();
+comphelper::dispatchCommand(".uno:UpdateInputFields", 
{});
 
 // Are database fields contained?
 // Get all used databases for the first time
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/doc/Metadatable.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9036336cdc67f1924bad2486a62b4c7b43375e04
Author: Noel Grandin 
AuthorDate: Thu Nov 1 09:44:56 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 1 10:03:49 2018 +0100

revert accidental rename

in
commit 15c86cadadcd389bfcf80ca285c1c298353d987f
Date:   Wed Oct 31 14:36:41 2018 +0200
rename RemoveX->Remove in SfxUndoArray

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

diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 3ff02fb39735..65b386640845 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -183,7 +183,7 @@ public:
 Does not remove the metadata reference from the element.
 
 
-@see RemovemlIdForElement
+@see RemoveXmlIdForElement
  */
 virtual void UnregisterMetadatable(Metadatable const&) = 0;
 
@@ -192,7 +192,7 @@ public:
 GetXmlIdForElement(Metadatable const&) const;
 
 /** remove the metadata reference for the given element. */
-virtual void RemovemlIdForElement(Metadatable const&) = 0;
+virtual void RemoveXmlIdForElement(Metadatable const&) = 0;
 
 protected:
 
@@ -221,7 +221,7 @@ public:
 
 virtual void UnregisterMetadatable(Metadatable const&) override;
 
-virtual void RemovemlIdForElement(Metadatable const&) override;
+virtual void RemoveXmlIdForElement(Metadatable const&) override;
 
 /** register i_rCopy as a copy of i_rSource,
 with precedence iff i_bCopyPrecedesSource is true */
@@ -312,7 +312,7 @@ public:
 
 virtual void UnregisterMetadatable(Metadatable const&) override;
 
-virtual void RemovemlIdForElement(Metadatable const&) override;
+virtual void RemoveXmlIdForElement(Metadatable const&) override;
 
 /** register i_rCopy as a copy of i_rSource */
 MetadatableClipboard & RegisterCopyClipboard(Metadatable & i_rCopy,
@@ -761,9 +761,9 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const 
Metadatable& i_rObject)
 }
 }
 
-void XmlIdRegistryDocument::RemovemlIdForElement(const Metadatable& i_rObject)
+void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject)
 {
-SAL_INFO("sfx", "RemovemlIdForElement: " << &i_rObject);
+SAL_INFO("sfx", "RemoveXmlIdForElement: " << &i_rObject);
 
 const XmlIdReverseMap_t::iterator iter(
 m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -1165,9 +1165,9 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const 
Metadatable& i_rObject)
 }
 
 
-void XmlIdRegistryClipboard::RemovemlIdForElement(const Metadatable& i_rObject)
+void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& 
i_rObject)
 {
-SAL_INFO("sfx", "RemovemlIdForElement: " << &i_rObject);
+SAL_INFO("sfx", "RemoveXmlIdForElement: " << &i_rObject);
 
 ClipboardXmlIdReverseMap_t::iterator iter(
 m_pImpl->m_XmlIdReverseMap.find(&i_rObject) );
@@ -1246,7 +1246,7 @@ void Metadatable::RemoveMetadataReference()
 if (m_pReg)
 {
 m_pReg->UnregisterMetadatable( *this );
-m_pReg->RemovemlIdForElement( *this );
+m_pReg->RemoveXmlIdForElement( *this );
 m_pReg = nullptr;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/headless/svpgdi.hxx |5 +++--
 vcl/qt5/Qt5Widget.cxx   |   12 +++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit f541da4f6d61d089c8d7a7c25b58795705c787eb
Author: Aleksei Nikiforov 
AuthorDate: Wed Oct 31 15:13:42 2018 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 1 09:34:56 2018 +0100

tdf#120777 KDE5: Dialogs get blank when they are resized

On window resize qt5 only redraws changed parts of widgets.
If resize is minor (i.e. height has increased by 1 pixel, for example),
qt5 may consider most parts of widget not changed and skip redrawing them
and redraw only certain widget elements.

But if cairo is used for drawing, on resize previously drawed image of 
widget
is discarded and new one of different size is created.
New image is empty, but qt5 doesn't issue redraw for whole widget.
To mitigate this issue, data from old image of widget should be copied over
to image of new widget, qt5 will redraw it partially or fully if necessary.

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

diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 1b24f2fa8c5d..89fe682d3223 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -119,11 +119,12 @@ public:
 double fMiterMinimumAngle,
 bool bPixelSnapHairline);
 
-private:
-void invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags);
 void copySource(const SalTwoRect& rTR, cairo_surface_t* source);
 void copyWithOperator(const SalTwoRect& rTR, cairo_surface_t* source,
   cairo_operator_t eOp = CAIRO_OPERATOR_SOURCE);
+
+private:
+void invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags);
 void applyColor(cairo_t *cr, Color rColor);
 
 protected:
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index a47aaca8b853..1055ccd9fb16 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -24,12 +24,14 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -57,7 +59,7 @@ void Qt5Widget::paintEvent(QPaintEvent* pEvent)
 p.drawImage(pEvent->rect().topLeft(), *m_pFrame->m_pQImage, 
pEvent->rect());
 }
 
-void Qt5Widget::resizeEvent(QResizeEvent* /*event*/)
+void Qt5Widget::resizeEvent(QResizeEvent* pEvent)
 {
 if (m_pFrame->m_bUseCairo)
 {
@@ -71,7 +73,15 @@ void Qt5Widget::resizeEvent(QResizeEvent* /*event*/)
 cairo_surface_set_user_data(pSurface, 
SvpSalGraphics::getDamageKey(),
 &m_pFrame->m_aDamageHandler, nullptr);
 m_pFrame->m_pSvpGraphics->setSurface(pSurface, 
basegfx::B2IVector(width, height));
+UniqueCairoSurface old_surface(m_pFrame->m_pSurface.release());
 m_pFrame->m_pSurface.reset(pSurface);
+
+int min_width = qMin(pEvent->oldSize().width(), 
pEvent->size().width());
+int min_height = qMin(pEvent->oldSize().height(), 
pEvent->size().height());
+
+SalTwoRect rect(0, 0, min_width, min_height, 0, 0, min_width, 
min_height);
+
+m_pFrame->m_pSvpGraphics->copySource(rect, old_surface.get());
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/filter/ppt/pptin.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0c33e80bd0091c928be4209ff6210844ee5465a7
Author: Mike Kaganski 
AuthorDate: Thu Nov 1 07:29:50 2018 +0100
Commit: Mike Kaganski 
CommitDate: Thu Nov 1 09:27:14 2018 +0100

Limit the unique_ptr scope to get rid of .reset()

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

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5f19b38cdd2b..0d7842a6db8c 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -137,11 +137,10 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, 
SvStream& rDocStream, SotSt
 pSummaryInformation.reset();
 #endif
 
-std::unique_ptr pCurrentUserStream(rStorage.OpenSotStream( 
"Current User", StreamMode::STD_READ ));
-if( pCurrentUserStream )
+if (auto pCurrentUserStream
+= std::unique_ptr(rStorage.OpenSotStream("Current User", 
StreamMode::STD_READ)))
 {
 ReadPptCurrentUserAtom(*pCurrentUserStream, maParam.aCurrentUserAtom);
-pCurrentUserStream.reset();
 }
 
 if( pDocument )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/customize/CommandCategoryListBox.cxx |   17 -
 cui/source/inc/CommandCategoryListBox.hxx   |2 +-
 include/unotools/textsearch.hxx |7 +++
 unotools/source/i18n/textsearch.cxx |   10 ++
 4 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit e9b06dd9458074af36b0fc97ff41ed4c79e5de32
Author: Muhammet Kara 
AuthorDate: Wed Oct 31 15:48:38 2018 +0300
Commit: Noel Grandin 
CommitDate: Thu Nov 1 08:34:50 2018 +0100

tdf#112614: Include all labels in the search in Customize dialog

For uno commands

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

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 523008fb8287..fe05b2c5a33a 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // include search util
 #include 
@@ -215,13 +216,19 @@ void CommandCategoryListBox::FillFunctionsList(
 
 for (const auto & rInfo : xCommands)
 {
-OUString sUIName= MapCommand2UIName(rInfo.Command);
-sal_Int32 aStartPos = 0;
-sal_Int32 aEndPos   = sUIName.getLength();
+OUString sUIName= getCommandName(rInfo.Command);
+OUString sLabel = 
vcl::CommandInfoProvider::GetLabelForCommand(rInfo.Command, m_sModuleLongName);
+OUString sTooltipLabel = 
vcl::CommandInfoProvider::GetTooltipForCommand( rInfo.Command, m_xFrame);
+OUString sPopupLabel =
+
(vcl::CommandInfoProvider::GetPopupLabelForCommand(rInfo.Command, 
m_sModuleLongName))
+.replaceFirst("~", "");
 
 // Apply the search filter
 if (!filterTerm.isEmpty()
-&& !textSearch.SearchForward( sUIName, &aStartPos, &aEndPos ) )
+&& !textSearch.searchForward( sUIName )
+&& !textSearch.searchForward( sLabel )
+&& !textSearch.searchForward( sTooltipLabel )
+&& !textSearch.searchForward( sPopupLabel ) )
 {
 continue;
 }
@@ -240,7 +247,7 @@ void CommandCategoryListBox::FillFunctionsList(
 }
 }
 
-OUString CommandCategoryListBox::MapCommand2UIName(const OUString& sCommand)
+OUString CommandCategoryListBox::getCommandName(const OUString& sCommand)
 {
 OUString sUIName;
 try
diff --git a/cui/source/inc/CommandCategoryListBox.hxx 
b/cui/source/inc/CommandCategoryListBox.hxx
index 8d85169ed0d5..f49ff2c999e6 100644
--- a/cui/source/inc/CommandCategoryListBox.hxx
+++ b/cui/source/inc/CommandCategoryListBox.hxx
@@ -54,7 +54,7 @@ public:
 const VclPtr&  pFunctionListBox,
 const OUString& filterTerm,
 SaveInData *pCurrentSaveInData );
-OUStringMapCommand2UIName(const OUString& sCommand);
+OUStringgetCommandName(const OUString& sCommand);
 
 /**
 Signals that a command category has been selected.
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 2d609fe99ec0..396ecf294b38 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -202,6 +202,13 @@ public:
 bool SearchForward( const OUString &rStr,
 sal_Int32* pStart, sal_Int32* pEnd,
 css::util::SearchResult* pRes = nullptr );
+/**
+ * @brief searchForward Search forward beginning from the start to the end
+ *of the given text
+ * @param rStr The text in wich we search
+ * @return True if the search term is found in the text
+ */
+bool searchForward( const OUString &rStr );
 bool SearchBackward( const OUString &rStr,
 sal_Int32* pStart, sal_Int32* pEnd,
 css::util::SearchResult* pRes = nullptr );
diff --git a/unotools/source/i18n/textsearch.cxx 
b/unotools/source/i18n/textsearch.cxx
index 12504ccf0882..81768e9d021e 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -263,6 +263,16 @@ bool TextSearch::SearchForward( const OUString &rStr,
 return bRet;
 }
 
+bool TextSearch::searchForward( const OUString &rStr )
+{
+sal_Int32 pStart = 0;
+sal_Int32 pEnd = rStr.getLength();
+
+bool bResult = SearchForward(rStr, &pStart, &pEnd);
+
+return bResult;
+}
+
 bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart,
 sal_Int32* pEnde, SearchResult* pRes )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/svdraw/svdhdl.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 53bc3b618b5a97702a54d3aa4dbf7853d8980a5d
Author: Noel Grandin 
AuthorDate: Wed Oct 31 16:20:41 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 1 08:33:22 2018 +0100

tdf#120997 Crash after Ctrl+Tab to traverse points of object, more fix

regression from
commit b4fc996520b47a6212661a9de3a1c72ccfc379a4
loplugin:useuniqueptr in SdrHdlList

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

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 2c1ee22a064c..7dc05bc1a086 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2063,10 +2063,9 @@ void SdrHdlList::TravelFocusHdl(bool bForward)
 if(nOldHdlNum != nNewHdlNum)
 {
 mnFocusIndex = nNewHdlNum;
-SdrHdl* pNew = GetHdl(mnFocusIndex);
-
-if(pNew)
+if (mnFocusIndex < GetHdlCount())
 {
+SdrHdl* pNew = GetHdl(mnFocusIndex);
 pNew->Touch();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch |   55 
++
 external/libnumbertext/UnpackedTarball_libnumbertext.mk  |8 +
 2 files changed, 63 insertions(+)

New commits:
commit cfdcb1bb0cf3a9fa2b342109cd581d3211e965bf
Author: Stephan Bergmann 
AuthorDate: Wed Oct 31 21:01:04 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 1 08:19:26 2018 +0100

external/libnumbertext: Don't depend on en_US.UTF-8 locale

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

diff --git 
a/external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch 
b/external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch
new file mode 100644
index ..4a454a098007
--- /dev/null
+++ b/external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch
@@ -0,0 +1,55 @@
+From 59a04cb70b261ad77baf671d5059a836ba339bbd Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Tue, 30 Oct 2018 13:51:02 +0100
+Subject: [PATCH] Don't depend on en_US.UTF-8 locale
+
+Instead, create locale with codecvt_utf8 facet on all platforms (even if
+codecvt_utf8 is deprecated since C++17).  There is no guarantee that
+"en_US.UTF-8" is a supported locale name, so the locale constructor might throw
+a runtime_error.  (See the discussion in the comments to
+ "Add check for en_US.utf8 locale"
+for a real-live example of issues caused by that.)
+
+(And the  and  headers apparently need to be included always,
+regardless of NUMBERTEXT_BOOST.)
+---
+ src/Numbertext.cxx | 8 ++--
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/Numbertext.cxx b/src/Numbertext.cxx
+index 8cf5198..5f05b48 100644
+--- a/src/Numbertext.cxx
 b/src/Numbertext.cxx
+@@ -2,6 +2,8 @@
+  * 2018 (c) László Németh
+  * License: LGPL/BSD dual license */
+ 
++#include 
++#include 
+ #include 
+ #include 
+ 
+@@ -11,8 +13,6 @@
+   #include 
+   using namespace boost;
+ #else
+-  #include 
+-  #include 
+   using namespace std;
+ #endif
+ 
+@@ -25,11 +25,7 @@ bool readfile(const std::string& filename, std::wstring& 
result)
+ std::wifstream wif(filename);
+ if (wif.fail())
+ return false;
+-#ifdef _MSC_VER
+ wif.imbue(std::locale(std::locale(), new std::codecvt_utf8));
+-#else
+-wif.imbue(std::locale("en_US.UTF-8"));
+-#endif
+ std::wstringstream wss;
+ wss << wif.rdbuf();
+ result = wss.str();
+-- 
+2.19.1
+
diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk 
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index ac2a14133205..67b147393e31 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -13,4 +13,12 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,1))
+
+# external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch is 
upstream at
+#  :
+$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
+external/libnumbertext/0001-Don-t-depend-on-en_US.UTF-8-locale.patch \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits