date:20170319

[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py include/svx svx/source

2017-03-19 Thread Noel Grandin

 bin/find-unused-defines-in-hrc-files.py |9 
 include/svx/svdstr.hrc  |  236 
 svx/source/svdraw/svdstr.src|  623 
 3 files changed, 11 insertions(+), 857 deletions(-)

New commits:
commit 17e872c3fa87bb596ec8b263b7a2e692b927dcef
Author: Noel Grandin 
Date:   Fri Mar 17 13:11:27 2017 +0200

remove unused defines from HRC files in svx(1)

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

diff --git a/bin/find-unused-defines-in-hrc-files.py 
b/bin/find-unused-defines-in-hrc-files.py
index 5ad87d8cc3a0..94ec2170fe22 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -93,6 +93,15 @@ exclusionSet = set([
 "PRICING_DEFFUNCNAME_",
 "PRICING_FUNCDESC_",
 "PRICING_FUNCNAME_",
+"STR_ItemValCAPTION",
+"STR_ItemValCIRC",
+"STR_ItemValEDGE",
+"STR_ItemValFITTOSIZE",
+"STR_ItemValMEASURE_",
+"STR_ItemValMEASURETEXT_",
+"STR_ItemValTEXTANI_",
+"STR_ItemValTEXTHADJ",
+"STR_ItemValTEXTVADJ",
 ])
 
 
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index 377c68e19d95..2762571491cc 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -38,20 +38,6 @@
 #define STR_ObjNamePluralLINE(STR_ObjNameBegin + 12)
 #define STR_ObjNameSingulRECT(STR_ObjNameBegin + 13)
 #define STR_ObjNamePluralRECT(STR_ObjNameBegin + 14)
-#define STR_ObjNameSingulQUAD(STR_ObjNameBegin + 15)
-#define STR_ObjNamePluralQUAD(STR_ObjNameBegin + 16)
-#define STR_ObjNameSingulPARAL   (STR_ObjNameBegin + 17)
-#define STR_ObjNamePluralPARAL   (STR_ObjNameBegin + 18)
-#define STR_ObjNameSingulRAUTE   (STR_ObjNameBegin + 19)
-#define STR_ObjNamePluralRAUTE   (STR_ObjNameBegin + 20)
-#define STR_ObjNameSingulRECTRND (STR_ObjNameBegin + 21)
-#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22)
-#define STR_ObjNameSingulQUADRND (STR_ObjNameBegin + 23)
-#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24)
-#define STR_ObjNameSingulPARALRND(STR_ObjNameBegin + 25)
-#define STR_ObjNamePluralPARALRND(STR_ObjNameBegin + 26)
-#define STR_ObjNameSingulRAUTERND(STR_ObjNameBegin + 27)
-#define STR_ObjNamePluralRAUTERND(STR_ObjNameBegin + 28)
 #define STR_ObjNameSingulCIRC(STR_ObjNameBegin + 29)
 #define STR_ObjNamePluralCIRC(STR_ObjNameBegin + 30)
 #define STR_ObjNameSingulSECT(STR_ObjNameBegin + 31)
@@ -83,9 +69,6 @@
 #define STR_ObjNameSingulFREEFILL(STR_ObjNameBegin + 57)
 #define STR_ObjNamePluralFREEFILL(STR_ObjNameBegin + 58)
 #define STR_ObjNameSingulCOMBLINE(STR_ObjNameBegin + 59)
-#define STR_ObjNamePluralCOMBLINE(STR_ObjNameBegin + 60)
-#define STR_ObjNameSingulCOMBFILL(STR_ObjNameBegin + 61)
-#define STR_ObjNamePluralCOMBFILL(STR_ObjNameBegin + 62)
 #define STR_ObjNameSingulNATSPLN (STR_ObjNameBegin + 63)
 #define STR_ObjNamePluralNATSPLN (STR_ObjNameBegin + 64)
 #define STR_ObjNameSingulPERSPLN (STR_ObjNameBegin + 65)
@@ -94,10 +77,6 @@
 #define STR_ObjNamePluralTEXT(STR_ObjNameBegin + 68)
 #define STR_ObjNameSingulTEXTLNK (STR_ObjNameBegin + 69)
 #define STR_ObjNamePluralTEXTLNK (STR_ObjNameBegin + 70)
-#define STR_ObjNameSingulFITTEXT (STR_ObjNameBegin + 71)
-#define STR_ObjNamePluralFITTEXT (STR_ObjNameBegin + 72)
-#define STR_ObjNameSingulFITALLTEXT  (STR_ObjNameBegin + 73)
-#define STR_ObjNamePluralFITALLTEXT  (STR_ObjNameBegin + 74)
 #define STR_ObjNameSingulTITLETEXT   (STR_ObjNameBegin + 75)
 #define STR_ObjNamePluralTITLETEXT   (STR_ObjNameBegin + 76)
 #define STR_ObjNameSingulOUTLINETEXT (STR_ObjNameBegin + 77)
@@ -118,18 +97,10 @@
 #define STR_ObjNamePluralGRAFBMP (STR_ObjNameBegin + 92)
 #define STR_ObjNameSingulGRAFBMPLNK  (STR_ObjNameBegin + 93)
 #define STR_ObjNamePluralGRAFBMPLNK  (STR_ObjNameBegin + 94)
-#define STR_ObjNameSingulGRAFMAC (STR_ObjNameBegin + 95)
-#define STR_ObjNamePluralGRAFMAC (STR_ObjNameBegin + 96)
-#define STR_ObjNameSingulGRAFMACLNK  (STR_ObjNameBegin + 97)
-#define STR_ObjNamePluralGRAFMACLNK  (STR_ObjNameBegin + 98)
 #define STR_ObjNameSingulOLE2(STR_ObjNameBegin + 99)
 #define STR_ObjNamePluralOLE2(STR_ObjNameBegin +100)
-#define STR_ObjNameSingulOLE2LNK (STR_ObjNameBegin +101)
-#define STR_ObjNamePluralOLE2LNK (STR_ObjNameBegin +102)
-#define STR_ObjOLE2NamePrefix(STR_ObjNameBegin +103)
 #define STR_ObjNameSingulFrame   (STR_ObjNameBegin +104)
 #define STR_ObjNamePluralFrame   (STR_ObjNameBegin +105)
-#define STR_ObjFrameNamePrefix   (STR_ObjNameBegin +106)
 #define STR_ObjNameSingulEDGE(STR_ObjNameBegin +107)
 #define STR_ObjNamePluralEDGE(STR_ObjNameBegin +108)
 #define STR_ObjNameSingulCAPTION (STR_ObjNameBegin +109)
@@ -140,7 +111,6 @@
 #define

[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py filter/source l10ntools/source sc/AllLangResTarget_sc.mk sc/source uui/source

2017-03-19 Thread Noel Grandin

 bin/find-unused-defines-in-hrc-files.py |8 +-
 filter/source/xsltdialog/xmlfilterdialogstrings.hrc |2 -
 filter/source/xsltdialog/xmlfilterdialogstrings.src |   10 ---
 l10ntools/source/gRun.sh|2 -
 sc/AllLangResTarget_sc.mk   |1 
 sc/source/ui/dbgui/filtdlg.cxx  |1 
 sc/source/ui/dbgui/pfiltdlg.cxx |1 
 sc/source/ui/dbgui/sfiltdlg.cxx |1 
 sc/source/ui/inc/filter.hrc |   24 --
 sc/source/ui/src/filter.src |   26 
 uui/source/ids.hrc  |1 
 uui/source/ids.src  |5 ---
 12 files changed, 8 insertions(+), 74 deletions(-)

New commits:
commit 4307643b2fa1f2cdc2bf087ab2285a8557d61bec
Author: Noel Grandin 
Date:   Fri Mar 17 12:35:13 2017 +0200

remove unused defines from HRC files in misc(2)

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

diff --git a/bin/find-unused-defines-in-hrc-files.py 
b/bin/find-unused-defines-in-hrc-files.py
index 488b045340e5..5ad87d8cc3a0 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -87,6 +87,12 @@ exclusionSet = set([
 "STR_VOBJ_MODE_",
 "STR_COND_",
 "SCSTR_CONTENT_",
+"DATE_FUNCDESC_",
+"DATE_FUNCNAME_",
+"DATE_DEFFUNCNAME_",
+"PRICING_DEFFUNCNAME_",
+"PRICING_FUNCDESC_",
+"PRICING_FUNCNAME_",
 ])
 
 
@@ -131,7 +137,7 @@ with a.stdout as txt:
 # is the constant being used as an identifier by 
entries in .src files
 if ".src:" in line2 and "HelpId = " in line2: 
found_reason_to_exclude = True
 # is it being used as a constant in an ItemList  in .src files?
-if ".src:" in line2 and ";> ;" in line2: 
found_reason_to_exclude = True
+if ".src:" in line2 and (";> ;" in line2 or "; >;" in line2): 
found_reason_to_exclude = True
 # these are used in calculations in other .hrc files
 if "sw/inc/rcid.hrc:" in line2: found_reason_to_exclude = True
 # calculations
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc 
b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
index 141ea6326153..66b6b3e3cf12 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
@@ -30,8 +30,6 @@
 #define STR_EXPORT_ONLY (RID_XSLT_DIALOG_START + 5)
 
 #define STR_WARN_DELETE (RID_XSLT_DIALOG_START + 10)
-#define STR_NO_ERRORS_FOUND (RID_XSLT_DIALOG_START + 11)
-#define STR_NOT_SPECIFIED   (RID_XSLT_DIALOG_START + 12)
 
 #define STR_DEFAULT_FILTER_NAME (RID_XSLT_DIALOG_START + 13)
 #define STR_DEFAULT_EXTENSION   (RID_XSLT_DIALOG_START + 14)
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.src 
b/filter/source/xsltdialog/xmlfilterdialogstrings.src
index af886465f1df..8e6501cd8a85 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.src
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.src
@@ -119,16 +119,6 @@ String STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND
 Text [ en-US ]  = "The given import template cannot be found. Please enter 
a valid path.";
 };
 
-String STR_NOT_SPECIFIED
-{
-Text [ en-US ]  = "Not specified";
-};
-
-String STR_NO_ERRORS_FOUND
-{
-Text= "No errors found.";
-};
-
 String STR_DEFAULT_FILTER_NAME
 {
 Text [ en-US ]  = "New Filter";
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index cdee79787edd..15d39ceabbfa 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -338,7 +338,7 @@ ${MYCMD} --files sc/source/ui/navipi/navipi.src
 
 ${MYCMD} --base sc/source/ui/sidebar --files CellAppearancePropertyPanel.src 
NumberFormatPropertyPanel.src
 
-${MYCMD} --base sc/source/ui/src --files condformatdlg.src filter.src 
globstr.src iconsets.src sc.src scerrors.src scfuncs.src scstring.src 
scwarngs.src toolbox.src
+${MYCMD} --base sc/source/ui/src --files condformatdlg.src globstr.src 
iconsets.src sc.src scerrors.src scfuncs.src scstring.src scwarngs.src 
toolbox.src
 
 ${MYCMD} --files sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
 
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index cd43a8cea91b..c14e169ebd52 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/src/sc.src \
 sc/source/ui/src/scerrors.src \
 sc/source/ui/src/scstring.src \
-sc/source/ui/src/filter.src \
 sc/source/ui/cctrl/checklistmenu.src

[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py include/svx svx/inc svx/source

2017-03-19 Thread Noel Grandin

 bin/find-unused-defines-in-hrc-files.py|2 
 include/svx/dialogs.hrc|   10 
 include/svx/svxids.hrc |4 -
 svx/inc/float3d.hrc|   10 
 svx/inc/fmhelp.hrc |1 
 svx/inc/helpid.hrc |3 -
 svx/source/dialog/docrecovery.cxx  |4 -
 svx/source/dialog/docrecovery.hrc  |   47 -
 svx/source/dialog/docrecovery.src  |2 
 svx/source/dialog/sdstring.src |   34 ---
 svx/source/sidebar/paragraph/ParaPropertyPanel.src |5 --
 11 files changed, 4 insertions(+), 118 deletions(-)

New commits:
commit e604ddfd1196c877ddce603dca15f9a5228497e0
Author: Noel Grandin 
Date:   Fri Mar 17 15:10:04 2017 +0200

remove unused defines from HRC files in svx(2)

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

diff --git a/bin/find-unused-defines-in-hrc-files.py 
b/bin/find-unused-defines-in-hrc-files.py
index b945266351b6..488b045340e5 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -146,6 +146,8 @@ with a.stdout as txt:
 if "reportdesign/" in line2 and 
idName.startswith("HID_RPT_PROP_"): found_reason_to_exclude = True
 if "reportdesign/" in line2 and idName.startswith("RID_STR_"): 
found_reason_to_exclude = True
 if "forms/" in line2 and idName.startswith("PROPERTY_"): 
found_reason_to_exclude = True
+if "svx/source/tbxctrls/extrusioncontrols.hrc:" in line2 and 
idName.startswith("DIRECTION_"): found_reason_to_exclude = True
+if "svx/source/tbxctrls/extrusioncontrols.hrc:" in line2 and 
idName.startswith("FROM_"): found_reason_to_exclude = True
 # if we see more than 2 lines then it's probably one of the 
BASE/START/BEGIN things
 cnt = cnt + 2
 if cnt > 3: found_reason_to_exclude = True
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 3ae2db064bea..214e0d48d7e1 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -363,15 +363,6 @@
 #define RID_SVXSTR_GRAFMODE_MONO(RID_SVX_START + 522)
 #define RID_SVXSTR_GRAFMODE_WATERMARK   (RID_SVX_START + 523)
 
-// Strings for Plugin-Filedialog
-#define STR_INSERT_VIDEO_EXTFILTER_IVF  (RID_SVX_START + 524)
-#define STR_INSERT_VIDEO_EXTFILTER_AVI  (RID_SVX_START + 525)
-#define STR_INSERT_VIDEO_EXTFILTER_MOV  (RID_SVX_START + 526)
-#define STR_INSERT_VIDEO_EXTFILTER_MPEG (RID_SVX_START + 527)
-#define STR_EXTFILTER_ALL   (RID_SVX_START + 528)
-#define STR_INSERT_SOUND_TITLE  (RID_SVX_START + 529)
-#define STR_INSERT_VIDEO_TITLE  (RID_SVX_START + 530)
-
 #define RID_SVXBMP_WIRE_FRAME   (RID_SVX_START + 532)
 #define RID_SVXBMP_MATTE(RID_SVX_START + 533)
 #define RID_SVXBMP_PLASTIC  (RID_SVX_START + 534)
@@ -955,7 +946,6 @@
 
 // sidebar-related resources
 #define RID_SVX_SIDEBAR_BEGIN(RID_SVX_START + 1242)
-#define BMP_SPACE3   (RID_SVX_SIDEBAR_BEGIN +  0)
 #define BMP_INDENT_HANG  (RID_SVX_SIDEBAR_BEGIN +  1)
 #define BMP_NONE_ICON(RID_SVX_SIDEBAR_BEGIN + 21)
 #define BMP_WIDTH1_ICON  (RID_SVX_SIDEBAR_BEGIN + 22)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 79eef2acf4c1..d95368c5ed3f 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -38,11 +38,8 @@
 #define MID_INTER_SPACE 0x37
 
 #define MID_LOWER   0x3d
-#define MID_POS 0x43
 #define MID_RIGHT   0x46
-#define MID_SIZE0x4a
 #define MID_UPPER   0x4b
-#define MID_USExxx  0x4c
 
 #define MID_HLINK_NAME  0x6f
 #define MID_HLINK_URL   0x70
@@ -129,7 +126,6 @@
 #define SID_BASICIDE_STAT_DATE  ( SID_BASICIDE_START + 39 )
 #define SID_BASICIDE_STAT_TITLE ( SID_BASICIDE_START + 40 )
 #define SID_BASICIDE_NEWJAVAMODULE  ( SID_BASICIDE_START + 41 )
-#define SID_BASICIDE_IMAGESTART ( SID_BASICIDE_START + 50 )
 #define SID_OPTIONS_TREEDIALOG  ( SID_BASICIDE_START + 862)
 
 // StarBase-Id's
diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index 7007bdead91a..6d1eeceeff04 100644
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -18,23 +18,14 @@
  */
 #include 
 
-#define BTN_GEO 2
-#define BTN_LIGHT   4
-
 // Unterer Teil
 #define CTL_PREVIEW 12
 #define CTL_LIGHT_PREVIEW   13
 
 // Geometry
-#define FT_DEPTH35
-#define MTR_DEPTH   36
 
 // Depiction/Appear

[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py sc/inc sc/source

2017-03-19 Thread Noel Grandin

 bin/find-unused-defines-in-hrc-files.py |1 
 sc/inc/sc.hrc   |3 
 sc/inc/scres.hrc|   74 
 sc/source/ui/dbgui/asciiopt.hrc |1 
 sc/source/ui/dbgui/pvfundlg.hrc |1 
 sc/source/ui/miscdlgs/retypepassdlg.src |5 
 sc/source/ui/src/scstring.src   |  282 
 7 files changed, 2 insertions(+), 365 deletions(-)

New commits:
commit a386915e51c54901d2e6cb77b615de33f3c9fa18
Author: Noel Grandin 
Date:   Fri Mar 17 12:25:00 2017 +0200

remove unused defines from HRC files in sc(2)

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

diff --git a/bin/find-unused-defines-in-hrc-files.py 
b/bin/find-unused-defines-in-hrc-files.py
index 724e1b358b48..b945266351b6 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -86,6 +86,7 @@ exclusionSet = set([
 "HID_PROP_",
 "STR_VOBJ_MODE_",
 "STR_COND_",
+"SCSTR_CONTENT_",
 ])
 
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index c93bbfd81156..768ed088c2fa 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -55,10 +55,7 @@
 
 // help IDs for templates
 #define HID_SC_SHEET_CELL_STD   (HID_SC_SHEET_START +0 )
-#define HID_SC_SHEET_CELL_ERG   (HID_SC_SHEET_START +1 )
 #define HID_SC_SHEET_CELL_ERG1  (HID_SC_SHEET_START +2 )
-#define HID_SC_SHEET_CELL_UEB   (HID_SC_SHEET_START +3 )
-#define HID_SC_SHEET_CELL_UEB1  (HID_SC_SHEET_START +4 )
 #define HID_SC_SHEET_PAGE_STD   (HID_SC_SHEET_START +10 )
 #define HID_SC_SHEET_PAGE_REP   (HID_SC_SHEET_START +11 )
 
diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc
index f34b4456a27b..2aaa38f13860 100644
--- a/sc/inc/scres.hrc
+++ b/sc/inc/scres.hrc
@@ -24,14 +24,6 @@
 #include "formula/compiler.hrc"
 
 #define STR_START   (SC_RESOURCE_START+100)
-#define STR_ROWHEIGHT   (STR_START)
-#define STR_ROWHEIGHT_TITLE (STR_START + 1)
-#define STR_OPT_ROWHEIGHT   (STR_START + 2)
-#define STR_OPT_ROWHEIGHT_TITLE (STR_START + 3)
-#define STR_COLWIDTH(STR_START + 4)
-#define STR_COLWIDTH_TITLE  (STR_START + 5)
-#define STR_OPT_COLWIDTH(STR_START + 6)
-#define STR_OPT_COLWIDTH_TITLE  (STR_START + 7)
 #define SCSTR_UNDEFINED (STR_START + 8)
 #define SCSTR_NONAME(STR_START + 9)
 #define SCSTR_NONE  (STR_START + 10)
@@ -39,64 +31,34 @@
 #define SCSTR_FILTER_NOTEMPTY   (STR_START + 12)
 #define SCSTR_COLUMN(STR_START + 13)
 #define SCSTR_ROW   (STR_START + 14)
-#define SCSTR_NEW   (STR_START + 15)
-
-#define SCSTR_REMOVE(STR_START + 17)
-#define SCSTR_CANCEL(STR_START + 18)
-
-#define SCSTR_SHOWTABLE (STR_START + 20)
-#define SCSTR_HIDDENTABLES  (STR_START + 21)
 
 #define SCSTR_TABLE (STR_START + 24)
 #define SCSTR_NAME  (STR_START + 25)
-#define SCSTR_INSTABLE  (STR_START + 26)
 #define SCSTR_APDTABLE  (STR_START + 27)
 #define SCSTR_RENAMETAB (STR_START + 28)
 #define STR_INSERTGRAPHIC   (STR_START + 29)
 
-#define SCSTR_NEWTABLE  (STR_START + 37)
-
 #define SCSTR_PROTECTDOC(STR_START + 39)
 #define SCSTR_UNPROTECTDOC  (STR_START + 40)
-#define SCSTR_PROTECTTAB(STR_START + 41)
 #define SCSTR_UNPROTECTTAB  (STR_START + 42)
 #define SCSTR_PASSWORD  (STR_START + 43)
 #define SCSTR_PASSWORDOPT   (STR_START + 44)
 #define SCSTR_WRONGPASSWORD (STR_START + 45)
 
 #define SCSTR_END   (STR_START + 47)
-#define SCSTR_STAT_PRINT(STR_START + 48)
 
 #define SCSTR_UNKNOWN   (STR_START + 49)
-#define SCSTR_CHAR_ATTRS(STR_START + 50)
 #define SCSTR_ALL   (STR_START + 51)
 #define SCSTR_STDFILTER (STR_START + 52)
 
-// Cfg-Item-names
-#define SCSTR_CFG_APP   (STR_START + 53)
-#define SCSTR_CFG_DOC   (STR_START + 54)
-#define SCSTR_CFG_VIEW  (STR_START + 55)
-#define SCSTR_CFG_SPELLCHECK(STR_START + 56)
-#define SCSTR_CFG_PRINT (STR_START + 57)
-
 #define SCSTR_CHARSET_USER  (STR_START + 59)
 #define SCSTR_COLUMN_USER   (STR_START + 60)
 #define SCSTR_FIELDSEP  (STR_START + 61)
 #define SCSTR_TEXTSEP   (STR_START + 62)
 #define SCSTR_MULTIPLE  (STR_START + 63)
 
-#define SCSTR_CFG_INPUT (STR_START + 65)
-
 #define SCSTR_TOP10FILTER   (STR_START + 66)
 
-#define SCSTR_CFG_NAVIPI(STR_START + 67)
-
-#define SCSTR_GRFILTER_OPENERROR (STR_START + 77)
-#define SCSTR_GRFILTER_IOERROR   (STR_START + 78)
-#define SCSTR_GRFILTER_FORMATERROR   (STR_START + 79)
-#define SCSTR_GRFILTER_VERSIONERROR  (STR_START + 80)
-#define SCSTR_GRFILTER_FILTERERROR   (STR_START + 81)
-#define SCSTR_GRFILTER_TOOBIG(STR_START + 82)
 #define SCSTR_UNDO_GRAFFILTER(STR_START

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

2017-03-19 Thread Noel Grandin

 sw/inc/dcontact.hxx |   10 -
 sw/inc/fesh.hxx |8 
 sw/inc/fmtanchr.hxx |2 
 sw/inc/swtypes.hxx  |   21 +-
 sw/inc/undobj.hxx   |3 
 sw/qa/core/uwriter.cxx  |4 
 sw/qa/extras/uiwriter/uiwriter.cxx  |2 
 sw/source/core/access/accdoc.cxx|4 
 sw/source/core/access/accframebase.cxx  |4 
 sw/source/core/access/accfrmobj.cxx |8 
 sw/source/core/access/accmap.cxx|   10 -
 sw/source/core/access/accselectionhelper.cxx|2 
 sw/source/core/doc/CntntIdxStore.cxx|8 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   42 ++--
 sw/source/core/doc/DocumentDrawModelManager.cxx |2 
 sw/source/core/doc/DocumentLayoutManager.cxx|   46 
++---
 sw/source/core/doc/DocumentStylePoolManager.cxx |   14 -
 sw/source/core/doc/docdesc.cxx  |4 
 sw/source/core/doc/docdraw.cxx  |2 
 sw/source/core/doc/docedt.cxx   |   12 -
 sw/source/core/doc/docfly.cxx   |   58 
+++---
 sw/source/core/doc/docglbl.cxx  |4 
 sw/source/core/doc/doclay.cxx   |   46 
++---
 sw/source/core/doc/docnew.cxx   |2 
 sw/source/core/doc/docsort.cxx  |2 
 sw/source/core/doc/tblcpy.cxx   |4 
 sw/source/core/docnode/ndtbl.cxx|4 
 sw/source/core/docnode/node.cxx |4 
 sw/source/core/docnode/nodes.cxx|2 
 sw/source/core/docnode/swbaslnk.cxx |8 
 sw/source/core/draw/dcontact.cxx|   22 +-
 sw/source/core/draw/dview.cxx   |8 
 sw/source/core/edit/autofmt.cxx |2 
 sw/source/core/fields/expfld.cxx|   10 -
 sw/source/core/frmedt/fecopy.cxx|   70 

 sw/source/core/frmedt/fefly1.cxx|   86 
-
 sw/source/core/frmedt/feshview.cxx  |   56 
+++---
 sw/source/core/frmedt/fews.cxx  |   14 -
 sw/source/core/frmedt/tblsel.cxx|4 
 sw/source/core/inc/UndoCore.hxx |2 
 sw/source/core/inc/flyfrm.hxx   |8 
 sw/source/core/layout/anchoreddrawobject.cxx|   14 -
 sw/source/core/layout/anchoredobject.cxx|   12 -
 sw/source/core/layout/atrfrm.cxx|   78 

 sw/source/core/layout/calcmove.cxx  |2 
 sw/source/core/layout/flowfrm.cxx   |2 
 sw/source/core/layout/fly.cxx   |   14 -
 sw/source/core/layout/flycnt.cxx|2 
 sw/source/core/layout/flylay.cxx|8 
 sw/source/core/layout/flypos.cxx|4 
 sw/source/core/layout/frmtool.cxx   |   20 +-
 sw/source/core/layout/objectformattertxtfrm.cxx |4 
 sw/source/core/layout/pagechg.cxx   |   10 -
 sw/source/core/layout/sortedobjs.cxx|   32 +--
 sw/source/core/layout/tabfrm.cxx|6 
 sw/source/core/layout/wsfrm.cxx |4 
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx  |2 
 sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx |2 
 sw/source/core/text/EnhancedPDFExportHelper.cxx |8 
 sw/source/core/text/frmform.cxx |2 
 sw/source/core/text/itratr.cxx  |4 
 sw/source/core/text/porfly.cxx  |4 
 sw/source/core/text/txtfly.cxx  |   32 +--
 sw/source/core/text/txtfrm.cxx

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/ClientSession.cpp

2017-03-19 Thread Pranav Kant

 wsd/ClientSession.cpp |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 9e3471d3b1ba61b0a989e1655fe1b42828d39ca8
Author: Pranav Kant 
Date:   Mon Dec 5 17:50:22 2016 +0530

tdf#106601 wsd: Allow executing search in readonly mode

Change-Id: Ie0c2721e4f932a08dfefae742f9f3c934514fde6
Reviewed-on: https://gerrit.libreoffice.org/35360
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 30bc33b2..93609cbf 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -400,6 +400,13 @@ bool ClientSession::filterMessage(const std::string& 
message) const
 {
 allowed = true;
 }
+else if (tokens[0] == "uno")
+{
+if (tokens[1] == ".uno:ExecuteSearch")
+{
+allowed = true;
+}
+}
 }
 
 return allowed;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - wsd/ClientSession.cpp wsd/ClientSession.hpp

2017-03-19 Thread Pranav Kant

 wsd/ClientSession.cpp |   20 +---
 wsd/ClientSession.hpp |4 
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit fa65cbeb87a760b2dcb2094de6a9ec79471c0ca1
Author: Pranav Kant 
Date:   Mon Dec 5 17:48:33 2016 +0530

wsd: readonly message filtering in separate function

Change-Id: I1c02be876aa4cf2a878082b593de3c83e45e15b3
Reviewed-on: https://gerrit.libreoffice.org/35359
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index cedbc5e3..30bc33b2 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -213,9 +213,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 }
 else
 {
-// Allow 'downloadas' for all kinds of views
-if ( (isReadOnly()) && tokens[0] != "downloadas" &&
- tokens[0] != "userinactive" && tokens[0] != "useractive")
+if (!filterMessage(firstLine))
 {
 const std::string dummyFrame = "dummymsg";
 return forwardToChild(dummyFrame, docBroker);
@@ -391,6 +389,22 @@ bool ClientSession::forwardToChild(const std::string& 
message,
 return docBroker->forwardToChild(getId(), message);
 }
 
+bool ClientSession::filterMessage(const std::string& message) const
+{
+bool allowed = true;
+StringTokenizer tokens(message, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
+if (isReadOnly())
+{
+allowed = false;
+if (tokens[0] == "downloadas" || tokens[0] == "userinactive" || 
tokens[0] == "useractive")
+{
+allowed = true;
+}
+}
+
+return allowed;
+}
+
 void ClientSession::setReadOnly()
 {
 _isReadOnly = true;
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index bf484f43..37035936 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -87,6 +87,10 @@ private:
 bool forwardToChild(const std::string& message,
 const std::shared_ptr& docBroker);
 
+/// Returns true if given message from the client should be allowed or not
+/// Eg. in readonly mode only few messages should be allowed
+bool filterMessage(const std::string& msg) const;
+
 private:
 std::weak_ptr _docBroker;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - 2 commits - loleaflet/src

2017-03-19 Thread Pranav Kant

 loleaflet/src/control/Control.ColumnHeader.js |   10 +++---
 loleaflet/src/control/Control.RowHeader.js|   11 ---
 loleaflet/src/map/Map.js  |2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 1b25f50efdd749d099a224f13dc5424a51410398
Author: Pranav Kant 
Date:   Tue Dec 6 13:28:30 2016 +0530

tdf#106601 loleaflet: Disable row/col header context menu in readonly/view

Also fix a js error trying to disable context menu before
row/column headers are created.

Change-Id: I6b04ce5c0fefa00567ce5fe58fdad9102d1f1651
Reviewed-on: https://gerrit.libreoffice.org/35363
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index df19c650..cd231ccb 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -192,6 +192,10 @@ L.Control.ColumnHeader = L.Control.Header.extend({
}
L.DomEvent.addListener(text, 'click', 
this._onColumnHeaderClick, this);
}
+
+   if ($('.spreadsheet-header-column-text').length > 0) {
+   
$('.spreadsheet-header-column-text').contextMenu(this._map._permission === 
'edit');
+   }
},
 
_colAlphaToNumber: function(alpha) {
@@ -332,9 +336,9 @@ L.Control.ColumnHeader = L.Control.Header.extend({
if (!this._initialized) {
this._initialize();
}
-   setTimeout(function() {
-   $('.spreadsheet-header-column').contextMenu(e.perm === 
'edit');
-   }, 1000);
+   if ($('.spreadsheet-header-column-text').length > 0) {
+   $('.spreadsheet-header-column-text').contextMenu(e.perm 
=== 'edit');
+   }
}
 });
 
diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index a625efa8..f2d5bfd8 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -190,6 +190,10 @@ L.Control.RowHeader = L.Control.Header.extend({
}
L.DomEvent.addListener(text, 'click', 
this._onRowHeaderClick, this);
}
+
+   if ($('.spreadsheet-header-row-text').length > 0) {
+   
$('.spreadsheet-header-row-text').contextMenu(this._map._permission === 'edit');
+   }
},
 
_selectRow: function(row, modifier) {
@@ -319,9 +323,10 @@ L.Control.RowHeader = L.Control.Header.extend({
if (!this._initialized) {
this._initialize();
}
-   setTimeout(function() {
-   $('.spreadsheet-header-row').contextMenu(e.perm === 
'edit');
-   }, 1000);
+   // Enable context menu on row headers only if permission is 
'edit'
+   if ($('.spreadsheet-header-row-text').length > 0) {
+   $('.spreadsheet-header-row-text').contextMenu(e.perm 
=== 'edit');
+   }
}
 });
 
commit 34df3408388e57bc0b6ca5742ae42b6d014c5aca
Author: Pranav Kant 
Date:   Wed Dec 7 18:03:50 2016 +0530

tdf#106601 loleaflet: Popup virtual keyboard only in editmode

Change-Id: I5e1e134e07f65bc52ff3c5f38879ad3b7097254c
Reviewed-on: https://gerrit.libreoffice.org/35365
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index aaa04ac1..f692ea37 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -897,7 +897,7 @@ L.Map = L.Evented.extend({
// For touch devices, to pop-up the keyboard, it is required to 
call
// .focus() method on hidden input within actual 'click' event 
here
// Calling from some other place with no real 'click' event 
doesn't work
-   if (type === 'click') {
+   if (type === 'click' && this._permission === 'edit') {
this._textArea.blur();
this._textArea.focus();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src

2017-03-19 Thread Pranav Kant

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

New commits:
commit bfe5d84773202cd4944370c11fb79702945be731
Author: Pranav Kant 
Date:   Tue Dec 6 13:19:44 2016 +0530

loleaflet: Missing semi-colon

Change-Id: I216dd1caa9bfba33b5538e149aeddfb7159ccbbd
Reviewed-on: https://gerrit.libreoffice.org/35362
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index 7c331489..7a6c42b1 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -104,7 +104,7 @@ L.Control.Header = L.Control.extend({
L.DomUtil.disableTextSelection();
 
L.DomEvent.stopPropagation(e);
-   L.DomEvent.on(document, 'mousemove', this._onMouseMove, this)
+   L.DomEvent.on(document, 'mousemove', this._onMouseMove, this);
L.DomEvent.on(document, 'mouseup', this._onMouseUp, this);
 
var rect = target.parentNode.getBoundingClientRect();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src

2017-03-19 Thread Pranav Kant

 loleaflet/src/layer/tile/TileLayer.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83aab971cb1100cb5c84e13ec0837713a2bd9d2f
Author: Pranav Kant 
Date:   Wed Dec 7 17:39:44 2016 +0530

tdf#106602 loleaflet: Higher resoultion on retina displays

Change-Id: Ib2a031d2d1cb88fe7fede392cfc2332a73252bbb
Reviewed-on: https://gerrit.libreoffice.org/35364
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index ef401ef7..19782c1b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -45,7 +45,7 @@ L.TileLayer = L.GridLayer.extend({
maxNativeZoom: null, // Number
tms: false,
zoomReverse: false,
-   detectRetina: false,
+   detectRetina: true,
crossOrigin: false,
previewInvalidationTimeout: 1000,
defaultPermission: 'view'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src

2017-03-19 Thread Pranav Kant

 loleaflet/src/layer/tile/CalcTileLayer.js|4 ++--
 loleaflet/src/layer/tile/GridLayer.js|   12 ++--
 loleaflet/src/layer/tile/ImpressTileLayer.js |4 ++--
 loleaflet/src/layer/tile/TileLayer.js|   21 -
 loleaflet/src/layer/tile/WriterTileLayer.js  |4 ++--
 5 files changed, 24 insertions(+), 21 deletions(-)

New commits:
commit 734e40f55f3698d52cb8b153202b6efb32bb013a
Author: Pranav Kant 
Date:   Wed Dec 7 20:54:26 2016 +0530

tdf#106602 loleaflet: Request higher pixel density tiles on retina display

Change-Id: I418f0db47239c915d8f12c07979306a814370b65
Reviewed-on: https://gerrit.libreoffice.org/35368
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index b66a6577..5d6e6e4c 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -83,8 +83,8 @@ L.CalcTileLayer = L.TileLayer.extend({
{
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
-   'width=' + this._tileSize + ' ' +
-   'height=' + this._tileSize + ' ' +
+   'width=' + this._tileWidthPx + ' ' +
+   'height=' + this._tileHeightPx + ' ' +
'tileposx=' + tilePositionsX + ' ' +
'tileposy=' + tilePositionsY + ' ' +
'tilewidth=' + this._tileWidthTwips + ' ' +
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index a704b42c..9f675d1b 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -684,8 +684,8 @@ L.GridLayer = L.Layer.extend({
if (tilePositionsX !== '' && tilePositionsY !== '') {
var message = 'tilecombine ' +
'part=' + this._selectedPart + ' ' +
-   'width=' + this._tileSize + ' ' +
-   'height=' + this._tileSize + ' ' +
+   'width=' + this._tileWidthPx + ' ' +
+   'height=' + this._tileHeightPx + ' ' +
'tileposx=' + tilePositionsX + ' ' +
'tileposy=' + tilePositionsY + ' ' +
'tilewidth=' + this._tileWidthTwips + ' 
' +
@@ -916,8 +916,8 @@ L.GridLayer = L.Layer.extend({
twips = this._coordsToTwips(coords);
msg = 'tile ' +
'part=' + coords.part + ' ' +
-   'width=' + this._tileSize + ' ' +
-   'height=' + this._tileSize + ' ' +
+   'width=' + this._tileWidthPx + ' ' +
+   'height=' + this._tileHeightPx + ' ' +
'tileposx=' + twips.x + ' ' +
'tileposy=' + twips.y + ' ' +
'tilewidth=' + this._tileWidthTwips + ' 
' +
@@ -946,8 +946,8 @@ L.GridLayer = L.Layer.extend({
twips = this._coordsToTwips(coords);
msg = 'tilecombine ' +
'part=' + coords.part + ' ' +
-   'width=' + this._tileSize + ' ' +
-   'height=' + this._tileSize + ' ' +
+   'width=' + this._tileWidthPx + ' ' +
+   'height=' + this._tileHeightPx + ' ' +
'tileposx=' + tilePositionsX + ' '  
+
'tileposy=' + tilePositionsY + ' ' +
'tilewidth=' + this._tileWidthTwips + ' 
' +
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js 
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 07bb75cc..da0166c6 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -67,8 +67,8 @@ L.ImpressTileLayer = L.TileLayer.extend({
{
var message = 'tilecombine ' +
'part=' + command.part + ' ' +
-   'width=' + this._tileSize + ' ' +
-   'height=' + this._tileSize + ' ' +
+   'width=' + this._tileWidthPx + ' ' +
+   'height=' + this._tileHeightPx + ' ' +
'tileposx=' + tilePosit

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

2017-03-19 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/addin/fods/impower.fods | 1144 +++---
 1 file changed, 572 insertions(+), 572 deletions(-)

New commits:
commit 8e5437ea859e78f7de2730bfa60ab6d27534f286
Author: ZdenÄk Crhonek 
Date:   Sun Mar 19 22:58:17 2017 +0100

impower test case - repair

Change-Id: Iada2cf246b46c316c3127a27fced6569704d7a9b
Reviewed-on: https://gerrit.libreoffice.org/35446
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/unit/data/functions/addin/fods/impower.fods 
b/sc/qa/unit/data/functions/addin/fods/impower.fods
index 71cf748a7e2e..206fad01cc9f 100644
--- a/sc/qa/unit/data/functions/addin/fods/impower.fods
+++ b/sc/qa/unit/data/functions/addin/fods/impower.fods
@@ -31,14 +31,14 @@
false
   
   
-   14
-   19
+   11
+   25
0
0
0
0
2
-   4
+   0
0
0
0
@@ -132,7 +132,7 @@
true
1
true
-   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgBJbnB1dFNsb3Q6VHJheTEARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
false
0
   
@@ -266,99 +266,99 @@
KÄ

   
-  
+  

 
   
-  
+  
(

)
-   
+   
   
-  
+  

 
   
-  
+  
(

)
-   
+   
   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

 
â¬
   
-  
+  

-

 
â¬
-   
+   
   
-  
+  

   
-  
+  

-

 
â¬
-   
+   
   
-  
+  

 

@@ -367,7 +367,7 @@
/

   
-  
+  

  

@@ -376,241 +376,241 @@
/

   
-  
+  
â¬
 

   
-  
+  

-
â¬
 

-   
+   
   
-  
+  

 KÄ
   
-  
+  
-

 KÄ
-   
+   
   
-  
+  

 KÄ
   
-  
+  

-

 KÄ
-   
+   
   
-  
+  

 KÄ
   
-  
+  
-

 KÄ
-   
+   
   
-  
+  

 KÄ
   
-  
+  

-

 KÄ
-   
+   
   
-  
+  

   
-  
+  
-

-   
+   
   
-  
+  

   
-  
+  

-

-   
+   
   
-  
+  

   
-  
+  
-

-   
+   
   
-  
+  

   
-  
+  

-

-   
+   
   
-  
+  
 

  
   
-  
+  
-
 

  
   
-  
+  
 
-  
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  
 

 KÄ 
   
-  
+  
-
 

 KÄ 
   
-  
+  
 
- KÄ 
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  
 

  
   
-  
+  
-
 

  
   
-  
+  
 
-

  
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  
 

 KÄ 
   
-  
+  
-
 

 KÄ 
   
-  
+  
 
-

 KÄ 
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  

:

   
-  
+  

:

:

   
-  
+  

:

   
-  
+  

   
-  
+  
Yes
   
-  
+  
Yes
   
-  
+  
No
-   
-   
+   
+   
   
-  
+  
True
   
-  
+  
True
   
-  
+  
False
-   
-   
+   
+   
   
-  
+  
On
   
-  
+  
On
   
-  
+  
Off
-   
-   
+   
+   
   
-  
+  
Â¥â¬
 

@@ -618,7 +618,7 @@

 
   
-  
+  

(
â¬
@@ -627,1270 +627,1270 @@
  

)
-   
+   
   
-  
+  

 
â¬
   
-  
+  

-

 
â¬
-   
+   
   
-  
+  
$

 
   
-  
+  

($

)
-   
+   
   
-  
+  

 â¬
   
-  
+  
-

 â¬
-   
+   
   
-  
+  

 â¬
   
-  
+  

-

 â¬
-   
+   
   
-  
+  

 â¬
   
-  
+  

 â¬
   
-  
+  
-

 â¬
-   
+   
   
-  
+

[Libreoffice-commits] online.git: 13 commits - common/Util.cpp net/loolnb.cpp net/Socket.cpp net/Socket.hpp net/SslSocket.hpp net/WebSocketHandler.hpp wsd/Admin.cpp wsd/ClientSession.cpp wsd/ClientSes

2017-03-19 Thread Ashod Nakashian

 common/Util.cpp  |4 +
 net/Socket.cpp   |   13 +++
 net/Socket.hpp   |   20 +++--
 net/SslSocket.hpp|3 
 net/WebSocketHandler.hpp |   15 ++--
 net/loolnb.cpp   |9 +-
 wsd/Admin.cpp|8 +-
 wsd/ClientSession.cpp|   34 -
 wsd/ClientSession.hpp|   18 -
 wsd/DocumentBroker.cpp   |   44 
 wsd/DocumentBroker.hpp   |   15 ++--
 wsd/LOOLWSD.cpp  |  167 +++
 12 files changed, 203 insertions(+), 147 deletions(-)

New commits:
commit d0bb5cbdc7a2a76877b17bbc4283a76ff8cc4d52
Author: Ashod Nakashian 
Date:   Mon Mar 20 00:41:43 2017 -0400

wsd: restore forkit after crash

Change-Id: Iacfcbfbf922897ea1bb9896d01a9a8afd4e194cc

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e096ade4..226fbf58 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -288,7 +288,7 @@ bool cleanupDocBrokers()
 /// Forks as many children as requested.
 /// Returns the number of children requested to spawn,
 /// -1 for error.
-static bool forkChildren(const int number)
+static int forkChildren(const int number)
 {
 Util::assertIsLocked(NewChildrenMutex);
 
@@ -417,7 +417,20 @@ std::shared_ptr getNewChild_Blocks()
 if (rebalanceChildren(numPreSpawn) < 0)
 {
 // Fatal. Let's fail and retry at a higher level.
-LOG_DBG("getNewChild: rebalancing of children failed.");
+LOG_DBG("getNewChild: rebalancing of children failed. Checking and 
restoring forkit.");
+
+lockb.unlock();
+locka.unlock();
+LOOLWSD::checkAndRestoreForKit();
+if 
(chrono::duration_cast(chrono::steady_clock::now() - 
startTime).count() <
+CHILD_TIMEOUT_MS * 4)
+{
+// Try again.
+locka.lock();
+lockb.lock();
+continue;
+}
+
 return nullptr;
 }
 
@@ -1025,7 +1038,7 @@ bool LOOLWSD::checkAndRestoreForKit()
 {
 // Should never fail.
 LOG_FTL("Failed to spawn loolforkit.");
-return Application::EXIT_SOFTWARE;
+SigUtil::requestShutdown();
 }
 }
 
commit 53da72a1dc10f4f5f121bc167680493a123c0b88
Author: Ashod Nakashian 
Date:   Sun Mar 19 21:45:53 2017 -0400

wsd: fix hot looping the poll

When not sending ping the ping time is not set
which results in the setting the poll timeout to
a negative value, forcing it to return immediately.

This happens when sending ping before upgrading
to WebSocket, which isn't common. One way to
reproduce it, however, is to connect to the
admin console with an unauthenticated socket.

Change-Id: I9f3db1a02b8f8e2781d23d843e848068ad434958

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 72466d8f..9fe7aab6 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -262,6 +262,7 @@ public:
 if (_wsState == WSState::WS)
 {
 LOG_WRN("Attempted ping on non-upgraded websocket!");
+_pingSent = now; // Pretend we sent it to avoid timing out 
immediately.
 return;
 }
 LOG_TRC("Send ping message");
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 19819e26..bb235156 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -64,8 +64,8 @@ void AdminSocketHandler::handleMessage(bool /* fin */, 
WSOpCode /* code */,
 {
 if (tokens.count() < 2)
 {
+LOG_DBG("Auth command without any token");
 sendFrame("InvalidAuthToken");
-LOG_TRC("Auth command without any token");
 shutdown();
 return;
 }
@@ -84,8 +84,8 @@ void AdminSocketHandler::handleMessage(bool /* fin */, 
WSOpCode /* code */,
 }
 else
 {
+LOG_DBG("Invalid auth token");
 sendFrame("InvalidAuthToken");
-LOG_TRC("Invalid auth token");
 shutdown();
 return;
 }
@@ -93,10 +93,10 @@ void AdminSocketHandler::handleMessage(bool /* fin */, 
WSOpCode /* code */,
 
 if (!_isAuthenticated)
 {
+LOG_DBG("Not authenticated - message is '" << firstLine << "' " <<
+tokens.count() << " first: '" << tokens[0] << "'");
 sendFrame("NotAuthenticated");
 shutdown();
-LOG_TRC("Not authenticated - message is '" << firstLine << "' "
-<< tokens.count() << " first: '" << tokens[0] << "'");
 return;
 }
 else if (tokens[0] == "documents" ||
commit e9675ed6e1022e449c13802b9e2929f059a7fdf1
Author: Ashod Nakashian 
Date:   Sun Mar 19 19:07:42 2017 -0400

wsd: close socket when WS close handshake is complete

We shouldn't send any more data after the client
shuts down, or after we initiate shutdown.

Change-Id: Ibf0cf61dcabe9d02ddcb7eb40b2df23712c5a136

diff --git a/net/S

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

2017-03-19 Thread Henry Castro

 loleaflet/src/core/LOUtil.js |   16 
 loleaflet/src/layer/AnnotationManager.js |   21 +++--
 2 files changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 7bf26378721ef6c63edd589f463db210e0efe59f
Author: Henry Castro 
Date:   Sun Mar 19 23:16:34 2017 -0400

loleaflet: use textRange property to select the text

Change-Id: Ie396b199b33ab322a015ce77272430fcf83ef17b

diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index 237edbe3..286f2fa4 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -62,5 +62,21 @@ L.LOUtil = {
var topLeft = L.point(parseInt(numbers[0]), 
parseInt(numbers[1]));
var bottomRight = topLeft.add(L.point(parseInt(numbers[2]), 
parseInt(numbers[3])));
return L.bounds(topLeft, bottomRight);
+   },
+
+   stringToRectangles: function(strRect) {
+   var matches = strRect.match(/\d+/g);
+   var rectangles = [];
+   if (matches !== null) {
+   for (var itMatch = 0; itMatch < matches.length; itMatch 
+= 4) {
+   var topLeft = 
L.point(parseInt(matches[itMatch]), parseInt(matches[itMatch + 1]));
+   var size = L.point(parseInt(matches[itMatch + 
2]), parseInt(matches[itMatch + 3]));
+   var topRight = topLeft.add(L.point(size.x, 0));
+   var bottomLeft = topLeft.add(L.point(0, 
size.y));
+   var bottomRight = topLeft.add(size);
+   rectangles.push([bottomLeft, bottomRight, 
topLeft, topRight]);
+   }
+   }
+   return rectangles;
}
 };
diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index bca8e15d..a21bf121 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -101,20 +101,21 @@ L.AnnotationManager = L.Class.extend({
 
update: function () {
var topRight = 
this._map.project(this._map.options.maxBounds.getNorthEast());
-   var point, bounds;
+   var point, rectangles;
this.layout();
if (this._selected.annotation) {
point = 
this._map._docLayer._twipsToPixels(this._selected.annotation._data.anchorPos.min);
-   bounds = 
L.latLngBounds(this._map._docLayer._twipsToLatLng(this._selected.annotation._data.anchorPos.getBottomLeft()),
-   
this._map._docLayer._twipsToLatLng(this._selected.annotation._data.anchorPos.getTopRight()));
this._map._docLayer._selections.clearLayers();
-   
this._map._docLayer._selections.addLayer(L.rectangle(bounds,{
-   pointerEvents: 'none',
-   fillColor: '#43ACE8',
-   fillOpacity: 0.25,
-   weight: 2,
-   opacity: 0.25
-   }));
+   rectangles = 
L.PolyUtil.rectanglesToPolygons(L.LOUtil.stringToRectangles(this._selected.annotation._data.textRange),
 this._map._docLayer);
+   if (rectangles.length > 0) {
+   
this._map._docLayer._selections.addLayer(L.polygon(rectangles, {
+   pointerEvents: 'none',
+   fillColor: '#43ACE8',
+   fillOpacity: 0.25,
+   weight: 2,
+   opacity: 0.25
+   }));
+   }

this._selected.annotation.setLatLng(this._map.unproject(L.point(topRight.x, 
point.y)));
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Takeshi Abe

 starmath/source/parse.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fdbf7aa4f04c66ab84b7069c04534ed789db25d6
Author: Takeshi Abe 
Date:   Sun Mar 19 16:26:40 2017 +0900

starmath: Assert a precondition of DoBlank()

Change-Id: I9e2d7dc5d209559b9cacb4315610431ebd1df717
Reviewed-on: https://gerrit.libreoffice.org/35419
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index dc557095decd..a4c390d87867 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1256,14 +1256,15 @@ void SmParser::DoPower()
 
 SmBlankNode *SmParser::DoBlank()
 {
-OSL_ENSURE(TokenInGroup(TG::Blank), "Sm : wrong token");
+assert(TokenInGroup(TG::Blank));
 std::unique_ptr pBlankNode(new SmBlankNode(m_aCurToken));
 
-while (TokenInGroup(TG::Blank))
+do
 {
 pBlankNode->IncreaseBy(m_aCurToken);
 NextToken();
 }
+while (TokenInGroup(TG::Blank));
 
 // Ignore trailing spaces, if corresponding option is set
 if ( m_aCurToken.eType == TNEWLINE ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Markus Mohrhard

 sfx2/source/control/unoctitm.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit dade97c9186bd70ec7aefe7e06f54fda11968fec
Author: Markus Mohrhard 
Date:   Mon Mar 20 00:51:34 2017 +0100

uitest: use the new ui test logger also for the UNO commands

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

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 3d84cc05edab..acdf7a3b779d 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -53,7 +53,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -609,16 +609,7 @@ void collectUIInformation(const util::URL& rURL, const 
uno::Sequencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Markus Mohrhard

 vcl/source/control/ctrl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8fd7b49308e296097355c38922fbb766d439fa74
Author: Markus Mohrhard 
Date:   Mon Mar 20 00:52:12 2017 +0100

uitest: start logging the actions on UI elements

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

diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index ff90996359d8..aadff32a5953 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -300,6 +301,7 @@ void Control::AppendLayoutData( const Control& rSubControl 
) const
 bool Control::ImplCallEventListenersAndHandler( VclEventId nEvent, 
std::function const & callHandler )
 {
 VclPtr xThis(this);
+UITestLogger::getInstance().logAction(xThis, nEvent);
 
 CallEventListeners( nEvent );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Markus Mohrhard

 include/vcl/uitest/logger.hxx   |   37 +++
 include/vcl/uitest/uiobject.hxx |7 +++
 vcl/Library_vcl.mk  |1 
 vcl/source/uitest/logger.cxx|   76 
 vcl/source/uitest/uiobject.cxx  |   30 +++
 5 files changed, 151 insertions(+)

New commits:
commit 26ee34d1332e164cf938fcf78902df7d0cc3fe8f
Author: Markus Mohrhard 
Date:   Mon Mar 20 00:45:28 2017 +0100

uitest: add logging for UI actions

The long term goal for this logging is that it generates content in a
DSL for the UI testing. The generated file can then be interpreted by
the UI testing and replay the interaction with the UI.

For now the plan is to have a readable output of what happens in the UI
layer that allows to quickly transform it to a UI test.

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

diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
new file mode 100644
index ..32625c7f60a7
--- /dev/null
+++ b/include/vcl/uitest/logger.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+
+class UITEST_DLLPUBLIC UITestLogger
+{
+private:
+
+SvFileStream maStream;
+
+bool mbValid;
+
+public:
+
+UITestLogger();
+
+void logCommand(const OUString& rAction);
+
+void logAction(VclPtr& xUIElement, VclEventId nEvent);
+
+void log(const OUString& rString);
+
+static UITestLogger& getInstance();
+
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index c2de7d4652b1..4641b999722c 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -92,6 +92,11 @@ public:
  *
  */
 virtual OUString dumpHierarchy() const;
+
+/**
+ * Gets the corresponding Action string for the event.
+ */
+virtual OUString get_action(VclEventId nEvent) const;
 };
 
 class UITEST_DLLPUBLIC WindowUIObject : public UIObject
@@ -117,6 +122,8 @@ public:
 
 virtual OUString dumpHierarchy() const override;
 
+virtual OUString get_action(VclEventId nEvent) const override;
+
 static std::unique_ptr create(vcl::Window* pWindow);
 
 protected:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b7dad29a3f80..79efcbaa0817 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -393,6 +393,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/fontsubset/sft \
 vcl/source/fontsubset/ttcr \
 vcl/source/fontsubset/xlat \
+vcl/source/uitest/logger \
 vcl/source/uitest/uiobject \
 vcl/source/uitest/uitest \
 vcl/source/uitest/uno/uiobject_uno \
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
new file mode 100644
index ..d24efeb5d0a8
--- /dev/null
+++ b/vcl/source/uitest/logger.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+UITestLogger::UITestLogger():
+maStream(),
+mbValid(false)
+{
+static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
+if (pFile)
+{
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+rtl::Bootstrap::expandMacros(aDirPath);
+osl::Directory::createPath(aDirPath);
+OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
+
+maStream.Open(aFilePath, StreamMode::READWRITE);
+mbValid = true;
+}
+}
+
+void UITestLogger::logCommand(const OUString& rAction)
+{
+if (!mbValid)
+return;
+
+maStream.WriteLine(OUStringToOString(rAction, RTL_TEXTENCODING_UTF8));
+}
+
+void UITestLogger::logAction(VclPtr& xUIElement, VclEventId nEvent)
+{
+if (!mbValid)
+return;
+
+if (xUIElement->get_id().isEmpty())
+return;
+
+std::unique_ptr pUIObject = 
xUIElement->GetUITestFactory()(xUIElement.get());
+OUString aAction = pUIObject->get_action(nEvent);
+if (!aAction.isEmpty())
+maStream.WriteLine(OUStringToOString(aAction, RTL_TEXTENCODING_UTF8));
+}
+
+void UITestLogger::log(const OUString& rString)
+{
+if (!mbValid)
+

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

2017-03-19 Thread Markus Mohrhard

 sfx2/source/control/unoctitm.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit 2356bfdb1b99a93fcb35fefc0f587158e7d160c2
Author: Markus Mohrhard 
Date:   Sun Mar 19 21:25:23 2017 +0100

uitest: add a way to log the UNO commands

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

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f82460af8160..3d84cc05edab 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -52,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -601,6 +603,24 @@ void collectUsageInformation(const util::URL& rURL, const 
uno::Sequence& /*rArgs*/)
+{
+static const char* pFile = std::getenv("LO_COLLECT_UIINFO");
+if (!pFile)
+return;
+
+OUString aCommand = rURL.Protocol + rURL.Path;
+
+OUString aDirPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/uitest/");
+rtl::Bootstrap::expandMacros(aDirPath);
+osl::Directory::createPath(aDirPath);
+OUString aFilePath = aDirPath + OUString::fromUtf8(pFile);
+
+SvFileStream aFile(aFilePath, StreamMode::STD_READWRITE);
+aFile.Seek(aFile.Tell() + aFile.remainingSize());
+aFile.WriteLine(OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8));
+}
+
 }
 
 void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL,
@@ -608,6 +628,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const 
css::util::URL& aURL,
 const css::uno::Reference< css::frame::XDispatchResultListener >& 
rListener )
 {
 collectUsageInformation(aURL, aArgs);
+collectUIInformation(aURL, aArgs);
 
 SolarMutexGuard aGuard;
 if (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Tomaž Vajngerl

 android/source/res/drawable/ic_grow.xml  |   16 
 android/source/res/drawable/ic_line.xml  |   12 
 android/source/res/drawable/ic_rect.xml  |   13 
 android/source/res/drawable/ic_shrink.xml|   16 
 android/source/res/layout/toolbar_bottom.xml |  451 
++
 android/source/res/values/dimens.xml |1 
 android/source/src/java/org/libreoffice/FormattingController.java|   19 
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |   20 
 8 files changed, 386 insertions(+), 162 deletions(-)

New commits:
commit 382f9f744652d6ae1482910ec62513d6ea94863c
Author: TomaÅ¾ Vajngerl 
Date:   Sun Mar 19 23:16:02 2017 +0100

tdf#106317 bottom tabbar, grow/shrink font, insert line,rect

- added some initial implementation of the bottom tab-bar, which
  has 3 tabs - character, paragraph, insert

- insert has not (completely) working insert line and rect shapes

- add ability to shring/grow font as alternative to select its size

Change-Id: If039f985403a8155d1e011953043f2979b4bfa91

diff --git a/android/source/res/drawable/ic_grow.xml 
b/android/source/res/drawable/ic_grow.xml
new file mode 100644
index ..fd169434d7ea
--- /dev/null
+++ b/android/source/res/drawable/ic_grow.xml
@@ -0,0 +1,16 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
+
diff --git a/android/source/res/drawable/ic_line.xml 
b/android/source/res/drawable/ic_line.xml
new file mode 100644
index ..639ba2dbf690
--- /dev/null
+++ b/android/source/res/drawable/ic_line.xml
@@ -0,0 +1,12 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_rect.xml 
b/android/source/res/drawable/ic_rect.xml
new file mode 100644
index ..241759ff00c3
--- /dev/null
+++ b/android/source/res/drawable/ic_rect.xml
@@ -0,0 +1,13 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_shrink.xml 
b/android/source/res/drawable/ic_shrink.xml
new file mode 100644
index ..db0348437f16
--- /dev/null
+++ b/android/source/res/drawable/ic_shrink.xml
@@ -0,0 +1,16 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
+
diff --git a/android/source/res/layout/toolbar_bottom.xml 
b/android/source/res/layout/toolbar_bottom.xml
index dc17a721ac2e..15ff06886efe 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -1,191 +1,320 @@
 
 
-http://schemas.android.com/apk/res/android";
+http://schemas.android.com/apk/res/android";
 xmlns:app="http://schemas.android.com/apk/res-auto";
 xmlns:tools="http://schemas.android.com/tools";
 android:id="@+id/toolbar_bottom"
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
-android:orientation="vertical"
 android:layout_alignParentBottom="true"
-android:elevation="3dp"
 android:background="@color/toolbar_background"
+android:elevation="3dp"
+android:orientation="vertical"
 app:popupTheme="@style/LibreOfficeTheme.Toolbar"
 app:theme="@style/LibreOfficeTheme.Toolbar"
 tools:showIn="@layout/activity_main">
 
-
+
+
+android:layout_height="match_parent">
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+android:layout_height="match_parent"
+android:orientation="vertical">
 
-
+
 
-
-
-
-
-
-
-
-
-
-
+
 
-
+
 
-
+
 
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

2017-03-19 Thread Mert Tumer

 android/Bootstrap/src/org/libreoffice/kit/Document.java   |2 ++
 android/source/src/java/org/libreoffice/FormattingController.java |6 ++
 android/source/src/java/org/libreoffice/InvalidationHandler.java  |4 
 3 files changed, 12 insertions(+)

New commits:
commit 088fb93a7b178b076d293d15c049132ba2975a26
Author: Mert Tumer 
Date:   Sun Mar 19 14:55:24 2017 +0200

tdf#106369 added toggle status ability for the list buttons

Change-Id: Ic3132441bac57abf36e3588e6871c5b14a47c25d
Reviewed-on: https://gerrit.libreoffice.org/35427
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index dcc315faca4c..a7d3f04938bb 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -49,6 +49,8 @@ public class Document {
 public static final int ALIGN_CENTER = 5;
 public static final int ALIGN_RIGHT= 6;
 public static final int ALIGN_JUSTIFY= 7;
+public static final int NUMBERED_LIST= 8;
+public static final int BULLET_LIST= 9;
 
 /**
  * Callback message types
diff --git a/android/source/src/java/org/libreoffice/FormattingController.java 
b/android/source/src/java/org/libreoffice/FormattingController.java
index fd2e007416cf..ea8b6fb54e85 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -105,6 +105,12 @@ import org.libreoffice.kit.Document;
 case Document.ALIGN_JUSTIFY:
 buttonId = R.id.button_align_justify;
 break;
+case Document.BULLET_LIST:
+buttonId = R.id.button_insertFormatListBullets;
+break;
+case Document.NUMBERED_LIST:
+buttonId = R.id.button_insertFormatListNumbering;
+break;
 default:
 Log.e(LOGTAG, "Uncaptured state change type: " + type);
 return;
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index 4edef18c21d0..c4316c50a119 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -113,6 +113,10 @@ public class InvalidationHandler implements 
Document.MessageCallback {
 
mContext.getFormattingController().onToggleStateChanged(Document.ALIGN_RIGHT, 
pressed);
 } else if (parts[0].equals(".uno:JustifyPara")) {
 
mContext.getFormattingController().onToggleStateChanged(Document.ALIGN_JUSTIFY, 
pressed);
+} else if (parts[0].equals(".uno:DefaultBullet")) {
+
mContext.getFormattingController().onToggleStateChanged(Document.BULLET_LIST, 
pressed);
+} else if (parts[0].equals(".uno:DefaultNumbering")) {
+
mContext.getFormattingController().onToggleStateChanged(Document.NUMBERED_LIST, 
pressed);
 } else {
 Log.d(LOGTAG, "LOK_CALLBACK_STATE_CHANGED type uncatched: " + 
payload);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Caolán McNamara

 vcl/source/filter/jpeg/jpegc.cxx |   45 ++-
 1 file changed, 12 insertions(+), 33 deletions(-)

New commits:
commit ed42442cf88ab79a333ac182076949afe30737d4
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 19 20:57:47 2017 +

ofz#909 timeout on converting gray scale jpgs

but we can remove the whole setting pixels one at a time
because the format matches N8BitPal, and typically that's
what we're writing to anyway, so a direct copy will do

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

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c49c42fd5c7b..6e1e8f1c0f63 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -171,7 +171,14 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
 J_COLOR_SPACE best_out_color_space = JCS_RGB;
 ScanlineFormat eScanlineFormat = ScanlineFormat::N24BitTcRgb;
 ScanlineFormat eFinalFormat = pAccess->GetScanlineFormat();
-if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
+
+if (bGray)
+{
+best_out_color_space = JCS_GRAYSCALE;
+eScanlineFormat = ScanlineFormat::N8BitPal;
+nPixelSize = 1;
+}
+else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
 {
 best_out_color_space = JCS_EXT_BGRA;
 eScanlineFormat = eFinalFormat;
@@ -190,24 +197,17 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
 nPixelSize = 4;
 }
 
-if ( cinfo.jpeg_color_space == JCS_YCbCr )
-cinfo.out_color_space = best_out_color_space;
-else if ( cinfo.jpeg_color_space == JCS_YCCK )
+if (cinfo.jpeg_color_space == JCS_YCCK)
 cinfo.out_color_space = JCS_CMYK;
 
-if (cinfo.out_color_space != JCS_CMYK &&
-cinfo.out_color_space != JCS_GRAYSCALE &&
-cinfo.out_color_space != best_out_color_space)
-{
-SAL_WARN("vcl.filter", "jpg with unknown out color space, 
forcing to :" << best_out_color_space << " gray ");
+if (cinfo.out_color_space != JCS_CMYK)
 cinfo.out_color_space = best_out_color_space;
-}
 
 jpeg_start_decompress(&cinfo);
 
 JSAMPLE* aRangeLimit = cinfo.sample_range_limit;
 
-std::vector pScanLineBuffer(nWidth * (bGray ? 1 : 
nPixelSize));
+std::vector pScanLineBuffer(nWidth * nPixelSize);
 std::vector pCYMKBuffer;
 
 if (cinfo.out_color_space == JCS_CMYK)
@@ -215,19 +215,6 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
 pCYMKBuffer.resize(nWidth * 4);
 }
 
-std::unique_ptr pCols;
-
-if (bGray)
-{
-pCols.reset(new BitmapColor[256]);
-
-for (sal_uInt16 n = 0; n < 256; n++)
-{
-const sal_uInt8 cGray = n;
-pCols[n] = 
pAccess->GetBestMatchingColor(BitmapColor(cGray, cGray, cGray));
-}
-}
-
 for (*pLines = 0; *pLines < nHeight && 
!source->no_data_available; (*pLines)++)
 {
 size_t yIndex = *pLines;
@@ -235,15 +222,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
 sal_uInt8* p = (cinfo.out_color_space == JCS_CMYK) ? 
pCYMKBuffer.data() : pScanLineBuffer.data();
 jpeg_read_scanlines(&cinfo, 
reinterpret_cast(&p), 1);
 
-if (bGray)
-{
-for (long x = 0; x < nWidth; ++x)
-{
-sal_uInt8 nColorGray = pScanLineBuffer[x];
-pAccess->SetPixel(yIndex, x, pCols[nColorGray]);
-}
-}
-else if (cinfo.out_color_space == JCS_CMYK)
+if (cinfo.out_color_space == JCS_CMYK)
 {
 // convert CMYK to RGB
 for (long cmyk = 0, x = 0; cmyk < nWidth * 4; cmyk += 
4, ++x)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Caolán McNamara

 comphelper/source/container/embeddedobjectcontainer.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 3f243471b57761ea523a19d5c717d06752aa2aa4
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 19 21:25:27 2017 +

ofz: segv on nullptr

Change-Id: I5ec64411b101972ddd150a782b845d4f790ea873

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index ea8459596957..f1d8e2bd7d99 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -240,13 +240,12 @@ bool EmbeddedObjectContainer::HasEmbeddedObjects()
 bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName )
 {
 EmbeddedObjectContainerNameMap::iterator aIt = 
pImpl->maObjectContainer.find( rName );
-if ( aIt == pImpl->maObjectContainer.end() )
-{
-uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, 
uno::UNO_QUERY );
-return xAccess->hasByName(rName);
-}
-else
+if (aIt != pImpl->maObjectContainer.end())
 return true;
+uno::Reference  xAccess(pImpl->mxStorage, 
uno::UNO_QUERY);
+if (!xAccess.is())
+return false;
+return xAccess->hasByName(rName);
 }
 
 bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < 
embed::XEmbeddedObject >& xObj )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/experimental

2017-03-19 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift  | 
  10 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/WebView.swift | 
  14 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard  | 
  17 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h   | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c   | 
 205 ++
 6 files changed, 173 insertions(+), 81 deletions(-)

New commits:
commit 941ef397e9267f7ca7fac8b2133272f3655ec460
Author: jan Iversen 
Date:   Thu Mar 2 16:38:41 2017 +0100

ios LibreOfficeLight, tokenize

Add general tokenizer for parameters.
and WebWiew to host JS from online

Change-Id: I5bb419c18d239d6d88fa17078c079420aac58931
Reviewed-on: https://gerrit.libreoffice.org/35438
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index ab3e6af22da1..44d84f4028e9 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
3992D85E1E5B764A00BEA987 /* ViewFileManager.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
ViewFileManager.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 399648461E5B87DC00E73E83 /* 
ViewProperties.swift */; };
399648491E5C4E5500E73E83 /* LO.swift in Sources */ = {isa = 
PBXBuildFile; fileRef = 399648481E5C4E5500E73E83 /* LO.swift */; };
+   399BA3721E6881FC003D74A6 /* WebView.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = 399BA3711E6881FC003D74A6 /* WebView.swift */; };
39A83A8F1E5F471D00D0C683 /* lokit.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 39A83A8E1E5F471D00D0C683 /* lokit.c */; };
39B084E31E5F0A9600682A59 /* lo.xcconfig in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; };
39B08B9D1E5F0BB600682A59 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 39B084E51E5F0BB400682A59 /* fundamentalrc */; };
@@ -72,6 +73,7 @@
3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewFileManager.swift; path = LibreOfficeLight/ViewFileManager.swift; 
sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; 
sourceTree = SOURCE_ROOT; };
399648481E5C4E5500E73E83 /* LO.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= LO.swift; path = LibreOfficeLight/LO.swift; sourceTree = SOURCE_ROOT; };
+   399BA3711E6881FC003D74A6 /* WebView.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= WebView.swift; sourceTree = ""; };
39A83A8D1E5F471C00D0C683 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; explicitFileType = sourcecode.cpp.h; name = 
"lokit-Bridging-Header.h"; path = "LibreOfficeLight/lokit-Bridging-Header.h"; 
sourceTree = SOURCE_ROOT; };
39A83A8E1E5F471D00D0C683 /* lokit.c */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 
lokit.c; path = LibreOfficeLight/lokit.c; sourceTree = SOURCE_ROOT; };
39B084E21E5F0A9600682A59 /* lo.xcconfig */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = 
lo.xcconfig; path = "../../../../ios-work/workdir/ios/generated/lo.xcconfig"; 
sourceTree = SOURCE_ROOT; };
@@ -162,6 +164,7 @@
397E09011E597BD8001374E0 /* Main.storyboard */,
397868D81E59A3EA007F9248 /* LaunchScreen.xib */,
39A83A8D1E5F471C00D0C683 /* 
lokit-Bridging-Header.h */,
+   399BA3711E6881FC003D74A6 /* WebView.swift */,
);
path = LibreOfficeLight;
sourceTree = SOURCE_ROOT;
@@ -354,6 +357,7 @@
39A83A8F1E5F471D00D0C683 /* lokit.c in Sources 
*/,
399648491E5C4E5500E73E83 /* LO.swift in Sources 
*/,
3992D8581E5B761700BEA987 /* 
ViewController.swift in Sources */,
+   399BA3721E6881FC003D74A6 /* WebView.swift in

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

2017-03-19 Thread Markus Mohrhard

 sc/qa/unit/ucalc.hxx |2 ++
 sc/qa/unit/ucalc_formula.cxx |   27 +++
 2 files changed, 29 insertions(+)

New commits:
commit 47d4f6252df2ec3cc9f7363ce37e043dcec20f2e
Author: Markus Mohrhard 
Date:   Sat Mar 18 20:14:24 2017 +0100

add test for tdf#93151

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

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index b172776c0ac5..4d3558a71393 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -155,6 +155,7 @@ public:
 void testFormulaRefUpdateName();
 void testFormulaRefUpdateNameMove();
 void testFormulaRefUpdateNameExpandRef();
+void testFormulaRefUpdateNameExpandRef2();
 void testFormulaRefUpdateNameDeleteRow();
 void testFormulaRefUpdateNameCopySheet();
 void testFormulaRefUpdateNameCopySheetCheckTab( SCTAB Tab, bool 
bCheckNames );
@@ -553,6 +554,7 @@ public:
 CPPUNIT_TEST(testFormulaRefUpdateName);
 CPPUNIT_TEST(testFormulaRefUpdateNameMove);
 CPPUNIT_TEST(testFormulaRefUpdateNameExpandRef);
+CPPUNIT_TEST(testFormulaRefUpdateNameExpandRef2);
 CPPUNIT_TEST(testFormulaRefUpdateNameDeleteRow);
 CPPUNIT_TEST(testFormulaRefUpdateNameCopySheet);
 CPPUNIT_TEST(testFormulaRefUpdateNameDelete);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 6c288bce48e4..c11ecab06628 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2901,6 +2901,33 @@ void Test::testFormulaRefUpdateNameExpandRef()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testFormulaRefUpdateNameExpandRef2()
+{
+setExpandRefs(true);
+
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+m_pDoc->InsertTab(0, "Test");
+
+bool bInserted = m_pDoc->InsertNewRangeName("MyRange", ScAddress(0,0,0), 
"$A$1:$B$3");
+CPPUNIT_ASSERT(bInserted);
+
+// Insert a new row at row 4, which should expand the named range to A1:A4.
+ScDocFunc& rFunc = getDocShell().GetDocFunc();
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+
+// Insert a new column at column 3, which should expand the named
+rFunc.InsertCells(ScRange(1,0,0,1,MAXROW,0), &aMark, INS_INSCOLS_BEFORE, 
false, true);
+ScRangeData* pName = m_pDoc->GetRangeName()->findByUpperName("MYRANGE");
+CPPUNIT_ASSERT(pName);
+OUString aSymbol;
+pName->GetSymbol(aSymbol, m_pDoc->GetGrammar());
+CPPUNIT_ASSERT_EQUAL(OUString("$A$1:$C$3"), aSymbol);
+
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testFormulaRefUpdateNameDeleteRow()
 {
 m_pDoc->InsertTab(0, "Test");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Markus Mohrhard

 solenv/gbuild/UITest.mk |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5b878718b90fe10a0c9a41777ebb8b22330bad3b
Author: Markus Mohrhard 
Date:   Sat Mar 18 18:54:15 2017 +0100

uitest: allow to specify a different configuration for tests

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

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 2182682695e3..1edb3f769081 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -42,7 +42,9 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS)
rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
mkdir -p $(dir $(call gb_UITest_get_target,$*)) && \
$(if $(gb_UITest__interactive),, \
-   rm -fr $@.core && mkdir $@.core && cd $@.core && ) \
+   rm -fr $@.core && mkdir -p $(dir $(call 
gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \
+   $(if $(gb_UITest_use_config), \
+   cp $(gb_UITest_use_config) $(dir $(call 
gb_UITest_get_target,$*))user/. && ) \
($(gb_UITest_PRECOMMAND) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
@@ -100,6 +102,10 @@ $(call gb_UITest_get_target,$(1)) : $(call 
gb_CustomTarget_get_workdir,$(2))
 
 endef
 
+define gb_UITest_use_configuration
+$(call gb_UITest_get_target,$(1)) : gb_UITest_use_config := $(2)
+endef
+
 
 else # DISABLE_PYTHON
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

pipe accept problem

2017-03-19 Thread shoaibnoor95

 
Can anyone tell me how to overcome from this error 
Best Regards:
Shoaib



--
View this message in context: 
http://nabble.documentfoundation.org/pipe-accept-problem-tp4210569.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: help need to add path

2017-03-19 Thread shoaibnoor95

 
Now cursing with this issue do help me guys may God Bestow his mercy on you
guys now one respond me with in forum
i have posted there as well 
I have good programming skill but just a day before now i was busy in my
semester examinations 
Best Regards:
Shoaib




--
View this message in context: 
http://nabble.documentfoundation.org/Re-help-need-to-add-path-tp4210551p4210568.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: drawinglayer/source framework/qa qadevOOo/tests svx/source sw/source vcl/source

2017-03-19 Thread Julien Nabet

 drawinglayer/source/primitive2d/metafileprimitive2d.cxx  | 
   2 +-
 framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 
   2 +-
 qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java| 
   2 +-
 svx/source/accessibility/SvxShapeTypes.cxx   | 
   2 +-
 svx/source/form/dataaccessdescriptor.cxx | 
   6 +++---
 sw/source/filter/ww8/ww8atr.cxx  | 
   2 +-
 vcl/source/window/window.cxx | 
   2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 7b3825c66e7a7d7430404637261c41fd1ef0fbf8
Author: Julien Nabet 
Date:   Sun Mar 19 17:58:02 2017 +0100

Typos

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

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx 
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 7a13ff76ae4c..e22d9a04348a 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2742,7 +2742,7 @@ namespace
 
rPropertyHolders.Current().setTextColor(rFontColor.getBColor());
 }
 
-// caution: do NOT decativate here on transparet, see
+// caution: do NOT deactivate here on transparent, see
 // OutputDevice::SetFont(..) for more info
 // 
rPropertyHolders.Current().setTextColorActive(bActivate);
 
diff --git 
a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java 
b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index f7109c1bf538..3b8d7cd4c2cf 100644
--- 
a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ 
b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -190,7 +190,7 @@ public class CheckContextMenuInterceptor
 {
 XInterface toolkit = null;
 
-System.out.println("get accesibility...");
+System.out.println("get accessibility...");
 try
 {
 toolkit = (XInterface) 
xMSF.createInstance("com.sun.star.awt.Toolkit");
diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java 
b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
index 66065271693f..52e02f5fe813 100644
--- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
+++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
@@ -98,7 +98,7 @@ public class _XContextMenuInterception extends 
MultiMethodTest {
 XInterface toolkit = null;
 boolean res = true;
 
-log.println("get accesibility...");
+log.println("get accessibility...");
 try{
 toolkit = (XInterface) 
xMSF.createInstance("com.sun.star.awt.Toolkit");
 } catch (com.sun.star.uno.Exception e){
diff --git a/svx/source/accessibility/SvxShapeTypes.cxx 
b/svx/source/accessibility/SvxShapeTypes.cxx
index 250159891a20..fb53f41c52ed 100644
--- a/svx/source/accessibility/SvxShapeTypes.cxx
+++ b/svx/source/accessibility/SvxShapeTypes.cxx
@@ -155,7 +155,7 @@ void RegisterDrawShapeTypes()
 
 };
 
-// Crash while inserting callout with activated accesibility (#i37790#)
+// Crash while inserting callout with activated accessibility (#i37790#)
 ShapeTypeHandler::Instance().AddShapeTypeList ( DRAWING_END, 
aSvxShapeTypeList);
 }
 
diff --git a/svx/source/form/dataaccessdescriptor.cxx 
b/svx/source/form/dataaccessdescriptor.cxx
index b4ca33928b51..e2c675c5b3ab 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -178,7 +178,7 @@ namespace svx
 static MapString2PropertyEntry s_aProperties;
 if ( s_aProperties.empty() )
 {
-static PropertyMapEntry const s_aDesriptorProperties[] =
+static PropertyMapEntry const s_aDescriptorProperties[] =
 {
 { OUString("ActiveConnection"),   
DataAccessDescriptorProperty::Connection,},
 { OUString("BookmarkSelection"),  
DataAccessDescriptorProperty::BookmarkSelection, },
@@ -196,8 +196,8 @@ namespace svx
 { OUString("Selection"),  
DataAccessDescriptorProperty::Selection, }
 };
 
-for (unsigned i=0; imnActivateMode = nMode;
 
-// possibly trigger Decativate/Activate
+// possibly trigger Deactivate/Activate
 if ( mpWindowImpl->mnActivateMode != ActivateModeFlags::NONE )
 {
 if ( (mpWindowImpl->mbActive || (GetType() == 
WindowType::BORDERWINDOW)) &&
___
Libreoffice-commits mailing list
libreoffice-comm...

[Libreoffice-commits] core.git: i18nlangtag/README scp2/source

2017-03-19 Thread Stephan Bergmann

 i18nlangtag/README   |5 
 scp2/source/ooo/common_brand.scp |  292 ---
 2 files changed, 297 deletions(-)

New commits:
commit 00b54bd32c0780f945fd99f97df3e448b41b5afe
Author: Stephan Bergmann 
Date:   Sun Mar 19 20:08:45 2017 +0100

scp2: Removed unused Directory items

Change-Id: Ib095e8eb9f9b79864f6a50557994f4d24f0bd2a4

diff --git a/i18nlangtag/README b/i18nlangtag/README
index 4ddadcf1e18d..51fea0384b14 100644
--- a/i18nlangtag/README
+++ b/i18nlangtag/README
@@ -107,11 +107,6 @@ If dictionary is to be renamed, for example ku-TR to 
kmr-Latn:
 *** change to STR_DESC_MODULE_EXTENSION_DICTIONARY_KMR_LATN
 ** en-US = "Kurdish (Turkey) spelling dictionary"
 *** change to "Kurdish, Northern, Latin script spelling dictionary"
-* scp2/source/ooo/common_brand.scp
-** Directory gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr
-*** change to gid_Brand_Dir_Share_Extensions_Dict_Kmr_Latn
-** DosName = "dict-ku-TR";
-*** change to "dict-kmr-Latn"
 * setup_native/source/packinfo/packinfo_office.txt
 ** module = "gid_Module_Root_Extension_Dictionary_Ku_Tr"
 *** change to "gid_Module_Root_Extension_Dictionary_Kmr_Latn"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3fe08f3359c9..e36f8741de6b 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -48,10 +48,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Uno_Packages,
 gid_Brand_Dir_Share_Uno_Packages_Cache,
 gid_Brand_Dir_Share_Ure,
-gid_Brand_Dir_Share_Ure_Etc,
 gid_Brand_Dir_Share_Ure_Share,
-gid_Brand_Dir_Share_Glade,
-gid_Brand_Dir_Share_Labels,
 gid_Brand_Dir_Share_Registry,
 gid_Brand_Dir_Share_Xdg);
 Files = (auto_brand_ALL,
@@ -96,15 +93,6 @@ Directory gid_Brand_Dir_Program
 #endif
 End
 
-Directory gid_Brand_Dir_Program_Shell
-#if defined MACOSX
-ParentID = gid_Brand_Dir_Share;
-#else
-ParentID = gid_Brand_Dir_Program;
-#endif
-DosName = "shell";
-End
-
 Directory gid_Brand_Dir_Readme
 #if defined MACOSX
 ParentID = gid_Dir_Bundle_Contents_Resources;
@@ -128,271 +116,6 @@ Directory gid_Brand_Dir_Share_Config
 DosName = "config";
 End
 
-Directory gid_Brand_Dir_Share_Extensions
-ParentID = gid_Brand_Dir_Share;
-DosName = "extensions";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Af
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-af";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_An
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-an";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ar
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-ar";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Be
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-be";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Bg
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-bg";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Bn
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-bn";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Bo
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-bo";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Br
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-br";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Bs
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-bs";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-ca";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Cs
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-cs";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Da
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-da";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-de";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_En
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-en";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_El
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-el";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Es
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-es";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Et
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-et";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Fr
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-fr";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Gd
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosName = "dict-gd";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
-ParentID = gid_Brand_Dir_Share_Extensions;
-DosN

[Libreoffice-commits] core.git: helpcontent2

2017-03-19 Thread Adolfo Jayme Barrientos

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

New commits:
commit e39bc37250c325347bb780e62f21457816f35974
Author: Adolfo Jayme Barrientos 
Date:   Sun Mar 19 13:07:18 2017 -0600

Updated core
Project: help  58fe67c610ff2f7e67266424cb657129e3311975

Update references to Appleâs computer OS to âmacOSâ

I know the capitalization is ridiculous, but thatâs how they write it now.

Change-Id: I8043b41353a327dfe1ef19636ebb1573e6a11107

diff --git a/helpcontent2 b/helpcontent2
index 42188315ed1a..58fe67c610ff 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 42188315ed1aef6b50e73b968da52739fdc9a76e
+Subproject commit 58fe67c610ff2f7e67266424cb657129e3311975
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Adolfo Jayme Barrientos

 source/text/shared/01/0117.xhp |2 +-
 source/text/shared/autopi/0117.xhp |4 ++--
 source/text/shared/guide/hyperlink_rel_abs.xhp |2 +-
 source/text/shared/guide/start_parameters.xhp  |6 +++---
 source/text/shared/optionen/0100.xhp   |4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 58fe67c610ff2f7e67266424cb657129e3311975
Author: Adolfo Jayme Barrientos 
Date:   Sun Mar 19 13:07:18 2017 -0600

Update references to Appleâs computer OS to âmacOSâ

I know the capitalization is ridiculous, but thatâs how they write it now.

Change-Id: I8043b41353a327dfe1ef19636ebb1573e6a11107

diff --git a/source/text/shared/01/0117.xhp 
b/source/text/shared/01/0117.xhp
index a111b05fc..e992d9c74 100644
--- a/source/text/shared/01/0117.xhp
+++ b/source/text/shared/01/0117.xhp
@@ -34,7 +34,7 @@
 exiting;$[officename]
 mw made "exiting..." a two level entry
 Exit
-Closes all $[officename] programs and prompts you to save your 
changes. This command does not exist on Mac OS X systems.
+Closes all $[officename] programs and prompts you to save your 
changes. This command does not exist on macOS systems.
 
 
 
diff --git a/source/text/shared/autopi/0117.xhp 
b/source/text/shared/autopi/0117.xhp
index b95bd03e2..765894f4b 100644
--- a/source/text/shared/autopi/0117.xhp
+++ b/source/text/shared/autopi/0117.xhp
@@ -52,8 +52,8 @@
 KDE Address book
 Select this option if you already use an address book 
in KDE Address book.
 
-OS X Address book
-Select this option if you already use an address book 
in OS X Address book.
+macOS 
Address book
+Select this option if you already use an address book in macOS Address 
book.
 
 Evolution
 Select this option if you already use an address book 
in Evolution.
diff --git a/source/text/shared/guide/hyperlink_rel_abs.xhp 
b/source/text/shared/guide/hyperlink_rel_abs.xhp
index 2e33ca3c2..28b8f6da8 100644
--- a/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -45,7 +45,7 @@
 You should 
create the same directory structure on your hard disk as that which exists in 
the web space hosted by your Internet provider. Call the root directory for the 
homepage on your hard disk "homepage", for example. The start file is then 
"index.html", the full path being "C:\homepage\index.html" (assuming Windows 
operating system). The URL on your Internet provider's server might then be as 
follows: "http://www.myprovider.com/mypage/index.html";. With relative 
addressing, you indicate the link relative to the location of the output 
document. For example, if you placed all the graphics for your homepage in a 
subfolder called "C:\homepage\images", you would need to give the following 
path to access the graphic "picture.gif": "images\picture.gif". This is the 
relative path, starting from the location of the file "index.html". On the 
provider's server, you would place the picture in the folder "mypage/images". 
When you 
 transfer the document "index.html" to the provider's server through the 
File - Save As dialog, and if you have marked the option 
Copy local images to Internet under %PRODUCTNAME - 
PreferencesTools - 
Options - Load/Save - HTML 
Compatibility, $[officename] will automatically copy the graphic to the 
correct directory on the server.
 
 
-An absolute path such as "C:\homepage\graphics\picture.gif" would 
no longer function on the provider server. Neither a server nor the computer of 
a reader needs to have a C hard drive: operating systems such as Unix or MacOS 
do not recognize drive letters, and even if the folder homepage\graphics 
existed, your picture would not be available. It is better to use relative 
addressing for file links.
+An absolute 
path such as "C:\homepage\graphics\picture.gif" would no longer function on the 
provider server. Neither a server nor the computer of a reader needs to have a 
C hard drive: operating systems such as Unix or macOS do not recognize drive 
letters, and even if the folder homepage\graphics existed, your picture would 
not be available. It is better to use relative addressing for file 
links.
 
 
 A link to a web page, for example, "www.example.com" or 
"www.myprovider.com/mypage/index.html" is an absolute link.
diff --git a/source/text/shared/guide/start_parameters.xhp 
b/source/text/shared/guide/start_parameters.xhp
index ad4c25418..75a961769 100644
--- a/source/text/shared/guide/start_parameters.xhp
+++ b/source/text/shared/guide/start_parameters.xhp
@@ -39,7 +39,7 @@
 Starting $[officename] Software From the Command Line
 
 
-Under Windows, select Run from the Windows Start 
menu, or open a shell under Linux, *BSD, or Mac OS X platforms.
+Under Windows, select Run from the Windows Start 
menu, or open a shell under Linux, *BSD, or macOS platforms.
 
 
 Unde

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

2017-03-19 Thread Stephan Bergmann

 solenv/bin/modules/installer.pm |1 +
 solenv/bin/modules/installer/scriptitems.pm |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit fbcdca2becb4eee0825697efffba14b5796ade6d
Author: Stephan Bergmann 
Date:   Sun Mar 19 20:04:40 2017 +0100

tdf#87075: Filter out unused directories from FILELISTs

...so that on macOS dictionary extensions don't pollute LibreOffice.app's
Contents/Resources/extensions/ with empty directories (that would then show 
up
as phantom extenions in the Extension Manager).

Change-Id: Iacff73e931885cde0fe507e384de80e9bd38d475

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 1acac03e43c6..a29beb09efb2 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -790,6 +790,7 @@ sub run {
 $modulesinproductlanguageresolvedarrayref = 
installer::scriptitems::remove_not_required_spellcheckerlanguage_modules($modulesinproductlanguageresolvedarrayref);
 
 $filesinproductlanguageresolvedarrayref = 
installer::scriptitems::remove_not_required_spellcheckerlanguage_files($filesinproductlanguageresolvedarrayref);
+$directoriesforepmarrayref = 
installer::scriptitems::remove_not_required_spellcheckerlanguage_files($directoriesforepmarrayref);
 }
 
 
installer::scriptitems::changing_name_of_language_dependent_keys($modulesinproductlanguageresolvedarrayref);
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 5f8dfd698d5f..1b8922dfa21c 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1595,6 +1595,7 @@ sub collect_directories_from_filesarray
 $directoryhash{'specificlanguage'} = 
$onefile->{'specificlanguage'};
 $directoryhash{'Dir'} = $onefile->{'Dir'};
 $directoryhash{'modules'} = $onefile->{'modules'}; # NEW, 
saving modules
+$directoryhash{'gid'} = $onefile->{'gid'};
 
 $predefinedprogdir_added ||= $onefile->{'Dir'} eq 
"PREDEFINED_PROGDIR";
 
@@ -1604,6 +1605,15 @@ sub collect_directories_from_filesarray
 {
 # Adding the modules to the module list!
 $alldirectoryhash{$destinationpath}->{'modules'} .= "," . 
$onefile->{'modules'};
+# Save file's gid iff this directory appears in only a single
+# file's FILELIST (so that unused directories will be filtered
+# out in remove_not_required_spellcheckerlanguage_files, based
+# on gid):
+if ($alldirectoryhash{$destinationpath}->{'gid'}
+ne $onefile->{'gid'})
+{
+$alldirectoryhash{$destinationpath}->{'gid'} = '';
+}
 }
 } while ($destinationpath =~ 
s/(^.*\S)\Q$installer::globals::separator\E(\S.*?)\s*$/$1/);  # as long as the 
path contains slashes
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/experimental

2017-03-19 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 
  19 +-
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift  | 
   2 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h   | 
   4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c   | 
  78 +-
 4 files changed, 57 insertions(+), 46 deletions(-)

New commits:
commit 6aa9d41a0d0c45346cfe84cf903057d812815c20
Author: jan Iversen 
Date:   Tue Feb 28 19:27:11 2017 +0100

ios LibreOfficeLight clientCommands added

Add connection between client commands and LOKit.

Change-Id: I2593b3c0b7a82612924bf63c3be85963f5a20d32
Reviewed-on: https://gerrit.libreoffice.org/35434
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 73e789d2311b..ab3e6af22da1 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -52,7 +52,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-   392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewPrintManager.swift; sourceTree = ""; };
+   392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; 
sourceTree = ""; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
@@ -66,13 +66,13 @@
397E091C1E597BD8001374E0 /* LibreOfficeLightUITests.xctest */ = 
{isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 
0; path = LibreOfficeLightUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
397E09201E597BD8001374E0 /* LibreOfficeLightUITests.swift */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
LibreOfficeLightUITests.swift; path = 
LibreOfficeLightUITests/LibreOfficeLightUITests.swift; sourceTree = 
SOURCE_ROOT; };
397E09221E597BD8001374E0 /* Info.plist */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = 
LibreOfficeLightUITests/Info.plist; sourceTree = SOURCE_ROOT; };
-   3992D8571E5B761700BEA987 /* ViewController.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewController.swift; sourceTree = ""; };
-   3992D8591E5B762A00BEA987 /* ViewDocument.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewDocument.swift; sourceTree = ""; };
-   3992D85B1E5B764A00BEA987 /* SideMenu.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= SideMenu.swift; sourceTree = ""; };
-   3992D85C1E5B764A00BEA987 /* ViewFileManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewFileManager.swift; sourceTree = ""; };
-   399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= ViewProperties.swift; sourceTree = ""; };
-   399648481E5C4E5500E73E83 /* LO.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= LO.swift; sourceTree = ""; };
-   39A83A8D1E5F471C00D0C683 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; explicitFileType = sourcecode.cpp.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
+   3992D8571E5B761700BEA987 /* ViewController.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewController.swift; path = LibreOfficeLight/ViewController.swift; 
sourceTree = SOURCE_ROOT; };
+   3992D8591E5B762A00BEA987 /* ViewDocument.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewDocument.swift; path = LibreOfficeLight/ViewDocument.swift; sourceTree = 
SO

[Libreoffice-commits] core.git: chart2/source connectivity/qa drawinglayer/source extensions/source extensions/test filter/source framework/source include/sfx2 include/svx include/vcl odk/examples off

2017-03-19 Thread Julien Nabet

 chart2/source/controller/sidebar/ChartAreaPanel.hxx  |2 +-
 chart2/source/controller/sidebar/ChartAxisPanel.hxx  |2 +-
 chart2/source/controller/sidebar/ChartElementsPanel.hxx  |2 +-
 chart2/source/controller/sidebar/ChartErrorBarPanel.hxx  |2 +-
 chart2/source/controller/sidebar/ChartLinePanel.hxx  |2 +-
 chart2/source/controller/sidebar/ChartSeriesPanel.hxx|2 +-
 chart2/source/tools/DataSourceHelper.cxx |8 
 connectivity/qa/connectivity/ado/DriverTest.cxx  |2 +-
 connectivity/qa/connectivity/mork/DriverTest.cxx |2 +-
 drawinglayer/source/processor2d/hittestprocessor2d.cxx   |2 +-
 drawinglayer/source/processor3d/cutfindprocessor3d.cxx   |2 +-
 extensions/source/propctrlr/formmetadata.cxx |2 +-
 extensions/test/ole/callUnoToJava.htm|2 +-
 filter/source/xslt/import/uof/uof2odf_text.xsl   |4 ++--
 filter/source/xslt/import/wordml/wordml2ooo.xsl  |2 +-
 filter/source/xslt/import/wordml/wordml2ooo_field.xsl|2 +-
 framework/source/layoutmanager/toolbarlayoutmanager.hxx  |2 +-
 include/sfx2/shell.hxx   |2 +-
 include/svx/sidebar/AreaPropertyPanelBase.hxx|2 +-
 include/svx/sidebar/LinePropertyPanelBase.hxx|2 +-
 include/vcl/menu.hxx |2 +-
 odk/examples/java/Inspector/UnoTreeRenderer.java |2 +-
 offapi/com/sun/star/resource/OfficeResourceLoader.idl|2 +-
 offapi/com/sun/star/resource/XStringResourceResolver.idl |4 ++--
 reportdesign/source/ui/inspection/metadata.cxx   |2 +-
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx  |2 +-
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |2 +-
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx   |2 +-
 svtools/source/contnr/treelistbox.cxx|2 +-
 svx/source/sdr/contact/viewcontact.cxx   |2 +-
 svx/source/sidebar/area/AreaPropertyPanel.hxx|2 +-
 svx/source/sidebar/graphic/GraphicPropertyPanel.hxx  |2 +-
 svx/source/sidebar/line/LinePropertyPanel.hxx|2 +-
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx  |2 +-
 sw/source/core/doc/docnew.cxx|2 +-
 sw/source/core/fields/reffld.cxx |4 ++--
 sw/source/core/unocore/unochart.cxx  |2 +-
 sw/source/ui/fldui/fldref.cxx|2 +-
 38 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit b5bef1f7d5edb68a7609c2d003955461bfa9c5aa
Author: Julien Nabet 
Date:   Sun Mar 19 18:19:41 2017 +0100

Typos

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

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
index e51008fa..234a23e4f392 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx
@@ -56,7 +56,7 @@ public:
 const css::uno::Reference& rxFrame,
 ChartController* pController);
 
-// constructor/destuctor
+// constructor/destructor
 ChartAreaPanel(
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx 
b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 51da3511563c..a6fe43feb11f 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -58,7 +58,7 @@ public:
 const SfxPoolItem* pState,
 const bool bIsEnabled) override;
 
-// constructor/destuctor
+// constructor/destructor
 ChartAxisPanel(
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index e1fbe5767ff2..4dd6e6e5c980 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -56,7 +56,7 @@ public:
 virtual void HandleContextChange(
 const vcl::EnumContext& rContext) override;
 
-// constructor/destuctor
+// constructor/destructor
 ChartElementsPanel(
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx 
b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index b68d33cd9e85..5a55b7402293 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -56,7 +56,7 @@ public:
 const SfxPoolItem* pState,
 const bool bIsEnable

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

2017-03-19 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/addin/fods/impower.fods | 1416 ++
 1 file changed, 666 insertions(+), 750 deletions(-)

New commits:
commit 38e6da9f23a29d297701a35b213b7b38c4f67bda
Author: ZdenÄk Crhonek 
Date:   Sun Mar 19 17:10:50 2017 +0100

impwer testcase - repair buildbot error

roundsig(, 15) -> roundsig(, 12)

Change-Id: I5b9b09f136fc1cf0c1842a4767ee4e2b9f8b45b5
Reviewed-on: https://gerrit.libreoffice.org/35431
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/unit/data/functions/addin/fods/impower.fods 
b/sc/qa/unit/data/functions/addin/fods/impower.fods
index f78b46016c26..71cf748a7e2e 100644
--- a/sc/qa/unit/data/functions/addin/fods/impower.fods
+++ b/sc/qa/unit/data/functions/addin/fods/impower.fods
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-12-29T18:23:56.52200P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/36de6c50684c8241969a2064d30aff41e0bc5d97
+ 
2016-12-29T18:23:56.52200P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a5a6694128728c48c1a8482450a21ad49025c40c
  
   
0
@@ -31,14 +31,14 @@
false
   
   
-   11
+   14
19
0
0
0
0
2
-   0
+   4
0
0
0
@@ -132,7 +132,7 @@
true
1
true
-   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgBJbnB1dFNsb3Q6VHJheTEARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
false
0
   
@@ -164,7 +164,7 @@
  
  
   
-   
+   

   
   
@@ -173,269 +173,192 @@
   

   
-  
+  

 
KÄ
   
-  
+  

-

 
KÄ
-   
+   
   
-  
+  
 

 
   
-  
+  
 
(

)
   
-  
+  
 
-

 
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  

   
-  
+  

   
-  
+  

 
KÄ
   
-  
+  
-

 
KÄ
-   
+   
   
-  
+  

 
KÄ
   
-  
+  
-

 
KÄ
-   
+   
   
-  
+  

 
KÄ
   
-  
+  

-

 
KÄ
-   
+   
   
-  
+  

 
KÄ
   
-  
+

Re: How to enable interactive environment using visual studio and dr. memory

2017-03-19 Thread Mohammed Abdul Azeem

Hi Shoaib,

On Sun, Mar 19, 2017 at 11:12 PM, shoaibnoor95 
wrote:

> How to enable interactive debugging with visual studio and drmemory
> I am facing this issue continuously
> 
> Could any one please tell on what particular file it is pointing on or
> where
> to find that particular line
>
> "CppunitItrace=True"
> its target source and edit it
> Regards
> Shoaib Noor
>

What I gather from the screenshot is that one of the test cases has failed.
If it's the first time you are building the project, perhaps it is because
the master was broken when you last pulled from repository, in that case do
'git pull -r' and then 'make' again.

If you've already build before and this is happening after you made certain
modifications, you can run:
make CppunitTest_sal_osl_security CPPUNITTRACE=TRUE
to get the stack trace and what is going wrong and where.

Or run:
   CppunitTest_sal_osl_security CPPUNITTRACE="drmemory
 -free_max_frames_20"
for interactive debugging in Visual Studio.

This is just what I gather from the screenshot. I've never used Visual
Studio, not am an expert in this. Most of the developers won't be available
during weekends, so I suggest you wait a couple of days for them to respond.

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

How to enable interactive environment using visual studio and dr. memory

2017-03-19 Thread shoaibnoor95

How to enable interactive debugging with visual studio and drmemory
I am facing this issue continuously
  
Could any one please tell on what particular file it is pointing on or where
to find that particular line 

"CppunitItrace=True"
its target source and edit it 
Regards
Shoaib Noor 




--
View this message in context: 
http://nabble.documentfoundation.org/How-to-enable-interactive-environment-using-visual-studio-and-dr-memory-tp4210562.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-03-19 Thread Julien Nabet

 jvmfwk/source/fwkbase.cxx  |   12 ++--
 sw/qa/python/set_expression.py |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0a57e51f410eda8e5d27a95a8d0ae5124fcc7496
Author: Julien Nabet 
Date:   Sun Mar 19 17:35:07 2017 +0100

Fix typo for "expression"

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

diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 6eacf33e4bcf..df2e41e4994f 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -124,13 +124,13 @@ VersionInfo VendorSettings::getVersionInformation(const 
OUString & sVendor)
 VersionInfo aVersionInfo;
 OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);
 //Get minVersion
-OString sExpresion = OString(
+OString sExpression = OString(
 "/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
 osVendor + OString("\"]/jf:minVersion");
 
 CXPathObjectPtr xPathObjectMin;
 xPathObjectMin =
-xmlXPathEvalExpression(reinterpret_cast(sExpresion.getStr()),
+xmlXPathEvalExpression(reinterpret_cast(sExpression.getStr()),
m_xmlPathContextVendorSettings);
 if (xmlXPathNodeSetIsEmpty(xPathObjectMin->nodesetval))
 {
@@ -148,11 +148,11 @@ VersionInfo VendorSettings::getVersionInformation(const 
OUString & sVendor)
 }
 
 //Get maxVersion
-sExpresion = 
OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
+sExpression = 
OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
 osVendor + OString("\"]/jf:maxVersion");
 CXPathObjectPtr xPathObjectMax;
 xPathObjectMax = xmlXPathEvalExpression(
-reinterpret_cast(sExpresion.getStr()),
+reinterpret_cast(sExpression.getStr()),
 m_xmlPathContextVendorSettings);
 if (xmlXPathNodeSetIsEmpty(xPathObjectMax->nodesetval))
 {
@@ -170,11 +170,11 @@ VersionInfo VendorSettings::getVersionInformation(const 
OUString & sVendor)
 }
 
 //Get excludeVersions
-sExpresion = 
OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
+sExpression = 
OString("/jf:javaSelection/jf:vendorInfos/jf:vendor[@name=\"") +
 osVendor + OString("\"]/jf:excludeVersions/jf:version");
 CXPathObjectPtr xPathObjectVersions;
 xPathObjectVersions =
-xmlXPathEvalExpression(reinterpret_cast(sExpresion.getStr()),
+xmlXPathEvalExpression(reinterpret_cast(sExpression.getStr()),
m_xmlPathContextVendorSettings);
 if (!xmlXPathNodeSetIsEmpty(xPathObjectVersions->nodesetval))
 {
diff --git a/sw/qa/python/set_expression.py b/sw/qa/python/set_expression.py
index 7bcc20d69880..220952536fea 100644
--- a/sw/qa/python/set_expression.py
+++ b/sw/qa/python/set_expression.py
@@ -12,7 +12,7 @@ from org.libreoffice.unotest import UnoInProcess
 
 
 # @unittest.skip("that seems to work")
-class TestSetExpresion(unittest.TestCase):
+class TestSetExpression(unittest.TestCase):
 
 @classmethod
 def setUpClass(cls):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Julien Nabet

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

New commits:
commit fa7e3d389f64e051bd3a1f4cde4f938bd324051f
Author: Julien Nabet 
Date:   Sun Mar 19 17:27:08 2017 +0100

Fix typo to have "NEEDS_QUALITY_PARAMETER"

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

diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index f4c8c7dcdec0..6c0bf652d70b 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -138,7 +138,7 @@ void setupMethodStubs( functor_vector_type& res )
 const BitmapExaBitmapExAlpha( aBitmap, aBitmapAlien );
 const BitmapExaBitmapExAlphaAlien( aBitmapAlien, aBitmapAlien );
 
-#ifdef NEEDS_QUALIY_PARAMTER
+#ifdef NEEDS_QUALITY_PARAMETER
 const Image   aImage( aBitmapEx );
 #endif
 const Gradient
aGradient(GradientStyle::Elliptical,aBlackColor,aWhiteColor);
@@ -274,7 +274,7 @@ void setupMethodStubs( functor_vector_type& res )
 "CopyArea",
 [&] (OutputDevice * pDev) { return pDev->CopyArea(aPt1, aPt3, 
aRect2.GetSize()); } );
 
-#ifdef NEEDS_QUALIY_PARAMTER
+#ifdef NEEDS_QUALITY_PARAMETER
 /* void DrawBitmap( const Point& rDestPt,
 const Bitmap& rBitmap );
 */
@@ -509,7 +509,7 @@ void setupMethodStubs( functor_vector_type& res )
 return pDev->DrawImage(aPt1, aRect.GetSize(), aImage, 
static_cast(0)));
 });
 
-#endif // NEEDS_QUALITY_PARAMATER
+#endif // NEEDS_QUALITY_PARAMETER
 
 /* void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); 
*/
 add(res,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/LibreOfficeKit ios/CustomTarget_LibreOfficeLight_app.mk ios/experimental ios/Module_ios.mk

2017-03-19 Thread jan Iversen

 include/LibreOfficeKit/LibreOfficeKitInit.h
|   10 
 ios/CustomTarget_LibreOfficeLight_app.mk   
|   30 
 ios/Module_ios.mk  
|1 
 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
|  130 ++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift
|2 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight-Prefix.pch 
|   22 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h 
|   11 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/lokit.c 
|  491 ++
 8 files changed, 693 insertions(+), 4 deletions(-)

New commits:
commit c1f46c54a62030efb93443c025487d2caade5b9c
Author: jan Iversen 
Date:   Thu Feb 23 12:47:34 2017 +0100

ios LibreOfficeLight LOkit integration

Integrated LibreOfficeLight into gbuild.
added lo.xcconfig and Resources (needed to link with LO and run LO)
added swift --> C interface for LOkit
add known commands from JS client

added C++ condition in LibreOfficekitInit.h (inline no good in a C file)

Change-Id: I19ebe8912546408bf701c96c0c63541d6e37cad8
Reviewed-on: https://gerrit.libreoffice.org/35430
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index f4ab9cdf2082..d19aa0fae9ef 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -43,8 +43,10 @@ extern "C"
 #define SEPARATOR '/'
 
 #ifndef __OBJC__
+#ifdef __cplusplus
 inline
 #endif
+#endif
 void *lok_loadlib(const char *pFN)
 {
 return dlopen(pFN, RTLD_LAZY
@@ -55,32 +57,40 @@ extern "C"
 }
 
 #ifndef __OBJC__
+#ifdef __cplusplus
 inline
 #endif
+#endif
 char *lok_dlerror(void)
 {
 return dlerror();
 }
 
 #ifndef __OBJC__
+#ifdef __cplusplus
 inline
 #endif
+#endif
 void *lok_dlsym(void *Hnd, const char *pName)
 {
 return dlsym(Hnd, pName);
 }
 
 #ifndef __OBJC__
+#ifdef __cplusplus
 inline
 #endif
+#endif
 int lok_dlclose(void *Hnd)
 {
 return dlclose(Hnd);
 }
 
 #ifndef __OBJC__
+#ifdef __cplusplus
 inline
 #endif
+#endif
 void extendUnoPath(const char *pPath)
 {
 (void)pPath;
diff --git a/ios/CustomTarget_LibreOfficeLight_app.mk 
b/ios/CustomTarget_LibreOfficeLight_app.mk
new file mode 100644
index ..ed61f279e2cf
--- /dev/null
+++ b/ios/CustomTarget_LibreOfficeLight_app.mk
@@ -0,0 +1,30 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#- Env 
+BUILDID:=$(shell cd $(SRCDIR) && git log -1 
--format=%H)
+
+#- Targets 
+
+.PHONY: LibreOfficeLight_setup
+
+# Register target
+$(eval $(call gb_CustomTarget_CustomTarget,ios/LibreOfficeLight))
+
+# Build
+# Depend on the custom target that sets up lo.xcconfig
+$(call gb_CustomTarget_get_target,ios/LibreOfficeLight): $(call 
gb_CustomTarget_get_target,ios/Lo_Xcconfig)
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
+   $(call IOSbuild,LibreOfficeLight, clean build)
+
+# Clean
+$(call gb_CustomTarget_get_clean_target,ios/LibreOfficeLight):
+   $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2)
+   $(call IOSbuild,LibreOfficeLight, clean)
+
+# vim: set noet sw=4 ts=4:
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index 13c607b9d497..22b551214631 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,ios,\
CustomTarget_Lo_Xcconfig \
CustomTarget_TiledLibreOffice_app \
CustomTarget_Prototype_app \
+   CustomTarget_LibreOfficeLight_app \
 ))
 
 endif
diff --git 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 837aa290bfee..73e789d2311b 100644
--- 
a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -21,6 +21,17 @@
3992D85E1E5B764A00BEA987 /* ViewFileManager.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 3992D85C1E5B764A00BEA987 /* 
ViewFileManager.swift */; };
399648471E5B87DC00E73E83 /* ViewProperties.swift in Sources */ 
= {isa = PBXBuildFile; f

Re: help need to add path

2017-03-19 Thread Jan Iversen


> On 19 Mar 2017, at 17:21, Tor Lillqvist  wrote:
> 
>> i have to download and build the open office kindly help me i have sent a 
>> message in the forum of open office but no one is able to guide me please 
>> help me
> 
> That is perhaps because this is LibreOffice, not OpenOffice.
Interesting now he talks about open office, he sent me a screenshot in private 
(and I CC´ed my reply to the list).

I have sent him a link to the usual getInvolved page.

He seems incapable of making an environment variable

rgds
jan i.
> 
> --tml
>  
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

Re: help need to add path

2017-03-19 Thread Jan Iversen

Adding our mailing list (AGAIN), so others can follow the thread.

You do not need to allocate anything !

Do as the log tell you to do, create a variable CPPUNITTRACE, that either 
points to devenv.exe or drmemory.

If you do not know how to add a variable to your environment, you will find it 
very difficult to work with our sources.

And please do NOT mail me privately, we have a mailing list for such questions 
(CC in this and the previous mail). It is weekend here, and I want to enjoy my 
weekend !

rgds
jan I.

> On 19 Mar 2017, at 16:42, Shoaib Noor  wrote:
> 
> Where to allocate the following  
> 
> From: Shoaib Noor
> Sent: Sunday, March 19, 2017 8:33:10 PM
> To: Jan Iversen
> Subject: Re: help need to add path
>  
> Please please tell me where to find that particular file to change the 
> settings please brother
> Regards:
> Shoaib
> From: Shoaib Noor
> Sent: Sunday, March 19, 2017 8:09:06 PM
> To: Jan Iversen
> Subject: Fw: help need to add path
>  
> Hi Jan
> I need your assistance at once please please please please guide me how to 
> add path and enable interactive debugging i want to participate in google 
> summer of code for which i have to remove a bug moreover i have to download 
> and build the open office kindly help me i have sent a message in the forum 
> of open office but no one is able to guide me please help me
> Regards:
> Shoaib
> 

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

Re: help need to add path

2017-03-19 Thread Tor Lillqvist

>
> i have to download and build the open office kindly help me i have sent a
> message in the forum of open office but no one is able to guide me please
> help me
>
> That is perhaps because this is LibreOffice, not OpenOffice.

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

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

2017-03-19 Thread Matteo Casalin

 include/sfx2/docfac.hxx   |2 
 sfx2/source/view/viewfrm.cxx  |   88 --
 sfx2/source/view/viewfrm2.cxx |   12 +
 3 files changed, 32 insertions(+), 70 deletions(-)

New commits:
commit 7a2f07c4bd5d26657593044dd441ba5fd168e5de
Author: Matteo Casalin 
Date:   Sun Mar 19 17:05:49 2017 +0100

Use just geParameter instead of hasParameter + getParameter

getParameter returns and empty string if the key is not found,
so we can just avoid searching twice for the same key.

Change-Id: Ic48debce05fe94d8e087b64bde5a589e54bfb616

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index bd29aaf003f3..a16fda352944 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2416,9 +2416,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const 
OUString& sMacro )
 aMacroName = aName.getToken( 0, cTok, nIndex );
 
 // get location
-OUString aLocKey("location");
-if ( xUrl->hasParameter( aLocKey ) )
-aLocation = xUrl->getParameter( aLocKey );
+aLocation = xUrl->getParameter( "location" );
 }
 
 BasicManager* pBasMgr = nullptr;
commit e256519a629e88c624c52916f1c38f774cfd445c
Author: Matteo Casalin 
Date:   Sun Mar 19 12:06:20 2017 +0100

OUString-related simplifications

Change-Id: I2f4099410bcdb9e04583cd37bf63ef86ce81f7e5

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 384af9dfe478..bd29aaf003f3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -239,7 +239,7 @@ static bool AskPasswordToModify_Impl( const uno::Reference< 
task::XInteractionHa
 else
 {
 // the binary format
-bResult = ( SfxMedium::CreatePasswordToModifyHash( 
pPasswordRequest->getPasswordToModify(), OUString( 
"com.sun.star.text.TextDocument"  ).equals( pFilter->GetServiceName() ) ) == 
nPasswordHash );
+bResult = ( SfxMedium::CreatePasswordToModifyHash( 
pPasswordRequest->getPasswordToModify(), 
pFilter->GetServiceName()=="com.sun.star.text.TextDocument" ) == nPasswordHash 
);
 }
 }
 else
@@ -718,7 +718,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 {
 SfxAllItemSet aSet( pApp->GetPool() );
 aSet.Put( SfxStringItem( SID_FILE_NAME, 
pMedium->GetName() ) );
-aSet.Put( SfxStringItem( SID_TARGETNAME, 
OUString("_blank") ) );
+aSet.Put( SfxStringItem( SID_TARGETNAME, "_blank" 
) );
 if ( pSavedOptions )
 aSet.Put( *pSavedOptions );
 if ( pSavedReferer )
@@ -924,30 +924,18 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 rSet.DisableItem( SID_CLEARHISTORY );
 
 if ( pShUndoMgr && pShUndoMgr->GetUndoActionCount() )
-{
-OUString aTmp(SvtResId(STR_UNDO).toString());
-aTmp+= pShUndoMgr->GetUndoActionComment();
-rSet.Put( SfxStringItem( SID_UNDO, aTmp ) );
-}
+rSet.Put( SfxStringItem( SID_UNDO, 
SvtResId(STR_UNDO).toString()+pShUndoMgr->GetUndoActionComment() ) );
 else
 rSet.DisableItem( SID_UNDO );
 
 if ( pShUndoMgr && pShUndoMgr->GetRedoActionCount() )
-{
-OUString aTmp(SvtResId(STR_REDO).toString());
-aTmp += pShUndoMgr->GetRedoActionComment();
-rSet.Put( SfxStringItem( SID_REDO, aTmp ) );
-}
+rSet.Put( SfxStringItem( SID_REDO, 
SvtResId(STR_REDO).toString()+pShUndoMgr->GetRedoActionComment() ) );
 else
 rSet.DisableItem( SID_REDO );
+
 SfxRepeatTarget *pTarget = pSh->GetRepeatTarget();
-if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() &&
- pShUndoMgr->CanRepeat(*pTarget) )
-{
-OUString aTmp(SvtResId(STR_REPEAT).toString());
-aTmp += pShUndoMgr->GetRepeatActionComment(*pTarget);
-rSet.Put( SfxStringItem( SID_REPEAT, aTmp ) );
-}
+if ( pShUndoMgr && pTarget && pShUndoMgr->GetRepeatActionCount() && 
pShUndoMgr->CanRepeat(*pTarget) )
+rSet.Put( SfxStringItem( SID_REPEAT, 
SvtResId(STR_REPEAT).toString()+pShUndoMgr->GetRepeatActionComment(*pTarget) ) 
);
 else
 rSet.DisableItem( SID_REPEAT );
 }
@@ -1171,7 +1159,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 SignatureState nSignatureState = 
GetObjectShell()->GetDocumentSignatureState();
 InfoBarType aInfoBarType(InfoBarType::Info);
-OUString sMessage("");
+OUString sMessage;
 
 switch (nSignatureState)
 {
@@ -2370,9 +2358,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, 
sal_Int32 nLines, bool bEra
 else

Re: help need to add path

2017-03-19 Thread Jan Iversen

Adding our dev list as CC, since I am not the only one, who can help you.

I have no idea which file you talk about. The log you sent had 3 choices to 
activate debugging you do not state which one you want…and anyhow I do not know 
your system, so it not possible for me to tell you a path to somewhere in your 
setup.

Please read the log, it tells you what to do, if you do not know how to set a 
PATH variable (assuming that is the setting you look for), then I think you 
will find it difficult to enter a successful GSoC project.

And please DO NOT use my private email box (except for private matters) we are 
an open community, and community through our mailing lists.
rgds
jan I.

> On 19 Mar 2017, at 16:33, Shoaib Noor  wrote:
> 
> Please please tell me where to find that particular file to change the 
> settings please brother
> Regards:
> Shoaib
> From: Shoaib Noor
> Sent: Sunday, March 19, 2017 8:09:06 PM
> To: Jan Iversen
> Subject: Fw: help need to add path
>  
> Hi Jan
> I need your assistance at once please please please please guide me how to 
> add path and enable interactive debugging i want to participate in google 
> summer of code for which i have to remove a bug moreover i have to download 
> and build the open office kindly help me i have sent a message in the forum 
> of open office but no one is able to guide me please help me
> Regards:
> Shoaib

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

[Libreoffice-commits] core.git: ios/experimental

2017-03-19 Thread jan Iversen

 ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj   
|  581 ++
 ios/experimental/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift   
|   79 +
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
|  110 +
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-120.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-152.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-180.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-29.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-40.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-58.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-60.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-76.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-80.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-87.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/document.imageset/Document.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/Contents.json
|   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/menu.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@2x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/menu.imageset/m...@3x.png
   |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/pdf.imageset/Contents.json
  |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/pdf.imageset/pdf.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/print.imageset/Contents.json
|   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/print.imageset/print.png
|binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/properties.imageset/Contents.json
   |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/properties.imageset/properties.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/save.imageset/Contents.json
 |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/save.imageset/save.png
  |binary
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/saveas.imageset/Contents.json
   |   23 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/saveas.imageset/saveas.png
  |binary
 ios/experimental/LibreOfficeLight/LibreOfficeLight/Info.plist  
|   40 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/LO.swift
|   34 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/.xccurrentversion
 |8 
 
ios/experimental/LibreOfficeLight/LibreOfficeLight/LibreOfficeLight.xcdatamodeld/LibreOfficeLight.xcdatamodel/contents
 |4 
 ios/experimental/LibreOfficeLight/LibreOfficeLight/SideMenu.swift  
|   99 +
 ios/experimental/LibreOfficeLight/LibreOfficeLight

Extension review

2017-03-19 Thread Heiko Tietze

Hi all,

I'd like to ask for a review of an extension that aims to solve bug 90631. The 
capability to export a color list was intentionally removed, but some users 
request DAU-safe means for palette handling. Those must not be hard-coded but 
are a perfect example for extensions.

I filed a bug at https://bugs.documentfoundation.org/show_bug.cgi?id=106644 
that contains the code. It adds a menu entry and allows to export the custom 
palette as an extension itself. My request is to review the code. The xml 
parser could perhaps also realized similar to the UserProfileName() method but 
I failed trying. And in general I wonder if there may issues occur.

The minimum requirement for the extension should be 5.3. It usually works for 
the color extension with  but not for the exporter extension. Tried with or without 
lo:/l:/d: etc. Other than that any comment is welcome, of course.

Thanks in advance,
Heiko
-- 
Dr. Heiko Tietze
UX Designer
Tel. +49 (0)179/1268509



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

[Libreoffice-commits] core.git: connectivity/JunitTest_complex.mk

2017-03-19 Thread Andrea Gelmini

 connectivity/JunitTest_complex.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34ccc9c4866e10abe7d366c354dfadf4f2671bb1
Author: Andrea Gelmini 
Date:   Sun Mar 19 14:34:01 2017 +0100

Fix filename reference

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

diff --git a/connectivity/JunitTest_complex.mk 
b/connectivity/JunitTest_complex.mk
index f8b39075a78f..78947bfc2076 100644
--- a/connectivity/JunitTest_complex.mk
+++ b/connectivity/JunitTest_complex.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_JunitTest_JunitTest,connectivity_complex))
 
 $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
$$(DEFS) \
-   -Dorg.openoffice.test.arg.sce=$(SRCDIR)/connectivity/qa/scenearios.sce \
+   -Dorg.openoffice.test.arg.sce=$(SRCDIR)/connectivity/qa/scenarios.sce \
 ))
 
 $(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Khaled Hosny

 vcl/inc/CommonSalLayout.hxx|9 -
 vcl/source/gdi/CommonSalLayout.cxx |   14 --
 2 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 12490e743fadd9e1d509cdaeee67ccb15e024657
Author: Khaled Hosny 
Date:   Sun Mar 19 17:01:02 2017 +0200

This can move out of the header as well

Change-Id: I995ad7fb040e11363a70ee2b5cd88e068f06771c

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 17498eccc20a..471ca4d2da02 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -91,14 +91,5 @@ public:
 boolIsKashidaPosValid(int nCharPos) const final 
override;
 };
 
-// these must match the values in vcl/source/gdi/VerticalOrientationData.cxx
-enum class VerticalOrientation {
-Upright= 0,
-Rotated= 1,
-TransformedUpright = 2,
-TransformedRotated = 3
-};
-
-
 #endif // INCLUDED_VCL_INC_COMMONSALLAYOUT_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 07b82dae5302..522a0dc6f5ec 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -302,9 +302,19 @@ namespace vcl {
 }
 }
 };
+} // namespace vcl
 
+namespace {
 #include "VerticalOrientationData.cxx"
 
+// These must match the values in the file included above.
+enum class VerticalOrientation {
+Upright= 0,
+Rotated= 1,
+TransformedUpright = 2,
+TransformedRotated = 3
+};
+
 VerticalOrientation GetVerticalOrientation(sal_UCS4 cCh, const 
LanguageTag& rTag)
 {
 // Override fullwidth colon and semi-colon orientation. Tu is 
preferred.
@@ -333,7 +343,7 @@ namespace vcl {
 return VerticalOrientation(nRet);
 }
 
-} // namespace vcl
+} // namespace
 
 std::shared_ptr 
CommonSalLayout::CreateTextLayoutCache(OUString const& rString) const
 {
@@ -509,7 +519,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 {
 sal_Int32 nPrevIdx = nIdx;
 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx);
-VerticalOrientation aVo = 
vcl::GetVerticalOrientation(aChar, rArgs.maLanguageTag);
+VerticalOrientation aVo = GetVerticalOrientation(aChar, 
rArgs.maLanguageTag);
 
 sal_UCS4 aVariationSelector = 0;
 if (nIdx < nEndRunPos)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Khaled Hosny

 vcl/workben/commonfuzzer.hxx |2 +-
 vcl/workben/fftester.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 550c6ed03a6d5d56ec23ce0d18d081b03226f539
Author: Khaled Hosny 
Date:   Sun Mar 19 16:55:17 2017 +0200

Typo

Change-Id: Icdcf060b8e6d5ecbb08a1915261687026d674c0b

diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index a4cb5d33f664..f268c2973a7e 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -81,7 +81,7 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
 setenv("JPEGMEM", "1024M", 1);
 setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
 setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
-setenv("SAL_NO_FONT_LOOPUP", "1", 1);
+setenv("SAL_NO_FONT_LOOKUP", "1", 1);
 
 osl_setCommandArgs(*argc, *argv);
 
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index d5938725872a..a12f3cb2b06a 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -105,7 +105,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 setenv("JPEGMEM", "1024M", 1);
 setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
 setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
-setenv("SAL_NO_FONT_LOOPUP", "1", 1);
+setenv("SAL_NO_FONT_LOOKUP", "1", 1);
 
 try_again:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Szymon Kłos

 icon-themes/breeze_dark/res/notebookbar.png |binary
 1 file changed

New commits:
commit 2cfc214c6bf86e82b6dc742320c38561982ec3c5
Author: Szymon KÅos 
Date:   Sun Mar 19 15:42:13 2017 +0100

Notebookbar: transparent icon for breeze_dark

Change-Id: I01827e4064ed7b43a9d517cdd14716eeef4d054e

diff --git a/icon-themes/breeze_dark/res/notebookbar.png 
b/icon-themes/breeze_dark/res/notebookbar.png
index cea73a1eb106..b5d74ee336e8 100644
Binary files a/icon-themes/breeze_dark/res/notebookbar.png and 
b/icon-themes/breeze_dark/res/notebookbar.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/jpeg-turbo

2017-03-19 Thread Caolán McNamara

 external/jpeg-turbo/jpeg-turbo.limits.patch.1 |   83 ++
 1 file changed, 60 insertions(+), 23 deletions(-)

New commits:
commit d433bb874abb2106c5fd4c160e088598dc9bcf62
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 19 13:38:32 2017 +

sync with final upstream commit

Change-Id: I7ebe6096a63f1da29523295b8065c998809e125a

diff --git a/external/jpeg-turbo/jpeg-turbo.limits.patch.1 
b/external/jpeg-turbo/jpeg-turbo.limits.patch.1
index f78fd4b3253a..77979956309b 100644
--- a/external/jpeg-turbo/jpeg-turbo.limits.patch.1
+++ b/external/jpeg-turbo/jpeg-turbo.limits.patch.1
@@ -1,20 +1,63 @@
-From 066fee2e7d6834f24838bc1896aa38ca77209e3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
-Date: Thu, 16 Mar 2017 15:53:53 +
-Subject: [PATCH] honor max_memory_to_use if its set
+From da2a27ef056a0179cbd80f9146e58b89403d9933 Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Sat, 18 Mar 2017 16:15:14 -0500
+Subject: [PATCH] Honor max_memory_to_use/JPEGMEM/-maxmemory
 
-I'd like to use JPEGMEM to limit memory that libjpeg will allocation
-to reject sizes that would the default 2G limit under asan while
-fuzzing LibreOffice's jpeg integration
+This re-introduces a feature of the obsolete system-specific libjpeg
+memory managers-- namely the ability to limit the amount of main memory
+used by the library during decompression or multi-pass compression.
+This is mainly beneficial for two reasons:
+
+- Works around a 2 GB limit in libFuzzer
+- Allows security-sensitive applications to set a memory limit for the
+  JPEG decoder so as to work around the progressive JPEG exploit
+  (LJT-01-004) described here:
+  
http://www.libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf
+
+This commit also removes obsolete documentation regarding the MS-DOS
+memory manager (which itself was removed long ago) and changes the
+documentation of the -maxmemory switch and JPEGMEM environment variable
+to reflect the fact that backing stores are never used in libjpeg-turbo.
+
+Inspired by:
+https://github.com/caolanm/libjpeg-turbo/commit/066fee2e7d6834f24838bc1896aa38ca77209e3c
+
+Closes #143
 ---
- jmemnobs.c | 14 --
- 1 file changed, 12 insertions(+), 2 deletions(-)
+ ChangeLog.md  | 15 +++
+ cjpeg.1   |  4 ++--
+ djpeg.1   |  4 ++--
+ jmemnobs.c| 16 +++-
+ jpegtran.1|  4 ++--
+ libjpeg.txt   | 14 ++
+ structure.txt | 24 +++-
+ usage.txt | 35 +--
+ 8 files changed, 54 insertions(+), 62 deletions(-)
 
 diff --git a/jmemnobs.c b/jmemnobs.c
-index 5797198..c7dc560 100644
+index 5797198..ac12afa 100644
 --- a/jmemnobs.c
 +++ b/jmemnobs.c
-@@ -66,14 +66,24 @@ jpeg_free_large (j_common_ptr cinfo, void *object, size_t 
sizeofobject)
+@@ -3,8 +3,8 @@
+  *
+  * This file was part of the Independent JPEG Group's software:
+  * Copyright (C) 1992-1996, Thomas G. Lane.
+- * It was modified by The libjpeg-turbo Project to include only code and
+- * information relevant to libjpeg-turbo.
++ * libjpeg-turbo Modifications:
++ * Copyright (C) 2017, D. R. Commander.
+  * For conditions of distribution and use, see the accompanying README.ijg
+  * file.
+  *
+@@ -15,7 +15,6 @@
+  * This is very portable in the sense that it'll compile on almost anything,
+  * but you'd better have lots of main memory (or virtual memory) if you want
+  * to process big images.
+- * Note that the max_memory_to_use option is ignored by this implementation.
+  */
+ 
+ #define JPEG_INTERNALS
+@@ -66,14 +65,21 @@ jpeg_free_large (j_common_ptr cinfo, void *object, size_t 
sizeofobject)
  
  /*
   * This routine computes the total memory space available for allocation.
@@ -26,21 +69,15 @@ index 5797198..c7dc560 100644
  size_t max_bytes_needed, size_t already_allocated)
  {
 -  return max_bytes_needed;
-+  if (!cinfo->mem->max_memory_to_use)
-+  {
++  if (cinfo->mem->max_memory_to_use) {
++if (cinfo->mem->max_memory_to_use > already_allocated)
++  return cinfo->mem->max_memory_to_use - already_allocated;
++else
++  return 0;
++  } else {
 +/* Here we always say, "we got all you want bud!" */
 +return max_bytes_needed;
 +  }
-+
-+  if (cinfo->mem->max_memory_to_use - already_allocated >= max_bytes_needed)
-+  {
-+  return max_bytes_needed;
-+  }
-+
-+  return cinfo->mem->max_memory_to_use - already_allocated;
  }
  
  
--- 
-2.9.3
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Stephan Bergmann

 sw/source/ui/dbui/createaddresslistdialog.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit cffc082ec77b1511fb3397e9acb045b77c5d
Author: Stephan Bergmann 
Date:   Sun Mar 19 13:21:59 2017 +0100

loplugin:loopvartoosmall

Change-Id: Ie83c881db64a857bb542ffc8e298f585f3880d73

diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx 
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 7b831f8eda07..513c8101269b 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -79,7 +83,7 @@ public:
 
 voidSetCurrentDataSet(sal_uInt32 nSet);
 sal_uInt32  GetCurrentDataSet() const { return m_nCurrentDataSet;}
-voidSetCursorTo(sal_uInt32 nElement);
+voidSetCursorTo(std::size_t nElement);
 virtual void Resize() override;
 };
 
@@ -310,7 +314,7 @@ IMPL_LINK(SwAddressControl_Impl, EditModifyHdl_Impl, Edit&, 
rEdit, void)
 }
 }
 
-void SwAddressControl_Impl::SetCursorTo(sal_uInt32 nElement)
+void SwAddressControl_Impl::SetCursorTo(std::size_t nElement)
 {
 if(nElement < m_aEdits.size())
 {
@@ -708,7 +712,7 @@ void SwCreateAddressListDialog::Find(const OUString& 
rSearch, sal_Int32 nColumn)
 bool bFound = false;
 sal_uInt32 nStart = nCurrent + 1;
 sal_uInt32 nEnd = m_pCSVData->aDBData.size();
-sal_uInt32 nElement = 0;
+std::size_t nElement = 0;
 sal_uInt32 nPos = 0;
 for(short nTemp = 0; nTemp < 2 && !bFound; nTemp++)
 {
@@ -724,7 +728,7 @@ void SwCreateAddressListDialog::Find(const OUString& 
rSearch, sal_Int32 nColumn)
 bFound = -1 != 
aData[nElement].toAsciiLowerCase().indexOf(sSearch);
 if(bFound)
 {
-nColumn = nElement;
+nColumn = nElement; //TODO: std::size_t -> sal_Int32!
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-03-19 Thread Julien Nabet

 vcl/unx/generic/print/printerjob.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit b3be89a02c8d90f4620cc16d1e386c6912904bd6
Author: Julien Nabet 
Date:   Sat Mar 18 17:53:03 2017 +0100

cppcheck: alloca (vcl/printerjob)

Remove it since useless
Add an assert to pBuffer
Remove an useless variable

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

diff --git a/vcl/unx/generic/print/printerjob.cxx 
b/vcl/unx/generic/print/printerjob.cxx
index 1f9689ac9bb2..13dd71711c2e 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -38,7 +38,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -55,21 +54,18 @@ namespace psp
 bool
 AppendPS (FILE* pDst, osl::File* pSrc, unsigned char* pBuffer)
 {
-sal_uInt32 nBlockSize = nBLOCKSIZE;
+assert(pBuffer);
 if ((pDst == nullptr) || (pSrc == nullptr))
 return false;
 
 if (pSrc->setPos(osl_Pos_Absolut, 0) != osl::FileBase::E_None)
 return false;
 
-if (pBuffer == nullptr)
-pBuffer = static_cast(alloca (nBlockSize));
-
 sal_uInt64 nIn = 0;
 sal_uInt64 nOut = 0;
 do
 {
-pSrc->read  (pBuffer, nBlockSize, nIn);
+pSrc->read  (pBuffer, nBLOCKSIZE, nIn);
 if (nIn > 0)
 nOut = fwrite (pBuffer, 1, sal::static_int_cast(nIn), 
pDst);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-03-19 Thread andreas kainz

 icon-themes/breeze/cmd/32/orientation.png   |binary
 icon-themes/breeze/cmd/lc_orientation.png   |binary
 icon-themes/breeze/cmd/lc_pagecolumntype.png|binary
 icon-themes/breeze/cmd/lc_pagemargin.png|binary
 icon-themes/breeze/cmd/sc_orientation.png   |binary
 icon-themes/breeze_dark/cmd/32/orientation.png  |binary
 icon-themes/breeze_dark/cmd/lc_orientation.png  |binary
 icon-themes/breeze_dark/cmd/lc_pagecolumntype.png   |binary
 icon-themes/breeze_dark/cmd/lc_pagemargin.png   |binary
 icon-themes/breeze_dark/cmd/sc_linenumberdialog.png |binary
 icon-themes/breeze_dark/cmd/sc_orientation.png  |binary
 icon-themes/breeze_svg/cmd/32/orientation.svg   |   92 ++
 icon-themes/breeze_svg/cmd/lc_orientation.svg   |  139 +++
 icon-themes/breeze_svg/cmd/lc_pagecolumntype.svg|  165 ++
 icon-themes/breeze_svg/cmd/lc_pagemargin.svg|  175 
 icon-themes/breeze_svg/cmd/sc_orientation.svg   |   51 ++---
 16 files changed, 589 insertions(+), 33 deletions(-)

New commits:
commit fd697550825a091d9ee21c16ef25e011b1f201c4
Author: andreas kainz 
Date:   Sun Mar 19 00:51:39 2017 +0100

update page breeze icons

Change-Id: I0a2d92b8c5bdf1ab37f4ac4c4fe6ffa3ad066f2f
Reviewed-on: https://gerrit.libreoffice.org/35416
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/breeze/cmd/32/orientation.png 
b/icon-themes/breeze/cmd/32/orientation.png
new file mode 100644
index ..a6eb8a39b0b2
Binary files /dev/null and b/icon-themes/breeze/cmd/32/orientation.png differ
diff --git a/icon-themes/breeze/cmd/lc_orientation.png 
b/icon-themes/breeze/cmd/lc_orientation.png
index 145970538814..a601b4854d5b 100644
Binary files a/icon-themes/breeze/cmd/lc_orientation.png and 
b/icon-themes/breeze/cmd/lc_orientation.png differ
diff --git a/icon-themes/breeze/cmd/lc_pagecolumntype.png 
b/icon-themes/breeze/cmd/lc_pagecolumntype.png
index 28c5809f7cf4..13bbb0411abb 100644
Binary files a/icon-themes/breeze/cmd/lc_pagecolumntype.png and 
b/icon-themes/breeze/cmd/lc_pagecolumntype.png differ
diff --git a/icon-themes/breeze/cmd/lc_pagemargin.png 
b/icon-themes/breeze/cmd/lc_pagemargin.png
index 51ba15145acd..b8fee2d87c2d 100644
Binary files a/icon-themes/breeze/cmd/lc_pagemargin.png and 
b/icon-themes/breeze/cmd/lc_pagemargin.png differ
diff --git a/icon-themes/breeze/cmd/sc_orientation.png 
b/icon-themes/breeze/cmd/sc_orientation.png
new file mode 100644
index ..e82a84400a0b
Binary files /dev/null and b/icon-themes/breeze/cmd/sc_orientation.png differ
diff --git a/icon-themes/breeze_dark/cmd/32/orientation.png 
b/icon-themes/breeze_dark/cmd/32/orientation.png
new file mode 100644
index ..0181fbe2c820
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/orientation.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_orientation.png 
b/icon-themes/breeze_dark/cmd/lc_orientation.png
new file mode 100644
index ..2c0de2fd6903
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_orientation.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_pagecolumntype.png 
b/icon-themes/breeze_dark/cmd/lc_pagecolumntype.png
new file mode 100644
index ..4b92e4264869
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_pagecolumntype.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_pagemargin.png 
b/icon-themes/breeze_dark/cmd/lc_pagemargin.png
new file mode 100644
index ..a43059c25c1a
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_pagemargin.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/sc_linenumberdialog.png 
b/icon-themes/breeze_dark/cmd/sc_linenumberdialog.png
new file mode 100644
index ..772b0aeb582a
Binary files /dev/null and 
b/icon-themes/breeze_dark/cmd/sc_linenumberdialog.png differ
diff --git a/icon-themes/breeze_dark/cmd/sc_orientation.png 
b/icon-themes/breeze_dark/cmd/sc_orientation.png
new file mode 100644
index ..218c8477cd97
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_orientation.png 
differ
diff --git a/icon-themes/breeze_svg/cmd/32/orientation.svg 
b/icon-themes/breeze_svg/cmd/32/orientation.svg
new file mode 100644
index ..0b95591545ec
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/32/orientation.svg
@@ -0,0 +1,92 @@
+
+
+
+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";
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="orientation.svg"
+   viewBox="0 0 32 32">
+  
+  
+
+
+
+
+
+  
+  
+

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

2017-03-19 Thread Caolán McNamara

 filter/source/msfilter/msdffimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd3e18c2cfca66d2efdc7662bae38ce72a2f8d40
Author: CaolÃ¡n McNamara 
Date:   Sun Mar 19 10:22:03 2017 +

ofz#907 divide by zero

Change-Id: I663761239efe195b2051cf4410eca2a3362e5de8

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index e32a7cc48600..8d740fe83aba 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2404,7 +2404,7 @@ void 
DffPropertyReader::ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxIt
 rIn.ReadUInt16( nNumElemVert ).ReadUInt16( nNumElemMemVert 
).ReadUInt16( nElemSizeVert );
 
 bool bImport = false;
-if (nNumElemVert)
+if (nNumElemVert && nElemSizeVert)
 {
 //sanity check that the stream is long enough to fulfill 
nNumElemVert * nElemSizeVert;
 bImport = rIn.remainingSize() / nElemSizeVert >= nNumElemVert;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source connectivity/source desktop/unx editeng/source extensions/source filter/source fpicker/source framework/inc include/connectivity include/svtools include/sv

2017-03-19 Thread Andrea Gelmini

 basic/source/runtime/runtime.cxx   |2 +-
 connectivity/source/drivers/file/FNoException.cxx  |6 +++---
 desktop/unx/source/splashx.c   |2 +-
 editeng/source/misc/hangulhanja.cxx|2 +-
 extensions/source/ole/oleobjw.cxx  |2 +-
 extensions/source/propctrlr/formcomponenthandler.cxx   |2 +-
 filter/source/config/cache/filterfactory.cxx   |2 +-
 fpicker/source/win32/filepicker/asynceventnotifier.cxx |2 +-
 framework/inc/helper/statusindicatorfactory.hxx|2 +-
 framework/inc/threadhelp/transactionmanager.hxx|2 +-
 include/connectivity/CommonTools.hxx   |2 +-
 include/svtools/wizardmachine.hxx  |2 +-
 include/svx/svdpntv.hxx|2 +-
 sc/source/filter/inc/xiview.hxx|2 +-
 sc/source/ui/view/printfun.cxx |2 +-
 scripting/source/pyprov/pythonscript.py|2 +-
 sd/README_REMOTE   |2 +-
 sd/source/ui/view/Outliner.cxx |2 +-
 sfx2/source/dialog/backingcomp.cxx |4 ++--
 sfx2/source/dialog/filedlghelper.cxx   |2 +-
 shell/source/tools/lngconvex/lngconvex.cxx |2 +-
 svx/source/dialog/docrecovery.cxx  |4 ++--
 sw/inc/doc.hxx |2 +-
 sw/source/core/docnode/ndtbl.cxx   |2 +-
 sw/source/core/text/txtftn.cxx |2 +-
 test/source/sheet/xnamedrange.cxx  |2 +-
 vcl/osx/DataFlavorMapping.hxx  |2 +-
 vcl/source/filter/igif/gifread.cxx |2 +-
 wizards/com/sun/star/wizards/agenda/AgendaDocument.py  |2 +-
 xmloff/source/draw/sdxmlexp.cxx|2 +-
 30 files changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 47a9523f3fdc0bde2103e3c247fe9a74ab96af81
Author: Andrea Gelmini 
Date:   Sat Mar 18 15:36:19 2017 +0100

Fix typos + some German translations

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

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 2e342c992c37..7f01c6d1ff9e 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -172,7 +172,7 @@ SbiRuntime::pStep0 SbiRuntime::aStep0[] = { // all opcodes 
without operands
 &SbiRuntime::StepERASE, // delete TOS
 // branch
 &SbiRuntime::StepSTOP,  // program end
-&SbiRuntime::StepINITFOR,   // intitialize FOR-Variable
+&SbiRuntime::StepINITFOR,   // initialize FOR-Variable
 &SbiRuntime::StepNEXT,  // increment FOR-Variable
 &SbiRuntime::StepCASE,  // beginning CASE
 &SbiRuntime::StepENDCASE,   // end CASE
diff --git a/connectivity/source/drivers/file/FNoException.cxx 
b/connectivity/source/drivers/file/FNoException.cxx
index 9fad4f8d3acc..d1392bf7027a 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -69,13 +69,13 @@ void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
 
 void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,std::vector< 
OSQLParseNode*>& _rParaNodes)
 {
-DBG_ASSERT(pParseNode != nullptr,"OResultSet: interner Fehler: ungueltiger 
ParseNode");
+DBG_ASSERT(pParseNode != nullptr,"OResultSet: internal error: invalid 
ParseNode");
 
 // found parameter Name-Rule?
 if (SQL_ISRULE(pParseNode,parameter))
 {
-DBG_ASSERT(pParseNode->count() >= 1,"OResultSet: Parse Tree 
fehlerhaft");
-DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == 
SQLNodeType::Punctuation,"OResultSet: Parse Tree fehlerhaft");
+DBG_ASSERT(pParseNode->count() >= 1,"OResultSet: faulty Parse Tree");
+DBG_ASSERT(pParseNode->getChild(0)->getNodeType() == 
SQLNodeType::Punctuation,"OResultSet: faulty Parse Tree");
 
 _rParaNodes.push_back(pParseNode);
 // Further descend not necessary
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 7166738b0936..74c071157f00 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -396,7 +396,7 @@ static void suppress_decorations(struct splash* splash)
 }
 
 /**
- * Connects to the display and initiales splash with the screen details
+ * Connects to the display and initializes splash with the screen details
  *
  * @return Success: 1; Failure: 0
  */
diff --git a/editeng/source/misc/hangulhanja.cxx 
b/editeng/source/misc/hangulhanja.cxx
index 54bdaea9f2a3..7611fe509172 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -566,7 +566,7 @@ na

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-03-19 Thread andreas kainz

 icon-themes/breeze/cmd/32/titlepagedialog.png  |binary
 icon-themes/breeze/cmd/lc_titlepagedialog.png  |binary
 icon-themes/breeze/cmd/sc_titlepagedialog.png  |binary
 icon-themes/breeze_dark/cmd/32/titlepagedialog.png |binary
 icon-themes/breeze_dark/cmd/lc_titlepagedialog.png |binary
 icon-themes/breeze_dark/cmd/sc_titlepagedialog.png |binary
 icon-themes/breeze_svg/cmd/32/titlepagedialog.svg  |   99 +++
 icon-themes/breeze_svg/cmd/lc_titlepagedialog.svg  |  131 +++
 icon-themes/breeze_svg/cmd/sc_titlepagedialog.svg  |  176 +
 9 files changed, 406 insertions(+)

New commits:
commit 6b9498c65b0a549e97c287439131759aac3abc1b
Author: andreas kainz 
Date:   Sun Mar 19 01:23:50 2017 +0100

add titlepagedialog breeze icon

Change-Id: Ic7d30eb0c5ab85cdd62fb7d07e3d22c8352af47d
Reviewed-on: https://gerrit.libreoffice.org/35417
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/breeze/cmd/32/titlepagedialog.png 
b/icon-themes/breeze/cmd/32/titlepagedialog.png
new file mode 100644
index ..2975c09d8dd3
Binary files /dev/null and b/icon-themes/breeze/cmd/32/titlepagedialog.png 
differ
diff --git a/icon-themes/breeze/cmd/lc_titlepagedialog.png 
b/icon-themes/breeze/cmd/lc_titlepagedialog.png
new file mode 100644
index ..e209cf00e041
Binary files /dev/null and b/icon-themes/breeze/cmd/lc_titlepagedialog.png 
differ
diff --git a/icon-themes/breeze/cmd/sc_titlepagedialog.png 
b/icon-themes/breeze/cmd/sc_titlepagedialog.png
new file mode 100644
index ..30b11d21dd1b
Binary files /dev/null and b/icon-themes/breeze/cmd/sc_titlepagedialog.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/32/titlepagedialog.png 
b/icon-themes/breeze_dark/cmd/32/titlepagedialog.png
new file mode 100644
index ..686ebb39a4a2
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/titlepagedialog.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_titlepagedialog.png 
b/icon-themes/breeze_dark/cmd/lc_titlepagedialog.png
new file mode 100644
index ..15989a49a10d
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_titlepagedialog.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/sc_titlepagedialog.png 
b/icon-themes/breeze_dark/cmd/sc_titlepagedialog.png
new file mode 100644
index ..b19737ec3875
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_titlepagedialog.png 
differ
diff --git a/icon-themes/breeze_svg/cmd/32/titlepagedialog.svg 
b/icon-themes/breeze_svg/cmd/32/titlepagedialog.svg
new file mode 100644
index ..98000c3cfdb8
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/32/titlepagedialog.svg
@@ -0,0 +1,99 @@
+
+
+
+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";
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="titlepagedialog.svg"
+   viewBox="0 0 32 32">
+  
+  
+
+
+
+
+
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+
+
+  
+
diff --git a/icon-themes/breeze_svg/cmd/lc_titlepagedialog.svg 
b/icon-themes/breeze_svg/cmd/lc_titlepagedialog.svg
new file mode 100644
index ..2d7ad052569c
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/lc_titlepagedialog.svg
@@ -0,0 +1,131 @@
+
+
+
+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";
+   width="24"
+   height="24"
+   id="svg3760"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="lc_inserttitlefield.svg">
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+
+  
+  
+
+  
+
diff --git a/icon-themes/breeze_svg/cmd/sc_titlepagedialog.svg 
b/icon-themes/breeze_svg/cmd/sc_titlepagedialog.svg
new file mode 100644
index ..fcda7938a1f7
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/sc_titlepagedialog.svg
@@ -0,0 +1,176 @@
+
+
+
+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:/

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-03-19 Thread andreas kainz

 icon-themes/breeze/cmd/32/tablenumberformatdialog.png  |binary
 icon-themes/breeze_dark/cmd/32/tablenumberformatdialog.png |binary
 icon-themes/breeze_svg/cmd/32/tablenumberformatdialog.svg  |   97 +
 3 files changed, 97 insertions(+)

New commits:
commit b0ced895244bd7c727c3c50bc4d3c2e05c47074f
Author: andreas kainz 
Date:   Sat Mar 18 13:07:08 2017 +0100

add tablenumberformatdialog icon for 32px Breeze size

Change-Id: I0f93f3478b8320215ebf8ad4a6ea69182f62c51f
Reviewed-on: https://gerrit.libreoffice.org/35399
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/breeze/cmd/32/tablenumberformatdialog.png 
b/icon-themes/breeze/cmd/32/tablenumberformatdialog.png
new file mode 100644
index ..9bc92447cb82
Binary files /dev/null and 
b/icon-themes/breeze/cmd/32/tablenumberformatdialog.png differ
diff --git a/icon-themes/breeze_dark/cmd/32/tablenumberformatdialog.png 
b/icon-themes/breeze_dark/cmd/32/tablenumberformatdialog.png
new file mode 100644
index ..2ec9f1f10edd
Binary files /dev/null and 
b/icon-themes/breeze_dark/cmd/32/tablenumberformatdialog.png differ
diff --git a/icon-themes/breeze_svg/cmd/32/tablenumberformatdialog.svg 
b/icon-themes/breeze_svg/cmd/32/tablenumberformatdialog.svg
new file mode 100644
index ..33d11c938b08
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/32/tablenumberformatdialog.svg
@@ -0,0 +1,97 @@
+
+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";
+   viewBox="0 0 32 32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tablenumberformatdialog.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+
+  
+  
+
+  .ColorScheme-Text {
+color:#4d4d4d;
+  }
+  
+
+  
+  
+  
+  
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-03-19 Thread andreas kainz

 icon-themes/breeze/cmd/32/entirecell.png  |binary
 icon-themes/breeze_dark/cmd/32/entirecell.png |binary
 icon-themes/breeze_svg/cmd/32/entirecell.svg  |  104 ++
 3 files changed, 104 insertions(+)

New commits:
commit 53bfc6de0db07036c8c27418e6eace55fbc4ff15
Author: andreas kainz 
Date:   Sat Mar 18 12:27:31 2017 +0100

add entirecell for 32px

Change-Id: I0b2e2cc3cad9835d4fb3e13c43eab626079d7d23
Reviewed-on: https://gerrit.libreoffice.org/35397
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/breeze/cmd/32/entirecell.png 
b/icon-themes/breeze/cmd/32/entirecell.png
new file mode 100644
index ..f240f10e1c21
Binary files /dev/null and b/icon-themes/breeze/cmd/32/entirecell.png differ
diff --git a/icon-themes/breeze_dark/cmd/32/entirecell.png 
b/icon-themes/breeze_dark/cmd/32/entirecell.png
new file mode 100644
index ..90867f88b2da
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/entirecell.png 
differ
diff --git a/icon-themes/breeze_svg/cmd/32/entirecell.svg 
b/icon-themes/breeze_svg/cmd/32/entirecell.svg
new file mode 100644
index ..2806f51abc95
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/32/entirecell.svg
@@ -0,0 +1,104 @@
+
+
+
+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";
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="entirecell.svg"
+   viewBox="0 0 32 32">
+  
+  
+
+
+
+
+
+  
+  
+
+  
+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: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-03-19 Thread andreas kainz

 dev/null |binary
 icon-themes/breeze/links.txt |   14 +
 icon-themes/breeze_dark/links.txt|   14 +
 icon-themes/breeze_svg/cmd/lc_showtrackedchanges.svg |  144 ---
 icon-themes/breeze_svg/cmd/sc_showtrackedchanges.svg |  108 --
 icon-themes/breeze_svg/links.txt |   14 +
 6 files changed, 24 insertions(+), 270 deletions(-)

New commits:
commit e6341a94852187893ecd5cde54c9eda33e93d2fa
Author: andreas kainz 
Date:   Fri Mar 17 20:17:51 2017 +0100

update showtrackedchanges icon with addwatch

Change-Id: Icbde59ec6f2b99560dc110a5f5d28a08d05fe71f
Reviewed-on: https://gerrit.libreoffice.org/35378
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/breeze/cmd/32/showtrackedchanges.png 
b/icon-themes/breeze/cmd/32/showtrackedchanges.png
deleted file mode 100644
index 44df648e70d3..
Binary files a/icon-themes/breeze/cmd/32/showtrackedchanges.png and /dev/null 
differ
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index efd6d78d182e..a0b7f1d500a8 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -188,8 +188,10 @@ cmd/lc_hscrollbar.png cmd/lc_insertformhscroll.png
 cmd/sc_hscrollbar.png cmd/sc_insertformhscroll.png
 
 # Annotations
-cmd/sc_insertannotation.png cmd/sc_showannotations.png
-cmd/lc_insertannotation.png cmd/lc_showannotations.png
+cmd/sc_showannotations.png cmd/sc_addwatch.png
+cmd/lc_showannotations.png cmd/lc_addwatch.png
+cmd/sc_insertannotation.png cmd/sc_addwatch.png
+cmd/lc_insertannotation.png cmd/lc_addwatch.png
 
 # Template Menu
 cmd/sc_templatemenu.png cmd/sc_adddirect.png
@@ -1064,7 +1066,7 @@ sc/res/na011.png cmd/lc_ok.png
 sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
 sc/res/nc04.png cmd/sc_gallery.png
 sc/res/nc05.png cmd/sc_insertobject.png
-sc/res/nc06.png cmd/sc_showannotations.png
+sc/res/nc06.png cmd/sc_addwatch.png
 sc/res/nc07.png sc/res/droplink.png
 sc/res/nc08.png cmd/sc_gallery.png
 sc/res/sc26047.png cmd/sc_dbviewfunctions.png
@@ -1099,7 +1101,7 @@ sd/res/sf01.png cmd/sc_showfmexplorer.png
 sd/res/sf02.png cmd/sc_dia.png
 
 sd/res/breakplayingblue_16.png cmd/sc_mediapause.png
-sd/res/comments_indicator.png cmd/sc_showannotations.png
+sd/res/comments_indicator.png cmd/sc_addwatch.png
 sd/res/get1obj.png cmd/sc_selectobject.png
 sd/res/getallob.png cmd/sc_selectall.png
 sd/res/group.png cmd/sc_group.png
@@ -1236,7 +1238,7 @@ svx/res/notcertificate_16.png 
xmlsecurity/res/notcertificate_16.png
 
 svx/res/nu01.png cmd/sc_ok.png
 svx/res/nu02.png cmd/sc_cancel.png
-svx/res/nu03.png cmd/sc_showannotations.png
+svx/res/nu03.png cmd/sc_addwatch.png
 
 svx/res/ole.png cmd/sc_insertobject.png
 svx/res/persp3d.png cmd/lc_extrusiondirectionfloater.png
@@ -1276,7 +1278,7 @@ sw/res/nc20005.png cmd/sc_insertbookmark.png
 sw/res/nc20007.png cmd/sc_inserthyperlink.png
 sw/res/nc20008.png cmd/sc_insertreferencefield.png
 sw/res/nc20009.png cmd/sc_insertindexesentry.png
-sw/res/nc20010.png cmd/sc_showannotations.png
+sw/res/nc20010.png cmd/sc_addwatch.png
 sw/res/nc20011.png cmd/sc_toggleobjectbeziermode.png
 
 sw/res/re01.png cmd/lc_unsetcellsreadonly.png
diff --git a/icon-themes/breeze_dark/cmd/32/showtrackedchanges.png 
b/icon-themes/breeze_dark/cmd/32/showtrackedchanges.png
deleted file mode 100644
index b21f3e3107a0..
Binary files a/icon-themes/breeze_dark/cmd/32/showtrackedchanges.png and 
/dev/null differ
diff --git a/icon-themes/breeze_dark/cmd/lc_showtrackedchanges.png 
b/icon-themes/breeze_dark/cmd/lc_showtrackedchanges.png
deleted file mode 100644
index e470cbb5448b..
Binary files a/icon-themes/breeze_dark/cmd/lc_showtrackedchanges.png and 
/dev/null differ
diff --git a/icon-themes/breeze_dark/cmd/sc_showtrackedchanges.png 
b/icon-themes/breeze_dark/cmd/sc_showtrackedchanges.png
deleted file mode 100644
index eccec5f93a6c..
Binary files a/icon-themes/breeze_dark/cmd/sc_showtrackedchanges.png and 
/dev/null differ
diff --git a/icon-themes/breeze_dark/links.txt 
b/icon-themes/breeze_dark/links.txt
index efd6d78d182e..a0b7f1d500a8 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -188,8 +188,10 @@ cmd/lc_hscrollbar.png cmd/lc_insertformhscroll.png
 cmd/sc_hscrollbar.png cmd/sc_insertformhscroll.png
 
 # Annotations
-cmd/sc_insertannotation.png cmd/sc_showannotations.png
-cmd/lc_insertannotation.png cmd/lc_showannotations.png
+cmd/sc_showannotations.png cmd/sc_addwatch.png
+cmd/lc_showannotations.png cmd/lc_addwatch.png
+cmd/sc_insertannotation.png cmd/sc_addwatch.png
+cmd/lc_insertannotation.png cmd/lc_addwatch.png
 
 # Template Menu
 cmd/sc_templatemenu.png cmd/sc_adddirect.png
@@ -1064,7 +1066,7 @@ sc/res/na011.png cmd/lc_ok.png
 sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
 sc/res/nc04.png cmd/sc_gallery.png
 sc/res/nc05.png cmd/sc_insertobject.png
-sc/res/nc

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

2017-03-19 Thread andreas kainz

 icon-themes/breeze/res/savemodified_extralarge.png  |binary
 icon-themes/breeze_dark/res/savemodified_extralarge.png |binary
 icon-themes/breeze_svg/res/savemodified_extralarge.svg  |   82 
 3 files changed, 82 insertions(+)

New commits:
commit e1b9714aa8a6ac6833d3368303a1ef362aa1ccb4
Author: andreas kainz 
Date:   Fri Mar 17 12:10:46 2017 +0100

add savemodified_extralarge icon to breeze

Change-Id: I3ef5d0ef0d2d65478a281aca406ca14ecc075b90
Reviewed-on: https://gerrit.libreoffice.org/35327
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/breeze/res/savemodified_extralarge.png 
b/icon-themes/breeze/res/savemodified_extralarge.png
new file mode 100644
index ..9cb7207c
Binary files /dev/null and b/icon-themes/breeze/res/savemodified_extralarge.png 
differ
diff --git a/icon-themes/breeze_dark/res/savemodified_extralarge.png 
b/icon-themes/breeze_dark/res/savemodified_extralarge.png
new file mode 100644
index ..155b5cfa162c
Binary files /dev/null and 
b/icon-themes/breeze_dark/res/savemodified_extralarge.png differ
diff --git a/icon-themes/breeze_svg/res/savemodified_extralarge.svg 
b/icon-themes/breeze_svg/res/savemodified_extralarge.svg
new file mode 100644
index ..8e9011f5822a
--- /dev/null
+++ b/icon-themes/breeze_svg/res/savemodified_extralarge.svg
@@ -0,0 +1,82 @@
+
+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";
+   viewBox="0 0 32 32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="savemodified_extralarge.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+  
+
+  
+  
+
+  
+  
+
+  .ColorScheme-Text {
+color:#4d4d4d;
+  }
+  
+  
+  
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to pack a proper zip file with Basic

2017-03-19 Thread Heiko Tietze

Thanks a lot for your code snippet and the heads-up. It's almost the same code, 
and after double-checking the minor differences with no success the issue must 
have been caused by something else. That brought me to the slash in the 
filename. And eventually it works now like a charm.


On 03/19/2017 09:32 AM, Oliver Brinzing wrote:
> Hi Heiko,
> 
> following code works for me to create a new zip archive and add a file
> 
> Regards
> Oliver
> 
> OPTION EXPLICIT
> 
> Sub Test()
> 
> Dim oZipArchive as Variant
>  Dim aArg As New com.sun.star.beans.NamedValue
> Dim SURL as String
> Dim sFile as String
> 
> sURL = ConvertToURL("D:\TEMP\")
> oZipArchive = createUnoService("com.sun.star.packages.Package")
> 
> aArg.Name = "PackageFormat"
> aArg.Value = True
> oZipArchive.initialize(Array(sURL & "test.zip", aArg))
> 
> sFile = "test.txt"
> Call AddFiletoZipArchive(oZipArchive, sURL, sFile)
> 
> End Sub
> 
> Sub AddFiletoZipArchive(oZipArchive as Object, ByVal sUrl as String, ByVal 
> sFile as String)
> 
> On Local Error Goto ErrorHandler
> 
> Dim oSimpleFileAccess as Object
> Dim oInputStream as Object
> Dim oStream as Object
> Dim oPosition as Object
> Dim mArgs(0) as Variant
> 
> mArgs(0) = False
> 
> oStream = oZipArchive.createInstanceWithArguments(mArgs())
> oSimpleFileAccess = CreateUnoService("com.sun.star.ucb.SimpleFileAccess")
> oInputStream = oSimpleFileAccess.openFileRead(sURL & sFile)
> oStream.setInputStream(oInputStream)
> 
> oPosition = oZipArchive.getByHierarchicalName("")
> oPosition.insertByName(sFile, oStream)
> oZipArchive.commitChanges()
> oInputStream.closeInput()
> 
> Exit Sub
> ErrorHandler:
> MsgBox Err() & " - " & Error() & " - Row: " & Erl()
> End Sub
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

-- 
Dr. Heiko Tietze
UX Designer
Tel. +49 (0)179/1268509



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

Re: How to pack a proper zip file with Basic

2017-03-19 Thread Oliver Brinzing


Hi Heiko,

following code works for me to create a new zip archive and add a file

Regards
Oliver

OPTION EXPLICIT

Sub Test()

Dim oZipArchive as Variant
Dim aArg As New com.sun.star.beans.NamedValue
Dim SURL as String
Dim sFile as String

sURL = ConvertToURL("D:\TEMP\")
oZipArchive = createUnoService("com.sun.star.packages.Package")

aArg.Name = "PackageFormat"
aArg.Value = True
oZipArchive.initialize(Array(sURL & "test.zip", aArg))

sFile = "test.txt"
Call AddFiletoZipArchive(oZipArchive, sURL, sFile)

End Sub

Sub AddFiletoZipArchive(oZipArchive as Object, ByVal sUrl as String, ByVal 
sFile as String)

On Local Error Goto ErrorHandler

Dim oSimpleFileAccess as Object
Dim oInputStream as Object
Dim oStream as Object
Dim oPosition as Object
Dim mArgs(0) as Variant

mArgs(0) = False

oStream = oZipArchive.createInstanceWithArguments(mArgs())
oSimpleFileAccess = 
CreateUnoService("com.sun.star.ucb.SimpleFileAccess")
oInputStream = oSimpleFileAccess.openFileRead(sURL & sFile)
oStream.setInputStream(oInputStream)

oPosition = oZipArchive.getByHierarchicalName("")
oPosition.insertByName(sFile, oStream)
oZipArchive.commitChanges()
oInputStream.closeInput()

Exit Sub
ErrorHandler:
MsgBox Err() & " - " & Error() & " - Row: " & Erl()
End Sub

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

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

2017-03-19 Thread Khaled Hosny

 vcl/inc/CommonSalLayout.hxx|2 -
 vcl/source/gdi/CommonSalLayout.cxx |   57 +
 2 files changed, 41 insertions(+), 18 deletions(-)

New commits:
commit 49eadd40b5f0de6fa97498d89f20118b996385d2
Author: Khaled Hosny 
Date:   Sun Mar 5 00:04:35 2017 +0200

Handle Tr vertical orientation before shaping

See https://github.com/behdad/harfbuzz/issues/355

(cherry picked from commit 5c617a811724a45dd8688869eeafac4c44f6a8aa)

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

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 58cba16e63d4..496d17125835 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -60,7 +60,7 @@ class CommonSalLayout : public GenericSalLayout
 voidgetScale(double* nXScale, double* nYScale);
 
 hb_set_t*   mpVertGlyphs;
-boolIsVerticalAlternate(hb_codepoint_t nGlyphIndex);
+boolHasVerticalAlternate(sal_UCS4 aChar, sal_UCS4 
aNextChar);
 
 public:
 #if defined(_WIN32)
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index a6ca683c15f5..df2849828df7 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -409,12 +409,16 @@ void CommonSalLayout::DrawText(SalGraphics& rSalGraphics) 
const
 rSalGraphics.DrawSalLayout( *this );
 }
 
-// Find if the given glyph index can result from applying âvertâ feature.
+// Find if the nominal glyph of the character is an input to âvertâ 
feature.
 // We donât check for a specific script or language as it shouldnât matter
 // here; if the glyph would be the result from applying âvertâ for any
 // script/language then we want to always treat it as upright glyph.
-bool CommonSalLayout::IsVerticalAlternate(hb_codepoint_t nGlyphIndex)
+bool CommonSalLayout::HasVerticalAlternate(sal_UCS4 aChar, sal_UCS4 
aVariationSelector)
 {
+hb_codepoint_t nGlyphIndex = 0;
+if (!hb_font_get_glyph(mpHbFont, aChar, aVariationSelector, &nGlyphIndex))
+return false;
+
 if (!mpVertGlyphs)
 {
 hb_face_t* pHbFace = hb_font_get_face(mpHbFont);
@@ -432,7 +436,11 @@ bool CommonSalLayout::IsVerticalAlternate(hb_codepoint_t 
nGlyphIndex)
 while (hb_set_next(pLookups, &nIdx))
 {
 hb_set_t* pGlyphs = hb_set_create();
-hb_ot_layout_lookup_collect_glyphs(pHbFace, HB_OT_TAG_GSUB, 
nIdx, nullptr, nullptr, nullptr, pGlyphs);
+hb_ot_layout_lookup_collect_glyphs(pHbFace, HB_OT_TAG_GSUB, 
nIdx,
+nullptr,  // glyphs before
+pGlyphs,  // glyphs input
+nullptr,  // glyphs after
+nullptr); // glyphs out
 hb_set_union(mpVertGlyphs, pGlyphs);
 }
 }
@@ -516,16 +524,37 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 {
 sal_Int32 nPrevIdx = nIdx;
 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx);
-switch (vcl::GetVerticalOrientation(aChar))
+VerticalOrientation aVo = 
vcl::GetVerticalOrientation(aChar);
+
+sal_UCS4 aVariationSelector = 0;
+if (nIdx < nEndRunPos)
+{
+sal_Int32 nNextIdx = nIdx;
+sal_UCS4 aNextChar = 
rArgs.mrStr.iterateCodePoints(&nNextIdx);
+if (u_hasBinaryProperty(aNextChar, 
UCHAR_VARIATION_SELECTOR))
+{
+nIdx = nNextIdx;
+aVariationSelector = aNextChar;
+}
+}
+
+// Charters with U and Tu vertical orientation should
+// be shaped in vertical direction. But characters
+// with Tr should be shaped in vertical direction
+// only if they have vertical alternates, otherwise
+// they should be shaped in horizontal direction
+// and then rotated.
+// See http://unicode.org/reports/tr50/#vo
+if (aVo == VerticalOrientation::Upright ||
+aVo == VerticalOrientation::TransformedUpright ||
+(aVo == VerticalOrientation::TransformedRotated &&
+ HasVerticalAlternate(aChar, aVariationSelector)))
 {
-case VerticalOrientation::Upright:
-case VerticalOrientation::TransformedUpright:
-case VerticalOrientation::TransformedRotated:
 aDirection = HB_DIRECTION_TTB;
-

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

2017-03-19 Thread Mark Hung

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

New commits:
commit 465da7d95e17367e615ec5ef65f368d89c8d7f5d
Author: Mark Hung 
Date:   Fri Mar 17 20:00:03 2017 +0800

tdf#106295 fix vertical orientation for fullwidth colon and semicolon.

Chinese users would expect fullwidth colon (U+FF1A) and semi-colon (U+FF1B)
to be Tu( transformed upright ) instead of Tr ( Transformed rotated ) in
vertical writing mode. Make them exceptions of UTR50 when language is zh.

Change-Id: If7d01199973d73136a621bf2f32377da76ccb22a
Reviewed-on: https://gerrit.libreoffice.org/34980
Reviewed-by: Khaled Hosny 
Tested-by: Jenkins 
Reviewed-on: https://gerrit.libreoffice.org/35382

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index df2849828df7..4d8d65f9501c 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -330,8 +330,12 @@ namespace vcl {
 
 #include "VerticalOrientationData.cxx"
 
-VerticalOrientation GetVerticalOrientation(sal_UCS4 cCh)
+VerticalOrientation GetVerticalOrientation(sal_UCS4 cCh, const 
LanguageTag& rTag)
 {
+// Override fullwidth colon and semi-colon orientation. Tu is 
preferred.
+if ((cCh == 0xff1a || cCh == 0xff1b) && rTag.getLanguage() == "zh")
+return VerticalOrientation::TransformedUpright;
+
 uint8_t nRet = 1;
 
 if (cCh < 0x1)
@@ -524,7 +528,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 {
 sal_Int32 nPrevIdx = nIdx;
 sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx);
-VerticalOrientation aVo = 
vcl::GetVerticalOrientation(aChar);
+VerticalOrientation aVo = 
vcl::GetVerticalOrientation(aChar, rArgs.maLanguageTag);
 
 sal_UCS4 aVariationSelector = 0;
 if (nIdx < nEndRunPos)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

67 matches

Mail list logo