date:20160214

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

2016-02-14 Thread Pranav Kant

 sd/source/core/stlsheet.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit e95db1865c7a095cde5e9cb338394555767b5c65
Author: Pranav Kant 
Date:   Fri Feb 12 20:17:47 2016 +0530

sd: Output display names of styles, not internal ones

For some reason, maDisplayName is not initialized always. Use
GetDisplayName() that handles such a case gracefully.

Change-Id: Ib62d4f03dcd3b5571749b540e5af7f90299e2067
Reviewed-on: https://gerrit.libreoffice.org/22348
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 233a623..3765775 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -1090,7 +1090,18 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const 
OUString& PropertyName ) thro
 }
 else if( pEntry->nWID == WID_STYLE_DISPNAME )
 {
-aAny <<= maDisplayName;
+OUString aDisplayName;
+if ( nFamily == SD_STYLE_FAMILY_MASTERPAGE )
+{
+const SdStyleSheet* pStyleSheet = GetPseudoStyleSheet();
+if (pStyleSheet != nullptr)
+aDisplayName = pStyleSheet->GetDisplayName();
+}
+
+if (aDisplayName.isEmpty())
+aDisplayName = GetDisplayName();
+
+aAny <<= aDisplayName;
 }
 else if( pEntry->nWID == SDRATTR_TEXTDIRECTION )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Pranav Kant

 sd/source/core/stlsheet.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 74d41618f71cad9ba5337e50ef099ffcbeb2b1ad
Author: Pranav Kant 
Date:   Fri Feb 12 20:17:47 2016 +0530

sd: Output display names of styles, not internal ones

For some reason, maDisplayName is not initialized always. Use
GetDisplayName() that handles such a case gracefully.

Change-Id: Ib62d4f03dcd3b5571749b540e5af7f90299e2067
Reviewed-on: https://gerrit.libreoffice.org/22348
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit e95db1865c7a095cde5e9cb338394555767b5c65)

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 0295790..f5460c7 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -1086,7 +1086,18 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const 
OUString& PropertyName ) thro
 }
 else if( pEntry->nWID == WID_STYLE_DISPNAME )
 {
-aAny <<= maDisplayName;
+OUString aDisplayName;
+if ( nFamily == SD_STYLE_FAMILY_MASTERPAGE )
+{
+const SdStyleSheet* pStyleSheet = GetPseudoStyleSheet();
+if (pStyleSheet != nullptr)
+aDisplayName = pStyleSheet->GetDisplayName();
+}
+
+if (aDisplayName.isEmpty())
+aDisplayName = GetDisplayName();
+
+aAny <<= aDisplayName;
 }
 else if( pEntry->nWID == SDRATTR_TEXTDIRECTION )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Pranav Kant

 desktop/source/lib/init.cxx |   25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 3c84b0b032453a389a2606d67d1995d554468cad
Author: Pranav Kant 
Date:   Sun Feb 14 02:08:20 2016 +0530

lok: Expose DisplayName of styles, not internal ones

Change-Id: I2119713600703e3aa18f673979c7cd84c38177d7
Reviewed-on: https://gerrit.libreoffice.org/22349
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit b0111f494c1ee2d75ac4f1544c06c24d464cc416)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 27bf2a2..16d0c13 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1422,9 +1422,28 @@ static char* getStyles(LibreOfficeKitDocument* pThis, 
const char* pCommand)
 uno::Sequence aStyles = xStyleFamily->getElementNames();
 for (const OUString& rStyle: aStyles )
 {
-// Filter out the default styles - they are already at the top
-// of the list
-if (aDefaultStyleNames.find(rStyle) == aDefaultStyleNames.end())
+uno::Reference< beans::XPropertySet > xStyle 
(xStyleFamily->getByName(rStyle), uno::UNO_QUERY);
+bool bStyleInserted = false;
+// Its possible that the style does not implement XPropertySet.
+// For example, TableDesignFamily doesn't yet.
+if (xStyle.is())
+{
+// Filter out the default styles - they are already at the top
+// of the list
+OUString sName;
+xStyle->getPropertyValue("DisplayName") >>= sName;
+if (!sName.isEmpty() && aDefaultStyleNames.find(sName) == 
aDefaultStyleNames.end())
+{
+boost::property_tree::ptree aChild;
+aChild.put("", sName.toUtf8());
+aChildren.push_back(std::make_pair("", aChild));
+bStyleInserted = true;
+}
+}
+
+// If XPropertySet is not implemented or DisplayName is empty 
string,
+// fallback to LO internal names
+if (!bStyleInserted)
 {
 boost::property_tree::ptree aChild;
 aChild.put("", rStyle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Pranav Kant

 desktop/source/lib/init.cxx |   25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

New commits:
commit b0111f494c1ee2d75ac4f1544c06c24d464cc416
Author: Pranav Kant 
Date:   Sun Feb 14 02:08:20 2016 +0530

lok: Expose DisplayName of styles, not internal ones

Change-Id: I2119713600703e3aa18f673979c7cd84c38177d7
Reviewed-on: https://gerrit.libreoffice.org/22349
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b24fbbc..f73a976 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1375,9 +1375,28 @@ static char* getStyles(LibreOfficeKitDocument* pThis, 
const char* pCommand)
 uno::Sequence aStyles = xStyleFamily->getElementNames();
 for (const OUString& rStyle: aStyles )
 {
-// Filter out the default styles - they are already at the top
-// of the list
-if (aDefaultStyleNames.find(rStyle) == aDefaultStyleNames.end())
+uno::Reference< beans::XPropertySet > xStyle 
(xStyleFamily->getByName(rStyle), uno::UNO_QUERY);
+bool bStyleInserted = false;
+// Its possible that the style does not implement XPropertySet.
+// For example, TableDesignFamily doesn't yet.
+if (xStyle.is())
+{
+// Filter out the default styles - they are already at the top
+// of the list
+OUString sName;
+xStyle->getPropertyValue("DisplayName") >>= sName;
+if (!sName.isEmpty() && aDefaultStyleNames.find(sName) == 
aDefaultStyleNames.end())
+{
+boost::property_tree::ptree aChild;
+aChild.put("", sName.toUtf8());
+aChildren.push_back(std::make_pair("", aChild));
+bStyleInserted = true;
+}
+}
+
+// If XPropertySet is not implemented or DisplayName is empty 
string,
+// fallback to LO internal names
+if (!bStyleInserted)
 {
 boost::property_tree::ptree aChild;
 aChild.put("", rStyle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 57950] Replace chained O(U)StringBuffer::append() with operator+

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=57950

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|ToBeReviewed|ToBeReviewed target:5.2.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 57950] Replace chained O(U)StringBuffer::append() with operator+

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=57950

--- Comment #65 from Commit Notification 
 ---
Arnold Dumas committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=53bf3ea58e0f4f9f4399a44bfc9ddecc71cb54c7

tdf#57950: Replace chained O(U)StringBuffer::append() with operator+

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-02-14 Thread Arnold Dumas

 cppu/source/uno/lbenv.cxx  |5 +
 cui/source/options/optjava.cxx |   11 +--
 dbaccess/source/ext/macromigration/migrationengine.cxx |2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 53bf3ea58e0f4f9f4399a44bfc9ddecc71cb54c7
Author: Arnold Dumas 
Date:   Sun Feb 14 00:59:35 2016 +0100

tdf#57950: Replace chained O(U)StringBuffer::append() with operator+

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

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index b9e964da..c5cdaa5 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1108,10 +1108,7 @@ static uno_Environment * initDefaultEnvironment(
 else
 {
 // late init with some code from matching uno language binding
-::rtl::OUStringBuffer aLibName( 16 );
-aLibName.append( envTypeName );
-aLibName.append( "_uno" );
-OUString aStr( aLibName.makeStringAndClear() );
+OUString aStr( envTypeName + "_uno" );
 
 if (!loadEnv(aStr, pEnv))
 {
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 4bcdeab..3f178ac 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -167,12 +167,11 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* 
pParent, const SfxItemSet&
 
 m_pJavaList->SvSimpleTable::SetTabs( aStaticTabs );
 
-OUStringBuffer sHeader;
-sHeader.append("\t").append(get("vendor")->GetText())
-.append("\t").append(get("version")->GetText())
-.append("\t").append(get("features")->GetText())
-.append("\t");
-m_pJavaList->InsertHeaderEntry(sHeader.makeStringAndClear(), 
HEADERBAR_APPEND, HeaderBarItemBits::LEFT);
+OUString sHeader ( "\t" + get("vendor")->GetText() +
+"\t" + get("version")->GetText() +
+"\t" + get("features")->GetText() +
+"\t" );
+m_pJavaList->InsertHeaderEntry(sHeader, HEADERBAR_APPEND, 
HeaderBarItemBits::LEFT);
 m_pJavaList->setColSizes();
 
 m_pJavaEnableCB->SetClickHdl( LINK( this, SvxJavaOptionsPage, 
EnableHdl_Impl ) );
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx 
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 2aa941c..94dd12c 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -991,7 +991,7 @@ namespace dbmm
 {
 const OUString sHierarhicalBase(
 _rContainerLoc.isEmpty() ? OUString() :
-   OUStringBuffer( _rContainerLoc 
).append( "/" ).makeStringAndClear());
+   OUString( _rContainerLoc +  "/" ) );
 
 Sequence< OUString > aElementNames( 
_rxContainer->getElementNames() );
 for (   const OUString* elementName = 
aElementNames.getConstArray();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Module_vcl.mk

2016-02-14 Thread Tor Lillqvist

 vcl/Module_vcl.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f48b789e1b985f65be2c15e508202ccf9ec05102
Author: Tor Lillqvist 
Date:   Mon Feb 15 09:15:42 2016 +0200

Package_opengl_blacklist is Windows-specific

Change-Id: Ida79aa0d5a519a2c124d20a1cd908411d01799de

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 65fa586..6a41a0b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -23,7 +23,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
 CustomTarget_afm_hash \
 Library_vcl \
Package_opengl \
-   Package_opengl_blacklist \
+   $(if $(filter WNT,$(OS)), \
+   Package_opengl_blacklist ) \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 StaticLibrary_vclmain \
$(if $(ENABLE_HEADLESS),, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/breakpad' - RepositoryExternal.mk

2016-02-14 Thread Markus Mohrhard

 RepositoryExternal.mk |   15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit e17b37862121f61651ec51cf95838cc8714084cb
Author: Markus Mohrhard 
Date:   Mon Feb 15 07:44:30 2016 +0100

remove unneeded case for system breakpad

breakpad is limited to TDF builds so there is no system version support
needed

Change-Id: I8339037035e03fcd0ecf5c8d930fa7fe78344dd2

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8079c1b..86ff6bd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3362,8 +3362,6 @@ endif # DESKTOP
 
 ifeq ($(ENABLE_BREAKPAD),TRUE)
 
-# ifneq ($(SYSTEM_LIBBREAKPAD),TRUE)
-
 define gb_LinkTarget__use_breakpad
 $(call gb_LinkTarget_set_include,$(1),\
 -I$(call gb_UnpackedTarball_get_dir,breakpad)/src \
@@ -3384,18 +3382,7 @@ $(call gb_LinkTarget_use_external_project,$(1),breakpad)
 
 endef
 
-# else # SYSTEM_LIBBREAKPAD
-# 
-# define gb_LinkTarget__use_libgltf
-# $(call gb_LinkTarget_set_include,$(1),\
-#  $$(INCLUDE) \
-#  $(LIBBREAKPAD_CFLAGS) \
-# )
-# $(call gb_LinkTarget_add_libs,$(1),$(LIBBREAKPAD_LIBS))
-#
-# endef
-
-endif # SYSTEN_LIBBREAKPAD
+endif # ENABLE_BREAKPAD
 
 ifeq ($(ENABLE_GLTF),TRUE)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 3 commits - chart2/source sfx2/source sw/qa writerfilter/source

2016-02-14 Thread Laurent Balland-Poirier

 chart2/source/view/axes/ScaleAutomatism.cxx   |   14 --
 chart2/source/view/inc/ScaleAutomatism.hxx|1 +
 sfx2/source/doc/docfile.cxx   |9 +
 sw/qa/extras/ooxmlimport/data/tdf85523.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |8 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++-
 6 files changed, 28 insertions(+), 7 deletions(-)

New commits:
commit 3c8bef5e6ac97348ab54904ec8442e31b68ddc6e
Author: Laurent Balland-Poirier 
Date:   Sat Jan 2 15:02:00 2016 +0100

tdf#96807 Reset min/max of auto scale

Y minimum for auto scale was accidentaly set to 0.
This avoided correct calculation of Y auto log scale (tdf#96807)
But also set linear Y auto scale from 0 (tdf#85690)

This fix detects if both min and max are equal to 0, and reset them (+-inf)

Change-Id: Ifaf306831f3b5a18a86483c88e807f478b447c77
Reviewed-on: https://gerrit.libreoffice.org/21055
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Tested-by: Jenkins 
(cherry picked from commit 5553d6a9314fd778b9a124d8a2c7e9dd1d7a58a3)
Reviewed-on: https://gerrit.libreoffice.org/21278
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 98982ca06a87e8b63204b0acda2105c66ae57440)
Reviewed-on: https://gerrit.libreoffice.org/21459
Reviewed-by: Chris Sherlock 
(cherry picked from commit 2fa4b37e8d6d516e9ac9190ee45456534611c3e7)

diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx 
b/chart2/source/view/axes/ScaleAutomatism.cxx
index f58bde4..61df0af 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -99,8 +99,7 @@ ScaleAutomatism::ScaleAutomatism( const ScaleData& 
rSourceScale, const Date& rNu
 , m_nTimeResolution(::com::sun::star::chart::TimeUnit::DAY)
 , m_aNullDate(rNullDate)
 {
-::rtl::math::setNan( &m_fValueMinimum );
-::rtl::math::setNan( &m_fValueMaximum );
+resetValueRange();
 
 double fExplicitOrigin = 0.0;
 if( m_aSourceScale.Origin >>= fExplicitOrigin )
@@ -110,8 +109,19 @@ ScaleAutomatism::~ScaleAutomatism()
 {
 }
 
+void ScaleAutomatism::resetValueRange( )
+{
+::rtl::math::setNan( &m_fValueMinimum );
+::rtl::math::setNan( &m_fValueMaximum );
+}
+
 void ScaleAutomatism::expandValueRange( double fMinimum, double fMaximum )
 {
+// if m_fValueMinimum and m_fValueMaximum == 0, it means that they were 
not determined.
+// m_fValueMinimum == 0 makes impossible to determine real minimum,
+// so they need to be reseted tdf#96807
+if( (m_fValueMinimum == 0.0) && (m_fValueMaximum == 0.0) )
+resetValueRange();
 if( (fMinimum < m_fValueMinimum) || ::rtl::math::isNan( m_fValueMinimum ) )
 m_fValueMinimum = fMinimum;
 if( (fMaximum > m_fValueMaximum) || ::rtl::math::isNan( m_fValueMaximum ) )
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx 
b/chart2/source/view/inc/ScaleAutomatism.hxx
index 17370fb..513cf7d 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -53,6 +53,7 @@ public:
  *  undefined (that is empty `uno::Any` objects).
  */
 voidexpandValueRange( double fMinimum, double fMaximum );
+voidresetValueRange();
 
 /** Sets additional auto scaling options.
 @param bExpandBorderToIncrementRhythm  If true, expands automatic
commit f0afa3037c82482db605406b9384ec1b511ae1a3
Author: Miklos Vajna 
Date:   Tue Jan 19 09:27:19 2016 +0100

tdf#85523 DOCX import: fix unexpected extra char at comment end

Change-Id: Ic3eb073d11a395a81b90fd1a9292d6ecf2940c09
(cherry picked from commit 39969defa29948d77565a7cd8a3471baaec8f35d)
Reviewed-on: https://gerrit.libreoffice.org/22306
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 
(cherry picked from commit 10a142356a4cdb487da10d83857e4b50a0452a5b)

diff --git a/sw/qa/extras/ooxmlimport/data/tdf85523.docx 
b/sw/qa/extras/ooxmlimport/data/tdf85523.docx
new file mode 100644
index 000..cd31ae4
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf85523.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a83d683..424e5f6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2114,6 +2114,14 @@ DECLARE_OOXMLIMPORT_TEST(testAnnotationFormatting, 
"annotation-formatting.docx")
 CPPUNIT_ASSERT_EQUAL(awt::FontUnderline::SINGLE, 
getProperty(getRun(xParagraph, 1), "CharUnderline"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf85523, "tdf85523.docx")
+{
+auto xTextField = getProperty< uno::Reference 
>(getRun(getParagraph(1), 6), "TextField");
+auto xText = getProperty< uno::Reference >(xTextField, 
"TextRange");
+// This was "commentX": an unexpected extra char was added at the comment 
end.
+ge

[Libreoffice-commits] core.git: Branch 'feature/breakpad' - 3 commits - external/breakpad external/Module_external.mk

2016-02-14 Thread David Tardon

 external/Module_external.mk   |1 +
 external/breakpad/ExternalProject_breakpad.mk |4 
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 7c47ff349659f3507063176f8f82e509a0192e82
Author: David Tardon 
Date:   Mon Feb 15 07:52:34 2016 +0100

AFAICS breakpad does use neither glew nor libgltf

Change-Id: Icfea7b921d990a3d7adcbebbda2cddbc62d8ea39

diff --git a/external/breakpad/ExternalProject_breakpad.mk 
b/external/breakpad/ExternalProject_breakpad.mk
index 350ad99..c0ea5df 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -22,8 +22,6 @@ $(call gb_ExternalProject_get_state_target,breakpad,build) :
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
-   '/p:AdditionalIncludeDirectories=$(subst 
$(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
-   /p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)
 
 else # !ifeq($(COM),MSC)
commit fad147634d10c80a307162e63b926f9f37b00edb
Author: David Tardon 
Date:   Mon Feb 15 07:50:25 2016 +0100

_use_autoconf is not needed

It enables building with gcc wrappers on Windows, which is not used here

Change-Id: I8b27ae9f8952fd3fbae37d17fdddfc1d3b9d5fb6

diff --git a/external/breakpad/ExternalProject_breakpad.mk 
b/external/breakpad/ExternalProject_breakpad.mk
index 713276e..350ad99 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,breakpad))
 
-$(eval $(call gb_ExternalProject_use_autoconf,breakpad,build))
-
 $(eval $(call gb_ExternalProject_register_targets,breakpad,\
build \
 ))
commit c8490a4c675df37293de20214cf7664084220b18
Author: David Tardon 
Date:   Mon Feb 15 07:48:58 2016 +0100

actually allow gbuild to see breakpad makefiles...

Change-Id: I12ba34f30508c0a888445a2d9b68d48807b74e8c

diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6528629..2512b85 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \
$(call gb_Helper_optional,BOOST,boost) \
+   $(call gb_Helper_optional,BREAKPAD,breakpad) \
$(call gb_Helper_optional,BSH,beanshell) \
$(call gb_Helper_optional,BZIP2,bzip2) \
$(call gb_Helper_optional,CAIRO,cairo) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-1' - source/sl

2016-02-14 Thread Andras Timar

 source/sl/svtools/source/dialogs.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b7736048644defcbcccedb40e80e9f16c787e48d
Author: Andras Timar 
Date:   Mon Feb 15 07:40:34 2016 +0100

Updated Slovenian translation

Change-Id: Iecb1236d948ce2634e3bd27fc1620bf32168191d

diff --git a/source/sl/svtools/source/dialogs.po 
b/source/sl/svtools/source/dialogs.po
index 50c0602..ac5093a 100644
--- a/source/sl/svtools/source/dialogs.po
+++ b/source/sl/svtools/source/dialogs.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: LibreOffice 4.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2015-10-04 10:08+0200\n"
-"PO-Revision-Date: 2015-09-05 15:43+0200\n"
+"PO-Revision-Date: 2016-02-15 02:54+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -303,7 +303,7 @@ msgctxt ""
 "STR_SVT_DEFAULT_SERVICE_LABEL\n"
 "string.text"
 msgid "$user$'s $service$"
-msgstr "$servjce$ â $user$"
+msgstr "$service$ â $user$"
 
 #: formats.src
 msgctxt ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations

2016-02-14 Thread Andras Timar

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

New commits:
commit d6d93bb1e1078ba42d08d15a60fe3edd27c831d4
Author: Andras Timar 
Date:   Mon Feb 15 07:40:34 2016 +0100

Updated core
Project: translations  b7736048644defcbcccedb40e80e9f16c787e48d

Updated Slovenian translation

Change-Id: Iecb1236d948ce2634e3bd27fc1620bf32168191d

diff --git a/translations b/translations
index 259f921..b773604 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 259f921f6207e58ce4584551d544350fed55b8d6
+Subproject commit b7736048644defcbcccedb40e80e9f16c787e48d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/breakpad' - desktop/Library_crashreport.mk

2016-02-14 Thread Markus Mohrhard

 desktop/Library_crashreport.mk |   44 +
 1 file changed, 44 insertions(+)

New commits:
commit 43ad8fb533745e0a04728116375b336acf9e3640
Author: Markus Mohrhard 
Date:   Mon Feb 15 07:17:24 2016 +0100

add forgotten file

Change-Id: I709e612ac7651c1b073859245082a8568d80

diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk
new file mode 100644
index 000..5b14519
--- /dev/null
+++ b/desktop/Library_crashreport.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,crashreport))
+
+$(eval $(call gb_Library_set_include,crashreport,\
+$$(INCLUDE) \
+-I$(SRCDIR)/desktop/inc \
+))
+
+$(eval $(call gb_Library_use_external,crashreport,breakpad))
+
+$(eval $(call gb_Library_add_defs,crashreport,\
+-DCRASHREPORT_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_libs,crashreport,\
+$(if $(filter LINUX %BSD SOLARIS, $(OS)), \
+$(DLOPEN_LIBS) \
+-lpthread \
+) \
+))
+
+$(eval $(call gb_Library_use_libraries,crashreport,\
+comphelper \
+cppu \
+cppuhelper \
+sal \
+salhelper \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,crashreport,\
+desktop/source/app/crashreport \
+))
+
+
+# vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/breakpad' - 16 commits - bin/symbolstore.py bin/upload_symbols.py configure.ac desktop/Executable_minidump_upload.mk desktop/Library_sofficeapp.mk deskt

2016-02-14 Thread Markus Mohrhard

 Repository.mk |2 
 RepositoryExternal.mk |5 
 bin/symbolstore.py|  644 ++
 bin/upload_symbols.py |   24 
 configure.ac  |6 
 desktop/Executable_minidump_upload.mk |   22 
 desktop/Library_sofficeapp.mk |   12 
 desktop/Module_desktop.mk |2 
 desktop/source/app/app.cxx|   60 ++
 desktop/source/app/crashreport.cxx|   45 +
 desktop/source/app/sofficemain.cxx|   21 
 desktop/source/minidump/minidump_upload.cxx   |  199 
 distro-configs/LibreOfficeLinux.conf  |1 
 external/breakpad/ExternalPackage_breakpad.mk |   20 
 external/breakpad/Module_breakpad.mk  |1 
 external/breakpad/UnpackedTarball_breakpad.mk |2 
 external/breakpad/breakpad-wshadow.patch.1|  232 +
 external/breakpad/breakpad-wshadow2.patch.1   |  144 +
 include/desktop/crashreport.hxx   |9 
 include/desktop/dllapi.h  |6 
 include/vcl/window.hxx|   10 
 sc/source/ui/docshell/docsh.cxx   |7 
 svx/Library_svx.mk|5 
 svx/UIConfig_svx.mk   |1 
 svx/source/dialog/crashreportdlg.cxx  |   74 ++
 svx/source/dialog/crashreportdlg.hxx  |   36 +
 svx/source/dialog/crashreportui.cxx   |  104 
 svx/util/svx.component|4 
 vcl/Library_vcl.mk|2 
 vcl/inc/window.h  |1 
 vcl/opengl/win/WinDeviceInfo.cxx  |4 
 vcl/opengl/x11/X11DeviceInfo.cxx  |9 
 vcl/source/window/builder.cxx |1 
 vcl/source/window/window.cxx  |   10 
 34 files changed, 1672 insertions(+), 53 deletions(-)

New commits:
commit 07846bf83bda00ed220fc2e26609920b19c5adaf
Author: Markus Mohrhard 
Date:   Sun Feb 7 22:57:51 2016 +0100

disable breakpad by default

Includes fixes for disabled breakpad build.

Change-Id: I2112a82cfa8ca548987994ea97cda48a7387842e

diff --git a/configure.ac b/configure.ac
index 3f06009..1a28b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9090,14 +9090,14 @@ dnl 
==
 dnl Breakpad
 dnl ==
 AC_MSG_CHECKING([whether to enable breakpad])
-if test -z "$enable_breakpad" -o "$enable_breakpad" != no; then
+if test "$enable_breakpad" != yes; then
+AC_MSG_RESULT([no])
+else
 AC_MSG_RESULT([yes])
 ENABLE_BREAKPAD="TRUE"
 AC_DEFINE(ENABLE_BREAKPAD)
 AC_DEFINE(HAVE_FEATURE_BREAKPAD, 1)
 BUILD_TYPE="$BUILD_TYPE BREAKPAD"
-else
-AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_BREAKPAD)
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index f1c767f..2fae668 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2344,7 +2344,9 @@ void Desktop::OpenClients()
 }
 }
 
+#if HAVE_FEATURE_BREAKPAD
 CrashReporter::writeCommonInfo();
+#endif
 OfficeIPCThread::EnableRequests();
 
 ProcessDocumentsRequest aRequest(rArgs.getCwdUrl());
diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index d57706c..efa314f 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -34,3 +34,4 @@
 --enable-online-update
 --disable-dconf
 --enable-mergelibs
+--enable-breakpad
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 32a9ec5..88d4173 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,svx,\
 comphelper \
 cppuhelper \
 cppu \
-crashreport \
+$(if $(filter TRUE,$(ENABLE_BREAKPAD)), \
+   crashreport) \
 $(call gb_Helper_optional,DBCONNECTIVITY, \
 dbtools) \
 drawinglayer \
@@ -109,7 +110,8 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/dialog/_contdlg \
 svx/source/dialog/contwnd \
 svx/source/dialog/compressgraphicdialog \
-svx/source/dialog/crashreportdlg \
+$(if $(filter TRUE,$(ENABLE_BREAKPAD)), \
+   svx/source/dialog/crashreportdlg) \
 svx/source/dialog/crashreportui \
 svx/source/dialog/ctredlin \
 svx/source/dialog/databaseregistrationui \
diff --git a/svx/source/dialog/crashreportui.cxx 
b/svx/source/dialog/crashreportui.cxx
index 94b1a68..880a488 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -11,6 +11,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
@@ -82,8 +84,10 @@ css::uno::Any SAL_CALL 
CrashReportUI::dispatchWithReturnValue(const css::util::U
 {
 SolarMutexGuard aGuard;
 css::uno::Any aRet;
+#if HAV

[Libreoffice-commits] core.git: Changes to 'feature/breakpad'

2016-02-14 Thread Markus Mohrhard

New branch 'feature/breakpad' available with the following commits:
commit 4c21d0f45fdeba8d662180615769d3ebb180f3f5
Author: Markus Mohrhard 
Date:   Wed Nov 25 17:00:21 2015 +0100

don't hardcode the version string in crash report url

Change-Id: I9814e5975d69d4b93dd2a2b142e9368dc665c225

commit c6a4cecee99ec635037b016308a137e6da5db0dd
Author: Markus Mohrhard 
Date:   Wed Nov 25 16:50:22 2015 +0100

add way to add additional information to the crash report

We can add several additional key value pairs during the execution of
the program that will be used on the server to show more information.

Change-Id: I4102adc15fc821415fa0b997ca7fe0dc4f7abcec

commit 7a54dc4a3af52664e6f587a61416742a3b53c58b
Author: Markus Mohrhard 
Date:   Wed Nov 25 16:47:14 2015 +0100

LIBO_LIBEXEC_FOLDER is the correct place for executables

Change-Id: I09010819e37baacf02277ad294a6436b13e285fc

commit 9b61e7cd833dcb42ed57ed850af830d189c188fc
Author: Markus Mohrhard 
Date:   Mon Nov 23 17:48:16 2015 +0100

upload crashes correctly to server for linux

Change-Id: I75778dc572a2888b3966cb5731f7e59209c7a942

commit d21dc2edcfa469cb4d95c853e7401e0840ca68fc
Author: Markus Mohrhard 
Date:   Mon Nov 23 17:43:14 2015 +0100

fix the minidump_upload script to send correct http header

Change-Id: Ie373992ca9d69fec508778947a983fad56924a60

commit e1841ce8f61c1c5da3664fa1ff8abaf47af732f5
Author: Markus Mohrhard 
Date:   Tue Nov 17 07:09:20 2015 +0100

package minidump_upload tool

We are going to use this tool for uploading the minidumps for now.

Change-Id: I2c59d420e3884aee46411df913c2ec067e0c636b

commit f1925412a144e00b8c7253796d851c78b4a525fd
Author: Markus Mohrhard 
Date:   Tue Nov 17 06:55:03 2015 +0100

better way to handle breakpad in the build system

Change-Id: Icfd14e8b9649ee0bd0e0597e2abece183421c76b

commit 8c9b6a12d07e743798e4056e96a49464b9f54c21
Author: Markus Mohrhard 
Date:   Sun Nov 15 06:24:09 2015 +0100

integrate the crash reporter for windows

Change-Id: I8446b01087cd3eb9d492b6350869fc94b02b395c

commit cb1ca90eb4be976d5439fe13045321d41785f282
Author: Markus Mohrhard 
Date:   Sun Nov 15 04:39:24 2015 +0100

include breakpad into the build

Change-Id: I1bfd107502332fc86ae5e96bbc1f475b8d669c6c

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Martin Hosken

 vcl/source/glyphs/graphite_layout.cxx |   35 +++---
 1 file changed, 16 insertions(+), 19 deletions(-)

New commits:
commit b073d9f2e35dd0b6cdbc66e31050250a6f34cc55
Author: Martin Hosken 
Date:   Mon Feb 15 10:08:19 2016 +0700

Tidy up graphite layout code after fixing line ending diacritics

Change-Id: I1efafbd64539ac6d71de0be41ecaa71533143590
Reviewed-on: https://gerrit.libreoffice.org/22362
Tested-by: Jenkins 
Reviewed-by: Martin Hosken 

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8226c9c..dcdd31d 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -668,27 +668,24 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs 
&rArgs)
 unsigned int GraphiteLayout::ScanFwdForChar(int &findChar, bool fallback) const
 {
 int res = mvChar2Glyph[findChar - mnMinCharPos];
-int done = 3;
-while (res == -1 && --done)
+if (res >= 0)
+return unsigned(res);
+if (fallback)
 {
-if (fallback)
-{
-for (++findChar; findChar - mnMinCharPos < 
int(mvChar2Glyph.size()); ++findChar)
-if ((res = mvChar2Glyph[findChar - mnMinCharPos]) != -1)
-return res;
---findChar;
-return mvGlyphs.size() - 1;
-}
-else
-{
-for (--findChar; findChar >= mnMinCharPos; --findChar)
-if ((res = mvChar2Glyph[findChar - mnMinCharPos]) != -1)
-return res;
-++findChar;
-return 0;
-}
+for (++findChar; findChar - mnMinCharPos < int(mvChar2Glyph.size()); 
++findChar)
+if ((res = mvChar2Glyph[findChar - mnMinCharPos]) != -1)
+return res;
+--findChar;
+return mvGlyphs.size() - 1;
+}
+else
+{
+for (--findChar; findChar >= mnMinCharPos; --findChar)
+if ((res = mvChar2Glyph[findChar - mnMinCharPos]) != -1)
+return res;
+++findChar;
+return 0;
 }
-return unsigned(res);
 }
 
 void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector & 
rDeltaWidth)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Henry Castro

 loolwsd/LOOLKit.cpp |2 --
 loolwsd/Util.cpp|2 --
 2 files changed, 4 deletions(-)

New commits:
commit 45754cc36c7b087700c238d6e9d7d05b5cc04f2f
Author: Henry Castro 
Date:   Sun Feb 14 23:07:40 2016 -0400

loolwsd: remove unused TerminationState

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 80a763b..8089bd2 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -835,12 +835,10 @@ void lokit_main(const std::string& childRoot,
 Log::error() << exc.name() << ": " << exc.displayText()
  << (exc.nested() ? " (" + exc.nested()->displayText() + 
")" : "")
  << Log::end;
-TerminationState = LOOLState::LOOL_ABNORMAL;
 }
 catch (const std::exception& exc)
 {
 Log::error(std::string("Exception: ") + exc.what());
-TerminationState = LOOLState::LOOL_ABNORMAL;
 }
 
 Log::debug("Destroying documents.");
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index e4ae391..1685d38 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -60,7 +60,6 @@ extern "C"
 }
 }
 
-volatile LOOLState TerminationState = LOOLState::LOOL_RUNNING;
 volatile bool TerminationFlag = false;
 
 namespace Util
@@ -424,7 +423,6 @@ namespace Util
 // If we are signaled while having that lock,
 // logging again will deadlock on it.
 TerminationFlag = true;
-TerminationState = ( aSignal == SIGTERM ? LOOLState::LOOL_ABNORMAL 
: LOOLState::LOOL_STOPPING );
 
 Log::info() << "Termination signal received: "
 << Util::signalName(aSignal) << " "
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py

2016-02-14 Thread Markus Mohrhard

 ciabot/libreoffice-bugzilla2.py |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6f1d55ec8055f23613603fad5e82a5ec4f40890c
Author: Markus Mohrhard 
Date:   Mon Feb 15 04:05:18 2016 +0100

leave out leading whitespace for empty whiteboard

diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 075fe47..2acdf55 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -66,7 +66,9 @@ class FreedesktopBZ:
 
 m = re.findall(new_version, old_whiteboard)
 if m is None or len(m) == 0:
-new_whiteboard = old_whiteboard + " target:" + new_version
+if not old_whiteboard == "":
+old_whiteboard = old_whiteboard + " "
+new_whiteboard = old_whiteboard + "target:" + new_version
 bug.setwhiteboard(new_whiteboard)
 
 cgiturl = "http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s"; 
%(repo_name, commit.hexsha)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Markus Mohrhard

 sc/inc/document.hxx|2 ++
 sc/inc/documentimport.hxx  |2 ++
 sc/inc/olinetab.hxx|2 ++
 sc/inc/table.hxx   |2 ++
 sc/source/core/data/document10.cxx |   10 ++
 sc/source/core/data/documentimport.cxx |   16 
 sc/source/core/data/olinetab.cxx   |   21 +
 sc/source/core/data/table7.cxx |9 +
 sc/source/filter/xml/xmlrowi.cxx   |6 --
 9 files changed, 68 insertions(+), 2 deletions(-)

New commits:
commit a8232b30687879f31768b89f4ff0bcf9457a7e77
Author: Markus Mohrhard 
Date:   Tue Feb 9 04:26:49 2016 +0100

tdf#94858, avoid O(n^2) algorithm during outline import

The old code set called the outline visibility code for each row. Now we
are just calling it once at the end of the import.

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

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ce1017e..9b8ab5e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2164,6 +2164,8 @@ public:
 
 void SwapNonEmpty( sc::TableValues& rValues );
 
+void finalizeOutlineImport();
+
 private:
 
 /**
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index fc1c7c4..e90be0b 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -103,6 +103,8 @@ public:
  */
 void setAttrEntries( SCTAB nTab, SCCOL nCol, Attrs& rAttrs );
 
+void setRowsVisible(SCTAB nTab, SCROW nRowStart, SCROW nRowEnd, bool 
bVisible);
+
 void finalize();
 
 private:
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index ec0a83f..27ec0d3 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -136,6 +136,8 @@ public:
 bool ManualAction(
 SCCOLROW nStartPos, SCCOLROW nEndPos, bool bShow, const ScTable& 
rTable, bool bCol);
 
+void finalizeImport(ScTable& rTable, bool bCol);
+
 void RemoveAll();
 };
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 43a4897..e1b0706 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -954,6 +954,8 @@ public:
 void SwapNonEmpty(
 sc::TableValues& rValues, sc::StartListeningContext& rStartCxt, 
sc::EndListeningContext& rEndCxt );
 
+void finalizeOutlineImport();
+
 #if DEBUG_COLUMN_STORAGE
 void DumpFormulaGroups( SCCOL nCol ) const;
 #endif
diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index a2f13920..d73eac5 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -429,4 +429,14 @@ void ScDocument::StartAllListeners( const ScRange& rRange )
 }
 }
 
+void ScDocument::finalizeOutlineImport()
+{
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* p = *it;
+p->finalizeOutlineImport();
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/documentimport.cxx 
b/sc/source/core/data/documentimport.cxx
index 49243d8..6f7030b 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -465,6 +465,20 @@ void ScDocumentImport::setAttrEntries( SCTAB nTab, SCCOL 
nCol, Attrs& rAttrs )
 pCol->pAttrArray->SetAttrEntries(rAttrs.mpData, rAttrs.mnSize);
 }
 
+void ScDocumentImport::setRowsVisible(SCTAB nTab, SCROW nRowStart, SCROW 
nRowEnd, bool bVisible)
+{
+if (!bVisible)
+{
+getDoc().ShowRows(nRowStart, nRowEnd, nTab, false);
+getDoc().SetDrawPageSize(nTab);
+getDoc().UpdatePageBreaks( nTab );
+}
+else
+{
+assert(false);
+}
+}
+
 namespace {
 
 class CellStoreInitializer
@@ -597,6 +611,8 @@ void ScDocumentImport::finalize()
 for (SCCOL nColIdx = 0; nColIdx < nNumCols; ++nColIdx)
 initColumn(rTab.aCol[nColIdx]);
 }
+
+mpImpl->mrDoc.finalizeOutlineImport();
 }
 
 void ScDocumentImport::initColumn(ScColumn& rCol)
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index a90e0b1..1d94b79 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -769,6 +769,27 @@ void ScOutlineArray::RemoveAll()
 nDepth = 0;
 }
 
+void ScOutlineArray::finalizeImport(ScTable& rTable, bool bCol)
+{
+ScSubOutlineIterator aIter( this );
+ScOutlineEntry* pEntry;
+while((pEntry=aIter.GetNext())!=nullptr)
+{
+
+if (!pEntry->IsHidden())
+continue;
+
+SCCOLROW nEntryStart = pEntry->GetStart();
+SCCOLROW nEntryEnd   = pEntry->GetEnd();
+SCCOLROW nEnd = rTable.LastHiddenColRow(nEntryStart, bCol);
+bool bAllHidden = (nEntryEnd <= nEnd && nEnd <
+::std::numeric_limits::max());
+
+pEntry->SetHidden(bAllHidden);
+SetVisibleBelow(aIter.LastLevel(), aIte

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - Repository.mk

2016-02-14 Thread Tor Lillqvist

 Repository.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b7bf29eb0896eb2f431345e1a0c3515a3a13ecc6
Author: Tor Lillqvist 
Date:   Fri Feb 12 16:36:55 2016 +0200

We need to mention the vcl_opengl_blacklist here

Otherwise the file won't be included in the installer.

Change-Id: I928144e666377f18efa3a66f1e8c3e4204a708dc
(cherry picked from commit 98015cdcde77d23b66636591280463ae577246c0)
Reviewed-on: https://gerrit.libreoffice.org/22319
Reviewed-by: TomaÅ¾ Vajngerl 
Reviewed-by: Michael Stahl 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/Repository.mk b/Repository.mk
index 5e9bb48..a786b04 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -816,6 +816,9 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
xmlsec \
chart2_opengl_shader \
vcl_opengl_shader \
+   $(if $(filter WNT,$(OS)), \
+   vcl_opengl_blacklist \
+   ) \
$(if $(ENABLE_OPENGL_CANVAS),canvas_opengl_shader) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 97640] Beanshell Editor: Use fixed-width font

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=97640

Adolfo Jayme  changed:

   What|Removed |Added

Summary|Beanshell Editor: Use fixed |Beanshell Editor: Use
   |font|fixed-width font

--- Comment #6 from Adolfo Jayme  ---
I guess the bug summary could use some clarification…

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-02-14 Thread Pranav Kant

 loolwsd/LOOLKit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93fdcb34c48c0a877c76175892e85b32e97cfccf
Author: Pranav Kant 
Date:   Sun Feb 7 14:48:32 2016 +0530

loolwsd: Do not unload without a successfull load

A load document operation may fail, for example, when user enters
a wrong password or no password. In such cases ToPrisoner sends a
disconnect to child. Child do not need to take any steps in this
case, such as, decrementing the view counter, because nothing was
loaded.

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

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 2b47a0b..80a763b 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -558,7 +558,7 @@ private:
 
 const unsigned intSessionId = Util::decodeId(sessionId);
 const auto it = _connections.find(intSessionId);
-if (it == _connections.end() || !it->second)
+if (it == _connections.end() || !it->second || !_loKitDocument)
 {
 // Nothing to do.
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 45904] move java based api tests to c++

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=45904

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|ToBeReviewed|ToBeReviewed target:5.2.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 45904] move java based api tests to c++

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=45904

--- Comment #27 from Commit Notification 
 ---
kadertarlan committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c125eca7f8a0dd2d59678cff2574bbccc70e536

tdf#45904 move java based api tests to c++

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/CppunitTest_sc_check_xcell_ranges_query.mk sc/JunitTest_sc_complex.mk sc/Module_sc.mk sc/qa

2016-02-14 Thread kadertarlan

 sc/CppunitTest_sc_check_xcell_ranges_query.mk |  103 ++
 sc/JunitTest_sc_complex.mk|2 
 sc/Module_sc.mk   |1 
 sc/qa/extras/check_xcell_ranges_query.cxx |  191 ++
 4 files changed, 295 insertions(+), 2 deletions(-)

New commits:
commit 8c125eca7f8a0dd2d59678cff2574bbccc70e536
Author: kadertarlan 
Date:   Thu Feb 11 03:01:14 2016 +0200

tdf#45904 move java based api tests to c++

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

diff --git a/sc/CppunitTest_sc_check_xcell_ranges_query.mk 
b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
new file mode 100644
index 000..5ca88d9
--- /dev/null
+++ b/sc/CppunitTest_sc_check_xcell_ranges_query.mk
@@ -0,0 +1,103 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+$(eval $(call gb_CppunitTest_CppunitTest,sc_check_xcell_ranges_query))
+
+$(eval $(call 
gb_CppunitTest_add_exception_objects,sc_check_xcell_ranges_query, \
+   sc/qa/extras/check_xcell_ranges_query \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_check_xcell_ranges_query, \
+   basegfx \
+   comphelper \
+   cppu \
+   cppuhelper \
+   drawinglayer \
+   editeng \
+   for \
+   forui \
+   i18nlangtag \
+   msfilter \
+   oox \
+   sal \
+   salhelper \
+   sax \
+   sb \
+   sc \
+   scqahelper \
+   sfx \
+   sot \
+   subsequenttest \
+   svl \
+   svt \
+   svx \
+   svxcore \
+   test \
+   tk \
+   tl \
+   ucbhelper \
+   unotest \
+   utl \
+   vbahelper \
+   vcl \
+   xo \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_check_xcell_ranges_query,\
+   -I$(SRCDIR)/sc/source/ui/inc \
+   -I$(SRCDIR)/sc/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_check_xcell_ranges_query,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_check_xcell_ranges_query))
+$(eval $(call gb_CppunitTest_use_vcl,sc_check_xcell_ranges_query))
+
+$(eval $(call gb_CppunitTest_use_components,sc_check_xcell_ranges_query,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sc/util/sc \
+sc/util/scd \
+sc/util/scfilt \
+$(call gb_Helper_optional,SCRIPTING, \
+   sc/util/vbaobj) \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+   svtools/util/svt \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_check_xcell_ranges_query,))
+
+# vim: set noet sw=4 ts=4:
\ No newline at end of file
diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index 8fedb47..6e446e8 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_JunitTest_JunitTest,sc_complex))
 # any key after resizing" etc.)
 
 $(eval $(call gb_JunitTest_add_classes,sc_complex, \
-complex.cellRanges.CheckXCellRangesQuery \
 complex.dataPilot.CheckDataPilot \
 complex.sc.CalcRTL \
 ))
@@ -27,7 +26,6 @@ $(eval $(call gb_JunitTest_use_jars,sc_complex, \
 ))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \
-sc/qa/complex/cellRanges/CheckXCellRangesQuery \
 sc/qa/complex/dataPilot/CheckDataPilot \
 sc/qa/complex/dataPilot/_XDataPilotDescriptor \
 sc/qa/complex/dataPilot/_XDataPilotTable \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 1d802f9..c8f9808 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_editfieldobj_cell \
CppunitTest_sc_editfieldobj_header \
CppunitTest_sc_modelobj \
+   CppunitTest_sc_check_xcell_ranges_query \
 ))
 
 $(eval $(call gb_Module_add_perfcheck_targets,sc,\
diff --git a/sc

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - autodoc/source offapi/com sw/source

2016-02-14 Thread Kay Schenk

 autodoc/source/display/idl/hfi_hierarchy.cxx |6 +++---
 offapi/com/sun/star/awt/UnoControlFixedTextModel.idl |7 +++
 sw/source/core/doc/poolfmt.cxx   |3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 92ff48eb981610cb1565cd5472a6714feb7f68a6
Author: Kay Schenk 
Date:   Sun Feb 14 21:45:01 2016 +

#i126658# Add description about NoLabel property on 
css.awt.UnoControlFixedTextModel

Patch by: hanya

diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl 
b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index 9bc7a99..a6cbd30 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -169,6 +169,13 @@ published service UnoControlFixedTextModel
  */
 [optional, property] com::sun::star::style::VerticalAlignment 
VerticalAlign;
 
+//-
+
+/** supresses automatic accelerator assignment on this control.
+
+@since OpenOffice 2.4
+ */
+[optional, property] boolean NoLabel;
 };
 
 //=
commit 257406d5794770d8c07c263b7d043fda944da07a
Author: Kay Schenk 
Date:   Sun Feb 14 21:38:20 2016 +

#i126652#  [Autodoc] Numeric character reference should ends with a 
semicolon

Patch by: hanya

diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx 
b/autodoc/source/display/idl/hfi_hierarchy.cxx
index 206e126..119084b 100644
--- a/autodoc/source/display/idl/hfi_hierarchy.cxx
+++ b/autodoc/source/display/idl/hfi_hierarchy.cxx
@@ -163,16 +163,16 @@ Write_Bases( csi::xml::Element &o_out,
 for (uintt i = 0; i < io_setColumns.size(); ++i)
 {
 if (io_setColumns[i] == 1)
-o_out << new csi::xml::XmlCode("┃");
+o_out << new csi::xml::XmlCode("┃");
 else
 o_out << "  ";
 o_out << " ";
 }
 
 if (bThereComesMore)
-o_out << new csi::xml::XmlCode("┣");
+o_out << new csi::xml::XmlCode("┣");
 else
-o_out << new csi::xml::XmlCode("┗");
+o_out << new csi::xml::XmlCode("┗");
 o_out << " ";
 
 HF_IdlTypeText
commit 334f028219a004408695d6c099a543dc1f07
Author: Kay Schenk 
Date:   Sun Feb 14 21:07:39 2016 +

#i126635# Possible null pointer reference

patch by: orcmid

diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 4467076..40d5de1 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -300,8 +300,7 @@ void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
 rSet.Put( aLR );
 rSet.Put( aUL );
 
-if( !pColl )
-pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( nNxt ));
+pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( nNxt ));
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: export-validation/README

2016-02-14 Thread Markus Mohrhard

 export-validation/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59472ed2656701b1882f522181162e91fd99bf21
Author: Markus Mohrhard 
Date:   Mon Feb 15 00:51:47 2016 +0100

point to LibreOffice based officeotron

diff --git a/export-validation/README b/export-validation/README
index 9508d13..586a94b 100644
--- a/export-validation/README
+++ b/export-validation/README
@@ -6,4 +6,4 @@ odfvalidator and should have a form similar to the ones of the 
two scripts in th
 Use the 'setup.sh' script in this directory if you want to set them up 
automatically.
 
 [1] http://incubator.apache.org/odftoolkit/conformance/ODFValidator.html
-[2] https://code.google.com/p/officeotron/
+[2] https://gerrit.libreoffice.org/gitweb?p=officeotron.git;a=summary
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Rename of include/Vcl/graph.hxx and graph.cxx

2016-02-14 Thread Chris Sherlock

Hi all,

Would anyone have objections if I renamed VCL's graph.hxx and graph.cxx to
graphic.hxx and graph.cxx respectively?

I find the artificial shortening of names a bit odd and disconcerting, and
in the case of graph.hxx it sort of implies the header deals with *graphs*,
as opposed to the Graphic class (i.e. images).

I did a bug fix around JPEG exports not picking up the DPI last night, and
would be happy to back port this fix if there is a concern it might
interfere with this. Heck, I'd be happy to back port any fixes a rename
might cause issues with - I would really like improve code readability,
which I guess is an itch I need to scratch.

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

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-1' - source/sl

2016-02-14 Thread Andras Timar

 source/sl/filter/source/config/fragments/filters.po |   24 +---
 source/sl/helpcontent2/source/text/shared/01.po |4 +--
 source/sl/sfx2/uiconfig/ui.po   |4 +--
 source/sl/vcl/source/src.po |4 +--
 4 files changed, 27 insertions(+), 9 deletions(-)

New commits:
commit 259f921f6207e58ce4584551d544350fed55b8d6
Author: Andras Timar 
Date:   Sun Feb 14 23:36:06 2016 +0100

Updated Slovenian translation

Change-Id: I777971268f130f1d9870e5c412f73b35b39a48ae

diff --git a/source/sl/filter/source/config/fragments/filters.po 
b/source/sl/filter/source/config/fragments/filters.po
index d8fb381..ab8f75a 100644
--- a/source/sl/filter/source/config/fragments/filters.po
+++ b/source/sl/filter/source/config/fragments/filters.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-12-16 23:53+0100\n"
-"PO-Revision-Date: 2015-12-14 00:52+0200\n"
+"POT-Creation-Date: 2016-02-14 18:41+0100\n"
+"PO-Revision-Date: 2016-02-14 22:02+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1898,6 +1898,15 @@ msgctxt ""
 msgid "OpenOffice.org 1.0 HTML Template"
 msgstr "Predloga dokumenta HTML OpenOffice.org 1.0"
 
+#: writer_web_jpg_Export.xcu
+msgctxt ""
+"writer_web_jpg_Export.xcu\n"
+"writer_web_jpg_Export\n"
+"UIName\n"
+"value.text"
+msgid "JPEG - Joint Photographic Experts Group"
+msgstr "JPEG â Joint Photographic Experts Group"
+
 #: writer_web_pdf_Export.xcu
 msgctxt ""
 "writer_web_pdf_Export.xcu\n"
@@ -1907,6 +1916,15 @@ msgctxt ""
 msgid "PDF - Portable Document Format"
 msgstr "PDF â Portable Document Format"
 
+#: writer_web_png_Export.xcu
+msgctxt ""
+"writer_web_png_Export.xcu\n"
+"writer_web_png_Export\n"
+"UIName\n"
+"value.text"
+msgid "PNG - Portable Network Graphic"
+msgstr "PNG â Portable Network Graphic"
+
 #: writerglobal8.xcu
 msgctxt ""
 "writerglobal8.xcu\n"
diff --git a/source/sl/helpcontent2/source/text/shared/01.po 
b/source/sl/helpcontent2/source/text/shared/01.po
index 3ffdf6f..80da0da 100644
--- a/source/sl/helpcontent2/source/text/shared/01.po
+++ b/source/sl/helpcontent2/source/text/shared/01.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-02-03 11:05+0100\n"
+"POT-Creation-Date: 2016-02-14 18:41+0100\n"
 "PO-Revision-Date: 2016-02-05 23:04+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/sfx2/uiconfig/ui.po b/source/sl/sfx2/uiconfig/ui.po
index 4d9caf7..6e6d81c 100644
--- a/source/sl/sfx2/uiconfig/ui.po
+++ b/source/sl/sfx2/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-02-03 11:05+0100\n"
+"POT-Creation-Date: 2016-02-14 18:41+0100\n"
 "PO-Revision-Date: 2016-02-03 22:14+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/vcl/source/src.po b/source/sl/vcl/source/src.po
index 55d4699..16d2c86 100644
--- a/source/sl/vcl/source/src.po
+++ b/source/sl/vcl/source/src.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-02-03 11:05+0100\n"
+"POT-Creation-Date: 2016-02-14 18:41+0100\n"
 "PO-Revision-Date: 2016-02-03 22:12+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations

2016-02-14 Thread Andras Timar

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

New commits:
commit 7b72a74b5a6c97a08c031decc17030bf84bd7344
Author: Andras Timar 
Date:   Sun Feb 14 23:36:06 2016 +0100

Updated core
Project: translations  259f921f6207e58ce4584551d544350fed55b8d6

Updated Slovenian translation

Change-Id: I777971268f130f1d9870e5c412f73b35b39a48ae

diff --git a/translations b/translations
index 95639d3..259f921 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 95639d3c94590930ca63e5029eea21ea4ba1d8e7
+Subproject commit 259f921f6207e58ce4584551d544350fed55b8d6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Strange failure on Jenkins

2016-02-14 Thread Chris Sherlock

Ah, I see!

Thanks Markus and Mark for the explanations.

Chris

Sent from my iPhone

> On 14 Feb 2016, at 8:15 PM, Markus Mohrhard  
> wrote:
> 
> 
> 
>> On Sun, Feb 14, 2016 at 8:54 AM, Chris Sherlock  
>> wrote:
>> Are you sure? That seems like a very odd thing… not saying you are wrong, 
>> but this seems like a very odd thing to have as a requirement for a unit 
>> test. 
> 
> 
> This only fails in dbgutil builds because we only enforce the UNO exception 
> specification in dbgutil builds. So this is similar to asserts which also 
> only fail a test in special builds.
> 
> You can see that it was an unexpected exception by the: 
> #11 0x2abea7e0f5d2 in __cxa_call_unexpected () at /lib64/libstdc++.so.6
> 
> line in the backtrace.
> 
> Regards,
> Markus
>> 
>> Chris
>> 
>>> On 14 Feb 2016, at 6:47 PM, Mark Hung  wrote:
>>> 
>>> Hi Chris,
>>> 
>>> It is possible that for some tests need --enable-dbgutil or make debug=true 
>>> to trigger the assert.
>>> 
>>> Best Regards.
>>> 
>>> 2016-02-14 15:14 GMT+08:00 Chris Sherlock :
 Hi all,
 
 https://gerrit.libreoffice.org/#/c/20993/ on Gerrit, and fixes bug 96749 
 (deal with missing custom headers/footers in docx). 
 
 I’ve cherry picked this and built this on my Ubuntu Linux system from 
 master, and I’m getting no unit test failures. 
 
 Jenkins, however, is failing on both Linux and Mac OS X, but interestingly 
 not Windows. On Linux the failure is:
 
 http://ci.libreoffice.org/job/lo_gerrit_master/11877/Gerrit=Gerrit,Platform=Linux/console
 
 Anyone have any ideas why this failure is occuring when it isn’t occuring 
 on my local Linux system?
 
 (Incidentally, the fix is good and works really well). 
 
 Chris
 
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>> 
>>> 
>>> 
>>> -- 
>>> Mark Hung
>> 
>> 
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 7c/e8b7f08c7f8e468accd181d3859b56e1ae25d8 fb/954f6cc9c90a539801aac0e7d202e0caaede06

2016-02-14 Thread Caolán McNamara

 7c/e8b7f08c7f8e468accd181d3859b56e1ae25d8 |1 +
 fb/954f6cc9c90a539801aac0e7d202e0caaede06 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 25e07d17c531c4771303a7cf8b26014f1c0edc61
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 21:06:25 2016 +

Notes added by 'git notes add'

diff --git a/fb/954f6cc9c90a539801aac0e7d202e0caaede06 
b/fb/954f6cc9c90a539801aac0e7d202e0caaede06
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/fb/954f6cc9c90a539801aac0e7d202e0caaede06
@@ -0,0 +1 @@
+ignore: aoo
commit be2c67aebe5422a551f22da25360137f9028e80f
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 21:06:17 2016 +

Notes added by 'git notes add'

diff --git a/7c/e8b7f08c7f8e468accd181d3859b56e1ae25d8 
b/7c/e8b7f08c7f8e468accd181d3859b56e1ae25d8
new file mode 100644
index 000..35f84dd
--- /dev/null
+++ b/7c/e8b7f08c7f8e468accd181d3859b56e1ae25d8
@@ -0,0 +1 @@
+prefer: 82cdcc392ae07fd230ac3f0ec2c4850681f49c39
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/ba554525f3e6da20ae4f657d2775c01b8dcf00

2016-02-14 Thread Caolán McNamara

 96/ba554525f3e6da20ae4f657d2775c01b8dcf00 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ae007a4f4466015f4c7d4f58b5801466779f3a31
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 21:05:44 2016 +

Notes added by 'git notes add'

diff --git a/96/ba554525f3e6da20ae4f657d2775c01b8dcf00 
b/96/ba554525f3e6da20ae4f657d2775c01b8dcf00
new file mode 100644
index 000..7239d27
--- /dev/null
+++ b/96/ba554525f3e6da20ae4f657d2775c01b8dcf00
@@ -0,0 +1 @@
+prefer: f974db5d89eacf0c23e303c22c62972014e9db16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Caolán McNamara

 sc/source/core/data/dociter.cxx   |4 +-
 sc/source/ui/vba/vbaformat.cxx|4 +-
 sc/source/ui/vba/vbaformat.hxx|4 +-
 sc/source/ui/vba/vbarange.cxx |4 +-
 sc/source/ui/vba/vbarange.hxx |4 +-
 test/source/primitive2dxmldump.cxx|   52 +-
 vcl/source/glyphs/graphite_layout.cxx |1 
 7 files changed, 36 insertions(+), 37 deletions(-)

New commits:
commit 30a36fa3a6451cf27cdec039aba480357d6f1613
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 20:59:16 2016 +

WaE: unreachable code

Change-Id: I700168b0484e86caa8df4a579ef51bcd40b6f66f

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 2038a24..8226c9c 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -687,7 +687,6 @@ unsigned int GraphiteLayout::ScanFwdForChar(int &findChar, 
bool fallback) const
 ++findChar;
 return 0;
 }
-fallback = !fallback;
 }
 return unsigned(res);
 }
commit 9ac4a3426a63178607536e4ec85ac2984b775c62
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 20:54:04 2016 +

coverity#1352321 Dereference null return value

and

coverity#1352322 Dereference null return value

Change-Id: I0482ed95e8fbce5d7f9a827588a66ebd0f9d69c7

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index c174d99..4ea2d54 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -789,7 +789,7 @@ ScFormulaGroupIterator::ScFormulaGroupIterator( ScDocument* 
pDoc ) :
 mnIndex(0)
 {
 ScTable *pTab = mpDoc->FetchTable(mnTab);
-ScColumn *pCol = pTab->FetchColumn(mnCol);
+ScColumn *pCol = pTab ? pTab->FetchColumn(mnCol) : nullptr;
 if (pCol)
 {
 mbNullCol = false;
@@ -820,7 +820,7 @@ sc::FormulaGroupEntry* ScFormulaGroupIterator::next()
 return nullptr;
 }
 ScTable *pTab = mpDoc->FetchTable(mnTab);
-ScColumn *pCol = pTab->FetchColumn(mnCol);
+ScColumn *pCol = pTab ? pTab->FetchColumn(mnCol) : nullptr;
 if (pCol)
 {
 mbNullCol = false;
commit 5969fc79cf2d67d8a7c1483f0cc2cf42c863efb4
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 20:52:08 2016 +

coverity#1352306 Unchecked dynamic_cast

and

coverity#1352307 Unchecked dynamic_cast

Change-Id: I0b072e432fe5d510a2a55ad33628ec93b706c860

diff --git a/test/source/primitive2dxmldump.cxx 
b/test/source/primitive2dxmldump.cxx
index dd1546f..d1b2fcb 100644
--- a/test/source/primitive2dxmldump.cxx
+++ b/test/source/primitive2dxmldump.cxx
@@ -102,31 +102,31 @@ void Primitive2dXmlDump::decomposeAndWrite(
 {
 case PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D:
 {
-const HiddenGeometryPrimitive2D* pHiddenGeometryPrimitive2D = 
dynamic_cast(pBasePrimitive);
+const HiddenGeometryPrimitive2D& rHiddenGeometryPrimitive2D = 
dynamic_cast(*pBasePrimitive);
 rWriter.startElement("hiddengeometry");
-decomposeAndWrite(pHiddenGeometryPrimitive2D->getChildren(), 
rWriter);
+decomposeAndWrite(rHiddenGeometryPrimitive2D.getChildren(), 
rWriter);
 rWriter.endElement();
 }
 break;
 
 case PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D:
 {
-const TransformPrimitive2D* pTransformPrimitive2D = 
dynamic_cast(pBasePrimitive);
+const TransformPrimitive2D& rTransformPrimitive2D = 
dynamic_cast(*pBasePrimitive);
 rWriter.startElement("transform");
 //pTransformPrimitive2D->getTransformation()
-decomposeAndWrite(pTransformPrimitive2D->getChildren(), 
rWriter);
+decomposeAndWrite(rTransformPrimitive2D.getChildren(), 
rWriter);
 rWriter.endElement();
 }
 break;
 
 case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D:
 {
-const PolyPolygonColorPrimitive2D* 
pPolyPolygonColorPrimitive2D = dynamic_cast(pBasePrimitive);
+const PolyPolygonColorPrimitive2D& 
rPolyPolygonColorPrimitive2D = dynamic_cast(*pBasePrimitive);
 
 rWriter.startElement("polypolygoncolor");
-rWriter.attribute("color", 
convertColorToString(pPolyPolygonColorPrimitive2D->getBColor()));
+rWriter.attribute("color", 
convertColorToString(rPolyPolygonColorPrimitive2D.getBColor()));
 rWriter.startElement("polypolygon");
-
rWriter.content(basegfx::tools::exportToSvgD(pPolyPolygonColorPrimitive2D->getB2DPolyPolygon(),
 true, true, false));
+
rWriter.content(basegfx::tools::exportToSvgD(rPolyPolygonColorPrimitive2D.getB2DPolyPolygon(),
 true, true, false));
 rWriter.endE

[Libreoffice-commits] core.git: filter/source include/vcl vcl/CppunitTest_vcl_mapmode.mk vcl/Module_vcl.mk vcl/qa vcl/source

2016-02-14 Thread Chris Sherlock

 filter/source/graphicfilter/eps/eps.cxx |   49 
 include/vcl/graph.hxx   |3 +
 include/vcl/mapmod.hxx  |3 +
 vcl/CppunitTest_vcl_mapmode.mk  |   53 ++
 vcl/Module_vcl.mk   |1 
 vcl/qa/cppunit/mapmode.cxx  |   65 
 vcl/source/filter/jpeg/JpegWriter.cxx   |6 ++
 vcl/source/filter/jpeg/jpeg.h   |4 +
 vcl/source/filter/jpeg/jpegc.cxx|6 +-
 vcl/source/gdi/graph.cxx|   26 +++-
 vcl/source/gdi/mapmod.cxx   |   47 ++-
 11 files changed, 207 insertions(+), 56 deletions(-)

New commits:
commit f8355221ae62b89a706f2d04b63eda658f3ccfa5
Author: Chris Sherlock 
Date:   Sat Feb 13 16:08:01 2016 +1100

tdf#85761 vcl: JPEG export does not save PPI values correctly

JPEG values are currently hardcoded to 96PPI when we export JPEGs. The
Graphic class doesn't have an easy way to get the PPI, but this can
actually be calculated from the pref size and pref map mode (no idea
why it is called "Pref").

Interestingly, you need to get a multiplier to work this out, relative
to units of 100th mm. The EPS filter code had a function that does
exactly this, but it's entirely based on MapMode units so it was really
implemented in the wrong class IMO. I have thus moved it out of PSWriter
and into MapMode.

This also fixes tdf#65695, which was partially fixed, but had the JPEG
PPI hardcoded to 96dpi.

Also fixes tdf#97481.

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

diff --git a/filter/source/graphicfilter/eps/eps.cxx 
b/filter/source/graphicfilter/eps/eps.cxx
index 0800b4c..aaa5fd0 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -215,7 +215,6 @@ private:
 inline void ImplWriteTextColor( sal_uLong nMode = PS_RET );
 voidImplWriteColor( sal_uLong nMode );
 
-static double   ImplGetScaling( const MapMode& );
 voidImplGetMapMode( const MapMode& );
 static bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, 
sal_uLong nSize );
 static sal_uInt8*   ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * 
pDest, sal_uLong nComp, sal_uLong nSize );
@@ -2197,56 +2196,10 @@ void PSWriter::ImplWriteColor( sal_uLong nMode )
 ImplExecMode( nMode );
 }
 
-double PSWriter::ImplGetScaling( const MapMode& rMapMode )
-{
-double  nMul;
-switch ( rMapMode.GetMapUnit() )
-{
-case MAP_PIXEL :
-case MAP_SYSFONT :
-case MAP_APPFONT :
-
-case MAP_100TH_MM :
-nMul = 1;
-break;
-case MAP_10TH_MM :
-nMul = 10;
-break;
-case MAP_MM :
-nMul = 100;
-break;
-case MAP_CM :
-nMul = 1000;
-break;
-case MAP_1000TH_INCH :
-nMul = 2.54;
-break;
-case MAP_100TH_INCH :
-nMul = 25.4;
-break;
-case MAP_10TH_INCH :
-nMul = 254;
-break;
-case MAP_INCH :
-nMul = 2540;
-break;
-case MAP_TWIP :
-nMul = 1.7639;
-break;
-case MAP_POINT :
-nMul = 35.2778;
-break;
-default:
-nMul = 1.0;
-break;
-}
-return nMul;
-}
-
 void PSWriter::ImplGetMapMode( const MapMode& rMapMode )
 {
 ImplWriteLine( "tm setmatrix" );
-double fMul = ImplGetScaling( rMapMode );
+double fMul = rMapMode.GetUnitMultiplier();
 double fScaleX = (double)rMapMode.GetScaleX() * fMul;
 double fScaleY = (double)rMapMode.GetScaleY() * fMul;
 ImplTranslate( rMapMode.GetOrigin().X() * fScaleX, 
rMapMode.GetOrigin().Y() * fScaleY );
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 4ca9491..7514f87 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 enum GraphicType
@@ -163,6 +164,8 @@ public:
 MapMode GetPrefMapMode() const;
 voidSetPrefMapMode( const MapMode& rPrefMapMode );
 
+basegfx::B2DSize GetPPI() const;
+
 SizeGetSizePixel( const OutputDevice* pRefDevice = nullptr ) 
const;
 
 sal_uLong   GetSizeBytes() const;
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 508bdd8..77aa83d 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -61,6 +61,9 @@ public:
 voidSetScaleY( const Fraction& rScaleY );
 const Fraction& GetScaleY() const;
 
+/// Gets the multiplier, which is relative to 1/100 mm units
+double  GetUnitMu

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

2016-02-14 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19fb09dce67d29d480ff39c538209b887f661dc9
Author: CaolÃ¡n McNamara 
Date:   Sun Feb 14 20:26:31 2016 +

coverity#1352217 Logically dead code

Change-Id: Ia4ca58ca67936a558b3157daae6a663ef81a81bf

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 4715995..8cdb67b 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1614,7 +1614,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType 
nType, ControlPart nPar
 {
 indicator_size = 0;
 
-GtkStyleContext *pMenuItemStyle = (nType == 
PART_MENU_ITEM_CHECK_MARK ) ? mpCheckMenuItemStyle : mpRadioMenuItemStyle;
+GtkStyleContext *pMenuItemStyle = (nPart == 
PART_MENU_ITEM_CHECK_MARK ) ? mpCheckMenuItemStyle : mpRadioMenuItemStyle;
 
 gtk_style_context_get_style( pMenuItemStyle,
  "indicator-size", &indicator_size,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help on getting started contributing to Libreoffice

2016-02-14 Thread Thorsten Behrens

Jan Iversen wrote:
> I hope one of the our fellow developers have an idea of what can
> cause this Boost problem.
> 
Looks like you're using msvc 2012
(http://lists.boost.org/Archives/boost/2015/07/224122.php). LibreOffice
master requires at least msvc 2013 - if that's not written clearly
enough on
https://wiki.documentfoundation.org/Development/BuildingOnWindows,
please let us know.

Cheers,

-- Thorsten


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

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

2016-02-14 Thread Henry Castro

 loolwsd/LOOLBroker.cpp |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit cdcb32f01337b51db097f3abea5165d2d2d14172
Author: Henry Castro 
Date:   Sun Feb 14 14:54:04 2016 -0400

loolwsd: loolbroker drop capabilities

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index bd35210..5d81486 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -761,6 +761,16 @@ int main(int argc, char** argv)
 if (numPreSpawnedChildren > 1)
 forkCounter = numPreSpawnedChildren - 1;
 
+if (!sharePages)
+{
+#ifdef __linux
+dropCapability(CAP_SYS_CHROOT);
+dropCapability(CAP_MKNOD);
+dropCapability(CAP_FOWNER);
+#else
+dropCapability();
+#endif
+}
 
 PipeRunnable pipeHandler;
 Poco::Thread aPipe;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Help on getting started contributing to Libreoffice

2016-02-14 Thread jan iversen

Hi

In order to get general help for problems like this, it is better to write to 
our mailing list (CC). The experts listen on that list and are better to help 
than I am.

I hope one of the our fellow developers have an idea of what can cause this 
Boost problem.

have a nice weekend.
rgds
jan i.



Sent from my iPad, please excuse any misspellings 

> On 14 Feb 2016, at 13:41, Pranav Ganorkar  wrote:
> 
> Hi Jani,
> 
> I am trying to compile libreoffice on windows.
> 
> But it is giving me this error with boost library:
> 
> 
> [BIN] hyphen
> C:/sources/libreoffice/workdir/UnpackedTarball/boost\boost/type_traits/common_type.hpp(111)
>  : fatal error C1001: An internal error has occurred in the compiler.
> (compiler file 'f:\dd\vctools\compiler\cxxfe\sl\p1\c\esumem.c', line 8636)
> To work around this problem, try simplifying or changing the program near the 
> locations listed above.
> Please choose the Technical Support command on the Visual C++
> Help menu, or open the Technical Support help file for more information
> C:/sources/libreoffice/workdir/UnpackedTarball/boost\boost/type_traits/common_type.hpp(133)
>  : see reference to class template instantiation 
> 'boost::type_traits_detail::common_type_impl' being compiled
> with
> [
> T1=int_least64_t
> ,T2=int_least64_t
> ]
> C:/sources/libreoffice/workdir/UnpackedTarball/boost\boost/type_traits/common_type.hpp(139)
>  : see reference to class template instantiation 
> 'boost::type_traits_detail::common_type_decay_helper' 
> being compiled
> with
> [
> T1=int_least64_t
> ,T2=int_least64_t
> ]
> C:/sources/libreoffice/workdir/UnpackedTarball/boost\boost/chrono/duration.hpp(405)
>  : see reference to class template instantiation 
> 'boost::common_type' being compiled
> with
> [
> Rep1=int_least64_t
> ,Rep2=int_least64_t
> ]
> C:/sources/libreoffice/workdir/UnpackedTarball/boost\boost/thread/win32/basic_timed_mutex.hpp(211)
>  : see reference to class template instantiation 'boost::common_t
> **
> 
> can someone with experience in building libreoffice on windows help me 
> regarding this.
> 
> Regards,
> Pranav
> 
>> On Sat, Feb 13, 2016 at 7:55 PM, Pranav Ganorkar  
>> wrote:
>> Hi Jani,
>> 
>> I wanted to start contributing to libreoffice foundation.
>> 
>> I want to start by working on this easyhack bug: 
>> https://bugs.documentfoundation.org/show_bug.cgi?id=96020
>> 
>> How should i proceed with it.
>> 
>> Also, i wanted to ask how can i sort the easyhack bugs for which patches 
>> have not been submitted yet and not been fixed.
>> 
>> Regards,
>> Pranav
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-02-14 Thread Henry Castro

 loolwsd/LOOLKit.cpp |   22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 42abb3b1a73d7aeb0280389ca2c28bb041de2039
Author: Henry Castro 
Date:   Sun Feb 14 14:32:55 2016 -0400

loolwsd: websocket shutdown receive

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 5655a8c..6f1fc63 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define LOK_USE_UNSTABLE_API
 #include 
@@ -338,17 +339,24 @@ public:
 // Destroy all connections and views.
 for (auto aIterator : _connections)
 {
-if (TerminationState == LOOLState::LOOL_ABNORMAL)
+try
 {
 // stop all websockets
-std::shared_ptr ws = 
aIterator.second->getWebSocket();
-if ( ws )
-ws->shutdownReceive();
+if (aIterator.second->isRunning())
+{
+std::shared_ptr ws = 
aIterator.second->getWebSocket();
+if ( ws )
+{
+ws->shutdownReceive();
+aIterator.second->join();
+}
+}
 }
-else
+catch(Poco::Net::NetException& exc)
 {
-// wait until loolwsd close all websockets
-aIterator.second->join();
+Log::error() << "Error: " << exc.displayText()
+ << (exc.nested() ? " (" + 
exc.nested()->displayText() + ")" : "")
+ << Log::end;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-02-14 Thread Henry Castro

 loolwsd/LOOLKit.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5c163e6daf3638a2fec2f65aa2372f6a96b4d36
Author: Henry Castro 
Date:   Sun Feb 14 14:39:02 2016 -0400

loolwsd: avoid deadlock with mutex and join

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 6f1fc63..2b47a0b 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -325,8 +325,6 @@ public:
 
 ~Document()
 {
-std::unique_lock lock(_mutex);
-
 Log::info("~Document dtor for url [" + _url + "] on child [" + _jailId 
+
   "]. There are " + std::to_string(_clientViews) + " views.");
 
@@ -360,6 +358,8 @@ public:
 }
 }
 
+std::unique_lock lock(_mutex);
+
 // Destroy all connections and views.
 _connections.clear();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Document with a zero-sized graphic - how to handle?

2016-02-14 Thread Thorsten Behrens

Chris Sherlock wrote:
> I’ve merged this, as it fixes a legitimate issue.
>
Nothing much to say on that, except that sticking zeros into something
that previously never had that & is not inconceivably used for
dividing might get us into some follow-up fun. ;)

> One interesting thing highlighted is that a 0x0 image might be being
> used as a tracker.
>
That's a red herring. Move the graphic off the page, make it all
white, or hide it behind something else, and you don't need zero-size
for tracking...

Cheers,

-- Thorsten


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

Re: Strange failure on Jenkins

2016-02-14 Thread julien2412

Hello Chris,

Here's what I get with master sources updated today (+ enable-dbgutil):
terminate called after throwing an instance of
'com::sun::star::packages::zip::ZipIOException'

Program received signal SIGABRT, Aborted.
0x2bb57507 in __GI_raise (sig=sig@entry=6) at
../sysdeps/unix/sysv/linux/raise.c:55
55  ../sysdeps/unix/sysv/linux/raise.c: Aucun fichier ou dossier de ce type.
(gdb) bt
#0  0x2bb57507 in __GI_raise (sig=sig@entry=6) at
../sysdeps/unix/sysv/linux/raise.c:55
#1  0x2bb588da in __GI_abort () at abort.c:89
#2  0x2b31d33d in __gnu_cxx::__verbose_terminate_handler() () at
/usr/lib/x86_64-linux-gnu/libstdc++.so.6
#3  0x2b31b3b6 in  () at /usr/lib/x86_64-linux-gnu/libstdc++.so.6
#4  0x2b31b401 in  () at /usr/lib/x86_64-linux-gnu/libstdc++.so.6
#5  0x2b31b416 in  () at /usr/lib/x86_64-linux-gnu/libstdc++.so.6
#6  0x2b31b072 in __cxa_call_unexpected () at
/usr/lib/x86_64-linux-gnu/libstdc++.so.6
#7  0x2aaad475900e in
writerfilter::ooxml::OOXMLFastContextHandlerProperties::lcl_endFastElement(int)
(this=0x1ab2590, Element=854321)
at
/home/julien/compile-libreoffice/libreoffice/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:930
#8  0x2aaad4755b74 in
writerfilter::ooxml::OOXMLFastContextHandler::endFastElement(int)
(this=0x1ab2590, Element=854321)
at
/home/julien/compile-libreoffice/libreoffice/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:190
#9  0x2aaacece3f6e in (anonymous namespace)::Entity::endElement()
(this=0x1aacc50) at
/home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:494
#10 0x2aaacece776c in
sax_fastparser::FastSaxParserImpl::callbackEndElement(unsigned char const*,
unsigned char const*, unsigned char const*) (this=0x18bdaf0)
at
/home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:1137
#11 0x2aaacece2426 in (anonymous
namespace)::call_callbackEndElement(void*, xmlChar const*, xmlChar const*,
xmlChar const*) (userData=0x18bdaf0, localName=0x1a9caf2 "footerReference",
prefix=0x1a9c797 "w", URI=0x1a9c922
"http://schemas.openxmlformats.org/wordprocessingml/2006/main";)
at
/home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:298

the last bt from "catch throw com::sun::star::packages::zip::ZipIOException"
gives this http://pastebin.com/fWjWBNCA

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Strange-failure-on-Jenkins-tp4175476p4175523.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 69455] VIEWING: "About" window of latest master build allows typing in version info (OS X only)

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=69455

--- Comment #12 from steve -_-  ---
Andras, thanks for elaborating. Guess it would be useful to give reasoning when
changing such things? I don't know why t_arceri added that status. Maybe
editing of such fields should be restricted?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-02-14 Thread Pranav Kant

 libreofficekit/source/gtk/lokdocview.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 58ec66da422e5ac6aec5cbd28403039cded7c7ed
Author: Pranav Kant 
Date:   Sun Feb 14 20:44:00 2016 +0530

lokdocview: Center the widget vertically inside the allocation

Change-Id: I891519d54212ecd99273a54aca2a44e2d54c1933

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 742946d..baa4f6e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -2574,6 +2574,7 @@ lok_doc_view_new (const gchar* pPath, GCancellable 
*cancellable, GError **error)
 return GTK_WIDGET (g_initable_new (LOK_TYPE_DOC_VIEW, cancellable, error,
"lopath", pPath == nullptr ? LOK_PATH : 
pPath,
"halign", GTK_ALIGN_CENTER,
+   "valign", GTK_ALIGN_CENTER,
nullptr));
 }
 
@@ -2585,6 +2586,7 @@ SAL_DLLPUBLIC_EXPORT GtkWidget* 
lok_doc_view_new_from_widget(LOKDocView* pOldLOK
"lopointer", 
pOldPriv->m_pOffice,
"docpointer", 
pOldPriv->m_pDocument,
"halign", 
GTK_ALIGN_CENTER,
+   "valign", 
GTK_ALIGN_CENTER,
nullptr));
 
 // No documentLoad(), just a createView().
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 69455] VIEWING: "About" window of latest master build allows typing in version info (OS X only)

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=69455

Andras Timar  changed:

   What|Removed |Added

   Keywords|difficultyBeginner, |
   |easyHack, skillCpp, topicUI |
 Whiteboard|ToBeReviewed|

--- Comment #11 from Andras Timar  ---
(In reply to steve -_- from comment #10)
> Jan: why changing the status to "ToBeReviewed"?

Because it's not an Easy Hack. There are no code pointers or anything helpful
that a beginner can use to start working on this bug.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 69455] VIEWING: "About" window of latest master build allows typing in version info (OS X only)

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=69455

--- Comment #10 from steve -_-  ---
Jan: why changing the status to "ToBeReviewed"?

This bug is persisting. Nothing has changed. There is a semi-automatic process
in bugzilla which pings old bugs if they see no action for a certain time.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Some problems in LibreOffice 5.1

2016-02-14 Thread V Stuart Foote

jan iversen wrote
>> On 11 Feb 2016, at 17:27, Carlos Molina Palma <

> cmolinap@

> > wrote:
>> ...
>> 2.   The Exit of LibreOffice command (Ctrl + Q) in File Menu doesn’t
>> work.
> This sound like real problem, can I please ask you to file 2 bug reports
> using:
> https://bugs.documentfoundation.org/
> 
> rgds
> jan I.

Yes, a BZ  issue should be opened against the first issue.

For the second, we already have an issue for the Q_MOD1 shortcut -- entered
on Linux and Windows as +Q and on OS X as +Q -- which has
never functioned while focus is inside the the menus.  That is open as 
tdf#97511   .

Stuart

--
View this message in context: 
http://nabble.documentfoundation.org/Some-problems-in-LibreOffice-5-1-tp4175327p4175510.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-02-14 Thread Pranav Kant

 configure.ac |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b7c807faeb18a87dc8ad5bc1ae68ca5cb3999a66
Author: Pranav Kant 
Date:   Mon Jan 18 01:12:37 2016 +0530

configure: Add a missing option, --with-gcc-home

--enable-icecream option mentions this in its documentation, but
it had been missing till now.

This option is also necessary when operating systems installs
icecc wrappers in locations other than /usr/lib/icecc, /opt/icecream,
which is what GCC_HOME gets set to by default with --enable-icecream.

Change-Id: Ib2b6ec010271467949e7ac9f1d01624cb360c5a5
Reviewed-on: https://gerrit.libreoffice.org/21551
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/configure.ac b/configure.ac
index 07bf6fd..bf96369 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1514,6 +1514,13 @@ dnl 
===
 dnl Optional Packages (--with/without-)
 dnl ===
 
+AC_ARG_WITH(gcc-home,
+AS_HELP_STRING([--with-gcc-home],
+[Specify the location of gcc/g++ manually. This can be used in 
conjunction
+ with --enable-icecream when icecream gcc/g++ wrappers are installed 
in a
+ non-default path.]),
+,)
+
 AC_ARG_WITH(gnu-patch,
 AS_HELP_STRING([--with-gnu-patch],
 [Specify location of GNU patch on Solaris or FreeBSD.]),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 97642] Beanshell Editor: Use native theming for swing controls

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=97642

--- Comment #2 from Chris Sherlock  ---
It too me a bit of time to work out how to get into Beanshell. In case anyone
else is curious (someone comes onto the dev IRC channel every now and again to
ask about it), you need to:

1. Open a new writer document
2. Go to tools -> Macros -> Organize Macros -> Beanshell...
3. Find a .bsh script, then click on edit

At this point, you have the Beanshell editor.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

2016-02-14 Thread Andrea Pescetti

 extensions.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb954f6cc9c90a539801aac0e7d202e0caaede06
Author: Andrea Pescetti 
Date:   Sun Feb 14 11:23:24 2016 +

#i126842# Update Italian dictionary to version 2016.02.10

diff --git a/extensions.lst b/extensions.lst
index b7e94a8..efe09a9 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -59,7 +59,7 @@
 
 # Italian dictionary.
 [ language=it || language=de || language=de_DE ]
-67eb02751dda7b2d312a66bcb0505fd2 
http://sourceforge.net/projects/aoo-extensions/files/1204/13/dict-it.oxt/download
 "dict-it.oxt"
+b20c2bf3114bdca5749606ad707e19be 
http://sourceforge.net/projects/aoo-extensions/files/1204/14/dict-it.oxt/download
 "dict-it.oxt"
 
 # Spanish dictionary.
 [ language=es || language=ca || language=ca_XV ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some problems in LibreOffice 5.1

2016-02-14 Thread jan iversen



Sent from my iPad, please excuse any misspellings 

> On 11 Feb 2016, at 17:27, Carlos Molina Palma  wrote:
> 
> Hi,
>  
> Today I install LO v5.1.0.3 Spanish versión (I had been using v5.0.4). I have 
> had some problems with it:
>  
> 1.   If I make a mistake introducing the password in a protected 
> document, LO send a warning saying that the document is corrupt.
> 2.   The Exit of LibreOffice command (Ctrl + Q) in File Menu doesn’t work.
This sound like real problem, can I please ask you to file 2 bug reports using:
https://bugs.documentfoundation.org/

rgds
jan I.

>  
> Windows 10 Pro v1511 Build 10586.104
>  
> Carlos Molina Palma.
> Enviado desde Correo para Windows 10
>  
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: A suggestion for "Get Involved" page

2016-02-14 Thread jan iversen



> I disagree here. In many cases I think it is wrong to simply repeat the bug 
> title in the commit message of the commit that (partly or wholly) fixes the 
> bug. Instead the commit message should say what the commit does. That it 
> fixes a specific bug is just a side-effect, a note.

I might be wrong, but I do not think there is much of a disagreement. I did on 
purpose not write  but "what was the problem", hoping to see a developer 
sentence describing the problem.

I think it is important that the total commit message contains both why (was 
this solved) and what (was changed). Just reading the "what" will make me 
wonder why was it changed.

> Also (this is also personal preference, and might be just bike-shedding) a 
> commit message should be in present tense. It should say what the change 
> *does*. Not what it "did". 

We are at least 2 with that preference, I updated the commit message:
https://wiki.documentfoundation.org/Development/GetInvolved#4._Submit_the_patch

>  I personally also don't see the usefulness in putting the "module" name as a 
> prefix on the commit message. But I know that many esteemed colleagues 
> disagree.
I will leave this part open :-)

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

Re: Document with a zero-sized graphic - how to handle?

2016-02-14 Thread Cor Nouws

Chris Sherlock wrote on 14-02-16 03:11:

> Also wondering if it might be worthwhile back-porting?

AFAIAC: sure.

Thanks,
Cor


-- 
Cor Nouws
GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28  A038 E49D 7365 B134 80A6
- vrijwilliger http://nl.libreoffice.org
- volunteer http://www.libreoffice.org
- The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65108] Clean-up header includes (global/local)

2016-02-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=65108

--- Comment #29 from Chris Sherlock  ---
I'm including a script that fixes this, and I've run it against the codebase.
Gerrit submission is here:

https://gerrit.libreoffice.org/#/c/22351/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Strange failure on Jenkins

2016-02-14 Thread Markus Mohrhard

On Sun, Feb 14, 2016 at 8:54 AM, Chris Sherlock 
wrote:

> Are you sure? That seems like a very odd thing… not saying you are wrong,
> but this seems like a very odd thing to have as a requirement for a unit
> test.
>


This only fails in dbgutil builds because we only enforce the UNO exception
specification in dbgutil builds. So this is similar to asserts which also
only fail a test in special builds.

You can see that it was an unexpected exception by the:

#11 0x2abea7e0f5d2 in __cxa_call_unexpected () at /lib64/libstdc++.so.6

line in the backtrace.

Regards,

Markus


> Chris
>
> On 14 Feb 2016, at 6:47 PM, Mark Hung  wrote:
>
> Hi Chris,
>
> It is possible that for some tests need --enable-dbgutil or make
> debug=true to trigger the assert.
>
> Best Regards.
>
> 2016-02-14 15:14 GMT+08:00 Chris Sherlock :
>
>> Hi all,
>>
>> https://gerrit.libreoffice.org/#/c/20993/ on Gerrit, and fixes bug 96749
>> (deal with missing custom headers/footers in docx).
>>
>> I’ve cherry picked this and built this on my Ubuntu Linux system from
>> master, and I’m getting no unit test failures.
>>
>> Jenkins, however, is failing on both Linux and Mac OS X, but
>> interestingly not Windows. On Linux the failure is:
>>
>>
>> http://ci.libreoffice.org/job/lo_gerrit_master/11877/Gerrit=Gerrit,Platform=Linux/console
>>
>> Anyone have any ideas why this failure is occuring when it isn’t occuring
>> on my local Linux system?
>>
>> (Incidentally, the fix is good and works really well).
>>
>> Chris
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>
>
>
> --
> Mark Hung
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

57 matches

Mail list logo