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

2015-10-10 Thread Julien Nabet 
 ucb/source/ucp/webdav-neon/NeonSession.cxx   |6 +++---
 ucb/source/ucp/webdav-neon/webdavcontent.cxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c65ff0723f3b0df108bec006be6d5939d4999e10
Author: Julien Nabet 
Date:   Sun Oct 11 08:52:02 2015 +0200

cppcheck: Prefer prefix ++/-- operators for non-primitive types

Change-Id: I93b65c89cc7475460e0e7339f939cc058f36f0da

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index c4581e1..2c1705c 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -832,7 +832,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
 SAL_INFO( "ucb.ucp.webdav", "PROPFIND - inPath: <" << inPath << "> 
inDepth: " << inDepth );
 OUString aProps;
 for(std::vector< OUString >::const_iterator it = inPropNames.begin();
-it < inPropNames.end(); it++)
+it < inPropNames.end(); ++it)
 {
 aProps += *it;
 aProps += ", ";
@@ -880,11 +880,11 @@ void NeonSession::PROPFIND( const OUString & inPath,
 #if defined SAL_LOG_INFO
 { //debug
 for ( std::vector< DAVResourceInfo >::const_iterator itres = 
ioResInfo.begin();
-  itres < ioResInfo.end(); itres++)
+  itres < ioResInfo.end(); ++itres)
 {
 OUString aProps;
 for ( std::vector< OUString >::const_iterator it = 
(*itres).properties.begin();
-  it < (*itres).properties.end(); it++)
+  it < (*itres).properties.end(); ++it)
 {
 aProps += *it;
 aProps += ", ";
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index ae1663e..275f8c5 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2842,7 +2842,7 @@ Content::ResourceType Content::resourceTypeForLocks(
 std::vector< DAVPropertyValue >::iterator it;
 
 for ( it = resources[0].properties.begin();
-  it != resources[0].properties.end(); it++)
+  it != resources[0].properties.end(); ++it)
 {
 if ( (*it).Name ==  DAVProperties::SUPPORTEDLOCK )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Giuseppe Castagno 
 sal/osl/w32/file_error.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b49a2f7373e950efc3fe11b89309313ac69c1e1f
Author: Giuseppe Castagno 
Date:   Thu Oct 8 11:04:07 2015 +0200

tdf#94888: Accessing Sharepoint r/o share through UNC path does not work

Added a Windows API missing error.

The error added:

ERROR_CANT_ACCESS_FILE
returned when a file cannot be accessed by the system.

Mapped to existent osl_File_E_ for compatibility.

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

diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index 2d7243d..cdb8571 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -86,6 +86,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_FILE_CHECKED_OUT,   osl_File_E_ACCES},  /* 220 */
   {  ERROR_DIRECTORY,  osl_File_E_NOENT},  /* 267 */
   {  ERROR_NOT_ENOUGH_QUOTA,   osl_File_E_NOMEM},  /* 1816 */
+  {  ERROR_CANT_ACCESS_FILE,   osl_File_E_ACCES},  /* 1920 */
   {  ERROR_UNEXP_NET_ERR,  osl_File_E_NETWORK  }   /* 59 */
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 93243] replace boost::bind with C++11 lambdas

2015-10-10 Thread bugzilla-daemon 
https://bugs.documentfoundation.org/show_bug.cgi?id=93243

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=91e0161dc5a0de0dcce1696aea318d919d5d04a1

tdf#93243 slideshow: replace boost::bind

It will be available in 5.1.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
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-10-10 Thread Daniel Robertson 
 slideshow/source/engine/shapes/backgroundshape.cxx |   28 --
 slideshow/source/engine/shapes/viewshape.cxx   |   11 +
 slideshow/source/engine/slide/layer.cxx|   33 ++--
 slideshow/source/engine/slide/layermanager.cxx |   24 
 slideshow/source/engine/slide/shapemanagerimpl.cxx |8 +---
 slideshow/source/engine/slide/slideimpl.cxx|2 -
 slideshow/source/engine/slideshowimpl.cxx  |   42 +
 7 files changed, 52 insertions(+), 96 deletions(-)

New commits:
commit 91e0161dc5a0de0dcce1696aea318d919d5d04a1
Author: Daniel Robertson 
Date:   Sat Oct 10 12:43:34 2015 -0400

tdf#93243 slideshow: replace boost::bind

Replace boost::bind with C++11 lambdas

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

diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx 
b/slideshow/source/engine/shapes/backgroundshape.cxx
index d53105e..dc71e0d 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -27,8 +27,6 @@
 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
@@ -169,11 +167,8 @@ namespace slideshow
 // already added?
 if( ::std::any_of( maViewShapes.begin(),
maViewShapes.end(),
-   ::boost::bind(
-::std::equal_to< ViewLayerSharedPtr >(),
-::boost::bind( 
&ViewBackgroundShape::getViewLayer,
-   _1 ),
-::boost::cref( rNewLayer ) ) ) )
+   [&rNewLayer]( const 
ViewBackgroundShapeSharedPtr& pBgShape )
+   { return pBgShape->getViewLayer() == rNewLayer; 
} ) )
 {
 // yes, nothing to do
 return;
@@ -195,22 +190,16 @@ namespace slideshow
 
 OSL_ENSURE( ::std::count_if(maViewShapes.begin(),
 aEnd,
-::boost::bind(
-::std::equal_to< 
ViewLayerSharedPtr >(),
-::boost::bind( 
&ViewBackgroundShape::getViewLayer,
-   _1 ),
-::boost::cref( rLayer ) ) ) < 2,
+[&rLayer]( const 
ViewBackgroundShapeSharedPtr& pBgShape )
+{ return pBgShape->getViewLayer() == 
rLayer; } ) < 2,
 "BackgroundShape::removeViewLayer(): Duplicate 
ViewLayer entries!" );
 
 ViewBackgroundShapeVector::iterator aIter;
 
 if( (aIter=::std::remove_if( maViewShapes.begin(),
  aEnd,
- ::boost::bind(
- ::std::equal_to< 
ViewLayerSharedPtr >(),
- ::boost::bind( 
&ViewBackgroundShape::getViewLayer,
-_1 ),
- ::boost::cref( rLayer ) ) )) == 
aEnd )
+ [&rLayer]( const 
ViewBackgroundShapeSharedPtr& pBgShape )
+ { return pBgShape->getViewLayer() == 
rLayer; } )) == aEnd )
 {
 // view layer seemingly was not added, failed
 return false;
@@ -280,9 +269,8 @@ namespace slideshow
 // redraw all view shapes, by calling their render() method
 if( ::std::count_if( maViewShapes.begin(),
  maViewShapes.end(),
- ::boost::bind( &ViewBackgroundShape::render,
-_1,
-::boost::cref( mpMtf ) ) )
+ [this]( const ViewBackgroundShapeSharedPtr& 
pBgShape )
+ { return pBgShape->render( this->mpMtf ); } )
 != 
static_cast(maViewShapes.size()) )
 {
 // at least one of the ViewBackgroundShape::render() calls did 
return
diff --git a/slideshow/source/engine/shapes/viewshape.cxx 
b/slideshow/source/engine/shapes/viewshape.cxx
index 05507e5..ed2ac3c 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -44,9 +44,6 @@
 #include "viewshape.hxx"
 #include "tools.hxx"
 
-#include 
-
-
 using namespace ::com::sun::star;
 
 namespace slideshow
@@ -742,12 +739,8 @@ namespace slideshow
 // already there?
 if( (

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

2015-10-10 Thread Daniel Robertson 
 slideshow/source/engine/shapes/shapeimporter.cxx   |7 
 slideshow/source/engine/shapes/viewshape.cxx   |   10 -
 slideshow/source/engine/slide/layermanager.cxx |   46 ++
 slideshow/source/engine/slide/targetpropertiescreator.cxx  |   16 --
 slideshow/source/engine/slideshowimpl.cxx  |   48 ++
 slideshow/source/engine/slideview.cxx  |   22 ---
 slideshow/source/engine/transitions/slidechangebase.cxx|   10 -
 slideshow/source/engine/transitions/slidetransitionfactory.cxx |   73 
+++---
 slideshow/source/engine/waitsymbol.cxx |   23 +--
 slideshow/source/inc/listenercontainer.hxx |   34 +---
 10 files changed, 94 insertions(+), 195 deletions(-)

New commits:
commit b6297280853a7325ac0fa226b783652b22daebd0
Author: Daniel Robertson 
Date:   Fri Oct 9 09:21:20 2015 -0400

Replace simple while loops with range-based for

Replace simple while loops with range-based for-loops when apropriate.
There should be no side effects due to this change.

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

diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx 
b/slideshow/source/engine/shapes/shapeimporter.cxx
index c92e27a..21322f6 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -490,12 +490,10 @@ void 
ShapeImporter::importPolygons(uno::Reference const& xP
 aPoint.setY((*pInnerSequence).Y);
 aPoly.append( aPoint );
 }
-UnoViewVector::const_iterator aIter=(mrContext.mrViewContainer).begin();
-UnoViewVector::const_iterator aEnd=(mrContext.mrViewContainer).end();
-while(aIter != aEnd)
+for( const auto& pView : mrContext.mrViewContainer )
 {
 ::cppcanvas::PolyPolygonSharedPtr pPolyPoly(
-::cppcanvas::BaseGfxFactory::createPolyPolygon( 
(*aIter)->getCanvas(),
+::cppcanvas::BaseGfxFactory::createPolyPolygon( pView->getCanvas(),
 aPoly ) );
 if( pPolyPoly )
 {
@@ -504,7 +502,6 @@ void 
ShapeImporter::importPolygons(uno::Reference const& xP
 pPolyPoly->draw();
 maPolygons.push_back(pPolyPoly);
 }
-++aIter;
 }
 }
 
diff --git a/slideshow/source/engine/shapes/viewshape.cxx 
b/slideshow/source/engine/shapes/viewshape.cxx
index 9847882..05507e5 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -231,15 +231,11 @@ namespace slideshow
 
 
 bool bRet(true);
-VectorOfDocTreeNodes::const_iteratoraIter( 
rSubsets.begin() );
-const VectorOfDocTreeNodes::const_iterator  aEnd ( 
rSubsets.end() );
-while( aIter != aEnd )
+for( const auto& rSubset : rSubsets )
 {
-if( !pRenderer->drawSubset( aIter->getStartIndex(),
-aIter->getEndIndex() ) )
+if( !pRenderer->drawSubset( rSubset.getStartIndex(),
+rSubset.getEndIndex() ) )
 bRet = false;
-
-++aIter;
 }
 
 return bRet;
diff --git a/slideshow/source/engine/slide/layermanager.cxx 
b/slideshow/source/engine/slide/layermanager.cxx
index aa555a8..3dbb554 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -53,11 +53,9 @@ namespace slideshow
 {
 LayerSharedPtr  pCurrLayer;
 ViewLayerSharedPtr  pCurrViewLayer;
-LayerShapeMap::const_iterator   aIter( maAllShapes.begin() );
-const LayerShapeMap::const_iterator aEnd ( maAllShapes.end() );
-while( aIter != aEnd )
+for( const auto& rShape : maAllShapes )
 {
-LayerSharedPtr pLayer = aIter->second.lock();
+LayerSharedPtr pLayer = rShape.second.lock();
 if( pLayer && pLayer != pCurrLayer )
 {
 pCurrLayer = pLayer;
@@ -65,9 +63,7 @@ namespace slideshow
 }
 
 if( pCurrViewLayer )
-shapeFunc(aIter->first,pCurrViewLayer);
-
-++aIter;
+shapeFunc(rShape.first,pCurrViewLayer);
 }
 }
 
@@ -470,16 +466,14 @@ namespace slideshow
 // send update() calls to every shape in the
 // maUpdateShapes set, which is _animated_ (i.e. a
 // sprite).
-const ShapeUpdateSet::const_iterator aEnd=maUpdateShapes.end();
-

CppCheck Report Update

2015-10-10 Thread cppcheck.libreoff...@gmail.com 

A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2015-11-10_02:31:25 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh


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

[Libreoffice-commits] core.git: 2 commits - android/Bootstrap android/CustomTarget_lo_android.mk android/.gitignore android/Makefile android/source .gitignore include/osl Makefile.in sal/android sal/o

2015-10-10 Thread Christian Lohmaier 
 .gitignore   |1 
 Makefile.in  |1 
 android/.gitignore   |   22 
 android/Bootstrap/.gitignore |1 
 android/Bootstrap/AndroidManifest.xml|9 
 android/Bootstrap/Makefile.shared|  194 
+--
 android/Bootstrap/ant.properties |   17 
 android/Bootstrap/build.xml  |   85 ---
 android/Bootstrap/no-resource-compress-20.xml|   45 -
 android/Bootstrap/no-resource-compress-21.xml|   46 -
 android/Bootstrap/no-resource-compress-22.xml|   46 -
 android/Bootstrap/no-resource-compress-23.xml|   46 -
 android/Bootstrap/no-resource-compress-24.xml|   46 -
 android/Bootstrap/project.properties |   12 
 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java|8 
 android/CustomTarget_lo_android.mk   |2 
 android/Makefile |4 
 android/source/AndroidManifest.xml   |  118 

 android/source/AndroidManifest.xml.in|  121 

 android/source/Makefile  |   42 -
 android/source/build.gradle  |  273 
++
 android/source/build.xml |   84 ---
 android/source/fonts.conf|2 
 android/source/gradle/wrapper/gradle-wrapper.jar |binary
 android/source/gradle/wrapper/gradle-wrapper.properties  |6 
 android/source/gradlew   |  164 
++
 android/source/gradlew.bat   |   90 +++
 android/source/project.properties|   15 
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |  139 
+++--
 include/osl/detail/android-bootstrap.h   |5 
 sal/android/libreofficekit-jni.c |   19 
 sal/android/lo-bootstrap.c   |  182 
--
 sal/osl/unx/file.cxx |   29 -
 33 files changed, 865 insertions(+), 1009 deletions(-)

New commits:
commit 143fb0a4b5d4ab69d4928299d8112ab95d99870a
Author: Christian Lohmaier 
Date:   Sun Oct 11 01:52:39 2015 +0200

move extracting assets to Java & use AssetManager to access assets

using AssetsManager in both java as well as native parts allows to
handle files both with and without compression transparently

Change-Id: If02f1159c498be7ea965fd9c217410722f2dca1f

diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java 
b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index 431c384..b2fb5e1 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -11,6 +11,7 @@ package org.libreoffice.kit;
 
 import android.app.Activity;
 import android.content.pm.ApplicationInfo;
+import android.content.res.AssetManager;
 import android.util.Log;
 
 import java.io.File;
@@ -24,6 +25,7 @@ import java.nio.ByteBuffer;
 public final class LibreOfficeKit
 {
 private static String LOGTAG = LibreOfficeKit.class.getSimpleName();
+private static AssetManager mgr;
 
 // private constructor because instantiating would be meaningless
 private LibreOfficeKit() {
@@ -34,7 +36,7 @@ public final class LibreOfficeKit
 }
 
 // Trigger initialization on the JNI - LOKit side.
-private static native boolean initializeNative(String dataDir, String 
cacheDir, String apkFile);
+private static native boolean initializeNative(String dataDir, String 
cacheDir, String apkFile, AssetManager mgr);
 
 public static native ByteBuffer getLibreOfficeKitHandle();
 
@@ -55,6 +57,8 @@ public final class LibreOfficeKit
 return;
 }
 
+mgr = activity.getResources().getAssets();
+
 ApplicationInfo applicationInfo = activity.getApplicationInfo();
 String dataDir = applicationInfo.dataDir;
 Log.i(LOGTAG, String.format("Initializing LibreOfficeKit, 
dataDir=%s\n", dataDir));
@@ -83,7 +87,7 @@ public final class LibreOfficeKit
 // TMPDIR is used by osl_getTempDirURL()
 putenv("TMPDIR=" + cacheDir);
 
-if (!initializeNative(dataDir, cacheDir, apkFile)) {
+if (!initializeNative(dataDir, cacheDir, apkFile, mgr)) {
 Log.e(LOGTAG, "Initializ

[Libreoffice-commits] core.git: helpcontent2

2015-10-10 Thread tagezi 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8dc648d0f32e94fe283e2d635f236012491819ca
Author: tagezi 
Date:   Fri Oct 9 23:54:35 2015 +0300

Updated core
Project: help  0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2

Added description COUNTIFS function

func_countifs.xhp is new
In func_averageifs.xhp and func_averageifs.xhp: added the link to COUNTIFS
corrected some typos

Change-Id: I2f9980d331bac807b1e1e03af24b5660c0081118
Reviewed-on: https://gerrit.libreoffice.org/19288
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index a52136a..0b6f808 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a52136a62f56c0ed327eeaa547098134a4f2fca8
+Subproject commit 0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread tagezi 
 AllLangHelp_scalc.mk |1 
 source/text/scalc/01/04060181.xhp|4 +
 source/text/scalc/01/func_averageifs.xhp |4 -
 source/text/scalc/01/func_countifs.xhp   |   65 +++
 source/text/scalc/01/func_sumifs.xhp |4 -
 5 files changed, 74 insertions(+), 4 deletions(-)

New commits:
commit 0b6f8089829c49f01e35ce7bb11d5e0e0dfc70f2
Author: tagezi 
Date:   Fri Oct 9 23:54:35 2015 +0300

Added description COUNTIFS function

func_countifs.xhp is new
In func_averageifs.xhp and func_averageifs.xhp: added the link to COUNTIFS
corrected some typos

Change-Id: I2f9980d331bac807b1e1e03af24b5660c0081118
Reviewed-on: https://gerrit.libreoffice.org/19288
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 6395e91..0c180ca 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -184,6 +184,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_averageif \
 helpcontent2/source/text/scalc/01/func_averageifs \
+helpcontent2/source/text/scalc/01/func_countifs \
 helpcontent2/source/text/scalc/01/func_date \
 helpcontent2/source/text/scalc/01/func_datedif \
 helpcontent2/source/text/scalc/01/func_datevalue \
diff --git a/source/text/scalc/01/04060181.xhp 
b/source/text/scalc/01/04060181.xhp
index 56f748e..53bbbfb 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -131,6 +131,10 @@ oldref="547">COUNTIF
 To count only 
negative numbers: =COUNTIF(A1:A10;"<0")
 
 
+
+
+
+
   
 B 
function
  probabilities of samples with binomial 
distribution
diff --git a/source/text/scalc/01/func_averageifs.xhp 
b/source/text/scalc/01/func_averageifs.xhp
index bc450f0..6fb9092 100644
--- a/source/text/scalc/01/func_averageifs.xhp
+++ b/source/text/scalc/01/func_averageifs.xhp
@@ -30,7 +30,7 @@
 AVERAGEIFS(Average_range; Criterion_range1; Criterion1 [; 
Criterion_range2; Criterion2 [; ...]])
 Average_range – required argument. It is a 
range of cells, a name of a named range or a label of a column or a row 
containing values for calculating the mean.
 Criterion_range1 – required argument. It is a 
range of cells, a name of a named range or a label of a column or a row 
containing values for finding the corresponding criterion.
-Criterion1 – required argument. A condition in 
the form of expression or cell reference with expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions. 
+Criterion1 – required argument. A condition in 
the form of expression or a cell reference to expression that defines what 
cells should be used to calculate the mean. The expression can contain text, 
numbers or regular expressions. 
 Criterion_range2 – Optional. Criterion_range2 
and all the following mean the same as Criterion_range1.
 Criterion2 – Optional. Criterion2 and all the 
following mean the same as Criterion1.
 The logical 
relation between criteria can be defined as logical AND (conjunction). In other 
words, if and only if all given criteria are met, a value from the 
corresponding cell of the given Average_range is taken into calculation of the 
mean.
@@ -58,7 +58,7 @@ If the range of values for calculating the mean and any range 
for finding criter
 =AVERAGEIFS(C2:C6;A2:A6;E2&".*";B2:B6;"<"&MAX(B2:B6))
 If E2 = 
pen, the function returns 65, because the link to the cell is substituted with 
its content.
 
-AVERAGE, AVERAGEA, , , MAX, MIN
+AVERAGE, AVERAGEA, , ,  MAX, MIN
 
 
 
diff --git a/source/text/scalc/01/func_countifs.xhp 
b/source/text/scalc/01/func_countifs.xhp
new file mode 100644
index 000..faa7a0b
--- /dev/null
+++ b/source/text/scalc/01/func_countifs.xhp
@@ -0,0 +1,65 @@
+
+
+
+
+
+  
+COUNTIFS function
+text/scalc/01/func_countifs.xhp
+  
+
+
+
+
+
+
+  COUNTIFS function
+  counting row;satisfying criteria
+  counting column;satisfying criteria
+
+COUNTIFS 
function
+Returns the count of rows or columns that 
meet criteria in multiple ranges.
+
+Syntax
+COUNTIFS(Range1; Criterion1 [; Range2; Criterion2 [; 
...]])
+Range1 – required argument. It is a range of 
cells, a name of a named range or a label of a column or a row containing 
values for counting and finding the corresponding criterion.
+Criterion1 – required argument. A condition in 
the form of expression or a cell reference to expression that defines what 
cells should be used for counting. The expression can contain text, numbers or 
regular expressions. 
+Criterion_range2 – Optional. Criterion_range2 
and all the following mean the same as Criterion_range1.
+Criterion2 – Optional. Criterion2 and all the 
following mean the same as Criterion1.
+The logical 
relation between criteria can be defined as logical AND (conjunc

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

2015-10-10 Thread Caolán McNamara 
 svtools/source/contnr/imivctl2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1412229c6e1284808b99cdcb33de99c511511b7f
Author: Caolán McNamara 
Date:   Sat Oct 10 20:47:32 2015 +0100

cppcheck: redundantCopy

just zero the un-overwritten new entries

Change-Id: Ifea1560a1c46ac5b10c04e6499c02e29a957191a

diff --git a/svtools/source/contnr/imivctl2.cxx 
b/svtools/source/contnr/imivctl2.cxx
index 16ea52f..9ca2278 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -559,9 +559,9 @@ void IcnGridMap_Impl::Expand()
 
 size_t nNewCellCount = static_cast(nNewGridRows) * 
nNewGridCols;
 bool* pNewGridMap = new bool[nNewCellCount];
-memset(pNewGridMap, 0, nNewCellCount * sizeof(bool));
 size_t nOldCellCount = static_cast(_nGridRows) * _nGridCols;
 memcpy(pNewGridMap, _pGridMap, nOldCellCount * sizeof(bool));
+memset(pNewGridMap + nOldCellCount, 0, (nNewCellCount-nOldCellCount) * 
sizeof(bool));
 delete[] _pGridMap;
 _pGridMap = pNewGridMap;
 _nGridRows = nNewGridRows;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Slávek Banko 
 vcl/inc/unx/tde/tdedata.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f0a68ebc4476ee0a78e638d1a08007edf8d2e3a
Author: Slávek Banko 
Date:   Sat Oct 10 13:36:09 2015 +0200

Fix FTBFS with TDE integration due to recent SalFrame changes

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

diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx
index 2df9bf3..d8f1363 100644
--- a/vcl/inc/unx/tde/tdedata.hxx
+++ b/vcl/inc/unx/tde/tdedata.hxx
@@ -69,7 +69,7 @@ class TDESalFrame : public X11SalFrame
 GraphicsHolder m_aGraphics[ nMaxGraphics ];
 
 public:
-TDESalFrame( SalFrame* pParent, sal_uLong );
+TDESalFrame( SalFrame* pParent, SalFrameStyleFlags );
 virtual ~TDESalFrame();
 
 virtual SalGraphics* AcquireGraphics();
@@ -85,7 +85,7 @@ public:
 TDESalInstance( SalYieldMutex* pMutex )
 : X11SalInstance( pMutex ) {}
 virtual ~TDESalInstance() {}
-virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle );
+virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags 
nStyle );
 };
 
 class TDEXLib : public SalXLib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread melikeyurtoglu 
 sot/source/sdstor/stgdir.cxx   |6 -
 sot/source/sdstor/stgstrms.cxx |  138 -
 sot/source/sdstor/stgstrms.hxx |   10 +-
 3 files changed, 77 insertions(+), 77 deletions(-)

New commits:
commit 30b3676624685e260e2ec1909486b971fac129f7
Author: melikeyurtoglu 
Date:   Sat Oct 10 00:00:16 2015 +0300

tdf#94879 add 'm' suffixes to member variables

Reviewed on:
https://gerrit.libreoffice.org/19290

Change-Id: I48b0488edc9462ec1c15188d0b5c893db529c0e7

diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index a2a82c8..821cb91 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -866,8 +866,8 @@ bool StgDirStrm::Store()
 sal_Int32 nOldStart = nStart;   // save for later deletion
 sal_Int32 nOldSize  = nSize;
 nStart = nPage = STG_EOF;
-nSize  = nPos = 0;
-nOffset = 0;
+nSize  = m_nPos = 0;
+m_nOffset = 0;
 // Delete all temporary entries
 m_pRoot->DelTemp( false );
 // set the entry numbers
@@ -906,7 +906,7 @@ bool StgDirStrm::Store()
 aEmpty.Store( p );
 }
 // Now we can release the old stream
-pFat->FreePages( nOldStart, true );
+m_pFat->FreePages( nOldStart, true );
 rIo.m_aHdr.SetTOCStart( nStart );
 return true;
 }
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 3d85481..f81aa45 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -307,17 +307,17 @@ bool StgFAT::FreePages( sal_Int32 nStart, bool bAll )
 
 StgStrm::StgStrm( StgIo& r ) : rIo( r )
 {
-pFat= NULL;
+m_pFat= NULL;
 nStart  = nPage = STG_EOF;
-nOffset = 0;
+m_nOffset = 0;
 pEntry  = NULL;
-nPos = nSize = 0;
+m_nPos = nSize = 0;
 nPageSize = rIo.GetPhysPageSize();
 }
 
 StgStrm::~StgStrm()
 {
-delete pFat;
+delete m_pFat;
 }
 
 // Attach the stream to the given entry.
@@ -353,7 +353,7 @@ void StgStrm::scanBuildPageChainCache(sal_Int32 
*pOptionalCalcSize)
 {
 if( nBgn >= 0 )
 m_aPagesCache.push_back(nBgn);
-nBgn = pFat->GetNextPage( nBgn );
+nBgn = m_pFat->GetNextPage( nBgn );
 
 //returned second is false if it already exists
 if (!nUsedPageNumbers.insert(nBgn).second)
@@ -380,19 +380,19 @@ void StgStrm::scanBuildPageChainCache(sal_Int32 
*pOptionalCalcSize)
 // behind the EOF.
 bool StgStrm::Pos2Page( sal_Int32 nBytePos )
 {
-if ( !pFat )
+if ( !m_pFat )
 return false;
 
 // Values < 0 seek to the end
 if( nBytePos < 0 || nBytePos >= nSize )
 nBytePos = nSize;
 // Adjust the position back to offset 0
-nPos -= nOffset;
+m_nPos -= m_nOffset;
 sal_Int32 nMask = ~( nPageSize - 1 );
-sal_Int32 nOld = nPos & nMask;
+sal_Int32 nOld = m_nPos & nMask;
 sal_Int32 nNew = nBytePos & nMask;
-nOffset = (short) ( nBytePos & ~nMask );
-nPos = nBytePos;
+m_nOffset = (short) ( nBytePos & ~nMask );
+m_nPos = nBytePos;
 if( nOld == nNew )
 return true;
 
@@ -417,7 +417,7 @@ bool StgStrm::Pos2Page( sal_Int32 nBytePos )
 // Start adding pages while we can
 while( nToAdd > 0 && nBgn >= 0 )
 {
-nBgn = pFat->GetNextPage( nBgn );
+nBgn = m_pFat->GetNextPage( nBgn );
 if( nBgn >= 0 )
 {
 m_aPagesCache.push_back( nBgn );
@@ -432,7 +432,7 @@ bool StgStrm::Pos2Page( sal_Int32 nBytePos )
  " beyond page cache size " << m_aPagesCache.size());
 // fdo#84229 - handle seek to end and back as eg. XclImpStream expects
 nPage = STG_EOF;
-nOffset = 0;
+m_nOffset = 0;
 // Intriguingly in the past we didn't reset nPos to match the real
 // length of the stream thus:
 //   nIdx = m_aPagesCache.size();
@@ -443,10 +443,10 @@ bool StgStrm::Pos2Page( sal_Int32 nBytePos )
 
 // special case: seek to 1st byte of new, unallocated page
 // (in case the file size is a multiple of the page size)
-if( nBytePos == nSize && !nOffset && nIdx > 0 && nIdx == 
m_aPagesCache.size() )
+if( nBytePos == nSize && !m_nOffset && nIdx > 0 && nIdx == 
m_aPagesCache.size() )
 {
 nIdx--;
-nOffset = nPageSize;
+m_nOffset = nPageSize;
 }
 else if ( nIdx == m_aPagesCache.size() )
 {
@@ -464,7 +464,7 @@ bool StgStrm::Pos2Page( sal_Int32 nBytePos )
 
 bool StgStrm::Copy( sal_Int32 nFrom, sal_Int32 nBytes )
 {
-if ( !pFat )
+if ( !m_pFat )
 return false;
 
 m_aPagesCache.clear();
@@ -481,21 +481,21 @@ bool StgStrm::Copy( sal_Int32 nFrom, sal_Int32 nBytes )
 rIo.Copy( nTo, nFrom );
 if( nFrom >= 0 )
 {
-nFrom = pFat->GetNextPage( nFrom );
+nFrom = m_pFat->GetNextPage( nFrom );
 if( nFrom < 0 )
 {
 rIo.SetError( SVSTREAM_FILEFORMAT_ERROR );

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

2015-10-10 Thread Szymon Kłos 
 svtools/source/dialogs/ServerDetailsControls.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c18dc237dc28eef504a0867cf5be6461edec6bbc
Author: Szymon Kłos 
Date:   Sat Oct 10 20:01:02 2015 +0200

remember host name

Change-Id: I74ebde5402ac385fe24cb5b4eb9a3ed9dcef2fe6

diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx 
b/svtools/source/dialogs/ServerDetailsControls.cxx
index 26fe15f..accb47f 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -137,6 +137,7 @@ bool HostDetailsContainer::setUrl( const INetURLObject& 
rUrl )
 
 if ( bSuccess )
 {
+m_sHost = rUrl.GetHost( );
 m_pEDHost->SetText( rUrl.GetHost( ) );
 m_pEDPort->SetValue( rUrl.GetPort( ) );
 m_pEDRoot->SetText( rUrl.GetURLPath() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - svtools/source

2015-10-10 Thread Szymon Kłos 
 svtools/source/dialogs/ServerDetailsControls.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c18dc237dc28eef504a0867cf5be6461edec6bbc
Author: Szymon Kłos 
Date:   Sat Oct 10 20:01:02 2015 +0200

remember host name

Change-Id: I74ebde5402ac385fe24cb5b4eb9a3ed9dcef2fe6

diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx 
b/svtools/source/dialogs/ServerDetailsControls.cxx
index 26fe15f..accb47f 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -137,6 +137,7 @@ bool HostDetailsContainer::setUrl( const INetURLObject& 
rUrl )
 
 if ( bSuccess )
 {
+m_sHost = rUrl.GetHost( );
 m_pEDHost->SetText( rUrl.GetHost( ) );
 m_pEDPort->SetValue( rUrl.GetPort( ) );
 m_pEDRoot->SetText( rUrl.GetURLPath() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Szymon Kłos 
 svtools/source/dialogs/PlaceEditDialog.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 2660a20170f31c764a7a5720c0d8b678dfb84666
Author: Szymon Kłos 
Date:   Sat Oct 10 19:31:29 2015 +0200

fixed CMIS service editing

Change-Id: I62e89700b158ace1edcf26384f4294ba0661444a

diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx 
b/svtools/source/dialogs/PlaceEditDialog.cxx
index cdea1e8..7f9ffa5 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -64,6 +64,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const 
std::shared_ptrsetUrl( rUrl );
 if ( bSuccess )
 {
-m_pLBServerType->SelectEntryPos( i );
-SelectTypeHdl( m_pLBServerType );
-
 // Fill the Username field
 if ( rUrl.HasUserData( ) )
+{
 m_pEDUsername->SetText( INetURLObject::decode( rUrl.GetUser( ),
   
INetURLObject::DECODE_WITH_CHARSET ) );
+m_aDetailsContainers[i]->setUsername( INetURLObject::decode( 
rUrl.GetUser( ),
+  
INetURLObject::DECODE_WITH_CHARSET ) );
+}
+
+m_pLBServerType->SelectEntryPos( i );
+SelectTypeHdl( m_pLBServerType );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - svtools/source

2015-10-10 Thread Szymon Kłos 
 svtools/source/dialogs/PlaceEditDialog.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 2660a20170f31c764a7a5720c0d8b678dfb84666
Author: Szymon Kłos 
Date:   Sat Oct 10 19:31:29 2015 +0200

fixed CMIS service editing

Change-Id: I62e89700b158ace1edcf26384f4294ba0661444a

diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx 
b/svtools/source/dialogs/PlaceEditDialog.cxx
index cdea1e8..7f9ffa5 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -64,6 +64,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const 
std::shared_ptrsetUrl( rUrl );
 if ( bSuccess )
 {
-m_pLBServerType->SelectEntryPos( i );
-SelectTypeHdl( m_pLBServerType );
-
 // Fill the Username field
 if ( rUrl.HasUserData( ) )
+{
 m_pEDUsername->SetText( INetURLObject::decode( rUrl.GetUser( ),
   
INetURLObject::DECODE_WITH_CHARSET ) );
+m_aDetailsContainers[i]->setUsername( INetURLObject::decode( 
rUrl.GetUser( ),
+  
INetURLObject::DECODE_WITH_CHARSET ) );
+}
+
+m_pLBServerType->SelectEntryPos( i );
+SelectTypeHdl( m_pLBServerType );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 540 commits - accessibility/source android/Bootstrap android/source avmedia/source basctl/source basegfx/source basic

2015-10-10 Thread Rene Engelhard 
Rebased ref, commits from common ancestor:
commit 34433196114f91af7216fe03823d2d0e920750bd
Author: Rene Engelhard 
Date:   Sat Oct 10 17:30:27 2015 +0200

add "GODSON64" aka mips64 to the JAVAINTERPRETER 64bit check

Change-Id: I20aa0e6cea6626efb5f507a6dbbfb7e6149029ce

diff --git a/configure.ac b/configure.ac
index dc6def3..fd9c755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6829,7 +6829,7 @@ if test "$ENABLE_JAVA" != ""; then
 JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
 elif test "$cross_compiling" != "yes"; then
 case $CPUNAME in
-AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
+AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64)
 if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 
2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
 AC_MSG_WARN([You are building 64-bit binaries but the JDK 
$JAVAINTERPRETER is 32-bit])
 AC_MSG_ERROR([You should pass the --with-jdk-home option 
pointing to a 64-bit JDK])
commit 82cf6c67373290c65523431e845d00c67f08be42
Author: Markus Mohrhard 
Date:   Sat Oct 10 16:54:43 2015 +0200

also update line panel for axis, related tdf#94933

Change-Id: Ie280fa01dbe25287d01b7f36d152ee55ce5dbe07

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 0cae040..1bb4bfc 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -136,7 +136,10 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
 mbModelValid(true),
 maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), 
"LineColor")
 {
-std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE};
+std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM,
+OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, 
OBJECTTYPE_DATA_CURVE,
+OBJECTTYPE_DATA_AVERAGE_LINE,
+OBJECTTYPE_AXIS};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
 Initialize();
 }
commit 3ddad211de9c6a87ccf328ae6bcbd1f6b9e65e6b
Author: Markus Mohrhard 
Date:   Sat Oct 10 16:44:51 2015 +0200

also update line panel for average and trend line, tdf#94933

Change-Id: I7ab991e94005665809ec52b8d4310209eb6ef75b

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index ba756d1..0cae040 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -136,7 +136,7 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
 mbModelValid(true),
 maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), 
"LineColor")
 {
-std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND};
+std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
 Initialize();
 }
commit 5f73eae61e137b04afa805c8b50713006179a014
Author: Markus Mohrhard 
Date:   Sat Oct 10 16:21:29 2015 +0200

we need to take the SolarMutex when we change the UI

Change-Id: I6347a1466038afd625cf59ae2ee87cb4e2014aa0

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index ccde794..ba756d1 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -178,6 +179,7 @@ void ChartLinePanel::updateData()
 if (!mbUpdate || !mbModelValid)
 return;
 
+SolarMutexGuard aGuard;
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
 if (!xPropSet.is())
 return;
commit 14237c1678167da725fee079532c4669264d697f
Author: Markus Mohrhard 
Date:   Sat Oct 10 15:23:05 2015 +0200

use trendline context for trendlines, tdf#94931, tdf#94934

Change-Id: I0cb9cdec33924e560b24744cc78d632025a189fc

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 754bc07..d6674cf 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -336,6 +336,9 @@ OUString ChartController::GetContextName()
 case OBJECTTYPE_DIAGRAM:
 if (xChartType->getChartType() == 
"com.sun.star.chart2.PieChartType")
 return OUString("ChartElements");
+case OBJECTTYPE_DATA_CURVE:
+case OBJECTTYPE_DATA_AVERAGE_LINE:
+re

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

2015-10-10 Thread Rene Engelhard 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34433196114f91af7216fe03823d2d0e920750bd
Author: Rene Engelhard 
Date:   Sat Oct 10 17:30:27 2015 +0200

add "GODSON64" aka mips64 to the JAVAINTERPRETER 64bit check

Change-Id: I20aa0e6cea6626efb5f507a6dbbfb7e6149029ce

diff --git a/configure.ac b/configure.ac
index dc6def3..fd9c755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6829,7 +6829,7 @@ if test "$ENABLE_JAVA" != ""; then
 JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
 elif test "$cross_compiling" != "yes"; then
 case $CPUNAME in
-AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
+AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64)
 if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 
2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
 AC_MSG_WARN([You are building 64-bit binaries but the JDK 
$JAVAINTERPRETER is 32-bit])
 AC_MSG_ERROR([You should pass the --with-jdk-home option 
pointing to a 64-bit JDK])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Markus Mohrhard 
 chart2/source/controller/sidebar/ChartLinePanel.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 82cf6c67373290c65523431e845d00c67f08be42
Author: Markus Mohrhard 
Date:   Sat Oct 10 16:54:43 2015 +0200

also update line panel for axis, related tdf#94933

Change-Id: Ie280fa01dbe25287d01b7f36d152ee55ce5dbe07

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index 0cae040..1bb4bfc 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -136,7 +136,10 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
 mbModelValid(true),
 maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), 
"LineColor")
 {
-std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE};
+std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM,
+OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, OBJECTTYPE_LEGEND, 
OBJECTTYPE_DATA_CURVE,
+OBJECTTYPE_DATA_AVERAGE_LINE,
+OBJECTTYPE_AXIS};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
 Initialize();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Markus Mohrhard 
 chart2/source/controller/sidebar/ChartLinePanel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ddad211de9c6a87ccf328ae6bcbd1f6b9e65e6b
Author: Markus Mohrhard 
Date:   Sat Oct 10 16:44:51 2015 +0200

also update line panel for average and trend line, tdf#94933

Change-Id: I7ab991e94005665809ec52b8d4310209eb6ef75b

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index ba756d1..0cae040 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -136,7 +136,7 @@ ChartLinePanel::ChartLinePanel(vcl::Window* pParent,
 mbModelValid(true),
 maLineColorWrapper(mxModel, getColorToolBoxControl(mpTBColor.get()), 
"LineColor")
 {
-std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND};
+std::vector aAcceptedTypes { OBJECTTYPE_PAGE, 
OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_TITLE, 
OBJECTTYPE_LEGEND, OBJECTTYPE_DATA_CURVE, OBJECTTYPE_DATA_AVERAGE_LINE};
 mxSelectionListener->setAcceptedTypes(aAcceptedTypes);
 Initialize();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Markus Mohrhard 
 chart2/source/controller/sidebar/ChartLinePanel.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5f73eae61e137b04afa805c8b50713006179a014
Author: Markus Mohrhard 
Date:   Sat Oct 10 16:21:29 2015 +0200

we need to take the SolarMutex when we change the UI

Change-Id: I6347a1466038afd625cf59ae2ee87cb4e2014aa0

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index ccde794..ba756d1 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -178,6 +179,7 @@ void ChartLinePanel::updateData()
 if (!mbUpdate || !mbModelValid)
 return;
 
+SolarMutexGuard aGuard;
 css::uno::Reference xPropSet = 
getPropSet(mxModel);
 if (!xPropSet.is())
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf#50916 : Calc : Dynamic column container

2015-10-10 Thread Markus Mohrhard 
Hey Dennis,

On Sat, Oct 10, 2015 at 3:30 PM, Dennis Francis 
wrote:

> Hi Markus
>
> Thanks for your valuable feedback !
>
> 1.
> """
> A simple high level design could be to use a std::vector and
> only allocate columns that really contain content or formatting.
> Additionally we'd need to introduce a way to store the format of a row.
> These row formats might not be visible to the user and would be just an
> internal way to handle the formatting for all not yet allocated columns.
> """
>
> Let me make sure I get this idea right -
>
> The aCol member in ScTable is declared as :
> *std::vector aCol;*  // Or can have wrapper on it own
> and in the ScTable ctor aCol is init with a minimum number (or possibly
> 16K) of NULL pointer elements ie no ScColumn instance is allocated yet.
> If we allocate space for all pointers in aCol vector then I think it might
> take around 128 KB just for pointers,
> (point 1.A) so might want to allocate that too just when it is needed,
> hence avoid the need to keep a int var for keeping the index of last non
> null element.
>

Please don't allocate any pointers in advance. There is no value in that
and it just causes higher memory load.



>
> While loading a sheet or user types in something in ith column for the
> first time, allocate ScColumn
>
>
> *if ( ! aCol[i] ){*
>
> *  aCol[i] = new ScColumn;*
>
> *  // Apply any full row formattings to aCol[i]*
>
> *}*
>

As we would not pre allocate the vector it would be more like:

if (i >= aCol.size())
{
aCol.resize(i+1);
}
if (!aCol[i])
{
   aCol[i] = new ScColumn;
}

>
> 2.
> Correct me if I am wrong - I guess the formatting of each cell in a column
> is stored in pAttrArray member of ScColumn. So for storing full row
> formatting, we need
> a data structure that map from row number to the formatting info.
> Definitely need your inputs and code pointers on this.
>


Either that, which would be quite trivial or a way to have a concept where
row and document formats are handled independently from the column
formatting. E.g instead of our current design that stores a formatting
entry even for a column that has default formatting only store entries for
columns and cells that have been explicitly formatted. So if there is no
column/cell formatting (they are basically the same) we would take the row
formatting and if no row formatting is around take the document formatting.

Which of the two makes more sense would need some more design work.


>
>
>
> This is surely not what we had in mind. Basically you just wrote a wrapper
>> around std::vector.
>>
>> There are a number of items a new design need:
>>
>> * decision whether to store all ScColumn instances or only filled ones
>>
>
> 3.
> If we use just std::vector, we have to allocate n ScColumns if
> there are totally n columns in the sheet including blank ones upto the last
> non-blank column.
> If we use std::vector we need to allocate ScColumn's for only
> the non blank columns in the document - definitely better.
>

The question is how likely it is to find such a case where it matters. The
bigger problem would be that for std::vector ScColumn needs to be
either movable or copyable. Both are most likely things we are not prepared
to do.


>
>
>> * a way to handle the increased memory load
>> ** most likely limiting the number of initial columns
>>
>
> See point 1.
>

As mentioned there we should only allocate entries that are necessary. So
an empty document basically just needs the size of an empty std::vector.
Also ideas like the row formatting are part of the solution to this problem.


>
> 4.
>
>> * a way to handle the performance impact of many columns
>> ** most likely improving the iterations through all columns
>>
>
> If we use std::vector, We can trim the for loops to run from 0
> up to current length of aCol.
> If we use std::vector, We can trim the for loops to run from 0
> up to current length of aCol and also skip running the inner logic whenever
> aCol[i] == NULL, there by saving time, but not sure we can convert all
> column for loops like that offhand.
>

You need to skip vector entries that are NULL anyway.

Obviously you need to convert all loops as you have some problems otherwise.


>
>
>>
>> * a better way to handle row formattings
>> ** what happens if someone marks a whole row and formats it
>> ** how to handle formatting for columns that were allocated after the
>> user formatted the whole row
>>
>> See point 2.
>
>
>> * most likely a way to store the last formatted column and the last
>> column with content
>> ** needs some inspecting which loops through the columns need which of
>> the information
>>
>> See point 1.A, using this we can save time wasted on iterating over blank
> columns(aCol[i] == NULL).
> Could you please explain why we need to remember "last formatted column" ?
>

Depending on the design this happens directly or you need to do it
indirectly. These comments where general comments without looking at any
implementation. In the implement

Crash test update

2015-10-10 Thread Crashtest VM 
New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/d2a07cd3214af27c5af601992e3c4a1a6e3b3dad/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Compiling Tiled LibreOffice Xcode Project

2015-10-10 Thread Arjun kochhar 
I am thinking of trying a Mac OS X dev build to figure out the unwanted
warnings that are generally reported and carry on to try and see if I can
fix the rest. Definitely not an easy task though, very new to libreoffice
source :).


On Sat, Oct 10, 2015 at 1:09 PM, Arjun kochhar  wrote:

> Hello tml, I work on a licensed library in one of my organization products
> that renders office and PDF documents just fine. But lately, we have been
> getting several requests to support open document formats as well, and we
> are considering/evaluating libreoffice as our solution if it works fairly
> well and I am trying to see if I can contribute and fix the issues related
> to at least fixing basic .odt,.odp and .ods viewing. Thanks for the info on
> the warnings :).
>
> On Sat, Oct 10, 2015 at 9:28 AM, Tor Lillqvist  wrote:
>
>> >I am able to open couple of .odt documents, but opening of .odp and .ods
>> fails,
>>
>> Yep, that is more or less what I see too, and if you seriously plan to
>> work on this, you need to figure out what causes that. (Are you doing this
>> just out of personal interest, or is there some organisation backing you?
>> Perhaps even commercial interest, which would be a good thing?)
>>
>> Also, note that many of the warnings that are displayed in Xcode show up
>> also when running (a developer build of) LibreOffice on a desktop OS. They
>> are often misleading and not really worth being displayed as warnings. I
>> think. But our codebase is so vast that people seldom bother removing
>> pointless warning messages. Also, there is the "yes, yes, I know, this is a
>> sign of something that we really should fix so let's not remove that
>> warning" phenomenon.
>>
>> --tml
>>
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: config listener API ...

2015-10-10 Thread Bjoern Michaelsen 
On Thu, Oct 08, 2015 at 01:03:15PM +0200, Michael Stahl wrote:
> uhm... did you just use "boost::signal2" and "trivial" in the same
> sentence?  are you aware that a single #include
>  adds a ludicrous 33 KLOC of included headers?

FWIW, from the top of my head, we have at least:

 - SwClient/SwNotify
 - tools/link.hxx
 - SfxBroadcaster/SfxListener

and a bazillion other implementations that I forgot about of the observer
pattern in LibreOffice. I would much prefer _not_ to introduce yet another
implementation, but rather use the least broken of our own.

And if something like boost::signal2 is awesome beyond believe (which is --
given Michaels hint about LOCs added at least open to debate), we should first
make our least broken implementation wrap or subclass that as a migration path.

Best,

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

Re: tdf#50916 : Calc : Dynamic column container

2015-10-10 Thread Dennis Francis 
Hi Markus

Thanks for your valuable feedback !

1.
"""
A simple high level design could be to use a std::vector and
only allocate columns that really contain content or formatting.
Additionally we'd need to introduce a way to store the format of a row.
These row formats might not be visible to the user and would be just an
internal way to handle the formatting for all not yet allocated columns.
"""

Let me make sure I get this idea right -

The aCol member in ScTable is declared as :
*std::vector aCol;*  // Or can have wrapper on it own
and in the ScTable ctor aCol is init with a minimum number (or possibly
16K) of NULL pointer elements ie no ScColumn instance is allocated yet.
If we allocate space for all pointers in aCol vector then I think it might
take around 128 KB just for pointers,
(point 1.A) so might want to allocate that too just when it is needed,
hence avoid the need to keep a int var for keeping the index of last non
null element.

While loading a sheet or user types in something in ith column for the
first time, allocate ScColumn


*if ( ! aCol[i] ){*

*  aCol[i] = new ScColumn;*

*  // Apply any full row formattings to aCol[i]*

*}*
2.
Correct me if I am wrong - I guess the formatting of each cell in a column
is stored in pAttrArray member of ScColumn. So for storing full row
formatting, we need
a data structure that map from row number to the formatting info.
Definitely need your inputs and code pointers on this.



This is surely not what we had in mind. Basically you just wrote a wrapper
> around std::vector.
>
> There are a number of items a new design need:
>
> * decision whether to store all ScColumn instances or only filled ones
>

3.
If we use just std::vector, we have to allocate n ScColumns if
there are totally n columns in the sheet including blank ones upto the last
non-blank column.
If we use std::vector we need to allocate ScColumn's for only
the non blank columns in the document - definitely better.


> * a way to handle the increased memory load
> ** most likely limiting the number of initial columns
>

See point 1.

4.

> * a way to handle the performance impact of many columns
> ** most likely improving the iterations through all columns
>

If we use std::vector, We can trim the for loops to run from 0 up
to current length of aCol.
If we use std::vector, We can trim the for loops to run from 0
up to current length of aCol and also skip running the inner logic whenever
aCol[i] == NULL, there by saving time, but not sure we can convert all
column for loops like that offhand.


>
> * a better way to handle row formattings
> ** what happens if someone marks a whole row and formats it
> ** how to handle formatting for columns that were allocated after the user
> formatted the whole row
>
> See point 2.


> * most likely a way to store the last formatted column and the last column
> with content
> ** needs some inspecting which loops through the columns need which of the
> information
>
> See point 1.A, using this we can save time wasted on iterating over blank
columns(aCol[i] == NULL).
Could you please explain why we need to remember "last formatted column" ?


> Most likely a few more that I have not in mind right now.
>

Will surely wait for others to comment before proceeding any further.


Thanks,
Dennis

www.ldcs.co.in
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-10-10 Thread Markus Mohrhard 
 chart2/source/controller/main/ChartController.cxx|3 +++
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |1 +
 2 files changed, 4 insertions(+)

New commits:
commit 14237c1678167da725fee079532c4669264d697f
Author: Markus Mohrhard 
Date:   Sat Oct 10 15:23:05 2015 +0200

use trendline context for trendlines, tdf#94931, tdf#94934

Change-Id: I0cb9cdec33924e560b24744cc78d632025a189fc

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 754bc07..d6674cf 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -336,6 +336,9 @@ OUString ChartController::GetContextName()
 case OBJECTTYPE_DIAGRAM:
 if (xChartType->getChartType() == 
"com.sun.star.chart2.PieChartType")
 return OUString("ChartElements");
+case OBJECTTYPE_DATA_CURVE:
+case OBJECTTYPE_DATA_AVERAGE_LINE:
+return OUString("Trendline");
 default:
 break;
 }
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index ecfd7d3..d933003 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -1312,6 +1312,7 @@
 Chart, ErrorBar, visible ;
 Chart, Axis, visible ;
 Chart, Grid, visible ;
+Chart, Trendline, visible ;
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cf/b82869af772bec5b67f8eff3c9e8402b90c84a

2015-10-10 Thread Caolán McNamara 
 cf/b82869af772bec5b67f8eff3c9e8402b90c84a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit de59037dce373df0463be3085c426d704065ee46
Author: Caolán McNamara 
Date:   Sat Oct 10 12:59:25 2015 +0100

Notes added by 'git notes add'

diff --git a/cf/b82869af772bec5b67f8eff3c9e8402b90c84a 
b/cf/b82869af772bec5b67f8eff3c9e8402b90c84a
new file mode 100644
index 000..54e1164
--- /dev/null
+++ b/cf/b82869af772bec5b67f8eff3c9e8402b90c84a
@@ -0,0 +1 @@
+prefer: c00601dab0f5533b152cd63cec0a89bfec1ba95f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-10 Thread Caolán McNamara 
 desktop/source/app/app.cxx|   35 ++-
 vcl/source/app/svapp.cxx  |   13 ++---
 vcl/source/fontsubset/sft.cxx |6 --
 3 files changed, 36 insertions(+), 18 deletions(-)

New commits:
commit 3a03ee49e7cced375decefd336294632180414e4
Author: Caolán McNamara 
Date:   Sat Oct 10 12:52:58 2015 +0100

afl-eventtesting: there is no focused/active window in headless mode

so close all open frames, not just the active one
and send events to the first discovered visible window and not the focus
window

Change-Id: I7339bc6743cd3106ceddea049136796121819eb3

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 79b3c86..a3b436d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1282,23 +1282,32 @@ unsigned int persist_cnt;
 //the application post start-up for ui-testing
 void Desktop::CloseFrameAndReopen(Reference xDesktop)
 {
-Reference xFrame = xDesktop->getActiveFrame();
-Reference xProvider(xFrame, 
css::uno::UNO_QUERY);
+css::uno::Reference xTaskContainer(
+xDesktop->getFrames(), css::uno::UNO_QUERY_THROW);
+sal_Int32 c = xTaskContainer->getCount();
+for (sal_Int32 i = 0; i < c; ++i)
+{
+css::uno::Reference< css::frame::XFrame > xFrame;
+xTaskContainer->getByIndex(i) >>= xFrame;
+if (!xFrame.is())
+continue;
+Reference xProvider(xFrame, 
css::uno::UNO_QUERY);
 
-css::uno::Reference xController = 
xFrame->getController();
-css::uno::Reference xModel = xController->getModel();
-css::uno::Reference< css::util::XModifiable > xModifiable(xModel, 
css::uno::UNO_QUERY);
-xModifiable->setModified(false);
+css::uno::Reference xController = 
xFrame->getController();
+css::uno::Reference xModel = 
xController->getModel();
+css::uno::Reference< css::util::XModifiable > xModifiable(xModel, 
css::uno::UNO_QUERY);
+xModifiable->setModified(false);
 
-css::util::URL aCommand;
-aCommand.Complete = ".uno:CloseDoc";
+css::util::URL aCommand;
+aCommand.Complete = ".uno:CloseDoc";
 
-css::uno::Reference xContext = 
::comphelper::getProcessComponentContext();
-Reference< css::util::XURLTransformer > xParser = 
css::util::URLTransformer::create(xContext);
-xParser->parseStrict(aCommand);
+css::uno::Reference xContext = 
::comphelper::getProcessComponentContext();
+Reference< css::util::XURLTransformer > xParser = 
css::util::URLTransformer::create(xContext);
+xParser->parseStrict(aCommand);
 
-css::uno::Reference< css::frame::XDispatch > xDispatch = 
xProvider->queryDispatch(aCommand, OUString(), 0);
-xDispatch->dispatch(aCommand, css::uno::Sequence< 
css::beans::PropertyValue >());
+css::uno::Reference< css::frame::XDispatch > xDispatch = 
xProvider->queryDispatch(aCommand, OUString(), 0);
+xDispatch->dispatch(aCommand, css::uno::Sequence< 
css::beans::PropertyValue >());
+}
 
 OpenDefault();
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a583307..1d92469 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -347,9 +347,16 @@ namespace
 {
 bool InjectKeyEvent(SvStream& rStream)
 {
-VclPtr xWin(Application::GetFocusWindow());
-if (!xWin)
-xWin.reset(Application::GetActiveTopWindow());
+if (Application::AnyInput())
+return false;
+
+VclPtr xWin(Application::GetFirstTopLevelWindow());
+while (xWin)
+{
+if (xWin->IsVisible())
+break;
+xWin.reset(Application::GetNextTopLevelWindow(xWin));
+}
 if (!xWin)
 return false;
 
commit b78d4c6503ff47177316685aae79cb5eaf55e33a
Author: Caolán McNamara 
Date:   Sat Oct 10 12:27:32 2015 +0100

valgrind: zero padding bytes

uninitialized memory warnings on --convert-to pdf
of ooo115771-3.doc

Change-Id: I2dac6fe29d23d6e25c2f1d1511886d8b585e498c

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 171d910..ac999a6 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2631,8 +2631,10 @@ GlyphData *GetTTRawGlyphData(TrueTypeFont *ttf, 
sal_uInt32 glyphID)
 
 if (length > 0) {
 const sal_uInt8* srcptr = glyf + ttf->goffsets[glyphID];
-d->ptr = static_cast(malloc((length + 1) & ~1)); 
assert(d->ptr != 0);
-memcpy( d->ptr, srcptr, length );
+const size_t nChunkLen = ((length + 1) & ~1);
+d->ptr = static_cast(malloc(nChunkLen)); assert(d->ptr != 
0);
+memcpy(d->ptr, srcptr, length);
+memset(d->ptr + length, 0, nChunkLen - length);
 d->compflag = (GetInt16( srcptr, 0, 1 ) < 0);
 } else {
 d->ptr = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
htt

Re: Calc function to check for text that could be number in order to place UI indicators

2015-10-10 Thread Łukasz Hryniuk 

Hi,

On 07.10.2015 14:10, Eike Rathke wrote:

On the LibreOffice Conference Hackfest at Aarhus we talked about placing
UI indicators in the current view to hint cells that contain text that
could be numbers instead. I moved and adapted the interpreter's function
that handles such strings to ScGlobal::ConvertStringToValue(), see
sc/inc/global.hxx for declaration/description and
sc/source/core/data/global2.cxx for implementation, it can be used in
a view's idle loop to detect such cell content.

I hope you're still interested in that project :)


yes, I'm still interested in that. We talked about marking cells with 
something like little square in a corner...


On 08.10.2015 11:31, Caolán McNamara wrote:

That would be v. neat. If we had a UI indicator for errors/warnings
detected in the idle loop I imagine we could extend it with all sorts
of checks, like Andrzej's unit detection stuff and things like
"formulas inconsistent with neighbouring formulas" ?


and I think we could have simply a list of "suspicious" cells, that will 
collect results of different checks. With some description or check type 
indication we will be able to undertake different actions for each cell 
in the list. Beside a cell indication we could have some information on 
the status bar saying what's wrong with the cell and maybe an element in 
a context menu, e.g. "Fix cell(s)->", which will let user to convert 
string to number/change unit to be consistent with the rest/.../even fix 
typo in formula name (e.g. "SU" to "SUM/SUMPRODUCT/SUMSQ").


Where can I start? You showed me some code during the Hackfest, but I 
don't remember what it was exactly. Is ScOutputData::LayoutStrings in 
sc/source/ui/view/output2.cxx the right place?


Łukasz




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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source

2015-10-10 Thread Tsutomu Uchino 
 i18npool/source/search/textsearch.cxx |   24 
 1 file changed, 20 insertions(+), 4 deletions(-)

New commits:
commit cfb82869af772bec5b67f8eff3c9e8402b90c84a
Author: Tsutomu Uchino 
Date:   Sat Oct 10 08:42:22 2015 +

#i107619# use next index to the last position from the offset when the 
match result is started at the end of thes string

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index 5c8dac6..7c716e8 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -241,10 +241,18 @@ SearchResult TextSearch::searchForward( const OUString& 
searchStr, sal_Int32 sta
 
 sres = (this->*fnForward)( in_str, newStartPos, newEndPos );
 
+sal_Int32 nOffsetLength = offset.getLength();
+sal_Int32 nStartOffset = 0;
 for ( int k = 0; k < sres.startOffset.getLength(); k++ )
 {
-if (sres.startOffset[k])
-  sres.startOffset[k] = offset[sres.startOffset[k]];
+nStartOffset = sres.startOffset[k];
+if ( nStartOffset )
+{
+if ( nStartOffset < nOffsetLength )
+sres.startOffset[k] = offset[nStartOffset];
+else
+sres.startOffset[k] = offset[offset.getLength()-1] +1;
+}
 // JP 20.6.2001: end is ever exclusive and then don't return
 //   the position of the next character - return the
 //   next position behind the last found character!
@@ -330,6 +338,8 @@ SearchResult TextSearch::searchBackward( const OUString& 
searchStr, sal_Int32 st
 
 sres = (this->*fnBackward)( in_str, newStartPos, newEndPos );
 
+sal_Int32 nOffsetLength = offset.getLength();
+sal_Int32 nEndOffset = 0;
 for ( int k = 0; k < sres.startOffset.getLength(); k++ )
 {
 if (sres.startOffset[k])
@@ -338,8 +348,14 @@ SearchResult TextSearch::searchBackward( const OUString& 
searchStr, sal_Int32 st
 //   the position of the next character - return the
 //   next position behind the last found character!
 //   "a b c" find "b" must return 2,3 and not 2,4!!!
-if (sres.endOffset[k])
-  sres.endOffset[k] = offset[sres.endOffset[k]];
+nEndOffset = sres.endOffset[k];
+if ( nEndOffset )
+{
+if ( nEndOffset < nOffsetLength )
+sres.endOffset[k] = offset[nEndOffset];
+else
+sres.endOffset[k] = offset[offset.getLength()-1] +1;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Compiling with clang 3.7: breaks in 'external/libwpd'

2015-10-10 Thread Giuseppe Castagno 

Hi all,

I'm trying to compile with clang 3.7 (home built from source I got as 
described here [1]) on Ubuntu 14.04.


Building LO master f99743e from scratch breaks as:

...

Making all in lib
  CXX  libwpd_internal.lo
clang: error: argument unused during compilation: '-I .'
clang: error: argument unused during compilation: '-I ../..'
clang: error: argument unused during compilation: '-I ../../inc'
clang: error: argument unused during compilation: '-I 
/srv5/git/LO/lo-clang-test/workdir/UnpackedTarball/librevenge/inc'

Makefile:1042: recipe for target 'libwpd_internal.lo' failed
make[5]: *** [libwpd_internal.lo] Error 1
Makefile:366: recipe for target 'all-recursive' failed
make[4]: *** [all-recursive] Error 1
Makefile:478: recipe for target 'all-recursive' failed
make[3]: *** [all-recursive] Error 1
Makefile:388: recipe for target 'all' failed
make[2]: *** [all] Error 2
/srv5/git/LO/lo-clang-test/external/libwpd/ExternalProject_libwpd.mk:23: 
recipe for target 
'/srv5/git/LO/lo-clang-test/workdir/ExternalProject/libwpd/build' failed
make[1]: *** 
[/srv5/git/LO/lo-clang-test/workdir/ExternalProject/libwpd/build] Error 1

Makefile:103: recipe for target 'libwpd' failed
make: *** [libwpd] Error 2

Compilation exited abnormally with code 2 at Sat Oct 10 11:20:08
...

Configured as:

CC=clang
CXX=clang++
--with-external-tar=/srv5/git/LO/externals
--with-lang=en-US
--enable-compiler-plugins
--enable-sal-log
--with-parallelism=1

single core build log of broken project can be read from
http://pastebin.com/QgMyzkJt

Any Idea?

Thanks

--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
[1] http://llvm.org/docs/GettingStarted.html#git-mirror
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Compiling Tiled LibreOffice Xcode Project

2015-10-10 Thread Arjun kochhar 
Hello tml, I work on a licensed library in one of my organization products
that renders office and PDF documents just fine. But lately, we have been
getting several requests to support open document formats as well, and we
are considering/evaluating libreoffice as our solution if it works fairly
well and I am trying to see if I can contribute and fix the issues related
to at least fixing basic .odt,.odp and .ods viewing. Thanks for the info on
the warnings :).

On Sat, Oct 10, 2015 at 9:28 AM, Tor Lillqvist  wrote:

> >I am able to open couple of .odt documents, but opening of .odp and .ods
> fails,
>
> Yep, that is more or less what I see too, and if you seriously plan to
> work on this, you need to figure out what causes that. (Are you doing this
> just out of personal interest, or is there some organisation backing you?
> Perhaps even commercial interest, which would be a good thing?)
>
> Also, note that many of the warnings that are displayed in Xcode show up
> also when running (a developer build of) LibreOffice on a desktop OS. They
> are often misleading and not really worth being displayed as warnings. I
> think. But our codebase is so vast that people seldom bother removing
> pointless warning messages. Also, there is the "yes, yes, I know, this is a
> sign of something that we really should fix so let's not remove that
> warning" phenomenon.
>
> --tml
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice