[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

2016-08-26 Thread Kay Schenk 
 set_soenv.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22922b027b97cbd7df967f6a8ae26e8b6f7fc2e1
Author: Kay Schenk 
Date:   Sat Aug 27 00:11:53 2016 +

Commented out reference to HAMCREST_CORE_JAR since it is not used in 
current configure.ac.

diff --git a/set_soenv.in b/set_soenv.in
index 52868de..0d8aa6a 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1650,7 +1650,7 @@ ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@","e" );
-ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
+# ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
 ToFile( "SAC_JAR",   "@SAC_JAR@",  "e" );
 ToFile( "LIBXML_JAR","@LIBXML_JAR@",   "e" );
 ToFile( "FLUTE_JAR", "@FLUTE_JAR@","e" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

2016-08-26 Thread Armin Le Grand 
Rebased ref, commits from common ancestor:
commit 3fd40763973eb02019a7ffe67f7c10511624b73d
Author: Armin Le Grand 
Date:   Fri Aug 26 16:26:34 2016 +0200

screenshot: fixup some details for screenshot dlg

Edge-rounding and linewidth for selection/cursor, default
filename for save dialog. Code cosmetics.

Change-Id: I8a76d68f4f3070458ec4ba51a81bb046057218ab

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index aad891f..e2a9b4c 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -29,6 +29,14 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -247,8 +255,7 @@ 
ScreenshotAnnotationDlg_Impl::~ScreenshotAnnotationDlg_Impl()
 
 IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, 
pButton, void)
 {
-// suppress compiler warning
-(*pButton);
+(void)pButton;
 
 // 'save screenshot...' pressed, offer to save maParentDialogBitmap
 // as PNG image, use *.id file name as screenshot file name offering
@@ -272,7 +279,7 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 
 uno::Reference< uno::XComponentContext > xContext = 
cppu::defaultBootstrap_InitialComponentContext();
 const uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker =
-ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_SIMPLE);
+ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION);
 
 xFilePicker->setTitle(maSaveAsText);
 
@@ -281,9 +288,10 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 xFilePicker->setDisplayDirectory(maLastFolderURL);
 }
 
-xFilePicker->appendFilter("*.png", "*.PNG");
+xFilePicker->appendFilter("*.png", "*.png");
 xFilePicker->setCurrentFilter("*.png");
-xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8)); // +".png");
+xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8));
+xFilePicker->setMultiSelectionMode(sal_False);
 
 if (xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK)
 {
@@ -338,10 +346,8 @@ ControlDataEntry* 
ScreenshotAnnotationDlg_Impl::CheckHit(const basegfx::B2IPoint
 {
 ControlDataEntry* pRetval = nullptr;
 
-for (auto aCandidate = maAllChildren.begin(); aCandidate != 
maAllChildren.end(); aCandidate++)
+for (auto&& rCandidate : maAllChildren)
 {
-ControlDataEntry& rCandidate = *aCandidate;
-
 if (rCandidate.getB2IRange().isInside(rPosition))
 {
 if (pRetval)
@@ -370,26 +376,34 @@ void ScreenshotAnnotationDlg_Impl::PaintControlDataEntry(
 {
 if (mpPicture && mpVirtualBufferDevice)
 {
-const basegfx::B2IRange& rRange = rEntry.getB2IRange();
-static double fRelativeEdgeRadius(0.1);
-basegfx::B2DRange aB2DRange(rRange);
-
-// grow one pixel to be a little bit outside
-aB2DRange.grow(1);
-
+basegfx::B2DRange aB2DRange(rEntry.getB2IRange());
+
+// grow in pixels to be a little bit 'outside'. This also
+// ensures that getWidth()/getHeight() ain't 0.0 (see division below)
+static double fGrowTopLeft(1.5);
+static double fGrowBottomRight(0.5);
+aB2DRange.expand(aB2DRange.getMinimum() - 
basegfx::B2DPoint(fGrowTopLeft, fGrowTopLeft));
+aB2DRange.expand(aB2DRange.getMaximum() + 
basegfx::B2DPoint(fGrowBottomRight, fGrowBottomRight));
+
+// edge rounding in pixel. Need to convert, value for
+// createPolygonFromRect is relative [0.0 .. 1.0]
+static double fEdgeRoundPixel(8.0);
 const basegfx::B2DPolygon aPolygon(
 basegfx::tools::createPolygonFromRect(
 aB2DRange,
-fRelativeEdgeRadius,
-fRelativeEdgeRadius));
+fEdgeRoundPixel / aB2DRange.getWidth(),
+fEdgeRoundPixel / aB2DRange.getHeight()));
+
 mpVirtualBufferDevice->SetLineColor(rColor);
 
+// try to use transparency
 if (!mpVirtualBufferDevice->DrawPolyLineDirect(
 aPolygon,
 fLineWidth,
 fTransparency,
 basegfx::B2DLineJoin::Round))
 {
+// no transparency, draw without
 mpVirtualBufferDevice->DrawPolyLine(
 aPolygon,
 fLineWidth,
@@ -423,10 +437,11 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
 Point(0, 0),
 bUseDimmed ? maDimmedDialogBitmap : maParentDialogBitmap);
 
-// get various options - sorry, no SvtOptionsDrawinglayer in vcl
-const Color 
aHilightColor(Application::GetSettings().GetStyleSettings().GetHi

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - 3 commits - cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/vcl l10ntools/sou

2016-08-26 Thread Armin Le Grand 
Rebased ref, commits from common ancestor:
commit c27384c1404a3339ef6a0c3606d056e8e7336844
Author: Armin Le Grand 
Date:   Fri Aug 26 16:26:34 2016 +0200

screenshot: fixup some details for screenshot dlg

Edge-rounding and linewidth for selection/cursor, default
filename for save dialog. Code cosmetics.

Change-Id: I8a76d68f4f3070458ec4ba51a81bb046057218ab

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index aad891f..58a3ab5 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -29,6 +29,14 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -247,8 +255,7 @@ 
ScreenshotAnnotationDlg_Impl::~ScreenshotAnnotationDlg_Impl()
 
 IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, saveButtonHandler, Button*, 
pButton, void)
 {
-// suppress compiler warning
-(*pButton);
+(void)pButton;
 
 // 'save screenshot...' pressed, offer to save maParentDialogBitmap
 // as PNG image, use *.id file name as screenshot file name offering
@@ -272,7 +279,7 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 
 uno::Reference< uno::XComponentContext > xContext = 
cppu::defaultBootstrap_InitialComponentContext();
 const uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker =
-ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_SIMPLE);
+ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION);
 
 xFilePicker->setTitle(maSaveAsText);
 
@@ -281,9 +288,10 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 xFilePicker->setDisplayDirectory(maLastFolderURL);
 }
 
-xFilePicker->appendFilter("*.png", "*.PNG");
+xFilePicker->appendFilter("*.png", "*.png");
 xFilePicker->setCurrentFilter("*.png");
-xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8)); // +".png");
+xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8));
+xFilePicker->setMultiSelectionMode(sal_False);
 
 if (xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK)
 {
@@ -338,7 +346,7 @@ ControlDataEntry* 
ScreenshotAnnotationDlg_Impl::CheckHit(const basegfx::B2IPoint
 {
 ControlDataEntry* pRetval = nullptr;
 
-for (auto aCandidate = maAllChildren.begin(); aCandidate != 
maAllChildren.end(); aCandidate++)
+for (auto aCandidate : maAllChildren)
 {
 ControlDataEntry& rCandidate = *aCandidate;
 
@@ -370,26 +378,34 @@ void ScreenshotAnnotationDlg_Impl::PaintControlDataEntry(
 {
 if (mpPicture && mpVirtualBufferDevice)
 {
-const basegfx::B2IRange& rRange = rEntry.getB2IRange();
-static double fRelativeEdgeRadius(0.1);
-basegfx::B2DRange aB2DRange(rRange);
-
-// grow one pixel to be a little bit outside
-aB2DRange.grow(1);
-
+basegfx::B2DRange aB2DRange(rEntry.getB2IRange());
+
+// grow in pixels to be a little bit 'outside'. This also
+// ensures that getWidth()/getHeight() ain't 0.0 (see division below)
+static double fGrowTopLeft(1.5);
+static double fGrowBottomRight(0.5);
+aB2DRange.expand(aB2DRange.getMinimum() - 
basegfx::B2DPoint(fGrowTopLeft, fGrowTopLeft));
+aB2DRange.expand(aB2DRange.getMaximum() + 
basegfx::B2DPoint(fGrowBottomRight, fGrowBottomRight));
+
+// edge rounding in pixel. Need to convert, value for
+// createPolygonFromRect is relative [0.0 .. 1.0]
+static double fEdgeRoundPixel(8.0);
 const basegfx::B2DPolygon aPolygon(
 basegfx::tools::createPolygonFromRect(
 aB2DRange,
-fRelativeEdgeRadius,
-fRelativeEdgeRadius));
+fEdgeRoundPixel / aB2DRange.getWidth(),
+fEdgeRoundPixel / aB2DRange.getHeight()));
+
 mpVirtualBufferDevice->SetLineColor(rColor);
 
+// try to use transparency
 if (!mpVirtualBufferDevice->DrawPolyLineDirect(
 aPolygon,
 fLineWidth,
 fTransparency,
 basegfx::B2DLineJoin::Round))
 {
+// no transparency, draw without
 mpVirtualBufferDevice->DrawPolyLine(
 aPolygon,
 fLineWidth,
@@ -423,10 +439,11 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
 Point(0, 0),
 bUseDimmed ? maDimmedDialogBitmap : maParentDialogBitmap);
 
-// get various options - sorry, no SvtOptionsDrawinglayer in vcl
-const Color 
aHilightColor(Application::GetSettings().GetStyleSettings().GetHighlightColor());
-const bool bIsAntiAliasing(true);
-const double fTransparence(0.4

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 59/b7d113bc939c00e8a2b8c395d1cfcb3e51b38b

2016-08-26 Thread Michael Stahl 
 59/b7d113bc939c00e8a2b8c395d1cfcb3e51b38b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f03d310bacd26b430a172c41fe5ab27b1d067e72
Author: Michael Stahl 
Date:   Sat Aug 27 01:15:49 2016 +0200

Notes added by 'git notes add'

diff --git a/59/b7d113bc939c00e8a2b8c395d1cfcb3e51b38b 
b/59/b7d113bc939c00e8a2b8c395d1cfcb3e51b38b
new file mode 100644
index 000..d4184fc
--- /dev/null
+++ b/59/b7d113bc939c00e8a2b8c395d1cfcb3e51b38b
@@ -0,0 +1 @@
+prefer: 81a7aeb0806298c7a8571a46e09f485f3cf5ea13
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Michael Stahl 
 download.lst   |6 
 external/redland/Library_raptor.mk |4 
 external/redland/Library_rasqal.mk |9 
 external/redland/UnpackedTarball_raptor.mk |1 
 external/redland/UnpackedTarball_redland.mk|2 
 external/redland/raptor/raptor-bundled-soname.patch.1  |6 
 external/redland/raptor/raptor-mingw.patch.1   |6 
 external/redland/raptor/raptor-msvc.patch.1|   10 
 external/redland/raptor/raptor2.h  |  101 +
 external/redland/raptor/raptor_config.h|   21 
 external/redland/rasqal/rasqal-bundled-soname.patch.1  |   10 
 external/redland/rasqal/rasqal-mingw.patch.1   |   10 
 external/redland/rasqal/rasqal-msvc.patch.1|  118 -
 external/redland/rasqal/rasqal-pkgconfig.patch.1   |  518 

 external/redland/rasqal/rasqal-xcompile.patch.1|7 
 external/redland/rasqal/rasqal.h   |   76 -
 external/redland/redland/librdf.h  |6 
 external/redland/redland/redland-msvc.patch.1  |   37 
 external/redland/redland/redland-pkgconfig.patch.1 |  619 
--
 external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 |   17 
 20 files changed, 270 insertions(+), 1314 deletions(-)

New commits:
commit 81a7aeb0806298c7a8571a46e09f485f3cf5ea13
Author: Michael Stahl 
Date:   Fri Aug 26 21:33:16 2016 +0200

redland: upgrade raptor to 2.0.15, rasqal to 0.9.33, redland to 1.0.17:

- drop rasqal-pkgconfig.patch.1:
  merged upstream
- drop most of rasqal-msvc.patch.1:
  merged upstream
- drop redland-query-rasqal-avoid-assert.patch.1:
  merged upstream
- drop redland-pkgconfig.patch.1:
  merged upstream

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

diff --git a/download.lst b/download.lst
index 337c086..c4ab49a 100644
--- a/download.lst
+++ b/download.lst
@@ -147,9 +147,9 @@ export PYTHON_MD5SUM := a56c0c0b45d75a0ec9c6dee933c41c36
 export PYTHON_TARBALL := Python-3.5.0.tgz
 endif
 
-export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
-export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
-export REDLAND_TARBALL := 
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
+export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
+export RASQAL_TARBALL := 1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz
+export REDLAND_TARBALL := 
e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
 export REVENGE_MD5SUM := 5b9ac52ec77d4d19157cf5962ebc0aea
 export REVENGE_VERSION_MICRO := 4
 export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
diff --git a/external/redland/Library_raptor.mk 
b/external/redland/Library_raptor.mk
index a7f5af5..333c294 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
UnpackedTarball/raptor/src/raptor_abbrev \
UnpackedTarball/raptor/src/raptor_avltree \
UnpackedTarball/raptor/src/raptor_concepts \
+   UnpackedTarball/raptor/src/raptor_escaped \
UnpackedTarball/raptor/src/raptor_general \
UnpackedTarball/raptor/src/raptor_guess \
UnpackedTarball/raptor/src/raptor_iostream \
@@ -44,6 +45,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
UnpackedTarball/raptor/src/raptor_log \
UnpackedTarball/raptor/src/raptor_memstr \
UnpackedTarball/raptor/src/raptor_namespace \
+   UnpackedTarball/raptor/src/raptor_ntriples \
UnpackedTarball/raptor/src/raptor_option \
UnpackedTarball/raptor/src/raptor_parse \
UnpackedTarball/raptor/src/raptor_qname \
@@ -55,6 +57,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
UnpackedTarball/raptor/src/raptor_serialize_ntriples \
UnpackedTarball/raptor/src/raptor_serialize_rdfxml \
UnpackedTarball/raptor/src/raptor_serialize_rdfxmla \
+   UnpackedTarball/raptor/src/raptor_serialize_turtle \
UnpackedTarball/raptor/src/raptor_set \
UnpackedTarball/raptor/src/raptor_statement \
UnpackedTarball/raptor/src/raptor_stringbuffer \
@@ -67,6 +70,7 @@ $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
UnpackedTarball/raptor/src/raptor_xml \
UnpackedTarball/raptor/src/raptor_xml_writer \
UnpackedTarball/raptor/src/snprintf \
+   UnpackedTarball/raptor/src/sort_r \
UnpackedTarball/raptor/src/strcasecmp \

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/apache-commons external/beanshell external/hsqldb external/jfreereport external/languagetool external/rhino

2016-08-26 Thread Thorsten Behrens 
 config_host.mk.in |1 
 configure.ac  |   75 
++
 external/apache-commons/ExternalProject_apache_commons_logging.mk |7 
 external/beanshell/ExternalProject_beanshell.mk   |7 
 external/hsqldb/ExternalProject_hsqldb.mk |7 
 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk   |7 
 external/jfreereport/ExternalProject_jfreereport_flute.mk |7 
 external/jfreereport/ExternalProject_jfreereport_libbase.mk   |7 
 external/jfreereport/ExternalProject_jfreereport_libfonts.mk  |7 
 external/jfreereport/ExternalProject_jfreereport_libformula.mk|7 
 external/jfreereport/ExternalProject_jfreereport_liblayout.mk |7 
 external/jfreereport/ExternalProject_jfreereport_libloader.mk |7 
 external/jfreereport/ExternalProject_jfreereport_librepository.mk |7 
 external/jfreereport/ExternalProject_jfreereport_libserializer.mk |7 
 external/jfreereport/ExternalProject_jfreereport_libxml.mk|7 
 external/jfreereport/ExternalProject_jfreereport_sac.mk   |7 
 external/languagetool/ExternalProject_languagetool.mk |7 
 external/rhino/ExternalProject_rhino.mk   |7 
 18 files changed, 52 insertions(+), 136 deletions(-)

New commits:
commit 7fe8c0b852fa421fe52de99a7f59e45027139eed
Author: Thorsten Behrens 
Date:   Fri Aug 26 14:31:52 2016 +0200

Remove gcj support from build system.

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 0ebdb8f..6094c7c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -289,7 +289,6 @@ export INSTDIR_FOR_BUILD=@INSTDIR_FOR_BUILD@
 export INSTROOT=@INSTROOT@
 export INSTROOT_FOR_BUILD=@INSTROOT_FOR_BUILD@
 export IWYU_PATH=@IWYU_PATH@
-export JAVACISGCJ=@JAVACISGCJ@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
diff --git a/configure.ac b/configure.ac
index 4fa4800..0cf2dba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6896,11 +6896,7 @@ if test "$ENABLE_JAVA" != ""; then
 if test `$JAVAINTERPRETER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then
 AC_MSG_ERROR([No valid check available. Please check the block for 
your desired java in configure.ac])
 elif test `$JAVAINTERPRETER --version 2>&1 | $GREP -c "GNU libgcj"` 
-gt 0; then
-JDK=gcj
-AC_MSG_RESULT([checked (gcj)])
-_gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 
's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`
-_gij_longver=`echo $_gij_version | $AWK -F. '{ print 
\$1*1+\$2*100+\$3 }'`
-
+AC_MSG_ERROR([No valid check available. Please check the block for 
your desired java in configure.ac])
 elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP 
-c "BEA"` -gt 0; then
 AC_MSG_ERROR([No valid check available. Please check the block for 
your desired java in configure.ac])
 elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP 
-c "IBM"` -gt 0; then
@@ -6951,7 +6947,7 @@ you must use the "--with-jdk-home" configure option 
explicitly])
 JAVAFLAGS=-J-Xmx128M
 fi
 else
-AC_MSG_ERROR([Java not found. You need at least jdk-1.5, or gcj-4])
+AC_MSG_ERROR([Java not found. You need at least jdk-1.6])
 fi
 else
 dnl Java disabled
@@ -6976,11 +6972,7 @@ dnl 
===
 dnl Checks for javac
 dnl ===
 if test "$ENABLE_JAVA" != ""; then
-if test "$JDK" = "gcj"; then
-javacompiler=`echo $with_java | $SED -e "s/gij/gcj/g" | $SED -e 
"s/java/javac/g"`
-else
-javacompiler="javac"
-fi
+javacompiler="javac"
 if test -z "$with_jdk_home"; then
 AC_PATH_PROG(JAVACOMPILER, $javacompiler)
 else
@@ -6999,25 +6991,7 @@ if test "$ENABLE_JAVA" != ""; then
 fi
 JAVACOMPILER=`win_short_path_for_make "$JAVACOMPILER"`
 fi
-
-if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Eclipse Java Compiler"` 
-gt 0; then
-AC_MSG_CHECKING([re-checking JDK])
-JDK=gcj
-AC_MSG_RESULT([checked (ecj)])
-_gij_longver="40200"
-fi
-fi
-
-JAVACISGCJ=""
-dnl ===
-dnl Checks that javac is gcj
-dnl ===
-if test "$ENABLE_JAVA" != ""; then
-if test `$JAVACOMPILER --version 2>&1 | $GREP -c "GCC"` -gt 0; then
-JAVACISGCJ="yes"
-fi
 fi
-AC_SUBST(JAVACISGCJ)
 
 dnl ==

Re: Tiago Santos license statement doubt

2016-08-26 Thread Wols Lists 
On 26/08/16 18:58, Tiago Santos wrote:
> Can I make LO licence statement now, or, once I make the statement I am
> interfering with the base licences, and as such, I must wait until PAPEL
> and Onto.pt author also grants a specific licensing change permission
> for this project?

You can't interfere with other peoples' licences.

Your licence statement only applies to contributions for which you hold
the copyright, so as long as you make it clear what code is yours and
what code is other peoples', you can post your licence statement at your
convenience.

(The current situation is confusing, because it sounds like you have
compiler's copyright, which means you own the copyright in the files you
are submitting, but not in the files they were built from. That's why
being very clear about what work is whose is so important...)

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

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

2016-08-26 Thread Jan-Marek Glogowski 
 sw/source/uibase/dbui/dbmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit daafd2ddaf019da11f4d0474b1840ad708a3199c
Author: Jan-Marek Glogowski 
Date:   Fri Aug 26 19:54:36 2016 +0200

tdf#12 MM: directly try filename from column

If we generate multiple files via mail merge with the same name,
we append a number to any file, so the "basename" filename won't
actually be generated.

But if we get the filename from a database column, the user
expects to try the original file name before trying a name with
an appended number.

Change-Id: I68411901ed90d8e9a21423de9233a5be4f41eb12

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 6ac018b..d7d6c15 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1322,7 +1322,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 aEntry.removeSegment();
 sPath = aEntry.GetMainURL( INetURLObject::NO_DECODE );
 OUString 
sExt(comphelper::string::stripStart(pStoreToFilter->GetDefaultExtension(), 
'*'));
-aTempFile.reset( new utl::TempFile(sLeading, true, &sExt, &sPath) 
);
+aTempFile.reset( new utl::TempFile(sLeading, 
sColumnData.isEmpty(), &sExt, &sPath) );
 if( !aTempFile->IsValid() )
 {
 ErrorHandler::HandleError( ERRCODE_IO_NOTSUPPORTED );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Riccardo Magliocchetti 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fc04e6e36fa4f40f942bb643b77b03979c8d29e
Author: Riccardo Magliocchetti 
Date:   Mon Aug 22 14:25:31 2016 +0200

configure: check for coinutils too

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

diff --git a/configure.ac b/configure.ac
index 07747a7..4fa4800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9779,7 +9779,7 @@ if test "$enable_coinmp" != "no"; then
 AC_MSG_RESULT([yes])
 if test "$with_system_coinmp" = "yes"; then
 SYSTEM_COINMP=TRUE
-PKG_CHECK_MODULES( COINMP, coinmp )
+PKG_CHECK_MODULES(COINMP, coinmp coinutils)
 FilterLibs "${COINMP_LIBS}"
 COINMP_LIBS="${filteredlibs}"
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tiago Santos license statement doubt

2016-08-26 Thread Tiago Santos 

Hello again Jan!


I understand there should be no issue, since all the requirements 
mentioned were followed, except to have the written permission forwarded 
to the project.


I already have the waiver in Portuguese and just need to know to whom 
should I address it.



 It is important that patches submitted are your own work and thus free 

of other license bindings.

(...)


 The license must be known and accepted.



Those thesauri are ‘original’ in the sense that they were converted, 
merged, and rebuilt ‘from scratch’. Unlike the first patch, there is 
only a small minority of lines that look like any of the source files. I 
credit the other authors/projects and included the licences in the 
Leiame file (Readme) inside the articles, for the word relations these 
projects provide.



> - you cannot change the license, without the written permission from 
the author (and we have a copy).



Can I make LO licence statement now, or, once I make the statement I am 
interfering with the base licences, and as such, I must wait until PAPEL 
and Onto.pt author also grants a specific licensing change permission 
for this project?


Sorry for these doubts, but, at least for me, these matters are very 
confusing and overwhelming.



Since this discussion pertains him, I copy in Hugo G. Oliveira, 
responsible for both projects, as well.



Best regards,

Tiago Santos


Às 09:43 de 26-08-2016, jan iversen escreveu:

Hi

For some reason, your email was duplicated, but let me try to answer 
your questions.


First of all let me say it is nice to see someone take the license 
seriously, a lot of people says "Lets do it without license" and 
believes that makes their software open and free.



Recently, I have been pointed to the Get Involved page, and I would 
like to subscribe to the license terms posted there, though I would 
like to ask advice about my previous submissions before proceeding.

I am the culpit, who commented on your bugzilla patches.

The first patch is a corrected merge of European Portuguese and 
Brazilian LibreOffice auto-correction files, explained and submitted 
on bug 97439.
I do not have many doubts about this patch since it was based on two 
files already present in LibreOffice, and as such, they should also 
be licensed under MPLv2/LGPLv3+ dual license.
You submitted it as an attachment to bugzilla, and these follow the 
footer note on
https://bugs.documentfoundation.org/ "Source code form contributions 
such as patches are considered to be modifications under the Mozilla 
Public License v2.0 ."


Furthermore you did not directly merge them into the master branch, I 
did that in your name, acting as a "guarantee" for the license.


We do accept smaller patches without a license statement, but as soon 
as you submit something bigger or more complicated, the license 
statement is demanded, to avoid any doubt.


The main doubts come from the second patch and third patches, posted 
on bug 101616. They are vastly increased thesaurus for European 
Portuguese language (though the third patch may be suitable for 
Brazilian Portuguese after review).
These last two patches were posted as a package with a copy of the 
base licenses since they are based in the already existing thesaurus 
from LibreOffice (MPLv2/LGPLv3+ dual license) and two other European 
Portuguese academic ontologies with free distribution licenses. I 
requested email approval from of the author, in addition to the 
public claim of free use from project PAPEL, and Creative Commons 
Attribution 3.0 Unported license from project Onto.pt 
. Though they should be compatible with MPLv2/LGPLv3+ 
dual license, I am not absolutely sure they are.

These patches are still pending to be merged on master.

It is important that patches submitted are your own work and thus free 
of other license bindings.


If submitting work of others, there are a couple of extra rules to follow:
- The work must be credited to the original author
- you cannot change the license, without the written permission from 
the author (and we have a copy).

- The license must be known and accepted.

We do use the CCA license for a lot of our work, and that is normally ok.

A good advice is to submit original work as a separate patch, followed 
by your work, so that we have the right crediting in our git logs.


Can someone with more knowledgeable of this licensing terms advise me 
on this matter, so I can proceed with the subscription to the 
licence, and these former patches can be made useful to others.


I hope to have answered your good questions and look forward to see 
your license statement, as well as more patches :-)


Have a good weekend.
rgds
jan I.

PS - Apologies for the former unrevised email. This email 
punctuation, spelling and grammar revision from the former one.


No problem.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http

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

2016-08-26 Thread Jaskaran Singh 
 sc/qa/unit/ucalc_sort.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 31596d7e0520db1a311764fde256e16f43c50349
Author: Jaskaran Singh 
Date:   Fri Aug 26 21:53:14 2016 +0530

Change the wrong message in test

Change-Id: I1c0d9563c67f2480906299bc039a853926f707df
Reviewed-on: https://gerrit.libreoffice.org/28413
Tested-by: Jenkins 
Reviewed-by: Jaskaran singh 

diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index 59293ba..7ec786d 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -611,7 +611,7 @@ void Test::testSortWithCellFormats()
 // Check if the italics is applied.
 if (static_cast(pItem)->GetEnumValue() 
== ITALIC_NORMAL)
 {
-cerr << "This cell is bold, but shouldn't." << endl;
+cerr << "This cell is italic, but shouldn't." << endl;
 return false;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

2016-08-26 Thread Armin Le Grand 
 cui/source/dialogs/screenshotannotationdlg.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit fc4da7c04c7a873afa1d583ff3bcd2d0e4dc6f70
Author: Armin Le Grand 
Date:   Fri Aug 26 19:08:19 2016 +0200

screenshot: corrections for linux build

Change-Id: I973f746f15dca4bd35495c8309bfad6af20e8707

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index bb955bf..05eeca9 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -29,6 +29,14 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Giuseppe Castagno 
 ucb/source/ucp/webdav-neon/NeonSession.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 15f1721dcb8a0550a5f7db6c0bafd56e7b08ff39
Author: Giuseppe Castagno 
Date:   Fri Aug 26 16:26:29 2016 +0200

tdf#101094 (28): Put back the thread mutex guard...

...the one I wrongly removed in commit
72589082945e5a197f3fb4b884f48dd4ae275e5f

Change-Id: I9f8e2f34a91b0fe481b1fe0f4655e3899a0589a6
Reviewed-on: https://gerrit.libreoffice.org/28412
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index b3f54e6..9c285c3 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -845,6 +845,8 @@ void NeonSession::OPTIONS( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
 throw( std::exception )
 {
+osl::Guard< osl::Mutex > theGuard( m_aMutex );
+
 SAL_INFO( "ucb.ucp.webdav", "OPTIONS - relative URL <" << inPath << ">" );
 
 rOptions.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: pizza time

2016-08-26 Thread koert 
Hey! 


I've  got some new pizza recipe for you, you should try it, more info  here 


Typos courtesy of my iPhone, koert


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

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

2016-08-26 Thread Eike Rathke 
 formula/source/core/api/FormulaCompiler.cxx |   91 +---
 sc/source/core/tool/compiler.cxx|   18 +
 2 files changed, 102 insertions(+), 7 deletions(-)

New commits:
commit f551477ab32ad2671d85a3070a0a436715ea7505
Author: Eike Rathke 
Date:   Fri Aug 26 16:31:33 2016 +0200

handle overwriting of symbols/opcodes in symbol map for known cases

This silences the SAL_WARN_IF like
warn:formula.core:6944:1:formula/source/core/api/FormulaCompiler.cxx:625:
OpCodeMap::putOpCode: reusing OpCode 161,
replacing '_xlfn.ORG.OPENOFFICE.ERRORTYPE' with 'ERRORTYPE'
in English map 0x1018000

that occurred during the first load of OOXML .xlsx documents since the
old bad entries were added with commit
89c4a69103b6e15e7f52401c51110b926c3ccf36

In fact the direction opcode -> string was replaced, which it should had
not. That specific mapping is only used though when loading msoxl
namespace formulas from ODF.

Also, the replacement of parameter separator and array column and row
separator worked merely by chance, depending on in which order the
entries where inserted to the hash map. Fixed along as it popped up with
the new handling.

Change-Id: I88017a8b38ccc30874c3dca7d78f0fa47a77a36f

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 7354cfc..be19fcf 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -617,14 +617,91 @@ void FormulaCompiler::OpCodeMap::putOpCode( const 
OUString & rStr, const OpCode
 {
 if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
 {
-SAL_WARN_IF( !(mpTable[eOp].isEmpty() || (mpTable[eOp] == rStr) ||
-(eOp == ocCurrency) || (eOp == ocSep) || (eOp == 
ocArrayColSep) ||
-(eOp == ocArrayRowSep)), "formula.core",
-"OpCodeMap::putOpCode: reusing OpCode " << 
static_cast(eOp)
-<< ", replacing '" << mpTable[eOp] << "' with '" << rStr << "' 
in "
-<< (mbEnglish ? "" : "non-") << "English map 0x" << ::std::hex 
<< meGrammar);
+bool bPutOp = mpTable[eOp].isEmpty();
+bool bRemoveFromMap = false;
+if (!bPutOp)
+{
+switch (eOp)
+{
+// These OpCodes are meant to overwrite and also remove an
+// existing mapping.
+case ocCurrency:
+bPutOp = true;
+bRemoveFromMap = true;
+break;
+// These separator OpCodes are meant to overwrite and also
+// remove an existing mapping if it is not used for one of the
+// other separators.
+case ocArrayColSep:
+bPutOp = true;
+bRemoveFromMap = (mpTable[ocArrayRowSep] != mpTable[eOp] 
&& mpTable[ocSep] != mpTable[eOp]);
+break;
+case ocArrayRowSep:
+bPutOp = true;
+bRemoveFromMap = (mpTable[ocArrayColSep] != mpTable[eOp] 
&& mpTable[ocSep] != mpTable[eOp]);
+break;
+// For ocSep keep the ";" in map but remove any other if it is
+// not used for ocArrayColSep or ocArrayRowSep.
+case ocSep:
+bPutOp = true;
+bRemoveFromMap = (mpTable[eOp] != ";" &&
+mpTable[ocArrayColSep] != mpTable[eOp] &&
+mpTable[ocArrayColSep] != mpTable[eOp]);
+break;
+// These OpCodes are known to be duplicates in the Excel
+// external API mapping because of different parameter counts
+// in different BIFF versions. Names are identical and entries
+// are ignored.
+case ocLinest:
+case ocTrend:
+case ocLogest:
+case ocGrowth:
+case ocTrunc:
+case ocFixed:
+case ocGetDayOfWeek:
+case ocHLookup:
+case ocVLookup:
+case ocGetDiffDate360:
+if (rStr == mpTable[eOp])
+return;
+SAL_FALLTHROUGH;
+// These OpCodes are known to be added to an existing mapping,
+// but only for the OOXML external API mapping. This is *not*
+// FormulaLanguage::OOXML. Keep the first
+// (correct) definition for the OpCode, all following are
+// additional alias entries in the map.
+case ocErrorType:
+case ocMultiArea:
+case ocBackSolver:
+case ocEasterSunday:
+case ocCurrent:
+case ocStyle:
+if (mbEnglish &&
+

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - 390 commits - accessibility/source avmedia/source basctl/source basegfx/source basic/source binaryurp/source bridges/source canv

2016-08-26 Thread Armin Le Grand 
Rebased ref, commits from common ancestor:
commit 6e2e615f09d9bf1fa8531cf3eed2e3852c0b0705
Author: Armin Le Grand 
Date:   Fri Aug 26 16:26:34 2016 +0200

screenshot: detail corrections

Edgerounding and linewidth for selection/cursor, default
filename for save dialog

Change-Id: I8a76d68f4f3070458ec4ba51a81bb046057218ab

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index aad891f..bb955bf 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -272,7 +272,7 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 
 uno::Reference< uno::XComponentContext > xContext = 
cppu::defaultBootstrap_InitialComponentContext();
 const uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker =
-ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_SIMPLE);
+ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION);
 
 xFilePicker->setTitle(maSaveAsText);
 
@@ -281,9 +281,10 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 xFilePicker->setDisplayDirectory(maLastFolderURL);
 }
 
-xFilePicker->appendFilter("*.png", "*.PNG");
+xFilePicker->appendFilter("*.png", "*.png");
 xFilePicker->setCurrentFilter("*.png");
-xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8)); // +".png");
+xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8));
+xFilePicker->setMultiSelectionMode(sal_False);
 
 if (xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK)
 {
@@ -370,26 +371,34 @@ void ScreenshotAnnotationDlg_Impl::PaintControlDataEntry(
 {
 if (mpPicture && mpVirtualBufferDevice)
 {
-const basegfx::B2IRange& rRange = rEntry.getB2IRange();
-static double fRelativeEdgeRadius(0.1);
-basegfx::B2DRange aB2DRange(rRange);
-
-// grow one pixel to be a little bit outside
-aB2DRange.grow(1);
-
+basegfx::B2DRange aB2DRange(rEntry.getB2IRange());
+
+// grow in pixels to be a little bit 'outside'. This also
+// ensures that getWidth()/getHeight() ain't 0.0 (see division below)
+static double fGrowTopLeft(1.5);
+static double fGrowBottomRight(0.5);
+aB2DRange.expand(aB2DRange.getMinimum() - 
basegfx::B2DPoint(fGrowTopLeft, fGrowTopLeft));
+aB2DRange.expand(aB2DRange.getMaximum() + 
basegfx::B2DPoint(fGrowBottomRight, fGrowBottomRight));
+
+// edge rounding in pixel. Need to convert, value for
+// createPolygonFromRect is relative [0.0 .. 1.0]
+static double fEdgeRoundPixel(8.0);
 const basegfx::B2DPolygon aPolygon(
 basegfx::tools::createPolygonFromRect(
 aB2DRange,
-fRelativeEdgeRadius,
-fRelativeEdgeRadius));
+fEdgeRoundPixel / aB2DRange.getWidth(),
+fEdgeRoundPixel / aB2DRange.getHeight()));
+
 mpVirtualBufferDevice->SetLineColor(rColor);
 
+// try to use transparency
 if (!mpVirtualBufferDevice->DrawPolyLineDirect(
 aPolygon,
 fLineWidth,
 fTransparency,
 basegfx::B2DLineJoin::Round))
 {
+// no transparency, draw without
 mpVirtualBufferDevice->DrawPolyLine(
 aPolygon,
 fLineWidth,
@@ -423,10 +432,11 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
 Point(0, 0),
 bUseDimmed ? maDimmedDialogBitmap : maParentDialogBitmap);
 
-// get various options - sorry, no SvtOptionsDrawinglayer in vcl
-const Color 
aHilightColor(Application::GetSettings().GetStyleSettings().GetHighlightColor());
-const bool bIsAntiAliasing(true);
-const double fTransparence(0.4);
+// get various options
+const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor());
+const double 
fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01);
+const bool bIsAntiAliasing(aSvtOptionsDrawinglayer.IsAntiAliasing());
 const AntialiasingFlags 
nOldAA(mpVirtualBufferDevice->GetAntialiasing());
 
 if (bIsAntiAliasing)
@@ -437,13 +447,15 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
 // paint selected entries
 for (auto candidate = maSelected.begin(); candidate != 
maSelected.end(); candidate++)
 {
-PaintControlDataEntry(**candidate, Color(COL_LIGHTRED), 3.0);
+static double fLineWidthEntries(5.0);
+PaintControlDataEntry(**candidate, Color(COL_LIGHTRED), 
fLineWidthEntries, fTransparence * 0.2);
 }
 
 // paint hilighted

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

2016-08-26 Thread Armin Le Grand 
 cui/source/dialogs/screenshotannotationdlg.cxx |   48 +++--
 1 file changed, 30 insertions(+), 18 deletions(-)

New commits:
commit 5989294c521eb155952ceb61f6ef806391070676
Author: Armin Le Grand 
Date:   Fri Aug 26 16:26:34 2016 +0200

screenshot: detail corrections

Edgerounding and linewidth for selection/cursor, default
filename for save dialog

Change-Id: I8a76d68f4f3070458ec4ba51a81bb046057218ab

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index aad891f..bb955bf 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -272,7 +272,7 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 
 uno::Reference< uno::XComponentContext > xContext = 
cppu::defaultBootstrap_InitialComponentContext();
 const uno::Reference< ui::dialogs::XFilePicker3 > xFilePicker =
-ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_SIMPLE);
+ui::dialogs::FilePicker::createWithMode(xContext, 
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION);
 
 xFilePicker->setTitle(maSaveAsText);
 
@@ -281,9 +281,10 @@ IMPL_LINK_TYPED(ScreenshotAnnotationDlg_Impl, 
saveButtonHandler, Button*, pButto
 xFilePicker->setDisplayDirectory(maLastFolderURL);
 }
 
-xFilePicker->appendFilter("*.png", "*.PNG");
+xFilePicker->appendFilter("*.png", "*.png");
 xFilePicker->setCurrentFilter("*.png");
-xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8)); // +".png");
+xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, 
RTL_TEXTENCODING_UTF8));
+xFilePicker->setMultiSelectionMode(sal_False);
 
 if (xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK)
 {
@@ -370,26 +371,34 @@ void ScreenshotAnnotationDlg_Impl::PaintControlDataEntry(
 {
 if (mpPicture && mpVirtualBufferDevice)
 {
-const basegfx::B2IRange& rRange = rEntry.getB2IRange();
-static double fRelativeEdgeRadius(0.1);
-basegfx::B2DRange aB2DRange(rRange);
-
-// grow one pixel to be a little bit outside
-aB2DRange.grow(1);
-
+basegfx::B2DRange aB2DRange(rEntry.getB2IRange());
+
+// grow in pixels to be a little bit 'outside'. This also
+// ensures that getWidth()/getHeight() ain't 0.0 (see division below)
+static double fGrowTopLeft(1.5);
+static double fGrowBottomRight(0.5);
+aB2DRange.expand(aB2DRange.getMinimum() - 
basegfx::B2DPoint(fGrowTopLeft, fGrowTopLeft));
+aB2DRange.expand(aB2DRange.getMaximum() + 
basegfx::B2DPoint(fGrowBottomRight, fGrowBottomRight));
+
+// edge rounding in pixel. Need to convert, value for
+// createPolygonFromRect is relative [0.0 .. 1.0]
+static double fEdgeRoundPixel(8.0);
 const basegfx::B2DPolygon aPolygon(
 basegfx::tools::createPolygonFromRect(
 aB2DRange,
-fRelativeEdgeRadius,
-fRelativeEdgeRadius));
+fEdgeRoundPixel / aB2DRange.getWidth(),
+fEdgeRoundPixel / aB2DRange.getHeight()));
+
 mpVirtualBufferDevice->SetLineColor(rColor);
 
+// try to use transparency
 if (!mpVirtualBufferDevice->DrawPolyLineDirect(
 aPolygon,
 fLineWidth,
 fTransparency,
 basegfx::B2DLineJoin::Round))
 {
+// no transparency, draw without
 mpVirtualBufferDevice->DrawPolyLine(
 aPolygon,
 fLineWidth,
@@ -423,10 +432,11 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
 Point(0, 0),
 bUseDimmed ? maDimmedDialogBitmap : maParentDialogBitmap);
 
-// get various options - sorry, no SvtOptionsDrawinglayer in vcl
-const Color 
aHilightColor(Application::GetSettings().GetStyleSettings().GetHighlightColor());
-const bool bIsAntiAliasing(true);
-const double fTransparence(0.4);
+// get various options
+const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor());
+const double 
fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01);
+const bool bIsAntiAliasing(aSvtOptionsDrawinglayer.IsAntiAliasing());
 const AntialiasingFlags 
nOldAA(mpVirtualBufferDevice->GetAntialiasing());
 
 if (bIsAntiAliasing)
@@ -437,13 +447,15 @@ void ScreenshotAnnotationDlg_Impl::RepaintToBuffer(
 // paint selected entries
 for (auto candidate = maSelected.begin(); candidate != 
maSelected.end(); candidate++)
 {
-PaintControlDataEntry(**candidate, Color(COL_LIGHTRED), 3.0);
+static double fLineWidthEntries(5.0);
+PaintControlDataEntry(**candidate,

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - external/liborcus

2016-08-26 Thread David Tardon 
 external/liborcus/Library_orcus.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit d65e40b6f44e97bbcc4c645b218c158669b638a2
Author: David Tardon 
Date:   Fri Aug 26 12:57:24 2016 +0200

tdf#94834 enable liborcus format detection on Windows

Change-Id: Ia6b353ed800eabd5766cc76e799f6151b71f865e
(cherry picked from commit 4462447b8a48ad097e56c47e3736d80dc4aaa13a)
Reviewed-on: https://gerrit.libreoffice.org/28403
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/liborcus/Library_orcus.mk 
b/external/liborcus/Library_orcus.mk
index 96169f1..e49adca 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_set_include,orcus,\
 $(eval $(call gb_Library_add_defs,orcus,\
-DBOOST_ALL_NO_LIB \
-D__ORCUS_BUILDING_DLL \
+   -D__ORCUS_GNUMERIC \
+   -D__ORCUS_ODS \
+   -D__ORCUS_XLSX \
+   -D__ORCUS_XLS_XML \
 ))
 
 $(eval $(call gb_Library_use_libraries,orcus,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Jochen Nitschke 
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx  |2 ++
 chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx |2 ++
 chart2/source/controller/inc/dlg_CreationWizard.hxx  |3 ++-
 chart2/source/controller/inc/dlg_InsertDataLabel.hxx |3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit c922161117dcaf33d6c61b0c5ffe860231e32e3c
Author: Jochen Nitschke 
Date:   Fri Aug 26 13:11:34 2016 +0200

tdf#95416 remove ../ style include

move (default) dtors to source files, where members are complete

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

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index cbf741b..7402c58 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -88,6 +88,8 @@ CreationWizard::CreationWizard( vcl::Window* pParent, const 
uno::Reference< fram
 ActivatePage();
 }
 
+CreationWizard::~CreationWizard() = default;
+
 VclPtr CreationWizard::createPage(WizardState nState)
 {
 VclPtr pRet;
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx 
b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 17c15bc..9846c20 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -34,6 +34,8 @@ DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, 
const SfxItemSet& rInAt
 Reset();
 }
 
+DataLabelsDialog::~DataLabelsDialog() = default;
+
 void DataLabelsDialog::Reset()
 {
 m_apDataLabelResources->Reset(m_rInAttrs);
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx 
b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index bc250be..fed0190 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -22,7 +22,6 @@
 
 #include "TimerTriggeredControllerLock.hxx"
 #include "TabPageNotifiable.hxx"
-#include "../dialogs/DialogModel.hxx"
 
 #include 
 #include 
@@ -35,6 +34,7 @@ namespace chart
 
 class RangeChooserTabPage;
 class DataSourceTabPage;
+class DialogModel;
 class ChartTypeTemplateProvider;
 
 class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable
@@ -45,6 +45,7 @@ public:
 , const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
 CreationWizard() = delete;
+virtual ~CreationWizard() override;
 
 // TabPageNotifiable
 virtual void setInvalidPage( TabPage * pTabPage ) override;
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx 
b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index 4d0d4b1..2f62ad6 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -23,12 +23,12 @@
 #include 
 #include 
 #include 
-#include "../dialogs/res_DataLabel.hxx"
 
 class SvNumberFormatter;
 
 namespace chart
 {
+class DataLabelResources;
 
 class DataLabelsDialog : public ModalDialog
 {
@@ -44,6 +44,7 @@ private:
 
 public:
 DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, 
SvNumberFormatter* pFormatter);
+virtual ~DataLabelsDialog() override;
 
 void FillItemSet(SfxItemSet& rOutAttrs);
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Markus Mohrhard 
 extensions/source/update/check/updateinfo.hxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit d54773ada2301d3a5c1ffc702715cd2d4006ad53
Author: Markus Mohrhard 
Date:   Mon Aug 8 04:43:26 2016 +0200

remove unnecessary default constructor and operator=

They are equal to the default generated and therefore unnecessary.

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

diff --git a/extensions/source/update/check/updateinfo.hxx 
b/extensions/source/update/check/updateinfo.hxx
index 4788405..a63e233 100644
--- a/extensions/source/update/check/updateinfo.hxx
+++ b/extensions/source/update/check/updateinfo.hxx
@@ -54,23 +54,8 @@ struct UpdateInfo
 OUString Description;
 std::vector< DownloadSource > Sources;
 std::vector< ReleaseNote > ReleaseNotes;
-
-UpdateInfo() : BuildId(), Version(), Description(), Sources(), 
ReleaseNotes() {};
-UpdateInfo(const UpdateInfo& ui) : BuildId(ui.BuildId), 
Version(ui.Version), Description(ui.Description), Sources(ui.Sources), 
ReleaseNotes(ui.ReleaseNotes) {};
-inline UpdateInfo & operator=( const UpdateInfo& ui );
 };
 
-UpdateInfo & UpdateInfo::operator=( const UpdateInfo& ui )
-{
-BuildId = ui.BuildId;
-Version = ui.Version;
-Description = ui.Description;
-Sources = ui.Sources;
-ReleaseNotes = ui.ReleaseNotes;
-return *this;
-}
-
-
 // Returns the URL of the release note for the given position
 OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool 
autoDownloadEnabled=false);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/vcl vcl/source vcl/uiconfig v

2016-08-26 Thread Armin Le Grand 
 cui/AllLangResTarget_cui.mk|1 
 cui/Library_cui.mk |1 
 cui/UIConfig_cui.mk|1 
 cui/source/dialogs/screenshotannotationdlg.cxx |  572 +
 cui/source/dialogs/screenshotannotationdlg.src |   27 +
 cui/source/factory/cuiexp.cxx  |1 
 cui/source/factory/dlgfact.cxx |9 
 cui/source/factory/dlgfact.hxx |   10 
 cui/source/inc/cuires.hrc  |1 
 cui/source/inc/screenshotannotationdlg.hxx |   44 +
 cui/uiconfig/ui/screenshotannotationdialog.ui  |  105 
 include/vcl/abstdlg.hxx|9 
 vcl/UIConfig_vcl.mk|1 
 vcl/source/window/layout.cxx   |  470 
 vcl/uiconfig/ui/screenshotannotationdialog.ui  |  105 
 15 files changed, 793 insertions(+), 564 deletions(-)

New commits:
commit e44b52da9b64ac0153e07a6b20b1a41bdf2d4ac3
Author: Armin Le Grand 
Date:   Fri Aug 26 14:48:17 2016 +0200

screenshot: added functionality to dialog

Moved code to cui, added abstraction for AbstractDialog,
adapted rendering, changed selection, added better selection
visualization, added save ressources and dialog, creating
pure screenshot with annotation display

Change-Id: I533d9f559ee17cd46105b934bcf4beef87b96168

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 7cb854c..b9d2700 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/dialogs/hyperdlg.src \
 cui/source/dialogs/multipat.src \
 cui/source/dialogs/passwdomdlg.src \
+cui/source/dialogs/screenshotannotationdlg.src \
 cui/source/dialogs/scriptdlg.src \
 cui/source/dialogs/svuidlg.src \
 cui/source/options/connpooloptions.src \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index cc3b314..ea46629 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/dialogs/multipat \
 cui/source/dialogs/newtabledlg \
 cui/source/dialogs/passwdomdlg \
+cui/source/dialogs/screenshotannotationdlg \
 cui/source/dialogs/pastedlg \
 cui/source/dialogs/postdlg \
 cui/source/dialogs/scriptdlg \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index df494ce..19c3871 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -144,6 +144,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/paraindentspacing \
cui/uiconfig/ui/paratabspage \
cui/uiconfig/ui/password \
+   cui/uiconfig/ui/screenshotannotationdialog \
cui/uiconfig/ui/pastespecial \
cui/uiconfig/ui/patterntabpage \
cui/uiconfig/ui/percentdialog \
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
new file mode 100644
index 000..aad891f
--- /dev/null
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -0,0 +1,572 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "screenshotannotationdlg.hxx"
+
+#include "cuires.hrc"
+#include "dialmgr.hxx"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
+
+class ControlDataEntry
+{
+public:
+ControlDataEntry(
+const vcl::Window& rControl,
+const basegfx::B2IRange& rB2IRange)
+: mrControl(rControl),
+maB2IRange(rB2IRange)
+{
+}
+
+const vcl::Window& getControl() const
+{
+return mrControl;
+}
+
+const basegfx::B2IRange& getB2IRange() const
+{
+return maB2IRange;
+}
+
+private:
+const vcl::Window&  mrControl;
+basegfx::B2IRange   maB2IRange;
+};
+
+typedef ::std::vector< ControlDataEntry > ControlDataCollection;
+typedef ::std::set< ControlDataEntry* > ControlDataSet;
+
+class ScreenshotAnnotationDlg_Impl // : public ModalDialog
+{
+public:
+ScreenshotAnnotationDlg_Impl

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

2016-08-26 Thread Ashod Nakashian 
 loleaflet/src/control/Control.Menubar.js |5 -
 loleaflet/src/control/Toolbar.js |6 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 78d4c7706deae727272ce28867c98418925838cf
Author: Ashod Nakashian 
Date:   Wed Aug 24 18:23:04 2016 -0400

loleaflet: Repair command and dialog handler

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

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 3cd011e..d10cb5a 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -15,7 +15,8 @@ L.Control.Menubar = L.Control.extend({

   {name: _('Microsoft Word 2003 (.doc)'), id: 
'downloadas-doc', type: 'action'},

   {name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', 
type: 'action'}]}]
},
-   {name: _('Edit'), type: 'menu', menu: [{name: 
_('Undo'), type: 'unocommand', uno: '.uno:Undo'},
+   {name: _('Edit'), type: 'menu', menu: [{name: 
_('Repair'), id: 'repair',  type: 'action'},
+   
{name: _('Undo'), type: 'unocommand', uno: '.uno:Undo'},

{name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},

{type: 'separator'},

{name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
@@ -316,6 +317,8 @@ L.Control.Menubar = L.Control.extend({
if (window.top !== window.self) {
window.parent.postMessage('rev-history', '*');
}
+   } else if (id === 'repair') {
+   map.showRepairDialog();
}
},
 
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 54a1d95..bbe3d86 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -230,5 +230,11 @@ L.Map.include({
});
}
});
+   },
+
+   showRepairDialog: function() {
+   vex.open({
+   });
}
+
 });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Ashod Nakashian 
 loleaflet/src/control/Control.Menubar.js |   12 ++--
 loolwsd/ChildSession.cpp |4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 960e0521bc839b04bed87a7765b19aba0437ad96
Author: Ashod Nakashian 
Date:   Wed Aug 24 18:22:32 2016 -0400

Formatting

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

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index e2113b7..3cd011e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -11,9 +11,9 @@ L.Control.Menubar = L.Control.extend({

   {name: _('Print'), id: 'print', type: 'action'},

   {name: _('See revision history'), id: 'rev-history', type: 
'action'},

   {name: _('Download as'), type: 'menu', menu: [{name: _('PDF 
Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
-   

   {name: _('ODF text document (.odt)'), id: 'downloadas-odt', 
type: 'action'},
-   

   {name: _('Microsoft Word 2003 (.doc)'), id: 
'downloadas-doc', type: 'action'},
-   

   {name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', 
type: 'action'}]}]
+   
   {name: _('ODF text document (.odt)'), id: 'downloadas-odt', 
type: 'action'},
+   
   {name: _('Microsoft Word 2003 (.doc)'), id: 
'downloadas-doc', type: 'action'},
+   
   {name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', 
type: 'action'}]}]
},
{name: _('Edit'), type: 'menu', menu: [{name: 
_('Undo'), type: 'unocommand', uno: '.uno:Undo'},

{name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
@@ -57,9 +57,9 @@ L.Control.Menubar = L.Control.extend({

   {name: _('Print'), id: 'print', type: 'action'},

   {name: _('See revision history'), id: 'rev-history', type: 
'action'},

   {name: _('Download as'), type: 'menu', menu:  [{name: _('PDF 
Document (.pdf)'), id: 'downloadas-pdf', type: 'action'},
-   

{name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action'},
-   

{name: _('Microsoft Powerpoint 2003 (.ppt)'), id: 
'downloadas-ppt', type: 'action'},
-   

{name: _('Microsoft Powerpoint (.pptx)'), id: 
'downloadas-pptx', type: 'action'}]}]
+   
{name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action'},
+   
{name: _('Microsoft Powerpoint 2003 (.ppt)'), id: 
'downloadas-ppt', type: 'action'},
+   
{name: _('Microsoft Powerpoint (.pptx)'), id: 
'downloadas-pptx', type: 'action'}]}]
},
{name: _('Edit'), type: 'menu', menu: [{name: 
_('Undo

Minutes of the Design Hangout: 2016-Aug-26

2016-08-26 Thread Jan Holesovsky 
Very short meeting today:

Present: Heiko, Kendy, Jay (but with technical problems)

Google Summer of Code

  * @all GSoC students: ESC asks for documentation of UI changes, which
is important and required, please write at least a few bullet points
and get in touch with the docu team (@ohallot, #libreoffice-doc)
+ Acknowledged
PLEASE SUMBIT HELP/DOCUMENTATION/RELEASE NOTES TO DOCUMENTATION TEAM!

  * Suggested contents (Olivier):
  + Short introduction
  + How to access the function/feature, toolbar, menu, kbd
  + Description of the feature (the more the better)
  + Tips, warnings
  + Related topics
 
All the best,
Kendy

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

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

2016-08-26 Thread Jochen Nitschke 
 download.lst  |3 -
 external/openldap/UnpackedTarball_openldap.mk |2 
 external/openldap/openldap-2.4.31.patch   |   73 --
 external/openldap/openldap-2.4.44.patch.1 |   73 ++
 4 files changed, 76 insertions(+), 75 deletions(-)

New commits:
commit a5b29a702e9102bf85d90a40d33cde81cafda45a
Author: Jochen Nitschke 
Date:   Thu Aug 25 17:58:38 2016 +0200

openldap: upgrade to release 2.4.44

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

diff --git a/download.lst b/download.lst
index 58bae02..337c086 100644
--- a/download.lst
+++ b/download.lst
@@ -122,7 +122,8 @@ export ODFVALIDATOR_JAR := 
a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-i
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
-export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
+export OPENLDAP_MD5SUM := 693ac26de86231f8dcae2b4e9d768e51
+export OPENLDAP_TARBALL := openldap-2.4.44.tgz
 export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
 export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
 export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
diff --git a/external/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
index f22cb97..44c192e 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
-   external/openldap/openldap-2.4.31.patch \
+   external/openldap/openldap-2.4.44.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openldap/openldap-2.4.31.patch 
b/external/openldap/openldap-2.4.44.patch.1
similarity index 69%
rename from external/openldap/openldap-2.4.31.patch
rename to external/openldap/openldap-2.4.44.patch.1
index 656a2c9..0d3cf5b 100644
--- a/external/openldap/openldap-2.4.31.patch
+++ b/external/openldap/openldap-2.4.44.patch.1
@@ -1,24 +1,28 @@
 misc/openldap-2.4.31/Makefile.in   2012-04-22 22:25:08.0 +0200
-+++ misc/build/openldap-2.4.31/Makefile.in 2012-07-16 13:53:47.140541654 
+0200
-@@ -13,7 +13,7 @@
- ## top-level directory of the distribution or, alternatively, at
- ## .
- 
--SUBDIRS= include libraries clients servers tests doc
-+SUBDIRS= include libraries
- CLEANDIRS=
- INSTALLDIRS= 
+--- openldap.org/configure
 openldap/configure
+@@ -15735,7 +15735,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnss3  $LIBS"
++LIBS="-lnss3  -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
-@@ -32,7 +32,3 @@
-   $(RM) config.status libtool stamp-h stamp-h.in
+--- openldap.org/configure.in
 openldap/configure.in
+@@ -1239,7 +1239,8 @@
+   AC_CHECK_HEADERS([nssutil.h])
+   if test "$ac_cv_header_nssutil_h" = yes ; then
+   AC_CHECK_LIB([nss3], [NSS_Initialize],
+-   [ have_moznss=yes ], [ 
have_moznss=no ])
++   [ have_moznss=yes ], [ 
have_moznss=no ],
++   [ -lssl3 -lsmime3 -lnss3 
-lnssutil3 -lplds4 -lplc4 -lnspr4 ])
+   fi
  
- distclean: veryclean FORCE
--
--check: test
--test: FORCE
--  cd tests; make test
 misc/openldap-2.4.31/libraries/libldap/tls_m.c 2012-04-22 
22:25:08.0 +0200
-+++ misc/build/openldap-2.4.31/libraries/libldap/tls_m.c   2012-07-16 
13:53:47.140541654 +0200
+   if test "$have_moznss" = yes ; then
+--- openldap.org/libraries/libldap/tls_m.c
 openldap/libraries/libldap/tls_m.c
 @@ -49,17 +49,17 @@
  #include  /* for echo on/off */
  #endif
@@ -48,26 +52,22 @@
  
  #undef NSS_VERSION_INT
  #define   NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
 misc/openldap-2.4.31/configure.in  2012-04-22 21:25:08.0 +0100
-+++ misc/build/openldap-2.4.31/configure.in2012-07-16 13:56:24.0 
+0100
-@@ -1232,7 +1232,8 @@
-   AC_CHECK_HEADERS([nssutil.h])
-   if test "$ac_cv_header_nssutil_h" = yes ; then
-   AC_CHECK_LIB([nss3], [NSS_Initialize],
--   [ have_moznss=yes ], [ 
have_moznss=no ])
-+   [ have_moznss=yes ], [ 
have_moznss=no ],
-+   [ -lssl3

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

2016-08-26 Thread Giuseppe Castagno 
 ucb/source/ucp/webdav-neon/NeonSession.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 72589082945e5a197f3fb4b884f48dd4ae275e5f
Author: Giuseppe Castagno 
Date:   Fri Aug 26 10:03:21 2016 +0200

tdf#101094 (27): Add a mutex guard to OPTIONS neon dispatch calls

This is a sort of follow up to commit:
510da29131e56ba0e1783e505e7131e6f7e0d6b4:

"forced to make certain neon api calls thread-safe due to cups

rhbz#637738 libgcrypt that's been initialized already by cups to be
non-threadsafe is therefore then also non-threadsafe. neon uses
libgcrypt. So in the (as this is the usual circumstance) case that
cups is initialized before neon, then libgcrypt is not threadsafe
even though neon attempt to initialize it as such."

Change-Id: I1f868642ac15bf9fa25d3edd46390467d8fce1f5
Reviewed-on: https://gerrit.libreoffice.org/28401
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 8fdab2f..b3f54e6 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -845,18 +845,19 @@ void NeonSession::OPTIONS( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
 throw( std::exception )
 {
-
-osl::Guard< osl::Mutex > theGuard( m_aMutex );
 SAL_INFO( "ucb.ucp.webdav", "OPTIONS - relative URL <" << inPath << ">" );
 
 rOptions.reset();
 
 Init( rEnv );
+int theRetVal;
 
 ne_request *req = ne_request_create(m_pHttpSession, "OPTIONS", 
OUStringToOString(
 inPath, RTL_TEXTENCODING_UTF8 
).getStr());
-
-int theRetVal = ne_request_dispatch(req);
+{
+osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
+theRetVal = ne_request_dispatch(req);
+}
 
 //check if http error is in the 200 class (no error)
 if (theRetVal == NE_OK && ne_get_status(req)->klass != 2) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - 10 commits - configure.ac external/harfbuzz vcl/headless vcl/inc vcl/Library_vcl.mk vcl/quartz vcl/README.vars vcl/source vcl/unx vcl

2016-08-26 Thread Akash Jain 
Rebased ref, commits from common ancestor:
commit 76f46abe3cac3174b95f21868422bb616dbd85e8
Author: Akash Jain 
Date:   Wed Aug 17 21:31:22 2016 +0530

GSoC: Speed up CommonSalLayout by caching hb_face

Cache hb_face so it is not created again and again.
Switch from GDI to DirectWrite on Windows to obtain SFNT table data.

Change-Id: I9c532cd72e1f6b57313f3b7d42a6b9b0633eb0ef

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 53d4468..fdb74a3 100755
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -40,6 +40,7 @@ class CommonSalLayout : public GenericSalLayout
 #ifdef _WIN32
 HDC   mhDC;
 HFONT mhFont;
+D2DWriteTextOutRenderer* mpD2DRenderer;
 #elif defined(MACOSX) || defined(IOS)
 const CoreTextStyle& mrCoreTextStyle;
 #else
@@ -49,7 +50,7 @@ class CommonSalLayout : public GenericSalLayout
 hb_font_t*  GetHBFont();
 public:
 #if defined(_WIN32)
-explicitCommonSalLayout(HDC, WinFontInstance&);
+explicitCommonSalLayout(WinSalGraphics*, WinFontInstance&, 
const WinFontFace&);
 virtual voidInitFont() const override;
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
@@ -59,7 +60,6 @@ public:
 const ServerFont&   getFontData() const { return mrServerFont; };
 #endif
 
-virtual ~CommonSalLayout();
 voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
 voidAdjustLayout(ImplLayoutArgs&) override;
 virtual boolLayoutText(ImplLayoutArgs&) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 7578768..678b0d1 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -45,6 +45,7 @@
 
 #include "quartz/salgdicommon.hxx"
 #include 
+#include 
 
 class AquaSalFrame;
 class FontAttributes;
@@ -98,6 +99,8 @@ public:
 void   GetFontMetric( ImplFontMetricDataPtr& ) const;
 bool   GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const;
 bool   GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const;
+hb_face_t* GetHBFace() const { return mpHBFace; }
+void   SetHBFace(hb_face_t* pHBFace) const { mpHBFace = pHBFace; }
 
 const CoreTextFontFace*  mpFontData;
 /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
@@ -109,6 +112,7 @@ public:
 private:
 /// CoreText text style object
 CFMutableDictionaryRef  mpStyleDict;
+mutable hb_face_t*  mpHBFace;
 
 friend class CTLayout;
 friend class AquaSalGraphics;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 04723cb..1c356c5 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -35,6 +35,7 @@
 #include 
 #include "fontattributes.hxx"
 #include "impfontmetricdata.hxx"
+#include "hb-ot.h"
 
 #include 
 
@@ -181,6 +182,8 @@ public:
 sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) 
const;
 boolGetGlyphOutline( sal_GlyphId aGlyphId, 
basegfx::B2DPolyPolygon& ) const;
 boolGetAntialiasAdvice() const;
+hb_face_t*  GetHBFace() { return mpHBFace; }
+voidSetHBFace( hb_face_t* pHBFace ) { 
mpHBFace=pHBFace; }
 
 private:
 friend class GlyphCache;
@@ -240,6 +243,7 @@ private:
 GlyphSubstitution   maGlyphSubstitution;
 
 ServerFontLayoutEngine* mpLayoutEngine;
+hb_face_t*  mpHBFace;
 };
 
 // a class for cache entries for physical font instances that are based on 
serverfonts
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index bc5165d..961cb47 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -44,6 +44,9 @@
 #  include "postwin.h"
 #endif
 
+#include 
+#include 
+
 class FontSelectPattern;
 class WinFontInstance;
 class ImplFontAttrCache;
@@ -139,10 +142,12 @@ private:
 
 mutable std::unordered_set  maGsubTable;
 mutable boolmbGsubRead;
+mutable hb_face_t*  mpHBFace;
 public:
 boolHasGSUBstitutions( HDC ) const;
 boolIsGSUBstituted( sal_UCS4 ) const;
-static int  GetTable( const char pTagName[5], const unsigned 
char*&, HDC );
+hb_face_t*  GetHBFace() const { return mpHBFace; }
+voidSetHBFace( hb_face_t* pHBFace ) const { mpHBFace = 
pHBFace; }
 };
 
 /** Class that creates (and destroys) a compatible Device Context.
@@ -354,6 +359,7 @@ private:
 sal_uLong   GetKernPairs();
 
 public:
+sal_uLong   GetTable( const char pTagName[5], const unsigned 
char*&, void*&, IDWriteFontFace*& );
 // public SalGraphics methods, the interface to the independent vcl part
 
 // get device resolution
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index c7b54d3..d315705 100644
--- a/vcl/quartz/c

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

2016-08-26 Thread Rishabh Kumar 
 cui/source/inc/cuitabarea.hxx |6 --
 cui/source/tabpages/tpcolor.cxx   |   39 ---
 cui/source/tabpages/tpgradnt.cxx  |   95 +-
 cui/source/tabpages/tphatch.cxx   |   76 --
 cui/source/tabpages/tppattern.cxx |   50 
 5 files changed, 26 insertions(+), 240 deletions(-)

New commits:
commit 2c2f0eaf6ae6f8b0e235e848b25959301d0941bd
Author: Rishabh Kumar 
Date:   Tue Aug 23 04:07:24 2016 +0530

[GSoC] Remove popup confirmation dialog in fill style tabs

Enable users to apply custom values without adding it to the preset list

Change-Id: Ida00c6eeb06e717a8aed30f4d230ab616c5b03dd
Reviewed-on: https://gerrit.libreoffice.org/28333
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 0d65c26..ed510c0 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -413,7 +413,6 @@ private:
 DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void );
 void ModifiedHdl_Impl(void*);
 
-long CheckChanges_Impl();
 void SetControlState_Impl( css::awt::GradientStyle eXGS );
 sal_Int32 SearchGradientList(const OUString& rGradientName);
 
@@ -496,7 +495,6 @@ private:
 DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void );
 DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
 
-long CheckChanges_Impl();
 sal_Int32 SearchHatchList(const OUString& rHatchName);
 
 public:
@@ -667,8 +665,6 @@ private:
 DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void );
 DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void );
 
-long CheckChanges_Impl();
-
 public:
 SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs  );
 virtual ~SvxPatternTabPage();
@@ -799,8 +795,6 @@ private:
 static sal_Int32 SearchColorList(OUString const & aColorName);
 DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void );
 
-long CheckChanges_Impl();
-
 void UpdateModified();
 css::uno::Reference< css::uno::XComponentContext > m_context;
 public:
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 9571073..696379c 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -303,9 +303,6 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 
 DeactivateRC SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
-if ( CheckChanges_Impl() == -1L )
-return DeactivateRC::KeepPage;
-
 if( _pSet )
 FillItemSet( _pSet );
 
@@ -313,42 +310,6 @@ DeactivateRC SvxColorTabPage::DeactivatePage( SfxItemSet* 
_pSet )
 }
 
 
-long SvxColorTabPage::CheckChanges_Impl()
-{
-if( ColorToPercent_Impl( aCurrentColor.GetRed() ) != ColorToPercent_Impl( 
aPreviousColor.GetRed() ) ||
-ColorToPercent_Impl( aCurrentColor.GetGreen() ) != 
ColorToPercent_Impl( aPreviousColor.GetGreen() ) ||
-ColorToPercent_Impl( aCurrentColor.GetBlue() ) != ColorToPercent_Impl( 
aPreviousColor.GetBlue() ) )
-{
-ResMgr& rMgr = CUI_MGR();
-Image aWarningBoxImage = WarningBox::GetStandardImage();
-ScopedVclPtrInstance aMessDlg( GetParentDialog(),
-SVX_RESSTR( RID_SVXSTR_COLOR ),
-ResId( RID_SVXSTR_ASK_CHANGE_COLOR, rMgr ),
-&aWarningBoxImage );
-aMessDlg->SetButtonText( SvxMessDialogButton::N1,
-ResId( RID_SVXSTR_CHANGE, rMgr ) );
-aMessDlg->SetButtonText( SvxMessDialogButton::N2,
-ResId( RID_SVXSTR_ADD, rMgr ) );
-aMessDlg->DisableButton( SvxMessDialogButton::N1 );
-
-short nRet = aMessDlg->Execute();
-
-switch( nRet )
-{
-case RET_BTN_2:
-{
-ClickAddHdl_Impl( nullptr );
-}
-break;
-
-case RET_CANCEL:
-break;
-}
-}
-return 0;
-}
-
-
 bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
 {
 if( ( nDlgType != 0 ) ||
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index bb62b55..12cc67d 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -254,9 +254,6 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
 
 DeactivateRC SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
-if( CheckChanges_Impl() == -1L )
-return DeactivateRC::KeepPage;
-
 if( _pSet )
 FillItemSet( _pSet );
 
@@ -264,94 +261,28 @@ DeactivateRC SvxGradientTabPage::DeactivatePage( 
SfxItemSet* _pSet )
 }
 
 
-long SvxGradientTabPage::CheckChanges_Impl()
-{
-// is used here in order to NOT lose changes
-XGradient aTmpGradient( m_pLbColorFrom->GetSelectEntryColor(),
-  m_pLbC

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/galaxy icon-themes/hicontrast icon-themes/sifr icon-themes/tango include/svx officecfg/registry sc/uiconfig svx/source sw/uiconfig

2016-08-26 Thread Maxim Monastirsky 
 icon-themes/breeze/links.txt |2 +
 icon-themes/galaxy/links.txt |2 +
 icon-themes/hicontrast/links.txt |2 +
 icon-themes/sifr/links.txt   |3 ++
 icon-themes/tango/links.txt  |2 +
 include/svx/TextUnderlinePopup.hxx   |4 +++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   11 
++
 sc/uiconfig/scalc/toolbar/singlemode.xml |2 -
 svx/source/sidebar/text/TextUnderlinePopup.cxx   |9 
+++-
 sw/uiconfig/swriter/toolbar/singlemode.xml   |2 -
 10 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit c73592e38a075242bc90c5cb2119f163defdad25
Author: Maxim Monastirsky 
Date:   Wed Aug 24 14:18:11 2016 +0300

tdf#101672 non-split underline button

Change-Id: Ib20dc0d0036f594adb83a50c2e3da66f565b2db8
Reviewed-on: https://gerrit.libreoffice.org/28356
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index e91a80e..b97f2e2 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -828,6 +828,8 @@ cmd/sc_dsbrowserexplorer.png cmd/sc_showfmexplorer.png
 
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
+cmd/lc_underlinesimple.png cmd/lc_underline.png
+cmd/sc_underlinesimple.png cmd/sc_underline.png
 
 # Slide command aliases
 cmd/lc_insertslide.png cmd/lc_insertpage.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 3cb75cc..0c66dda 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -1,5 +1,7 @@
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
+cmd/lc_underlinesimple.png cmd/lc_underline.png
+cmd/sc_underlinesimple.png cmd/sc_underline.png
 cmd/lc_datastreamsplay.png avmedia/res/avl02049.png
 cmd/sc_datastreamsplay.png avmedia/res/av02049.png
 cmd/lc_datastreamsstop.png avmedia/res/avl02051.png
diff --git a/icon-themes/hicontrast/links.txt b/icon-themes/hicontrast/links.txt
index fc96ed6..df0ec87 100644
--- a/icon-themes/hicontrast/links.txt
+++ b/icon-themes/hicontrast/links.txt
@@ -1,5 +1,7 @@
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
+cmd/lc_underlinesimple.png cmd/lc_underline.png
+cmd/sc_underlinesimple.png cmd/sc_underline.png
 cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png
 cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
 
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index bdf0d87..2424d04 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -162,6 +162,9 @@ cmd/sc_insertcolumnsafter.png cmd/sc_insertcolumns.png
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
 
+cmd/lc_underlinesimple.png cmd/lc_underline.png
+cmd/sc_underlinesimple.png cmd/sc_underline.png
+
 # anchor menu
 cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png
 cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 3ecaa71..5e7ed99 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -1,5 +1,7 @@
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
+cmd/lc_underlinesimple.png cmd/lc_underline.png
+cmd/sc_underlinesimple.png cmd/sc_underline.png
 cmd/sc_showsinglepage.png cmd/sc_adddirect.png
 res/sx03129.png dbaccess/res/db.png
 cmd/sc_refresh.png cmd/sc_reload.png
diff --git a/include/svx/TextUnderlinePopup.hxx 
b/include/svx/TextUnderlinePopup.hxx
index 99d0eba..c627391 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -36,6 +36,10 @@ public:
 TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
 virtual ~TextUnderlinePopup();
 
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException, 
std::exception ) override;
+
 virtual VclPtr CreatePopupWindow() override;
 };
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9f476a5..bcee0d6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1523,6 +1523,17 @@
   9
 
   
+  
+
+  Underline
+
+
+  9
+
+
+  .uno:Underline
+
+  
   
 
   Overline
diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml 
b/sc/uiconfig/scalc/toolbar/sin

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

2016-08-26 Thread Andras Timar 
 loolwsd/LOOLWSD.cpp |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit a5aa138774b028d2f366f24ce3ec8371d7e31e3a
Author: Andras Timar 
Date:   Fri Aug 26 13:40:20 2016 +0200

loolwsd: response to HTTP GET / (e.g. for checking if server is alive)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 828c014..3793624 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -875,6 +875,17 @@ public:
 bool responded = false;
 try
 {
+if (request.getMethod() == HTTPRequest::HTTP_GET && 
request.getURI() == "/")
+{
+std::string mimeType = "text/plain";
+std::string responseString = "OK";
+response.setContentLength(responseString.length());
+response.setContentType(mimeType);
+response.setChunkedTransferEncoding(false);
+std::ostream& ostr = response.send();
+ostr << responseString;
+responded = true;
+}
 if (request.getMethod() == HTTPRequest::HTTP_GET && 
request.getURI() == "/favicon.ico")
 {
 std::string mimeType = "image/vnd.microsoft.icon";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/favicon.ico loolwsd/LOOLWSD.cpp loolwsd/loolwsd.spec.in loolwsd/Makefile.am

2016-08-26 Thread Andras Timar 
 loolwsd/LOOLWSD.cpp |   12 
 loolwsd/Makefile.am |2 ++
 loolwsd/favicon.ico |binary
 loolwsd/loolwsd.spec.in |1 +
 4 files changed, 15 insertions(+)

New commits:
commit 619ddb4c2f06bcd22e69f4498dc4730a5e1d2eed
Author: Andras Timar 
Date:   Fri Aug 26 12:57:33 2016 +0200

loolwsd: add favicon

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 0d0c80a..828c014 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -875,6 +875,18 @@ public:
 bool responded = false;
 try
 {
+if (request.getMethod() == HTTPRequest::HTTP_GET && 
request.getURI() == "/favicon.ico")
+{
+std::string mimeType = "image/vnd.microsoft.icon";
+std::string faviconPath = 
Path(Application::instance().commandPath()).parent().toString() + "favicon.ico";
+if (!File(faviconPath).exists())
+{
+faviconPath = LOOLWSD_DATADIR "/favicon.ico";
+}
+response.setContentType(mimeType);
+response.sendFile(faviconPath, mimeType);
+responded = true;
+}
 if (request.getMethod() == HTTPRequest::HTTP_GET && 
request.getURI() == "/hosting/discovery")
 {
 // http://server/hosting/discovery
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 4f36078..ef8c794 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -9,6 +9,7 @@ dist_bin_SCRIPTS = loolwsd-systemplate-setup
 loolwsddatadir = @LOOLWSD_DATADIR@
 
 loolwsddata_DATA = discovery.xml \
+   favicon.ico \
robots.txt
 
 loolwsdconfigdir = @LOOLWSD_CONFIGDIR@
@@ -118,6 +119,7 @@ noinst_HEADERS = Admin.hpp \
  security.h
 
 EXTRA_DIST = discovery.xml \
+ favicon.ico \
  loolwsd.xml.in \
  loolwsd.service \
  robots.txt \
diff --git a/loolwsd/favicon.ico b/loolwsd/favicon.ico
new file mode 100644
index 000..10c0557
Binary files /dev/null and b/loolwsd/favicon.ico differ
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 3814682..f444cce 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -103,6 +103,7 @@ tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet 
&& tar xf -)
 /usr/bin/loolmount
 /usr/bin/looltool
 /usr/share/loolwsd/discovery.xml
+/usr/share/loolwsd/favicon.ico
 /usr/share/loolwsd/robots.txt
 /usr/share/loolwsd/loleaflet
 %{_unitdir}/loolwsd.service
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Zdeněk Crhonek 
 sc/qa/unit/data/functions/fods/column.fods | 7377 +
 1 file changed, 7377 insertions(+)

New commits:
commit 22f3ea65355de33a01406ccf9910e0c746433f40
Author: Zdeněk Crhonek 
Date:   Thu Aug 25 16:12:06 2016 +0200

add COLUMN  test case

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

diff --git a/sc/qa/unit/data/functions/fods/column.fods 
b/sc/qa/unit/data/functions/fods/column.fods
new file mode 100644
index 000..3a80f56
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/column.fods
@@ -0,0 +1,7377 @@
+
+
+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-08-05T15:25:27.468003587P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/989e8bc0d792f0dc5778746fac45de129a22d7ac
+ 
+  
+   0
+   0
+   26645
+   8775
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   80
+   60
+   true
+   false
+  
+  
+   3
+   20
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   80
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 80
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ fr
+ FR
+ 
+ 
+ 
+
+
+ ru
+ RU
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+$
+   
+
+  
+  
+$(
+   
+   )
+  
+  
+$-
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   -
+   
+  
+  
+   - 
+  
+  
+   
+
+   
+   
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £
+   
+   
+  
+  
+   £
+   
+  
+  
+   -
+   £

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

2016-08-26 Thread Zdeněk Crhonek 
 sc/qa/unit/data/functions/fods/columns.fods   | 7343 ++
 sc/qa/unit/data/functions/fods/errortype.fods | 7333 +
 2 files changed, 14676 insertions(+)

New commits:
commit a176045f928442e895c5b1ae2eaf71566d5ddc02
Author: Zdeněk Crhonek 
Date:   Thu Aug 25 16:45:10 2016 +0200

add COLUMNS  test case

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

diff --git a/sc/qa/unit/data/functions/fods/columns.fods 
b/sc/qa/unit/data/functions/fods/columns.fods
new file mode 100644
index 000..fa64ba0
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/columns.fods
@@ -0,0 +1,7343 @@
+
+
+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-08-05T15:25:27.468003587P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/989e8bc0d792f0dc5778746fac45de129a22d7ac
+ 
+  
+   0
+   0
+   34974
+   13428
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   80
+   60
+   true
+   false
+  
+  
+   4
+   28
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   80
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 80
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ fr
+ FR
+ 
+ 
+ 
+
+
+ ru
+ RU
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+$
+   
+
+  
+  
+$(
+   
+   )
+  
+  
+$-
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   -
+   
+  
+  
+   - 
+  
+  
+   
+
+   
+   
+   
+  
+

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

2016-08-26 Thread Eike Rathke 
 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 svtools/source/misc/langtab.src|1 +
 3 files changed, 3 insertions(+)

New commits:
commit a0e60062d90652a3de5739630b152cd6215b6b6c
Author: Eike Rathke 
Date:   Fri Aug 26 12:54:50 2016 +0200

add Old Hungarian (Hungarian Rovas) [hu-Hung-HU] to language list, tdf#97406

Change-Id: I1804a08c69d496d6d1a7a8bb657b65fbfc24beb3

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index ee2de00..ba440df 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -747,6 +747,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CA", 0 },
 { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CN", kSAME },  
 // erroneous tdf#73973
 { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CN", kSAME },  
 // erroneous tdf#73973
+{ LANGUAGE_USER_HUNGARIAN_RUNIC,"hu-Hung", "HU", 0 },
 { LANGUAGE_DONTKNOW,"",""  , 0 }   
 // marks end of table
 };
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 48772ab..68648d8 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -717,6 +717,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_ENGLISH_MAURITIUS 0x9C09  /* makeLangID( 0x27, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 #define LANGUAGE_USER_FRENCH_MAURITIUS  0x900C  /* makeLangID( 0x24, 
getPrimaryLanguage( LANGUAGE_FRENCH)) */
 #define LANGUAGE_USER_SILESIAN  0x0699
+#define LANGUAGE_USER_HUNGARIAN_RUNIC   0x800E  /* makeLangID( 0x20, 
getPrimaryLanguage( LANGUAGE_HUNGARIAN)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f8c2211..7f743f8 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -402,6 +402,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ;
 < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ;
 < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ;
+< "Old Hungarian (Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_RUNIC ; 
> ;
 };
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread David Tardon 
 external/liborcus/Library_orcus.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4462447b8a48ad097e56c47e3736d80dc4aaa13a
Author: David Tardon 
Date:   Fri Aug 26 12:57:24 2016 +0200

tdf#94834 enable liborcus format detection on Windows

Change-Id: Ia6b353ed800eabd5766cc76e799f6151b71f865e

diff --git a/external/liborcus/Library_orcus.mk 
b/external/liborcus/Library_orcus.mk
index 96169f1..e49adca 100644
--- a/external/liborcus/Library_orcus.mk
+++ b/external/liborcus/Library_orcus.mk
@@ -30,6 +30,10 @@ $(eval $(call gb_Library_set_include,orcus,\
 $(eval $(call gb_Library_add_defs,orcus,\
-DBOOST_ALL_NO_LIB \
-D__ORCUS_BUILDING_DLL \
+   -D__ORCUS_GNUMERIC \
+   -D__ORCUS_ODS \
+   -D__ORCUS_XLSX \
+   -D__ORCUS_XLS_XML \
 ))
 
 $(eval $(call gb_Library_use_libraries,orcus,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang i18npool/inc i18npool/source sfx2/source

2016-08-26 Thread Stephan Bergmann 
 compilerplugins/clang/refcounting.cxx |   42 
++
 i18npool/inc/localedata.hxx   |3 
 i18npool/source/breakiterator/breakiterator_cjk.cxx   |8 -
 i18npool/source/breakiterator/breakiterator_unicode.cxx   |2 
 i18npool/source/calendar/calendarImpl.cxx |6 -
 i18npool/source/calendar/calendar_gregorian.cxx   |   12 +-
 i18npool/source/collator/collator_unicode.cxx |2 
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |4 
 i18npool/source/indexentry/indexentrysupplier.cxx |8 -
 i18npool/source/indexentry/indexentrysupplier_common.cxx  |2 
 i18npool/source/indexentry/indexentrysupplier_default.cxx |   10 +-
 i18npool/source/nativenumber/nativenumbersupplier.cxx |2 
 i18npool/source/transliteration/transliteration_Numeric.cxx   |5 -
 sfx2/source/doc/objxtor.cxx   |2 
 sfx2/source/notify/eventsupplier.cxx  |2 
 15 files changed, 78 insertions(+), 32 deletions(-)

New commits:
commit 28cb2c1764f2365d69ce09cb69f0f5a676458a33
Author: Stephan Bergmann 
Date:   Fri Aug 26 12:40:43 2016 +0200

loplugin:refcounting: also cover temporaries being directly stack managed

Change-Id: Ib0f7c60df1d2fba0d4d9d3fa6faf3bb97867ebc0

diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index 523f048..97eea57 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -53,6 +53,14 @@ public:
 bool VisitVarDecl(const VarDecl *);
 bool VisitFunctionDecl(const FunctionDecl *);
 
+// Creation of temporaries with one argument are represented by
+// CXXFunctionalCastExpr, while any other number of arguments are
+// represented by CXXTemporaryObjectExpr:
+bool VisitCXXTemporaryObjectExpr(CXXTemporaryObjectExpr const * expr)
+{ return visitTemporaryObjectExpr(expr); }
+bool VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * expr)
+{ return visitTemporaryObjectExpr(expr); }
+
 bool WalkUpFromObjCIvarDecl(ObjCIvarDecl * decl) {
 // Don't recurse into WalkUpFromFieldDecl, as VisitFieldDecl calls
 // FieldDecl::getParent, which triggers an assertion at least with
@@ -63,6 +71,8 @@ public:
 private:
 void checkUnoReference(QualType qt, const Decl* decl,
const std::string& rParentName, const std::string& 
rDeclName);
+
+bool visitTemporaryObjectExpr(Expr const * expr);
 };
 
 bool BaseCheckNotSubclass(const CXXRecordDecl *BaseDefinition, void *p) {
@@ -343,6 +353,38 @@ void RefCounting::checkUnoReference(QualType qt, const 
Decl* decl, const std::st
 }
 }
 
+bool RefCounting::visitTemporaryObjectExpr(Expr const * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+auto t = expr->getType();
+if (containsSvRefBaseSubclass(t.getTypePtr())) {
+report(
+DiagnosticsEngine::Warning,
+("Temporary object of SvRefBase subclass %0 being directly stack"
+ " managed, should be managed via tools::SvRef"),
+expr->getLocStart())
+<< t.getUnqualifiedType() << expr->getSourceRange();
+} else if (containsSalhelperReferenceObjectSubclass(t.getTypePtr())) {
+report(
+DiagnosticsEngine::Warning,
+("Temporary object of salhelper::SimpleReferenceObject subclass %0"
+ " being directly stack managed, should be managed via"
+ " rtl::Reference"),
+expr->getLocStart())
+<< t.getUnqualifiedType() << expr->getSourceRange();
+} else if (containsXInterfaceSubclass(t)) {
+report(
+DiagnosticsEngine::Warning,
+("Temporary object of css::uno::XInterface subclass %0 being"
+ " directly stack managed, should be managed via"
+ " css::uno::Reference"),
+expr->getLocStart())
+<< t.getUnqualifiedType() << expr->getSourceRange();
+}
+return true;
+}
+
 bool RefCounting::VisitFieldDecl(const FieldDecl * fieldDecl) {
 if (ignoreLocation(fieldDecl)) {
 return true;
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 0a28ee0..c36e711 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -68,6 +69,8 @@ public:
 LocaleDataImpl();
 virtual ~LocaleDataImpl();
 
+static rtl::Reference get() { return new LocaleDataImpl; }
+
 static css::uno::Sequence< css::i18n::CalendarItem > 
downcastCalendarItems( const css::uno::Sequence< css::i18n::CalendarItem2 > & 
rCi );
 static css::i18n::Calendar do

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

2016-08-26 Thread Stephan Bergmann 
 compilerplugins/clang/refcounting.cxx  |   13 +
 compilerplugins/clang/staticaccess.cxx |7 +--
 2 files changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 6a1bebcc890c04acdc79236ff54cdd49b27be71a
Author: Stephan Bergmann 
Date:   Fri Aug 26 12:36:12 2016 +0200

Remove wrong check through template args from containsXInterfaceSubclass

...that was probably only there as a workaround for cases (equally wrongly)
covered by the check for !hasAnyDependentBase in isDerivedFrom.  And the 
latter
appears to no longer be necessary, probably because the cases it happened to
cover intentionally are now covered correctly through some other logic that 
got
added to this plugin meanwhile.

Change-Id: Ife6370b4f966198fc731813afe62d765450382e6

diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index bfdafe9..523f048 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -83,10 +83,7 @@ bool isDerivedFrom(const CXXRecordDecl *decl, const char 
*pString) {
 if (!decl->hasDefinition()) {
 return false;
 }
-if (// not sure what hasAnyDependentBases() does,
-// but it avoids classes we don't want, e.g. 
WeakAggComponentImplHelper1
-!decl->hasAnyDependentBases() &&
-!compat::forallBases(
+if (!compat::forallBases(
 *decl,
 #if CLANG_VERSION < 30800
 BaseCheckNotSubclass,
@@ -223,14 +220,6 @@ bool containsXInterfaceSubclass(const Type* pType0) {
 {
 return false;
 }
-for(unsigned i=0; igetTemplateArgs().size(); ++i) {
-const TemplateArgument& rArg = pTemplate->getTemplateArgs()[i];
-if (rArg.getKind() == TemplateArgument::ArgKind::Type &&
-containsXInterfaceSubclass(rArg.getAsType()))
-{
-return true;
-}
-}
 }
 }
 if (pType->isPointerType()) {
commit e3e66f7b07a920132c17a57e5434d0a472c6a250
Author: Stephan Bergmann 
Date:   Fri Aug 26 12:35:24 2016 +0200

Minor improvements of loplugin:staticaccess

Change-Id: I731aab418fb42922208afdaa60d98ccd76377dab

diff --git a/compilerplugins/clang/staticaccess.cxx 
b/compilerplugins/clang/staticaccess.cxx
index 7b825f3..7fa1d39 100644
--- a/compilerplugins/clang/staticaccess.cxx
+++ b/compilerplugins/clang/staticaccess.cxx
@@ -18,7 +18,9 @@ bool isStatic(ValueDecl const * decl, bool * 
memberEnumerator) {
 // clang::MemberExpr::getMemberDecl is documented to return either a
 // FieldDecl or a CXXMethodDecl, but can apparently also return a VarDecl
 // (as C++ static data members are modeled by VarDecl, not FieldDecl) or an
-// EnumConstantDecl (struct { enum {E}; } s; s.E;):
+// EnumConstantDecl (struct { enum {E}; } s; s.E;), see
+//  "Fix documentation of
+// MemberExpr::getMemberDecl":
 auto fd = dyn_cast(decl);
 if (fd != nullptr) {
 *memberEnumerator = false;
@@ -27,7 +29,8 @@ bool isStatic(ValueDecl const * decl, bool * 
memberEnumerator) {
 auto vd = dyn_cast(decl);
 if (vd != nullptr) {
 *memberEnumerator = false;
-return vd->isStaticDataMember();
+assert(vd->isStaticDataMember());
+return true;
 }
 auto md = dyn_cast(decl);
 if (md != nullptr) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tiago Santos license statement doubt

2016-08-26 Thread jan iversen 
Hi

For some reason, your email was duplicated, but let me try to answer your 
questions.

First of all let me say it is nice to see someone take the license seriously, a 
lot of people says "Lets do it without license" and believes that makes their 
software open and free.


> Recently, I have been pointed to the Get Involved page, and I would like to 
> subscribe to the license terms posted there, though I would like to ask 
> advice about my previous submissions before proceeding.
I am the culpit, who commented on your bugzilla patches.

> The first patch is a corrected merge of European Portuguese and Brazilian 
> LibreOffice auto-correction files, explained and submitted on bug 97439.
> I do not have many doubts about this patch since it was based on two files 
> already present in LibreOffice, and as such, they should also be licensed 
> under MPLv2/LGPLv3+ dual license.
You submitted it as an attachment to bugzilla, and these follow the footer note 
on 
https://bugs.documentfoundation.org/ "Source code form contributions such as 
patches are considered to be modifications under the Mozilla Public License 
v2.0."

Furthermore you did not directly merge them into the master branch, I did that 
in your name, acting as a "guarantee" for the license.

We do accept smaller patches without a license statement, but as soon as you 
submit something bigger or more complicated, the license statement is demanded, 
to avoid any doubt.

> The main doubts come from the second patch and third patches, posted on bug 
> 101616. They are vastly increased thesaurus for European Portuguese language 
> (though the third patch may be suitable for Brazilian Portuguese after 
> review).
> These last two patches were posted as a package with a copy of the base 
> licenses since they are based in the already existing thesaurus from 
> LibreOffice (MPLv2/LGPLv3+ dual license) and two other European Portuguese 
> academic ontologies with free distribution licenses. I requested email 
> approval from of the author, in addition to the public claim of free use from 
> project PAPEL, and Creative Commons Attribution 3.0 Unported license from 
> project Onto.pt. Though they should be compatible with MPLv2/LGPLv3+ dual 
> license, I am not absolutely sure they are.
These patches are still pending to be merged on master.

It is important that patches submitted are your own work and thus free of other 
license bindings.

If submitting work of others, there are a couple of extra rules to follow:
- The work must be credited to the original author
- you cannot change the license, without the written permission from the author 
(and we have a copy).
- The license must be known and accepted.

We do use the CCA license for a lot of our work, and that is normally ok.

A good advice is to submit original work as a separate patch, followed by your 
work, so that we have the right crediting in our git logs.

> Can someone with more knowledgeable of this licensing terms advise me on this 
> matter, so I can proceed with the subscription to the licence, and these 
> former patches can be made useful to others.
> 
I hope to have answered your good questions and look forward to see your 
license statement, as well as more patches :-)

Have a good weekend.
rgds
jan I.

> PS - Apologies for the former unrevised email. This email punctuation, 
> spelling and grammar revision from the former one.

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

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

2016-08-26 Thread Oliver Specht 
 loleaflet/dist/images/lc_insertfootnote.png |binary
 loleaflet/dist/toolbar.css  |1 +
 loleaflet/dist/toolbar/toolbar.js   |   16 
 3 files changed, 17 insertions(+)

New commits:
commit 5902700922d110aee29d67be6224094bb521132d
Author: Oliver Specht 
Date:   Mon Aug 15 23:38:39 2016 +0200

Add footnote and text wrap functions

diff --git a/loleaflet/dist/images/lc_insertfootnote.png 
b/loleaflet/dist/images/lc_insertfootnote.png
new file mode 100644
index 000..65b110f
Binary files /dev/null and b/loleaflet/dist/images/lc_insertfootnote.png differ
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 8699372..13f7f5b 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -246,6 +246,7 @@ button.leaflet-control-search-next
 .w2ui-icon.save{ background: url('/loleaflet/dist/images/lc_save.png') 
no-repeat center !important; }
 .w2ui-icon.saveas{ background: url('/loleaflet/dist/images/lc_saveas.png') 
no-repeat center !important; }
 .w2ui-icon.strikeout{ background: 
url('/loleaflet/dist/images/lc_strikeout.png') no-repeat center !important; }
+.w2ui-icon.insertfootnote{ background: 
url('/loleaflet/dist/images/lc_insertfootnote.png') no-repeat center 
!important; }
 .w2ui-icon.underline{ background: 
url('/loleaflet/dist/images/lc_underline.png') no-repeat center !important; }
 .w2ui-icon.undo{ background: url('/loleaflet/dist/images/lc_undo.png') 
no-repeat center !important; }
 .w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png') 
no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index fcb1ae6..c12d533 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -168,6 +168,11 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {

$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
}
+   else if (id.startsWith('menu:wrap:wrap-'))
+   {
+   var wrapType = id.substring('menu:wrap:wrap-'.length);
+   map.toggleCommandState(wrapType);
+   }
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -326,6 +331,15 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
+   {type: 'menu', id: 'writer:menu:wrap', caption: 
_('Textwrap'), items: [
+   { text: _('No wrap'), id: 'wrap-WrapOff' },
+   { text: _('Page wrap'), id: 'wrap-WrapOn' },
+   { text: _('Wrap anchor only'), id: 
'wrap-WrapAnchorOnly' },
+   { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
+   { text: _('Left wrap'), id: 'wrap-WrapLeft' },
+   { text: _('Right wrap'), id: 'wrap-WrapRight' },
+   { text: _('Wrap through'), id: 
'wrap-WrapThrough' }
+   ]},
{type: 'button',  id: 'save', img: 'save', hint: 
_('Save'), uno: 'Save'},
{type: 'break'},
{type: 'button',  id: 'undo',  img: 'undo', hint: 
_('Undo'), uno: 'Undo'},
@@ -340,6 +354,8 @@ $(function () {
{type: 'button',  id: 'underline',  img: 'underline', 
hint: _('Underline'), uno: 'Underline'},
{type: 'button',  id: 'strikeout', img: 'strikeout', 
hint: _('Strikeout'), uno: 'Strikeout'},
{type: 'break'},
+   {type: 'button',  id: 'insertfootnote', img: 
'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
+   {type: 'break' },
{type: 'html',  id: 'fontcolor-html', html: ''},
{type: 'button',  id: 'fontcolor', img: 'color', hint: 
_('Font color')},
{type: 'html',  id: 'backcolor-html', html: ''},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst redland/prj redland/raptor redland/rasqal redland/redland redland/redlandversion.mk scp2/source

2016-08-26 Thread Don Lewis 
 external_deps.lst  |   18 
 redland/prj/d.lst  |   16 
 redland/raptor/makefile.mk |   31 -
 redland/raptor/raptor-1.4.18.patch.autotools   |  217 -
 redland/raptor/raptor-1.4.18.patch.dmake   |  121 -
 redland/raptor/raptor-1.4.18.patch.fixes   |   42 -
 redland/raptor/raptor-1.4.18.patch.ooo_build   |   43 -
 redland/raptor/raptor-1.4.18.patch.win32   |   78 ---
 redland/raptor/raptor2-2.0.15.patch.dmake  |  136 +
 redland/raptor/raptor2-2.0.15.patch.win32  |  487 
 redland/rasqal/makefile.mk |   21 
 redland/rasqal/rasqal-0.9.16.patch.autotools   |  211 
 redland/rasqal/rasqal-0.9.16.patch.dmake   |  100 
 redland/rasqal/rasqal-0.9.16.patch.ooo_build   |   56 --
 redland/rasqal/rasqal-0.9.16.patch.win32   |   43 -
 redland/rasqal/rasqal-0.9.33.patch.dmake   |  153 ++
 redland/rasqal/rasqal-0.9.33.patch.ooo_build   |   14 
 redland/rasqal/rasqal-0.9.33.patch.win32   |  398 
 redland/redland/makefile.mk|   46 +
 redland/redland/redland-1.0.17.patch.autotools |   21 
 redland/redland/redland-1.0.17.patch.dmake |  122 +
 redland/redland/redland-1.0.17.patch.ooo_build |   32 +
 redland/redland/redland-1.0.17.patch.win32 |  598 +
 redland/redland/redland-1.0.8.patch.autotools  |  229 -
 redland/redland/redland-1.0.8.patch.dmake  |  119 
 redland/redland/redland-1.0.8.patch.ooo_build  |   22 
 redland/redland/redland-1.0.8.patch.win32  |  154 --
 redland/redlandversion.mk  |4 
 scp2/source/ooo/file_library_ooo.scp   |4 
 29 files changed, 2046 insertions(+), 1490 deletions(-)

New commits:
commit 59b7d113bc939c00e8a2b8c395d1cfcb3e51b38b
Author: Don Lewis 
Date:   Fri Aug 26 07:13:14 2016 +

Upgrade bundled raptor from raptor-1.4.18 to raptor2-2.0.15 to get the

fix for CVE-2012-0037.  It is not know whether this vulnerability
affects OpenOffice.

Also upgrade rasqal from version 0.9.16 to version 0.9.33 and redland
from version 1.0.8 to version 1.0.17 since all three packages are
closely related parts of the OpenOffice redland module for handling RDF.

OpenDocument version 1.2 documents contain an RDF metadata blob for
things like bookmarks and OLE objects.

diff --git a/external_deps.lst b/external_deps.lst
index 744f055..2de3b62a 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -89,21 +89,21 @@ if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = 284e768eeda0e2898b0d5bf7e26a016e
-name = raptor-1.4.18.tar.gz
-URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz
+MD5 = a39f6c07ddb20d7dd2ff1f95fa21e2cd
+name = raptor2-2.0.15.tar.gz
+URL1 = http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = ca66e26082cab8bb817185a116db809b
-name = redland-1.0.8.tar.gz
-URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz
+MD5 = e5be03eda13ef68aabab6e42aa67715e
+name = redland-1.0.17.tar.gz
+URL1 = http://download.librdf.org/source/redland-1.0.17.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_REDLAND != YES)
-MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d
-name = rasqal-0.9.16.tar.gz
-URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz
+MD5 = 1f5def51ca0026cd192958ef07228b52
+name = rasqal-0.9.33.tar.gz
+URL1 = http://download.librdf.org/source/rasqal-0.9.33.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (GUI!=UNX || SYSTEM_ZLIB!=YES)
diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index f96f3a5..4311b2a 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,13 +1,13 @@
 mkdir: %_DEST%\inc%_EXT%\external
 ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1
-symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib
-symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1
-symlink: %_DEST%\lib%_EXT%\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib
-symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.dylib
+..\%__SRC%\lib\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so.0
+symlink: %_DEST%\lib%_EXT%\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so
+..\%__SRC%\lib\libraptor2.0.dylib %_DEST%\lib%_EXT%\libraptor2.0.dylib
+symlink: %_DEST%\lib%_EXT%\libraptor2.0.dylib 
%_DEST%\lib%_EXT%\libraptor2.dylib
+..\%__SRC%\lib\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so.3
+symlink: %_DEST%\lib%

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

2016-08-26 Thread Jochen Nitschke 
 editeng/source/editeng/eertfpar.cxx |   19 +--
 editeng/source/editeng/eertfpar.hxx |5 +
 include/editeng/svxrtf.hxx  |2 --
 3 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit aa67fed597bb375d1180d85db7ac90999f86e1a4
Author: Jochen Nitschke 
Date:   Thu Aug 25 20:30:31 2016 +0200

reduce defines to bool

nLastAction could be 0, ACTION_INSERTTEXT or ACTION_INSERTPARABRK
only later was checked so make this a bool

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

diff --git a/editeng/source/editeng/eertfpar.cxx 
b/editeng/source/editeng/eertfpar.cxx
index cb97fcc..4e6e18d 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -53,14 +53,13 @@ ImportInfo::~ImportInfo()
 EditRTFParser::EditRTFParser(
 SvStream& rIn, EditSelection aSel, SfxItemPool& rAttrPool, EditEngine* 
pEditEngine) :
 SvxRTFParser(rAttrPool, rIn, nullptr),
+aCurSel(aSel),
 mpEditEngine(pEditEngine),
-aRTFMapMode(MAP_TWIP)
+aRTFMapMode(MAP_TWIP),
+nDefFont(0),
+nDefTab(0),
+bLastActionInsertParaBreak(false)
 {
-aCurSel = aSel;
-nDefFont= 0;
-nDefTab = 0;
-nLastAction = 0;
-
 SetInsPos(EditPosition(mpEditEngine, &aCurSel));
 
 // Convert the twips values ...
@@ -106,7 +105,7 @@ SvParserState EditRTFParser::CallParser()
 mpEditEngine->CallImportHandler(aImportInfo);
 }
 
-if ( nLastAction == ACTION_INSERTPARABRK )
+if (bLastActionInsertParaBreak)
 {
 ContentNode* pCurNode = aCurSel.Max().GetNode();
 sal_Int32 nPara = mpEditEngine->GetEditDoc().GetPos(pCurNode);
@@ -247,7 +246,7 @@ void EditRTFParser::InsertText()
 mpEditEngine->CallImportHandler(aImportInfo);
 }
 aCurSel = mpEditEngine->InsertText(aCurSel, aText);
-nLastAction = ACTION_INSERTTEXT;
+bLastActionInsertParaBreak = false;
 }
 
 void EditRTFParser::InsertPara()
@@ -258,7 +257,7 @@ void EditRTFParser::InsertPara()
 mpEditEngine->CallImportHandler(aImportInfo);
 }
 aCurSel = mpEditEngine->InsertParaBreak(aCurSel);
-nLastAction = ACTION_INSERTPARABRK;
+bLastActionInsertParaBreak = true;
 }
 
 void EditRTFParser::MovePos( bool const bForward )
@@ -564,7 +563,7 @@ void EditRTFParser::ReadField()
 SvxFieldItem aField( SvxURLField( aFldInst, aFldRslt, 
SVXURLFORMAT_REPR ), EE_FEATURE_FIELD  );
 aCurSel = mpEditEngine->InsertField(aCurSel, aField);
 mpEditEngine->UpdateFieldsOnly();
-nLastAction = ACTION_INSERTTEXT;
+bLastActionInsertParaBreak = false;
 }
 }
 
diff --git a/editeng/source/editeng/eertfpar.hxx 
b/editeng/source/editeng/eertfpar.hxx
index d58ccb6..86194a0 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -26,9 +26,6 @@
 
 class EditEngine;
 
-
-#define ACTION_INSERTPARABRK2
-
 class EditRTFParser : public SvxRTFParser
 {
 private:
@@ -39,7 +36,7 @@ private:
 
 sal_uInt16  nDefFont;
 sal_uInt16  nDefTab;
-sal_uInt8   nLastAction;
+boolbLastActionInsertParaBreak;
 
 protected:
 virtual voidInsertPara() override;
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index ede52eb..00e42c0 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -89,8 +89,6 @@ public:
 EditNodeIdx* MakeNodeIdx() const;
 };
 
-#define ACTION_INSERTTEXT   1
-
 typedef std::map> SvxRTFFontTbl;
 typedef std::map> SvxRTFStyleTbl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-26 Thread Jochen Nitschke 
 include/svtools/svlbitm.hxx   |   15 -
 include/svtools/treelistbox.hxx   |3 --
 svtools/source/contnr/svlbitm.cxx |   43 --
 3 files changed, 1 insertion(+), 60 deletions(-)

New commits:
commit 532c2bba7d9985a10b112c880f21691f6b66c19c
Author: Jochen Nitschke 
Date:   Fri Aug 26 01:58:01 2016 +0200

remove SvLBoxBmp class

not used by anything

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

diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index 2e5f83e..f520f86 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -133,21 +133,6 @@ public:
 virtual void Clone(SvLBoxItem* pSource) override;
 };
 
-class SvLBoxBmp : public SvLBoxItem
-{
-Image aBmp;
-public:
-SvLBoxBmp();
-virtual ~SvLBoxBmp();
-virtual SvLBoxItemType GetType() const override;
-virtual void InitViewData( SvTreeListBox* ,SvTreeListEntry*, 
SvViewDataItem* = nullptr ) override;
-virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev,  
vcl::RenderContext& rRenderContext,
-   const SvViewDataEntry* pView, const SvTreeListEntry& 
rEntry) override;
-virtual SvLBoxItem* Create() const override;
-virtual void Clone( SvLBoxItem* pSource ) override;
-};
-
-
 class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
 {
 boolisVis;
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 9898716..25bbf74 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -50,7 +50,6 @@ class SvInplaceEdit2;
 class SvLBoxString;
 class SvLBoxButton;
 class SvLBoxContextBmp;
-class SvLBoxBmp;
 class SvImpLBox;
 class SvLBoxButtonData;
 struct SvLBoxDDInfo;
@@ -125,7 +124,7 @@ typedef sal_Int64   ExtendedWinBits;
 // disable the behavior of automatically selecting a "CurEntry" upon painting 
the control
 #define EWB_NO_AUTO_CURENTRY0x0001
 
-enum class SvLBoxItemType {String, Bmp, Button, ContextBmp};
+enum class SvLBoxItemType {String, Button, ContextBmp};
 
 class SvLBoxTab
 {
diff --git a/svtools/source/contnr/svlbitm.cxx 
b/svtools/source/contnr/svlbitm.cxx
index 4aeb7ee..52c0da1 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -238,49 +238,6 @@ void SvLBoxString::InitViewData(
 }
 
 // ***
-// class SvLBoxBmp
-// ***
-
-
-SvLBoxBmp::SvLBoxBmp() : SvLBoxItem()
-{
-}
-
-SvLBoxBmp::~SvLBoxBmp()
-{
-}
-
-SvLBoxItemType SvLBoxBmp::GetType() const
-{
-return SvLBoxItemType::Bmp;
-}
-
-void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
-SvViewDataItem* pViewData)
-{
-if( !pViewData )
-pViewData = pView->GetViewDataItem( pEntry, this );
-pViewData->maSize = aBmp.GetSizePixel();
-}
-
-void SvLBoxBmp::Paint(const Point& rPos, SvTreeListBox& rDev, 
vcl::RenderContext& rRenderContext,
-  const SvViewDataEntry* /*pView*/, const SvTreeListEntry& 
/*rEntry*/)
-{
-DrawImageFlags nStyle = rDev.IsEnabled() ? DrawImageFlags::NONE : 
DrawImageFlags::Disable;
-rRenderContext.DrawImage(rPos, aBmp ,nStyle);
-}
-
-SvLBoxItem* SvLBoxBmp::Create() const
-{
-return new SvLBoxBmp;
-}
-
-void SvLBoxBmp::Clone( SvLBoxItem* pSource )
-{
-aBmp = static_cast(pSource)->aBmp;
-}
-
-// ***
 // class SvLBoxButton
 // ***
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/source cui/source dbaccess/source include/svtools sc/source svtools/source svx/source sw/source

2016-08-26 Thread Jochen Nitschke 
 accessibility/source/extended/accessiblelistboxentry.cxx  |2 
 cui/source/options/fontsubs.cxx   |4 
 cui/source/options/optfltr.cxx|8 -
 cui/source/options/optlingu.cxx   |4 
 cui/source/tabpages/autocdlg.cxx  |4 
 cui/source/tabpages/macroass.cxx  |2 
 dbaccess/source/ui/app/AppDetailView.cxx  |2 
 dbaccess/source/ui/browser/dsEntriesNoExp.cxx |2 
 dbaccess/source/ui/browser/unodatbr.cxx   |4 
 dbaccess/source/ui/control/dbtreelistbox.cxx  |4 
 dbaccess/source/ui/control/listviewitems.cxx  |4 
 dbaccess/source/ui/control/tabletree.cxx  |4 
 dbaccess/source/ui/dlg/tablespage.cxx |4 
 dbaccess/source/ui/inc/listviewitems.hxx  |4 
 include/svtools/svlbitm.hxx   |8 -
 include/svtools/treelistbox.hxx   |8 -
 include/svtools/treelistentry.hxx |4 
 sc/source/ui/miscdlgs/acredlin.cxx|8 -
 sc/source/ui/miscdlgs/solveroptions.cxx   |4 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx   |2 
 svtools/source/contnr/iconview.cxx|4 
 svtools/source/contnr/simptabl.cxx|8 -
 svtools/source/contnr/svimpbox.cxx|8 -
 svtools/source/contnr/svlbitm.cxx |   16 
+--
 svtools/source/contnr/svtabbx.cxx |   12 +-
 svtools/source/contnr/treelistbox.cxx |   45 
--
 svtools/source/contnr/treelistentry.cxx   |   14 
+--
 svx/source/dialog/checklbx.cxx|2 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |8 -
 sw/source/ui/index/cnttab.cxx |2 
 sw/source/uibase/utlui/content.cxx|2 
 sw/source/uibase/utlui/glbltree.cxx   |2 
 32 files changed, 102 insertions(+), 107 deletions(-)

New commits:
commit ef699b4d41cc602322d980027956aab636c776d5
Author: Jochen Nitschke 
Date:   Fri Aug 26 01:26:38 2016 +0200

convert SV_ITEM_ID_LBOX defines to scoped enum

and remove unused SV_ITEM_ID_EXTENDRLBOXSTRING

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

diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx 
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 0999c43..a087d6f 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -462,7 +462,7 @@ namespace accessibility
 while( iCount < iTotleItemCount )
 {
 const SvLBoxItem& rItem = pEntry->GetItem( iCount );
-if ( rItem.GetType() == SV_ITEM_ID_LBOXSTRING &&
+if ( rItem.GetType() == SvLBoxItemType::String &&
  !static_cast( rItem 
).GetText().isEmpty() )
 {
 iRealItemCount++;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 4580275..239e689 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -511,7 +511,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( 
SvTreeListEntry* pEntry, sal
 {
 SvLBoxButton& rItem = static_cast(pEntry->GetItem(nCol + 
1));
 
-if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON)
+if (rItem.GetType() == SvLBoxItemType::Button)
 {
 switch( eState )
 {
@@ -536,7 +536,7 @@ SvButtonState 
SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pE
 SvButtonState eState = SvButtonState::Unchecked;
 SvLBoxButton& rItem = static_cast(pEntry->GetItem(nCol + 
1));
 
-if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON)
+if (rItem.GetType() == SvLBoxItemType::Button)
 {
 SvItemStateFlags nButtonFlags = rItem.GetButtonFlags();
 eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 0602cef..e7f3057 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -236,7 +236,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
 if( pEntry )
 {
 SvLBoxButton

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

2016-08-26 Thread Susobhan Ghosh 
 extras/source/glade/libreoffice-catalog.xml.in |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 213a11b94caf28ffae927169ebd372a866f8f9b2
Author: Susobhan Ghosh 
Date:   Thu Aug 25 11:56:26 2016 +

Add custom widget entries to glade catalog

Change-Id: I0c51c70adcc81b04695ef07627e751a83c8d2f4d
Reviewed-on: https://gerrit.libreoffice.org/28381
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 379ff6d..3f78445 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -711,6 +711,22 @@
 generic-name="Fill Attr ListBox" parent="GtkComboBox"
 icon-name="widget-gtk-combobox"/>
 
+
+
+
+
+
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes of ESC call: 2016-08-25

2016-08-26 Thread jan iversen 

> * UX Update (Heiko)
>+ R.I.P. ux-advice, long live needsUXEval
>+ Robinson killed it today (Heiko)
>+ Total number of needsUXEval (507)
>+ Base 1
>+ Calc 14
>+ Draw 74
>+ Extensions 1
>+ framework 3
>+ Impress 9
>+ LibreOffice 357
>+ Localization 1
>+ UI 14
>+ Writer 33
>+ compared to 2016-08-18
>+ Changed: (507)
>+ New: All-in-one settings (tdf#101609)
>+ Closed: -
Am I correct in assuming "closed" means evaluated by the UX team and ready to 
be programmed (meaning needsUXEval is removed) and not "closed" as in "bug 
solved" ?
If my assumption is correct, maybe changing "closed" to e.g. "ready to be 
solved" would be a good idea.

If a bug has needsUXEval or needsDEVEval set, people will not start working on 
it, so therefore it is important to get needs removed as soon as the 
needed work is done.

rgds
jan I.


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

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

2016-08-26 Thread Daniel Sikeler 
 include/xmloff/xmltkmap.hxx |   17 +++--
 xmloff/source/core/xmltkmap.cxx |   30 ++
 2 files changed, 37 insertions(+), 10 deletions(-)

New commits:
commit e3b3c3fe41fde28b01ab1b2d8408d92dfa837dc5
Author: Daniel Sikeler 
Date:   Thu Aug 25 02:19:48 2016 +0530

Make SvXMLTokenMap compatible with FastTokens:

Added new methods for the fasttokens and
a lot of entries must be updated in later commits.

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

diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx
index 4cf6403..c54d801 100644
--- a/include/xmloff/xmltkmap.hxx
+++ b/include/xmloff/xmltkmap.hxx
@@ -28,20 +28,32 @@
 
 
 class SvXMLTokenMap_Impl;
+class SvXMLTokenMapEntry_Impl;
 
 #define XML_TOK_UNKNOWN 0xU
-#define XML_TOKEN_MAP_END { 0xU, ::xmloff::token::XML_TOKEN_INVALID, 0U }
+#define XML_TOKEN_MAP_END { 0xU, xmloff::token::XML_TOKEN_INVALID, 0U, 0 }
 
 struct SvXMLTokenMapEntry
 {
 sal_uInt16  nPrefixKey;
-enum ::xmloff::token::XMLTokenEnum eLocalName;
+enum xmloff::token::XMLTokenEnum eLocalName;
 sal_uInt16  nToken;
+sal_Int32 nFastToken;
+
+SvXMLTokenMapEntry( sal_uInt16 nPrefix, xmloff::token::XMLTokenEnum eName,
+sal_uInt16 nTok = XML_TOK_UNKNOWN, sal_Int32 nFastTok 
= 0 ) :
+nPrefixKey( nPrefix ),
+eLocalName( eName ),
+nToken( nTok ),
+nFastToken( nFastTok )
+{}
 };
 
 class XMLOFF_DLLPUBLIC SvXMLTokenMap
 {
+private:
 std::unique_ptr  m_pImpl;
+sal_uInt16 Get( const SvXMLTokenMapEntry_Impl& rEntry ) const;
 
 public:
 
@@ -49,6 +61,7 @@ public:
 ~SvXMLTokenMap();
 
 sal_uInt16 Get( sal_uInt16 nPrefix, const OUString& rLName ) const;
+sal_uInt16 Get( sal_Int32 nFastTok ) const;
 };
 
 #endif // INCLUDED_XMLOFF_XMLTKMAP_HXX
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 1b5810f..6888b62 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -30,22 +30,25 @@ class SvXMLTokenMapEntry_Impl
 sal_uInt16  nPrefixKey;
 OUStringsLocalName;
 sal_uInt16  nToken;
+sal_Int32   nFastToken;
 
 public:
 
 sal_uInt16 GetToken() const { return nToken; }
 
 SvXMLTokenMapEntry_Impl( sal_uInt16 nPrefix, const OUString& rLName,
- sal_uInt16 nTok=XML_TOK_UNKNOWN ) :
+ sal_uInt16 nTok = XML_TOK_UNKNOWN, sal_Int32 
nFastTok = 0 ) :
 nPrefixKey( nPrefix ),
 sLocalName( rLName  ),
-nToken( nTok )
+nToken( nTok ),
+nFastToken( nFastTok )
 {}
 
 explicit SvXMLTokenMapEntry_Impl( const SvXMLTokenMapEntry& rEntry ) :
 nPrefixKey( rEntry.nPrefixKey ),
 sLocalName( GetXMLToken( rEntry.eLocalName ) ),
-nToken( rEntry.nToken )
+nToken( rEntry.nToken ),
+nFastToken( rEntry.nFastToken )
 {}
 
 bool operator<( const SvXMLTokenMapEntry_Impl& r ) const
@@ -72,13 +75,10 @@ SvXMLTokenMap::~SvXMLTokenMap()
 {
 }
 
-sal_uInt16 SvXMLTokenMap::Get( sal_uInt16 nKeyPrefix,
-   const OUString& rLName ) const
+sal_uInt16 SvXMLTokenMap::Get( const SvXMLTokenMapEntry_Impl& rEntry ) const
 {
 SvXMLTokenMapEntry_Impl const* pEntry = nullptr;
-SvXMLTokenMapEntry_Impl aTst( nKeyPrefix, rLName );
-
-SvXMLTokenMap_Impl::iterator it = m_pImpl->find( aTst );
+SvXMLTokenMap_Impl::iterator it = m_pImpl->find( rEntry );
 if (it != m_pImpl->end())
 {
 pEntry = &*it;
@@ -90,4 +90,18 @@ sal_uInt16 SvXMLTokenMap::Get( sal_uInt16 nKeyPrefix,
 return XML_TOK_UNKNOWN;
 }
 
+sal_uInt16 SvXMLTokenMap::Get( sal_uInt16 nKeyPrefix,
+   const OUString& rLName ) const
+{
+SvXMLTokenMapEntry_Impl aTst( nKeyPrefix, rLName );
+return( Get( aTst ) );
+}
+
+sal_uInt16 SvXMLTokenMap::Get( sal_Int32 nFastTok ) const
+{
+static const OUString sEmptyString("");
+SvXMLTokenMapEntry_Impl aTst( 0, sEmptyString, XML_TOK_UNKNOWN, nFastTok );
+return( Get( aTst ) );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - 10 commits - configure.ac external/harfbuzz vcl/headless vcl/inc vcl/Library_vcl.mk vcl/quartz vcl/README.vars vcl/source vcl/unx vcl

2016-08-26 Thread Akash Jain 
Rebased ref, commits from common ancestor:
commit 0f4202b37a5662954caa6587025b0d2afe789c31
Author: Akash Jain 
Date:   Wed Aug 17 21:31:22 2016 +0530

GSoC: Speed up CommonSalLayout by caching hb_face

Cache hb_face so it is not created again and again.
Switch from GDI to DirectWrite on Windows to obtain SFNT table data.

Change-Id: I9c532cd72e1f6b57313f3b7d42a6b9b0633eb0ef

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 01641ad..90aa84b 100755
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -40,6 +40,7 @@ class CommonSalLayout : public GenericSalLayout
 #ifdef _WIN32
 HDC   mhDC;
 HFONT mhFont;
+D2DWriteTextOutRenderer* mpD2DRenderer;
 #elif defined(MACOSX) || defined(IOS)
 const CoreTextStyle& mrCoreTextStyle;
 #else
@@ -48,7 +49,7 @@ class CommonSalLayout : public GenericSalLayout
 
 public:
 #if defined(_WIN32)
-explicitCommonSalLayout(HDC, WinFontInstance&);
+explicitCommonSalLayout(WinSalGraphics*, WinFontInstance&, 
const WinFontFace&);
 virtual voidInitFont() const override;
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
@@ -58,7 +59,6 @@ public:
 const ServerFont&   getFontData() const { return mrServerFont; };
 #endif
 
-virtual ~CommonSalLayout();
 voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
 voidAdjustLayout(ImplLayoutArgs&) override;
 virtual boolLayoutText(ImplLayoutArgs&) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 7578768..678b0d1 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -45,6 +45,7 @@
 
 #include "quartz/salgdicommon.hxx"
 #include 
+#include 
 
 class AquaSalFrame;
 class FontAttributes;
@@ -98,6 +99,8 @@ public:
 void   GetFontMetric( ImplFontMetricDataPtr& ) const;
 bool   GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const;
 bool   GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const;
+hb_face_t* GetHBFace() const { return mpHBFace; }
+void   SetHBFace(hb_face_t* pHBFace) const { mpHBFace = pHBFace; }
 
 const CoreTextFontFace*  mpFontData;
 /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
@@ -109,6 +112,7 @@ public:
 private:
 /// CoreText text style object
 CFMutableDictionaryRef  mpStyleDict;
+mutable hb_face_t*  mpHBFace;
 
 friend class CTLayout;
 friend class AquaSalGraphics;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 04723cb..1c356c5 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -35,6 +35,7 @@
 #include 
 #include "fontattributes.hxx"
 #include "impfontmetricdata.hxx"
+#include "hb-ot.h"
 
 #include 
 
@@ -181,6 +182,8 @@ public:
 sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) 
const;
 boolGetGlyphOutline( sal_GlyphId aGlyphId, 
basegfx::B2DPolyPolygon& ) const;
 boolGetAntialiasAdvice() const;
+hb_face_t*  GetHBFace() { return mpHBFace; }
+voidSetHBFace( hb_face_t* pHBFace ) { 
mpHBFace=pHBFace; }
 
 private:
 friend class GlyphCache;
@@ -240,6 +243,7 @@ private:
 GlyphSubstitution   maGlyphSubstitution;
 
 ServerFontLayoutEngine* mpLayoutEngine;
+hb_face_t*  mpHBFace;
 };
 
 // a class for cache entries for physical font instances that are based on 
serverfonts
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index bc5165d..961cb47 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -44,6 +44,9 @@
 #  include "postwin.h"
 #endif
 
+#include 
+#include 
+
 class FontSelectPattern;
 class WinFontInstance;
 class ImplFontAttrCache;
@@ -139,10 +142,12 @@ private:
 
 mutable std::unordered_set  maGsubTable;
 mutable boolmbGsubRead;
+mutable hb_face_t*  mpHBFace;
 public:
 boolHasGSUBstitutions( HDC ) const;
 boolIsGSUBstituted( sal_UCS4 ) const;
-static int  GetTable( const char pTagName[5], const unsigned 
char*&, HDC );
+hb_face_t*  GetHBFace() const { return mpHBFace; }
+voidSetHBFace( hb_face_t* pHBFace ) const { mpHBFace = 
pHBFace; }
 };
 
 /** Class that creates (and destroys) a compatible Device Context.
@@ -354,6 +359,7 @@ private:
 sal_uLong   GetKernPairs();
 
 public:
+sal_uLong   GetTable( const char pTagName[5], const unsigned 
char*&, void*&, IDWriteFontFace*& );
 // public SalGraphics methods, the interface to the independent vcl part
 
 // get device resolution
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index c7b54d3..d315705 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx

[Libreoffice-commits] core.git: desktop/source extensions/source filter/source forms/source framework/source rsc/source

2016-08-26 Thread Gökhan Gurbetoğlu 
 desktop/source/migration/migration.cxx|   13 +-
 extensions/source/propctrlr/formcomponenthandler.cxx  |8 +++---
 extensions/source/propctrlr/newdatatype.cxx   |3 --
 filter/source/svg/svgwriter.cxx   |3 --
 forms/source/xforms/submission/replace.cxx|4 +--
 framework/source/uiconfiguration/uicategorydescription.cxx|4 +--
 framework/source/uiconfiguration/windowstateconfiguration.cxx |4 +--
 framework/source/uielement/uicommanddescription.cxx   |8 +++---
 rsc/source/rsc/rsc.cxx|6 ++--
 9 files changed, 26 insertions(+), 27 deletions(-)

New commits:
commit 674e0f0b43392a7e7fa515dad8427ccc901f7a01
Author: Gökhan Gurbetoğlu 
Date:   Wed Aug 24 14:43:05 2016 +0300

tdf#100726 - Improve readability of OUString concatanations

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

diff --git a/desktop/source/migration/migration.cxx 
b/desktop/source/migration/migration.cxx
index db40b4d..3d1383d 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -900,14 +900,15 @@ void MigrationImpl::runServices()
 
 
 } catch (const Exception& e) {
-OString aMsg("Execution of migration service failed (Exception 
caught).\nService: ");
-aMsg += OUStringToOString(i_mig->service, 
RTL_TEXTENCODING_ASCII_US) + "\nMessage: ";
-aMsg += OUStringToOString(e.Message, 
RTL_TEXTENCODING_ASCII_US);
+OString aMsg = "Execution of migration service failed 
(Exception caught).\nService: "
+ + OUStringToOString(i_mig->service, 
RTL_TEXTENCODING_ASCII_US)
+ + "\nMessage: "
+ + OUStringToOString(e.Message, 
RTL_TEXTENCODING_ASCII_US);
 OSL_FAIL(aMsg.getStr());
 } catch (...) {
-OString aMsg("Execution of migration service failed (Exception 
caught).\nService: ");
-aMsg += OUStringToOString(i_mig->service, 
RTL_TEXTENCODING_ASCII_US) +
-"\nNo message available";
+OString aMsg = "Execution of migration service failed 
(Exception caught).\nService: "
+ + OUStringToOString(i_mig->service, 
RTL_TEXTENCODING_ASCII_US)
+ + "\nNo message available";
 OSL_FAIL(aMsg.getStr());
 }
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4f9f9eb..e3322ae 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -384,13 +384,13 @@ namespace pcr
 
 // Create new Ids
 std::unique_ptr pNewPureIds(new 
OUString[nNewCount]);
-OUString aIdStrBase = aDot;
 Any aNameAny = 
m_xComponent->getPropertyValue(PROPERTY_NAME);
 OUString sControlName;
 aNameAny >>= sControlName;
-aIdStrBase += sControlName;
-aIdStrBase += aDot;
-aIdStrBase += _rPropertyName;
+OUString aIdStrBase = aDot
++ sControlName
++ aDot
++ _rPropertyName;
 sal_Int32 i;
 OUString aDummyStr;
 for ( i = 0; i < nNewCount; ++i )
diff --git a/extensions/source/propctrlr/newdatatype.cxx 
b/extensions/source/propctrlr/newdatatype.cxx
index d7c6d20..f290500 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -52,8 +52,7 @@ namespace pcr
 }
 }
 
-OUString sNameBase( _rNameBase.copy( 0, nStripUntil ? nStripUntil + 1 
: 0 ) );
-sNameBase += " ";
+OUString sNameBase = _rNameBase.copy( 0, nStripUntil ? nStripUntil + 1 
: 0 ) + " ";
 OUString sInitialName;
 sal_Int32 nPostfixNumber = 1;
 do
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index af83e28..0aaa305 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1222,8 +1222,7 @@ bool SVGTextWriter::nextTextPortion()
 const OUString& rTextPortionId = 
implGetValidIDFromInterface( Reference(xPortionTextRange, 
UNO_QUERY) );
 if( !rTextPortionId.isEmpty() )
 {
-