date:20170804

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

2017-08-04 Thread Markus Mohrhard

 bin/update/create_build_config.py |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit e371ec501db0c473bea7ef7325d9a9049f913b5e
Author: Markus Mohrhard 
Date:   Sat Aug 5 03:53:13 2017 +0200

updater: disable lang pack handling for windows

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

diff --git a/bin/update/create_build_config.py 
b/bin/update/create_build_config.py
index b21735af2c97..e2d197388793 100755
--- a/bin/update/create_build_config.py
+++ b/bin/update/create_build_config.py
@@ -10,13 +10,18 @@ from tools import replace_variables_in_string
 
 def update_all_url_entries(data, **kwargs):
 data['complete']['url'] = 
replace_variables_in_string(data['complete']['url'], **kwargs)
-for language in data['languages']:
-language['complete']['url'] = 
replace_variables_in_string(language['complete']['url'], **kwargs)
+
+if sys.platform != "cygwin":
+for language in data['languages']:
+language['complete']['url'] = 
replace_variables_in_string(language['complete']['url'], **kwargs)
 
 if 'partials' in data:
 for partial in data['partials']:
 partial['file']['url'] = 
replace_variables_in_string(partial['file']['url'], **kwargs)
 
+if sys.plaform == "cygwin":
+continue
+
 for lang, lang_file in partial['languages'].items():
 lang_file['url'] = 
replace_variables_in_string(lang_file['url'], **kwargs)
 
@@ -34,10 +39,14 @@ def main(argv):
 'platform' : argv[4]
 }
 
-extra_data_files = ['complete_info.json', 'complete_lang_info.json', 
'partial_update_info.json']
+extra_data_files = ['complete_info.json', 'partial_update_info.json']
+if sys.platform != "cygwin":
+extra_data_files += 'complete_lang_info.json'
 
 for extra_file in extra_data_files:
 extra_file_path = os.path.join(argv[5], extra_file)
+if not os.path.exists(extra_file_path):
+continue
 with open(extra_file_path, "r") as f:
 extra_data = json.load(f)
 data.update(extra_data)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bin/update

2017-08-04 Thread Markus Mohrhard

 bin/update/create_build_config.py |1 +
 bin/update/upload_builds.py   |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7d2fa41ca12a1724229ef8285af1895313e15c5f
Author: Markus Mohrhard 
Date:   Sat Aug 5 03:52:30 2017 +0200

updater: abort if there are not enough command line parameters

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

diff --git a/bin/update/create_build_config.py 
b/bin/update/create_build_config.py
index 8d6bf5206ce8..b21735af2c97 100755
--- a/bin/update/create_build_config.py
+++ b/bin/update/create_build_config.py
@@ -23,6 +23,7 @@ def update_all_url_entries(data, **kwargs):
 def main(argv):
 if len(argv) < 7:
 print("Usage: create_build_config.py $PRODUCTNAME $VERSION $BUILDID 
$PLATFORM $TARGETDIR $UPDATE_CONFIG")
+sys.exit(1)
 
 config = parse_config(argv[6])
 
commit 0ae09b2678778ccbf74d33390fa9f572ddca888f
Author: Markus Mohrhard 
Date:   Sat Aug 5 03:51:28 2017 +0200

updater: convert to unix path in another place

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

diff --git a/bin/update/upload_builds.py b/bin/update/upload_builds.py
index e80acb19585c..210668e0d07c 100755
--- a/bin/update/upload_builds.py
+++ b/bin/update/upload_builds.py
@@ -5,6 +5,7 @@ import os
 import subprocess
 
 from config import parse_config
+from path import convert_to_unix
 
 from tools import replace_variables_in_string
 
@@ -25,7 +26,7 @@ def main():
 subprocess.call(command, shell=True)
 for file in os.listdir(update_dir):
 if file.endswith('.mar'):
-subprocess.call(['scp', os.path.join(update_dir, file), 
upload_url])
+subprocess.call(['scp', convert_to_unix(os.path.join(update_dir, 
file)), upload_url])
 
 if __name__ == '__main__':
 main()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.gbuild

2017-08-04 Thread Markus Mohrhard

 Makefile.gbuild |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 502390fdb7fbc93e96d33600cf743a928845229e
Author: Markus Mohrhard 
Date:   Sat Aug 5 03:49:36 2017 +0200

updater: workaround cygwin python bug around command line arguments

Without the MAR env setting the python script only gets two command line
arguments, the script name and all the parameters as one string.

If someone knows a better fix I'm open to other suggestions.

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

diff --git a/Makefile.gbuild b/Makefile.gbuild
index a55bc5ffd4a7..cd7fc973c287 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -42,9 +42,10 @@ upload-update-info:
$(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H))
$(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH))
$(eval UPDATE_DIR := $(WORKDIR)/update-info)
-   $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" 
"$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
-   $(SRCDIR)/bin/update/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)" 
"$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
-   $(SRCDIR)/bin/update/upload_build_config.py "$(UPDATE_DIR)" 
"$(UPDATE_CONFIG)"
+   $(eval VERSION := 
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX))
+   MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_build_config.py 
"$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" 
"$(UPDATE_CONFIG)"
+   MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_builds.py 
"$(PRODUCTNAME)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
+   MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_build_config.py 
"$(UPDATE_DIR)" "$(UPDATE_CONFIG)"
 
 create-partial-info:
$(eval BUILDID := $(shell git -C $(SRCDIR) log -1 --format=%H))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 80731 - Incorrect syntax does compile, MID without end bracket

2017-08-04 Thread Pierre Lepage


Gerrit patch https://gerrit.libreoffice.org/#/c/40782/

If the proposed solution makes sense, it will only be necessary to 
program the warning message in the "else" clause. Here, I am considering 
a dialog box with the warning message.



Note that the changes to basic / source / runtime / stdobj.cxx are 
strictly for the readability of the aMethods table []. These changes 
have nothing to do with the bug tdf # 80731.


Pierre


Le 2017-08-04 à 01:07, Kaganski Mike a écrit :

Hi Pierre,

On 8/4/2017 4:26 AM, Pierre Lepage wrote:

I have implemented a new warning option on compilation. I did not go too
far.

Great!


A simple checkbox "Warning On" and an "else" in the faulty
structure causing the problem of the closing parenthesis does the trick.
I have included a screen copy of the dialog with the "Warning On" option.

The behavior of StarBasic with the "Warning On" option would be as follows.

A) Warning On and active IDE window: Warning displayed on line where
normally there would be an error.

B) Warning On and IDE window inactive: Warning at the beginning of the
macro execution in the application window.

C) Warning Off: No tolerated error and no warning stop.

For the case of the closing parenthesis, the warning message could be
the following: A closing parenthesis is missing in one or more
expressions with the Mid function.

Could you post your change to gerrit please? It's better to discuss code
there.



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

Re: For what versions get source archives created?

2017-08-04 Thread Thorsten Behrens

Christian Lohmaier wrote:
> On Tue, Jul 25, 2017 at 12:59 PM, Paul Menzel  wrote:
> > So does it take over a week to get the archives published, or does
> > the directory need to be manually created on the server, and was
> > just forgotten?
> 
> Sources are made available on the mirrors the same moment when the
> binaries are.
> 
One of the reasons: it's extremely rare, but it happens at times that
full release builds on one platform show errors, or subsequent
smoketesting shows errors. In that case, a hotfix tag is pushed.

So a release is only really done, once both tag and binaries are
ready.

Cheers,

-- Thorsten


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

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

2017-08-04 Thread Caolán McNamara

 connectivity/source/drivers/component/CTable.cxx |   46 ++-
 1 file changed, 20 insertions(+), 26 deletions(-)

New commits:
commit b032f21b5ea0011f2b134d758b696604c18dfa16
Author: CaolÃ¡n McNamara 
Date:   Fri Aug 4 17:06:36 2017 +0100

refactor to remove the gotos

no logic change intended

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

diff --git a/connectivity/source/drivers/component/CTable.cxx 
b/connectivity/source/drivers/component/CTable.cxx
index a58978a84c18..a7e17a658874 100644
--- a/connectivity/source/drivers/component/CTable.cxx
+++ b/connectivity/source/drivers/component/CTable.cxx
@@ -181,36 +181,30 @@ bool OComponentTable::seekRow(IResultSetHelper::Movement 
eCursorPosition, sal_In
 m_nFilePos = (sal_Int32)nNumberOfRecords + 1;
 
 if (m_nFilePos == 0 || m_nFilePos == (sal_Int32)nNumberOfRecords + 1)
-goto Error;
-else
 {
-//! read buffer / setup row object etc?
-}
-goto End;
-
-Error:
-switch(eCursorPosition)
-{
-case IResultSetHelper::PRIOR:
-case IResultSetHelper::FIRST:
-m_nFilePos = 0;
-break;
-case IResultSetHelper::LAST:
-case IResultSetHelper::NEXT:
-case IResultSetHelper::ABSOLUTE1:
-case IResultSetHelper::RELATIVE1:
-if (nOffset > 0)
-m_nFilePos = nNumberOfRecords + 1;
-else if (nOffset < 0)
+switch(eCursorPosition)
+{
+case IResultSetHelper::PRIOR:
+case IResultSetHelper::FIRST:
 m_nFilePos = 0;
-break;
-case IResultSetHelper::BOOKMARK:
-m_nFilePos = nTempPos;   // previous position
+break;
+case IResultSetHelper::LAST:
+case IResultSetHelper::NEXT:
+case IResultSetHelper::ABSOLUTE1:
+case IResultSetHelper::RELATIVE1:
+if (nOffset > 0)
+m_nFilePos = nNumberOfRecords + 1;
+else if (nOffset < 0)
+m_nFilePos = 0;
+break;
+case IResultSetHelper::BOOKMARK:
+m_nFilePos = nTempPos;   // previous position
+break;
+}
+return false;
 }
-//  aStatus.Set(SDB_STAT_NO_DATA_FOUND);
-return false;
 
-End:
+//! read buffer / setup row object etc?
 nCurPos = m_nFilePos;
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-08-04 Thread Andrea Gelmini

 chart2/source/controller/main/ChartController_Tools.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1aff997f632d6ebf710dbd69edb6a040998ee38e
Author: Andrea Gelmini 
Date:   Fri Aug 4 17:58:39 2017 +0200

Removed duplicated include

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

diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index 61144839e995..e91f43827387 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -65,7 +65,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source compilerplugins/clang oox/source svx/source sw/source uitest/uitest

2017-08-04 Thread Andrea Gelmini

 basic/source/classes/sbunoobj.cxx   |6 +++---
 compilerplugins/clang/checkunusedparams.cxx |2 +-
 oox/source/drawingml/lineproperties.cxx |2 +-
 svx/source/dialog/framelink.cxx |2 +-
 svx/source/dialog/framelinkarray.cxx|4 ++--
 sw/source/core/layout/paintfrm.cxx  |2 +-
 uitest/uitest/test.py   |2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 35a2d88288bfafe792f58906bdaad74a0135bb4a
Author: Andrea Gelmini 
Date:   Sat Aug 5 00:08:53 2017 +0200

Fix typos

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

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 771a6cd3da33..e90b52ea412c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4225,7 +4225,7 @@ void SAL_CALL ModuleInvocationProxy::setValue(const 
OUString& rProperty, const A
 SbMethod* pMeth = dynamic_cast( p );
 if( pMeth == nullptr )
 {
-// TODO: Check vba behavior concernig missing function
+// TODO: Check vba behavior concerning missing function
 //StarBASIC::Error( ERRCODE_BASIC_NO_METHOD, aFunctionName );
 throw UnknownPropertyException();
 }
@@ -4263,7 +4263,7 @@ Any SAL_CALL ModuleInvocationProxy::getValue(const 
OUString& rProperty)
 SbMethod* pMeth = dynamic_cast( p );
 if( pMeth == nullptr )
 {
-// TODO: Check vba behavior concernig missing function
+// TODO: Check vba behavior concerning missing function
 //StarBASIC::Error( ERRCODE_BASIC_NO_METHOD, aFunctionName );
 throw UnknownPropertyException();
 }
@@ -4318,7 +4318,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const 
OUString& rFunction,
 SbMethod* pMeth = dynamic_cast( p );
 if( pMeth == nullptr )
 {
-// TODO: Check vba behavior concernig missing function
+// TODO: Check vba behavior concerning missing function
 //StarBASIC::Error( ERRCODE_BASIC_NO_METHOD, aFunctionName );
 return aRet;
 }
diff --git a/compilerplugins/clang/checkunusedparams.cxx 
b/compilerplugins/clang/checkunusedparams.cxx
index 9772b2f90889..2e56d6e7bd2a 100644
--- a/compilerplugins/clang/checkunusedparams.cxx
+++ b/compilerplugins/clang/checkunusedparams.cxx
@@ -63,7 +63,7 @@ void CheckUnusedParams::run()
 // leave this alone for now
 if (loplugin::hasPathnamePrefix(fn, SRCDIR "/libreofficekit/"))
  return;
-// this has a certan pattern to it's code which appears to include lots of 
unused params
+// this has a certain pattern to its code which appears to include lots of 
unused params
 if (loplugin::hasPathnamePrefix(fn, SRCDIR "/xmloff/"))
  return;
 // I believe someone is busy working on this chunk of code
diff --git a/oox/source/drawingml/lineproperties.cxx 
b/oox/source/drawingml/lineproperties.cxx
index 43495e709561..c30f4537302b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -245,7 +245,7 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
 // pass X and Y as percentage to OOX_ARROW_POINT
 #define OOX_ARROW_POINT( x, y ) awt::Point( static_cast< sal_Int32 >( 
fArrowWidth * ( x ) ), static_cast< sal_Int32 >( fArrowLength * ( y ) ) )
 // tdf#100491 Arrow line marker, unlike other markers, depends on 
line width.
-// So calculate width of half line (more convinient during 
drawing) taking into account
+// So calculate width of half line (more convenient during 
drawing) taking into account
 // further conversions/scaling done in OOX_ARROW_POINT macro and 
scaling to nMarkerWidth.
 const double fArrowLineHalfWidth = ::std::max< double >( 100.0 * 
0.5 * nLineWidth / nMarkerWidth, 1 );
 
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 9bb3830b421d..fff63888d760 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -585,7 +585,7 @@ void CreateBorderPrimitives(
 else if (2 == myOffsets.size())
 {
 // we are a double edge, calculate cuts with edges coming from 
above/below
-// for both edges to detect the line start/end extensions. In the 
furure this
+// for both edges to detect the line start/end extensions. In the 
future this
 // needs to be extended to use two values per extension, 
getComplexExtendedLineValues
 // internally prepares these already. 
drawinglayer::primitive2d::BorderLine will
 // then need to take these double entries (maybe a pair) and use 
them internally.
diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index 04d0d2ac2b6d..5c87cf33943b 100644
--- a/svx/source/dialog/fra

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

2017-08-04 Thread Noel Grandin

 sw/inc/SwAppletImpl.hxx  |2 +-
 sw/inc/shellio.hxx   |2 +-
 sw/inc/unochart.hxx  |4 ++--
 sw/inc/unocrsrhelper.hxx |   10 +-
 sw/inc/unodraw.hxx   |2 +-
 sw/inc/unotbl.hxx|8 
 sw/inc/unotextbodyhf.hxx |2 +-
 sw/inc/unotextrange.hxx  |2 +-
 sw/inc/viewsh.hxx|8 
 sw/source/core/inc/SwUndoFmt.hxx |   20 ++--
 sw/source/core/inc/UndoBookmark.hxx  |2 +-
 sw/source/core/inc/UndoCore.hxx  |4 ++--
 sw/source/core/inc/UndoInsert.hxx|2 +-
 sw/source/core/inc/UndoOverwrite.hxx |4 ++--
 sw/source/core/inc/ptqueue.hxx   |2 +-
 sw/source/core/inc/rolbck.hxx|2 +-
 sw/source/core/inc/unoevent.hxx  |2 +-
 sw/source/core/inc/viewimp.hxx   |6 +++---
 sw/source/core/text/atrhndl.hxx  |2 +-
 sw/source/core/text/atrstck.cxx  |2 +-
 sw/source/core/undo/SwUndoFmt.cxx|   20 ++--
 sw/source/core/undo/rolbck.cxx   |2 +-
 sw/source/core/undo/unbkmk.cxx   |2 +-
 sw/source/core/undo/undobj.cxx   |4 ++--
 sw/source/core/undo/undobj1.cxx  |2 +-
 sw/source/core/undo/unfmco.cxx   |2 +-
 sw/source/core/undo/unins.cxx|2 +-
 sw/source/core/undo/unovwr.cxx   |4 ++--
 sw/source/core/unocore/unochart.cxx  |4 ++--
 sw/source/core/unocore/unocrsrhelper.cxx |8 
 sw/source/core/unocore/unodraw.cxx   |2 +-
 sw/source/core/unocore/unoevent.cxx  |2 +-
 sw/source/core/unocore/unoobj.cxx|4 ++--
 sw/source/core/unocore/unoobj2.cxx   |4 ++--
 sw/source/core/unocore/unoportenum.cxx   |4 ++--
 sw/source/core/unocore/unostyle.cxx  |4 ++--
 sw/source/core/unocore/unotbl.cxx|   24 
 sw/source/core/unocore/unotext.cxx   |4 ++--
 sw/source/core/view/viewimp.cxx  |6 +++---
 sw/source/core/view/viewsh.cxx   |6 +++---
 sw/source/core/view/vprint.cxx   |4 ++--
 sw/source/filter/basflt/fltini.cxx   |2 +-
 sw/source/filter/basflt/shellio.cxx  |2 +-
 sw/source/filter/html/htmlcss1.cxx   |2 +-
 sw/source/filter/html/htmlctxt.cxx   |2 +-
 sw/source/filter/html/swhtml.hxx |2 +-
 sw/source/filter/inc/fltini.hxx  |2 +-
 sw/source/filter/inc/fltshell.hxx|2 +-
 48 files changed, 108 insertions(+), 108 deletions(-)

New commits:
commit 5ecb947b3ad67300bae934dc011823d1989449b6
Author: Noel Grandin 
Date:   Fri Aug 4 16:23:37 2017 +0200

loplugin:constparams in sw part5

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

diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index b0fdbbf77364..aaa600b2453e 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -48,7 +48,7 @@ class SwApplet_Impl
 public:
 static SwHtmlOptType GetOptionType( const OUString& rName, bool bApplet );
 SwApplet_Impl( SfxItemPool& rPool );
-SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
+SwApplet_Impl( SfxItemSet const & rSet ): aItemSet ( rSet) {}
 ~SwApplet_Impl();
 void CreateApplet( const OUString& rCode, const OUString& rName,
bool bMayScript, const OUString& rCodeBase,
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index bbace938d039..1ebc33e4e0a8 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -496,7 +496,7 @@ class SW_DLLPUBLIC SwWriter
 bool bWriteAll;
 
 public:
-ErrCode Write( WriterRef& rxWriter, const OUString* = nullptr);
+ErrCode Write( WriterRef const & rxWriter, const OUString* = nullptr);
 
 SwWriter( SvStream&, SwCursorShell &, bool bWriteAll = false );
 SwWriter( SvStream&, SwDoc & );
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 6b57b32ac708..4769254de14e 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -179,8 +179,8 @@ public:
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 
override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  
) override;
 
-voidAddDataSequence( const SwTable &rTable, css::uno::Reference< 
css::chart2::data::XDataSequence > &rxDataSequence );
-voidRemoveDataSequence( const SwTable &rTable, 
css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence );
+voidAddDataSequence( const SwTable &rTable, css::uno::Reference< 
css::chart2::data::XDataSequence > const &rxDataSequence );
+voidRemoveDataSequence( const SwTable &rTable, 
css::uno::Reference< css::chart2::data::XDataSequence > const &rxDataSeq

Re: Experiences building LO from scratch as a "new" developer

2017-08-04 Thread jan

Hi Mike,

Thanks a lot for doing this. Excellent idea!

Jan

Am 03.08.2017 um 17:10 schrieb Mike Saunders:
> Hi everyone,
> 
> You may know me from doing marketing work and videos for TDF. But a
> while back I was talking to some developers and we had an idea: I should
> try to build LO from scratch (something I've never done before), using
> our existing documentation, to find out what could be improved.
> 
> I'm pretty geeky (been using Linux since 1998, know my way around the
> Bash prompt, and have written programming tutorials for magazines) so
> I'm probably quite representative of a typical new LO developer.
> 
> I've described my findings below, running a fresh installation of
> Xubuntu 17.04. Overall the process wasn't too complicated, although
> there are some rather confusing bits, and places where we could provide
> more info. Let me know what you think!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-08-04 Thread Armin Le Grand

New branch 'feature/editviewoverlay' available with the following commits:
commit e3d12c92c8663364220e7d1c04e888049f8d007d
Author: Armin Le Grand 
Date:   Fri Aug 4 18:56:43 2017 +0200

editviewoverlay: Allow EditView to run in Overlay

This is the first basic functionality to get the active
EditView with EditEngine work in the Overlay which all
Apps support. Reason is that the current EditEngine 'plugs'
into the Window and uses Invalidate() calls to repaint
deeply everything under a text change. While this is
acceptable for simple cases it can get very slow when
there are excessive, expensive to paint objects in the
background, e.g. MasterPages in Draw/Impress with gradients
and other stuff. This was avoided in older versions (LO51)
by 'guessing' a good BackgrundColor by the EditEngine,
not invalidating but painting actively using that guess
(with better or worse results) which someone removed.
For the future it is anyways the better way to get the
EditEngine functionality to Overlay and using Primitives,
this will be a first step. This may enable Text Editing
without repainting the Background (fast), using a non-XOR
selection paint and more. It will need thorough testing
and further experimenting due to EditEngine being used in
many places (DrawObjects, Calc Cells, Formular Fields,
Controls, ...)

Change-Id: Ib9eb0f3999fd61a82ddf7a60ab1ea6ccda3a60da

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

Re: LO 80731 - Incorrect syntax does compile, MID without end bracket

2017-08-04 Thread Kaganski Mike

Hi Pierre,

On 8/4/2017 4:26 AM, Pierre Lepage wrote:
> I have implemented a new warning option on compilation. I did not go too 
> far.

Great!

> A simple checkbox "Warning On" and an "else" in the faulty 
> structure causing the problem of the closing parenthesis does the trick. 
> I have included a screen copy of the dialog with the "Warning On" option.
> 
> The behavior of StarBasic with the "Warning On" option would be as follows.
> 
> A) Warning On and active IDE window: Warning displayed on line where 
> normally there would be an error.
> 
> B) Warning On and IDE window inactive: Warning at the beginning of the 
> macro execution in the application window.
> 
> C) Warning Off: No tolerated error and no warning stop.
> 
> For the case of the closing parenthesis, the warning message could be 
> the following: A closing parenthesis is missing in one or more 
> expressions with the Mid function.

Could you post your change to gerrit please? It's better to discuss code 
there.

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-08-04 Thread Caolán McNamara

 sw/source/core/doc/CntntIdxStore.cxx  |2 +-
 sw/uiconfig/swriter/ui/insertbreak.ui |   24 
 2 files changed, 9 insertions(+), 17 deletions(-)

New commits:
commit f7c59aaa078576a413846b7c8024e728818ca2be
Author: CaolÃ¡n McNamara 
Date:   Fri Aug 4 17:09:40 2017 +0100

coverity#1416133 Unchecked dynamic_cast

Change-Id: I6706e3f889c8c00bdc4bda56fe5f282472589a40

diff --git a/sw/source/core/doc/CntntIdxStore.cxx 
b/sw/source/core/doc/CntntIdxStore.cxx
index 1ba139572d2d..f164af01569f 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -269,7 +269,7 @@ void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, 
updater_t const & rUpdater)
 if (!m_aBkmkEntries.empty())
 {   // tdf#105705 sort bookmarks because SaveBkmks special handling of
 // "bMarkPosEqual" may destroy sort order
-dynamic_cast(pMarkAccess)->sortMarks();
+dynamic_cast(*pMarkAccess).sortMarks();
 }
 }
 
commit 3b39ff8b4e71928e7f33452322522dea49aee1e4
Author: CaolÃ¡n McNamara 
Date:   Fri Aug 4 16:34:14 2017 +0100

tweak insert break menu to load the same with native gtk builder

1) we can use a GtkComboBoxText for this simple case and move the liststore 
into the widget
2) add the response ids for the buttons

Change-Id: I7b3bd10c05f35b0e34bbbebc9f7a811f87d443ac

diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui 
b/sw/uiconfig/swriter/ui/insertbreak.ui
index 0299a6bc66a3..12e2f94907b7 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -8,17 +8,6 @@
 1
 10
   
-  
-
-  
-  
-
-
-  
-[None]
-  
-
-  
   
 False
 6
@@ -171,10 +160,13 @@
   
 
 
-  
+  
 True
 False
-liststore1
+0
+
+  [None]
+
   
   
 False
@@ -244,9 +236,9 @@
   
 
 
-  ok
-  cancel
-  help
+  ok
+  cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Experiences building LO from scratch as a "new" developer

2017-08-04 Thread Jan-Marek Glogowski

Am 04.08.2017 um 15:40 schrieb Shinnok:
>> On Aug 3, 2017, at 4:10 PM, Mike Saunders
>> > > wrote:
>>
>> Question: does parallel make (eg "make -j 2") have any effect here on
>> multi-core systems?
> 
> Regarding this, I had to use this to limit CPU usage and load, in my
> case it was overheating:
> $make build-nocheck -j4 -l2
> 
> Limiting with -j2,4,n alone seemed to have no effect in my case either...

export PARALLELISM=

LO uses its own management of parallel builds, so a manual "make -j"
doesn't work.

Jan-Marek

P.S. There is a "make help" target with more infos.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-08-04 Thread Noel Grandin

 sw/inc/EnhancedPDFExportHelper.hxx  |2 
 sw/inc/ndarr.hxx|2 
 sw/inc/ndhints.hxx  |8 +-
 sw/inc/ndole.hxx|4 -
 sw/inc/shellio.hxx  |2 
 sw/inc/swtable.hxx  |2 
 sw/inc/tox.hxx  |4 -
 sw/inc/txtatr.hxx   |2 
 sw/source/core/inc/SwXMLBlockExport.hxx |4 -
 sw/source/core/inc/flyfrm.hxx   |2 
 sw/source/core/inc/layouter.hxx |8 +-
 sw/source/core/inc/pagefrm.hxx  |   12 ++--
 sw/source/core/inc/paintfrm.hxx |2 
 sw/source/core/inc/swfont.hxx   |   22 +++
 sw/source/core/inc/txtfrm.hxx   |4 -
 sw/source/core/layout/fly.cxx   |2 
 sw/source/core/layout/layouter.cxx  |   12 ++--
 sw/source/core/layout/paintfrm.cxx  |   68 
 sw/source/core/layout/trvlfrm.cxx   |2 
 sw/source/core/layout/virtoutp.hxx  |2 
 sw/source/core/ole/ndole.cxx|8 +-
 sw/source/core/swg/SwXMLBlockExport.cxx |4 -
 sw/source/core/swg/swblocks.cxx |2 
 sw/source/core/table/swtable.cxx|2 
 sw/source/core/text/EnhancedPDFExportHelper.cxx |2 
 sw/source/core/text/atrhndl.hxx |2 
 sw/source/core/text/atrstck.cxx |2 
 sw/source/core/text/inftxt.cxx  |2 
 sw/source/core/text/inftxt.hxx  |6 +-
 sw/source/core/text/itratr.cxx  |7 +-
 sw/source/core/text/itratr.hxx  |8 +-
 sw/source/core/text/itrform2.cxx|8 +-
 sw/source/core/text/itrform2.hxx|   10 +--
 sw/source/core/text/itrpaint.hxx|2 
 sw/source/core/text/itrtxt.hxx  |8 +-
 sw/source/core/text/porfly.cxx  |6 +-
 sw/source/core/text/porfly.hxx  |4 -
 sw/source/core/text/pormulti.cxx|4 -
 sw/source/core/text/portxt.cxx  |2 
 sw/source/core/text/portxt.hxx  |2 
 sw/source/core/text/redlnitr.cxx|4 -
 sw/source/core/text/redlnitr.hxx|2 
 sw/source/core/text/txtcache.cxx|6 +-
 sw/source/core/text/txtcache.hxx|2 
 sw/source/core/text/txtfld.cxx  |2 
 sw/source/core/text/txtfrm.cxx  |4 -
 sw/source/core/text/txtftn.cxx  |4 -
 sw/source/core/text/txthyph.cxx |2 
 sw/source/core/text/widorp.cxx  |2 
 sw/source/core/text/widorp.hxx  |2 
 sw/source/core/tox/tox.cxx  |2 
 sw/source/core/txtnode/atrftn.cxx   |4 -
 sw/source/core/txtnode/fntcache.cxx |2 
 sw/source/core/txtnode/ndhints.cxx  |4 -
 sw/source/core/txtnode/ndtxt.cxx|2 
 sw/source/core/txtnode/swfont.cxx   |   12 ++--
 sw/source/core/txtnode/thints.cxx   |4 -
 sw/source/core/txtnode/txtatr2.cxx  |4 -
 sw/source/core/txtnode/txtedt.cxx   |2 
 59 files changed, 161 insertions(+), 162 deletions(-)

New commits:
commit c14f1abc49de68591298437b33b07feeddeb5a5d
Author: Noel Grandin 
Date:   Fri Aug 4 15:17:10 2017 +0200

loplugin:constparams in sw part4

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

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index c9804130acd5..c7c61ba39618 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -165,7 +165,7 @@ class SwTaggedPDFHelper
 // pPorInfo != 0 => BeginInlineStructureElement
 // pFrameInfo, pPorInfo = 0 => BeginNonStructureElement
 SwTaggedPDFHelper( const Num_Info* pNumInfo, const Frame_Info* pFrameInfo, 
const Por_Info* pPorInfo,
-   OutputDevice& rOut );
+   OutputDevice const & rOut );
 ~SwTaggedPDFHelper();
 
 static bool IsExportTaggedPDF( const OutputDevice& rOut );
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index a2cddd0133bc..fbc56be1e810 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -234,7 +234,7 @@ public:
 const OUString &rName,
 sal_Int64 nAspect,
 SwGrfFormatColl *pColl,
-SwAttrSet* pAutoAttr ); ///< in ndole.cxx
+SwAttrSet const * pAutoAttr ); ///< in ndole.cxx
 
 /// Array of all OutlineNodes.

New Defects reported by Coverity Scan for LibreOffice

2017-08-04 Thread scan-admin


Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

9 new defect(s) introduced to LibreOffice found with Coverity Scan.


New defect(s) Reported-by: Coverity Scan
Showing 9 of 9 defect(s)


** CID 1416138:  Control flow issues  (MISSING_RESTORE)
/connectivity/source/drivers/component/CTable.cxx: 211 in 
connectivity::component::OComponentTable::seekRow(connectivity::IResultSetHelper::Movement,
 int, int &)()



*** CID 1416138:  Control flow issues  (MISSING_RESTORE)
/connectivity/source/drivers/component/CTable.cxx: 211 in 
connectivity::component::OComponentTable::seekRow(connectivity::IResultSetHelper::Movement,
 int, int &)()
205 m_nFilePos = 0;
206 break;
207 case IResultSetHelper::BOOKMARK:
208 m_nFilePos = nTempPos;   // previous position
209 }
210 //  aStatus.Set(SDB_STAT_NO_DATA_FOUND);
>>> CID 1416138:  Control flow issues  (MISSING_RESTORE)
>>> Value of non-local "this->m_nFilePos" that was saved in "nTempPos" is 
>>> not restored as it was along other paths.
211 return false;
212 
213 End:
214 nCurPos = m_nFilePos;
215 return true;
216 }

** CID 1416137:  Null pointer dereferences  (FORWARD_NULL)
/sc/source/ui/view/drawvie4.cxx: 204 in ::getOleSourceRanges(const 
SdrMarkList &, bool &, bool &, std::vector> *, 
ScDocument *)()



*** CID 1416137:  Null pointer dereferences  (FORWARD_NULL)
/sc/source/ui/view/drawvie4.cxx: 204 in ::getOleSourceRanges(const 
SdrMarkList &, bool &, bool &, std::vector> *, 
ScDocument *)()
198 return;
199 }
200 
201 // Get all cell ranges that are referenced by the selected chart 
objects.
202 void getOleSourceRanges(const SdrMarkList& rMarkList, bool& rAnyOle, 
bool& rOneOle, std::vector* pRanges = nullptr, ScDocument* pDoc = 
nullptr )
203 {
>>> CID 1416137:  Null pointer dereferences  (FORWARD_NULL)
>>> Comparing "pDoc" to null implies that "pDoc" might be null.
204 bool bCalcSourceRanges = pRanges && pDoc;
205 std::vector aRangeReps;
206 rAnyOle = rOneOle = false;
207 const size_t nCount = rMarkList.GetMarkCount();
208 for (size_t i=0; i::getOleSourceRanges(const 
SdrMarkList &, bool &, bool &, std::vector> *, 
ScDocument *)()
/sc/source/ui/view/drawvie4.cxx: 204 in ::getOleSourceRanges(const 
SdrMarkList &, bool &, bool &, std::vector> *, 
ScDocument *)()



*** CID 1416135:(FORWARD_NULL)
/sc/source/ui/view/drawvie4.cxx: 204 in ::getOleSourceRanges(const 
SdrMarkList &, bool &, bool &, std::vector> *, 
ScDocument *)()
198 return;
199 }
200 
201 // Get all cell ranges that are referenced by the selected chart 
objects.
202 void getOleSourceRanges(const SdrMarkList& rMarkList, bool& rAnyOle, 
bool& rOneOle, std::vector* pRanges = nullptr, ScDocument* pDoc = 
nullptr )
203 {
>>> CID 1416135:(FORWARD_NULL)
>>> Comparing "pRanges" to null implies that "pRanges" might be null.
204 bool bCalcSourceRanges = pRanges && pDoc;
205 std::vector aRangeReps;
206 rAnyOle = rOneOle = false;
207 const size_t nCount = rMarkList.GetMarkCount();
208 for (size_t i=0; i::getOleSourceRanges(const 
SdrMarkList &, bool &, bool &, std::vector> *, 
ScDocument *)()
198 return;
199 }
200 
201 // Get all cell ranges that are referenced by the selected chart 
objects.
202 void getOleSourceRanges(const SdrMarkList& rMarkList, bool& rAnyOle, 
bool& rOneOle, std::vector* pRanges = nullptr, ScDocument* pDoc = 
nullptr )
203 {
>>> CID 1416135:(FORWARD_NULL)
>>> Comparing "pRanges" to null implies that "pRanges" might be null.
204 bool bCalcSourceRanges = pRanges && pDoc;
205 std::vector aRangeReps;
206 rAnyOle = rOneOle = false;
207 const size_t nCount = rMarkList.GetMarkCount();
208 for (size_t i=0; i::ContentIdxStoreImpl::RestoreBkmks(SwDoc *, std::function &)()



*** CID 1416133:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/doc/CntntIdxStore.cxx: 272 in 
::ContentIdxStoreImpl::RestoreBkmks(SwDoc *, std::function &)()
266 SetRightMarkPos(pMark, aEntry.m_bOther, &aNewPos);
267 }
268 }
269 if (!m_aBkmkEntries.empty())
270 {   // tdf#105705 sort bookmarks because SaveBkmks special handling 
of
271 // "bMarkPosEqual" may destroy sort order
>>> CID 1416133:  Null pointer dereferences  (FORWARD_NULL)
>

Re: Experiences building LO from scratch as a "new" developer

2017-08-04 Thread Shinnok

Hi Mike,

That's a pretty good report, surely all of that can and must be improved. I 
only did macOS builds so far but I'm going to setup a Linux one over the 
weekend.

> On Aug 3, 2017, at 4:10 PM, Mike Saunders 
>  wrote:
> 
> Question: does parallel make (eg "make -j 2") have any effect here on
> multi-core systems?

Regarding this, I had to use this to limit CPU usage and load, in my case it 
was overheating:
$make build-nocheck -j4 -l2

Limiting with -j2,4,n alone seemed to have no effect in my case either...

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

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

2017-08-04 Thread Pranav Kant

 loleaflet/README   |3 ++-
 loleaflet/dist/toolbar.css |   10 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 341c07b64f1012731b6d337929b120640d2474be
Author: Pranav Kant 
Date:   Fri Aug 4 17:41:54 2017 +0530

loleaflet: Explicitly mention z-index to please MS Edge 40

This is not required in any other browser, but Edge 40 requires it
otherwise the popup window upon clicking the combo box goes behind the
main #map element.

Change-Id: Ie95263f08c8af27b16a56ba2c3c7a9faa308400a

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index dbba1f3f..a4070770 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -42,6 +42,16 @@
 width: 100%;
 }
 
+/* For MS Edge 40, the select2 combo boxes need to have higher z-index than 
#map
+ * Ideal would be to add the class to select2-container , but
+ * https://github.com/select2/select2/issues/285
+ * So, for now just define the z-index here separately for the same class that 
select2 uses
+ * as a container
+ */
+.select2-container {
+z-index: 11;
+}
+
 /* center the toolbar */
 #tb_presentation-toolbar_item_left {
 width: 50%;
commit dbadff5551da2261f58a610514cc8a3b7ba1ff0e
Author: Pranav Kant 
Date:   Fri Aug 4 17:38:47 2017 +0530

loleaflet: Be more specific in README instructions regarding update

An `npm update` on my local tries to update all the modules to latest
version; surely we don't want it everytime only one module update is
required.

Change-Id: I2f79e77ae23edb9b8f8248ac7535e014b7b3218d

diff --git a/loleaflet/README b/loleaflet/README
index caa5e522..acc790da 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -31,7 +31,8 @@ directory, so build process can move forward even without an 
internet connection
 To update any of the dependency, process often goes like this:
 
 1.) Change version of the dependency in package.json
-2.) Do an `npm update', which fetches the new module from npm registry
+2.) Do an `npm update ', which fetches the new module from npm 
registry. Make sure that
+only the module that you want to update is updated.
 3.) `npm shrinkwrap --dev` to update npm-shrinkwrap.json with newer 
information. You might see
 that this tool updates path convention of tarballs inside node_shrinkwrap/ 
also, but this
 should get corrected in next step.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Experiences building LO from scratch as a "new" developer

2017-08-04 Thread Caolán McNamara

On Thu, 2017-08-03 at 17:10 +0200, Mike Saunders wrote:
>  sudo apt-get build-dep libreoffice
> 
> An error comes up: "E: You must put some 'source' URIs in your
> sources.list". I Googled the error and fixed this by checking "Source
> code" in the software-properties-gtk tool

This used to be unnecessary, this changed in the Ubuntu/Debian
distribution at some point to not include the Source repositories by
default. That part of the docs precede that change so needs to be
updated.

> 4. Next is this bullet point:
> 
> "With modern releases, use autogen to select a newer gstreamer, or
> install the old package with: sudo apt install libgstreamer0.10-dev
> libgstreamer-plugins-base0.10-dev"

I think configure will now try to build against gstreamer-1.0 and
gstreamer-0.1 and just pick whatever combo is possible to build against
so I think we can remove this line from the docs and rely on the
earlier lines that install the default dependencies of the distribution
libreoffice build to install something suitable.

> It looks like this fixes the problem I encountered earlier, in the
> first step of BuildingOnLinux, but I wasn't told until now.

Possibly the author of that bit wasn't brave enough to edit the
toplevel build page, feel free to edit the toplevel yourself to insert
some suitable step to enable the source repos under Ubuntu

> But I don't know how to do that, and I can't recall using autogen to
> select anything; I only installed gstreamer1.0-libav. I try entering
> "autogen" but I'm told it's not installed. Looking back in
> Linux_Build_Dependencies, I see "When you use autogen.sh" under the
> "Older Ubuntu" section - but the previous page said "With *modern*
> releases, use autogen"

If, after removing the gstreamer selection stuff, there's any mention
of autogen/autogen.sh then the correct scriptname that should be used
throughout is autogen.sh.

I think buovjaga is going to make some changes here along these lines
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-08-04 Thread Markus Mohrhard

 desktop/source/minidump/minidump.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4de6140c395a099df75d8e03306ab05322a887f4
Author: Markus Mohrhard 
Date:   Tue Aug 1 18:54:30 2017 +0200

tdf#109347: don't verify SSL certificate for crashreport upload

Seems that on Windows we can not rely on the CA information to include
the necessary info to verify the connection to the server.

Change-Id: Ieed639c438f5a66e538d1126bb1e8ec1ea02b168
Reviewed-on: https://gerrit.libreoffice.org/40642
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 7457079b85b05dca2a35dc29e0dac1204e6eda00)

diff --git a/desktop/source/minidump/minidump.cxx 
b/desktop/source/minidump/minidump.cxx
index e44fc4ccfb2f..ac63bd41096c 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -108,6 +108,7 @@ bool uploadContent(std::map& 
parameters, std::string&
 
 curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
 curl_easy_setopt(curl, CURLOPT_USERAGENT, kUserAgent);
+curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
 // Set proxy information if necessary.
 if (!proxy.empty())
 curl_easy_setopt(curl, CURLOPT_PROXY, proxy.c_str());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/README.scheduler

2017-08-04 Thread Jan-Marek Glogowski

 vcl/README.scheduler |  156 +++
 1 file changed, 156 insertions(+)

New commits:
commit fa1be538cdb0f15aff717aa8583c191194609266
Author: Jan-Marek Glogowski 
Date:   Fri Aug 4 13:46:44 2017 +0200

Add VCL scheduler documentation

Change-Id: Ifb2332b6d3c8bf472c684d3a79c861cc9035d246

diff --git a/vcl/README.scheduler b/vcl/README.scheduler
new file mode 100644
index ..1f2d617734a0
--- /dev/null
+++ b/vcl/README.scheduler
@@ -0,0 +1,156 @@
+= Introduction =
+
+The VCL scheduler handles LOs primary event queue. It is simple by design,
+currently just a single-linked list, processed in list-order by priority
+using round-robin for reoccuring tasks.
+
+The scheduler has the following behaviour:
+
+B.1. Tasks are scheduled just priority based
+B.2. Implicitly cooperative AKA non-preemptive
+B.3. It's not "fair" in any way (a consequence of B.2)
+B.4. Tasks are handled round-robin (per priority)
+B.5. Higher priorities have lower values
+B.6. A small set of priorities instead of an flexible value AKA int
+
+There are some consequences due to this design.
+
+C.1. Higher priorority tasks starve lower priority tasks
+ As long as a higher task is available, lower tasks are never run!
+ See Anti-pattern.
+
+C.2. Tasks should be split into sensible blocks
+ If this can't really be done, process pending tasks by calling
+ Application::Reschedule(). Or use a thread.
+
+C.3. This is not an OS scheduler
+ There is no real way to "fix" B.2. and B.3.
+ If you need to do an preemptive task, use a thread!
+ Otherwise mke your task suspendable and check SalInstance::AnyInput
+ or call Application::Reschedule regularly.
+
+
+= Driving the scheduler AKA the system timer =
+
+  1. There is just one system timer, which drives LO event loop
+  2. The timer has to run in the main window thread
+  3. The scheduler is run with the Solar mutex acquired
+  4. The system timer is a single-shot timer
+  5. The scheduler system event / message has a low system priority.
+ All system events should have a higher priority.
+
+Everytime a task is started, the scheduler timer is adjusted. When the timer
+fires, it posts an event to the system message queue. If the next most
+importent task is an Idle (AKA instant, 0ms timeout), the event is pushed to
+the back of the queue, so we don't starve system messages, otherwise to the
+front. This is especially importent to get a correct SalInstance::AnyInput
+handling, as this is used to suspend long background Idle tasks.
+
+Everytime the scheduler is invoked it searches for the next task to process,
+restarts the timer with the timeout for the next event and then invokes the
+task. After invoking the task and if the task is still active, it is pushed
+to the end of the queue and the timeout is eventually adjusted.
+
+
+= Locking =
+
+The locking is quite primitve: all interaction with internal Scheduler
+structures are locked. This includes the ImplSchedulerContext and the
+Task::mpSchedulerData, which is actually a part of the scheduler.
+Before invoking the task, we have to release the lock, so others can
+Start new Tasks.
+
+
+= Lifecycle / thread-safety of Scheduler-based objects =
+
+A scheduler object it thread-safe in the way, that it can be associated to
+any thread and any thread is free to call any functions on it. The owner must
+guarantee that the Invoke() function can be called, while the Scheduler object
+exists / is not disposed.
+
+
+= Anti-pattern: Dependencies via (fine grained) priorities =
+
+"Idle 1" should run before "Idle 2", therefore give "Idle 1" a higher priority
+then "Idle 2". This just works correct for low frequency idles, but otherwise
+always breaks!
+
+If you have some longer work - even if it can be split by into schedulable,
+smaller blocks - you normally don't want to schedule it with a non-default
+priority, as it starves all lower priority tasks. Even if a block was processed
+in "Idle 1", it is scheduled with the same (higher) priority again. Changing
+the "Idle" to a "Timer" also won't work, as this breaks the dependency.
+
+What is needed is task based dependency handling, so if "Task 1" is done, it
+has to start "Task 2" and if "Task 1" is started again, it has to stop
+"Task 2". This currently has to be done by the implementor, but this feature
+can be added to the scheduler reasonably.
+
+
+= Implementation details =
+
+== MacOS implementation details ==
+
+Generally the Scheduler is handled as expected. There is a workaround for a
+problem for pushing tasks to an empty queue, as [NSApp postEvent: ...
+atStart: NO] doesn't append the event, if the message queue is empty.
+
+Probably that's the reason, why some code comments spoke of lost events and
+there was some distinct additional event processing implemented.
+
+== Windows implementation details ==
+
+Posted or sent event messages often trigger processing of WndProc in
+PeekMessage, GetMessage or

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 13 commits - bin/lo-commit-stat download.lst external/expat include/oox oox/source sc/source sd/qa sd/source sw/qa sw/source writerfi

2017-08-04 Thread Caolán McNamara

 bin/lo-commit-stat |   36 +++
 download.lst   |4 -
 external/expat/StaticLibrary_expat.mk  |1 
 external/expat/StaticLibrary_expat_x64.mk  |1 
 external/expat/UnpackedTarball_expat.mk|2 
 external/expat/expat.getrandom_detection.patch.1   |   40 -
 include/oox/drawingml/shape.hxx|2 
 include/oox/vml/vmltextbox.hxx |2 
 oox/source/drawingml/shape.cxx |6 ++
 oox/source/vml/vmltextbox.cxx  |   14 +
 oox/source/vml/vmltextboxcontext.cxx   |6 ++
 sc/source/core/data/document.cxx   |2 
 sc/source/ui/undo/undotab.cxx  |1 
 sd/qa/unit/data/pptx/tdf109223.pptx|binary
 sd/qa/unit/import-tests.cxx|   34 ++
 sd/source/ui/dlg/sdpreslt.cxx  |2 
 sw/qa/extras/odfimport/data/tdf109228.odt  |binary
 sw/qa/extras/odfimport/odfimport.cxx   |7 ++
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  |3 +
 sw/qa/extras/ooxmlimport/data/groupshape-fontname.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   11 
 sw/source/core/doc/CntntIdxStore.cxx   |6 ++
 sw/source/core/inc/MarkManager.hxx |2 
 writerfilter/source/dmapper/PropertyMap.cxx|   21 
 xmloff/source/text/XMLTextFrameContext.cxx |1 
 25 files changed, 129 insertions(+), 75 deletions(-)

New commits:
commit f9f8acfb2e9f0b672e1658ed586f43ab40645f81
Author: CaolÃ¡n McNamara 
Date:   Thu Aug 3 14:03:27 2017 +0100

CVE-2017-11742: Expat 2.2.3

Reviewed-on: https://gerrit.libreoffice.org/40718
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit f680e5a441cecba4d238f031fc417ef3bccfd792)

Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b
Reviewed-on: https://gerrit.libreoffice.org/40749
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 2351570154e43fe919e5b9dd756bbe13a6b9c60d)

diff --git a/download.lst b/download.lst
index 7d92110fba01..a6af0c4369b0 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export EPM_TARBALL := 
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33
 export ETONYEK_VERSION_MICRO := 6
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
-export EXPAT_MD5SUM := d9c3baeab58774cefc2f04faf29f2cf8
-export EXPAT_TARBALL := expat-2.2.1.tar.bz2
+export EXPAT_MD5SUM := f053af63ef5f39bd9b78d01fbc203334
+export EXPAT_TARBALL := expat-2.2.3.tar.bz2
 export FIREBIRD_MD5SUM := 821260b61dafc22899d1464d4e91ee6a
 export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
 export FONTCONFIG_TARBALL := 
77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
diff --git a/external/expat/StaticLibrary_expat.mk 
b/external/expat/StaticLibrary_expat.mk
index 4d6957f9ef52..5a7d43d6c9bd 100644
--- a/external/expat/StaticLibrary_expat.mk
+++ b/external/expat/StaticLibrary_expat.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_StaticLibrary_add_cflags,expat,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
+   UnpackedTarball/expat/lib/loadlibrary \
UnpackedTarball/expat/lib/xmlparse \
UnpackedTarball/expat/lib/xmlrole \
UnpackedTarball/expat/lib/xmltok \
diff --git a/external/expat/StaticLibrary_expat_x64.mk 
b/external/expat/StaticLibrary_expat_x64.mk
index a38ba28c80dd..4f92d0fb284e 100644
--- a/external/expat/StaticLibrary_expat_x64.mk
+++ b/external/expat/StaticLibrary_expat_x64.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_StaticLibrary_add_defs,expat_x64,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\
+   UnpackedTarball/expat/lib/loadlibrary_x64 \
UnpackedTarball/expat/lib/xmlparse_x64 \
UnpackedTarball/expat/lib/xmltok_x64 \
UnpackedTarball/expat/lib/xmlrole_x64 \
diff --git a/external/expat/UnpackedTarball_expat.mk 
b/external/expat/UnpackedTarball_expat.mk
index 5d803dcf303a..f90fc8552568 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,7 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
external/expat/expat-winapi.patch \
-   external/expat/expat.getrandom_detection.patch.1 \
 ))
 
 # This is a bit hackish.
@@ -25,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\
 
 $(eval $(call gb_UnpackedTarball_set_post_action,expat,\
$(if $(filter $(BUILD_X64),TRUE), \
+ cp lib/loadlibrary.c lib/loadlibrary

[Libreoffice-commits] core.git: include/vcl sc/qa sfx2/source vcl/inc vcl/source

2017-08-04 Thread Jan-Marek Glogowski

 include/vcl/scheduler.hxx|7 ++-
 sc/qa/unoapi/sc_4.sce|7 ++-
 sfx2/source/appl/appinit.cxx |5 --
 vcl/inc/schedulerimpl.hxx|   35 +++
 vcl/inc/svdata.hxx   |4 +
 vcl/source/app/scheduler.cxx |   95 ++-
 vcl/source/app/svapp.cxx |   16 +--
 7 files changed, 138 insertions(+), 31 deletions(-)

New commits:
commit d55aabfd44563027aceffd0020f55b166184a0ca
Author: Jan-Marek Glogowski 
Date:   Thu Jul 27 11:42:31 2017 +0200

Implement VCL Scheduler locking

Replces the SolarMutex scheduler locking by using a distinct mutex
included in the scheduler context.

It should also get rid of the spurious assert( !bAniIdle ) failures,
as the test now holds the Scheduler lock for the whole time.

This includes reverting the additional scheduler de-init from commit
2e29a518b04250b5f9cc9d0d77da3df076834d60, as I couldn't reproduce
the bug running the unit test in valgrind.

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

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 370c367be04f..1196466cdb22 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -22,6 +22,7 @@
 
 #include 
 
+class SchedulerGuard;
 class Task;
 struct TaskImpl;
 struct ImplSchedulerContext;
@@ -29,8 +30,9 @@ struct ImplSchedulerData;
 
 class VCL_DLLPUBLIC Scheduler final
 {
+friend class SchedulerGuard;
 friend class Task;
-Scheduler() = delete;
+Scheduler() SAL_DELETED_FUNCTION;
 
 static inline void UpdateSystemTimer( ImplSchedulerContext &rSchedCtx,
   sal_uInt64 nMinPeriod,
@@ -38,6 +40,9 @@ class VCL_DLLPUBLIC Scheduler final
 
 static void ImplStartTimer ( sal_uInt64 nMS, bool bForce, sal_uInt64 nTime 
);
 
+static bool Lock( sal_uInt32 nLockCount = 1 );
+static sal_uInt32 Unlock( bool bUnlockAll = false );
+
 public:
 static constexpr sal_uInt64 ImmediateTimeoutMs = 0;
 static constexpr sal_uInt64 InfiniteTimeoutMs  = SAL_MAX_UINT64;
diff --git a/sc/qa/unoapi/sc_4.sce b/sc/qa/unoapi/sc_4.sce
index 0e615432c14e..bf05df96ac04 100644
--- a/sc/qa/unoapi/sc_4.sce
+++ b/sc/qa/unoapi/sc_4.sce
@@ -30,6 +30,11 @@
 -o sc.ScHeaderFieldsObj
 -o sc.ScHeaderFooterContentObj
 -o sc.ScHeaderFooterTextCursor
--o sc.ScHeaderFooterTextObj
+# SHF_TextObj is composed of SHF_TextData, which has a weak reference to
+# SHF_ContentObj, which itself has three references to SHF_TextObj.
+# The css::text::XTextRange test fails often when the weak SHF_ContentObj is
+# already gone. If just this test is disabled, later tests of this object fail
+# too, so this disables the whole interface.
+# -o sc.ScHeaderFooterTextObj
 -o sc.ScIndexEnumeration_CellAnnotationsEnumeration
 -o sc.ScIndexEnumeration_CellAreaLinksEnumeration
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 6551c4d3e39b..5afa8c736e13 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -47,7 +47,6 @@
 #include 
 
 #include 
-#include 
 
 #include 
 #include "sfx2/strings.hrc"
@@ -106,10 +105,6 @@ void SAL_CALL 
SfxTerminateListener_Impl::notifyTermination( const EventObject& a
 SolarMutexGuard aGuard;
 utl::ConfigManager::storeConfigItems();
 
-// Timers may access the SfxApplication and are only deleted in
-// Application::Quit(), which is asynchronous (PostUserEvent) - disable!
-Scheduler::ImplDeInitScheduler();
-
 SfxApplication* pApp = SfxGetpApp();
 pApp->Broadcast( SfxHint( SfxHintId::Deinitializing ) );
 pApp->Get_Impl()->mxAppDispatch->ReleaseAll();
diff --git a/vcl/inc/schedulerimpl.hxx b/vcl/inc/schedulerimpl.hxx
index 2c29de6a6b30..df10fc930bda 100644
--- a/vcl/inc/schedulerimpl.hxx
+++ b/vcl/inc/schedulerimpl.hxx
@@ -21,6 +21,8 @@
 #define INCLUDED_VCL_INC_SCHEDULERIMPL_HXX
 
 #include 
+#include 
+#include 
 
 class Task;
 
@@ -35,6 +37,39 @@ struct ImplSchedulerData final
 const char *GetDebugName() const;
 };
 
+class SchedulerMutex final
+{
+sal_uInt32  mnLockDepth;
+osl::Mutex  maMutex;
+
+public:
+SchedulerMutex() : mnLockDepth( 0 ) {}
+
+bool acquire( sal_uInt32 nLockCount = 1 );
+sal_uInt32 release( bool bUnlockAll = false );
+sal_uInt32 lockDepth() const { return mnLockDepth; }
+};
+
+class SchedulerGuard final
+{
+bool mbLocked;
+
+public:
+SchedulerGuard()
+: mbLocked( false )
+{
+mbLocked = Scheduler::Lock();
+assert( mbLocked );
+}
+
+~SchedulerGuard()
+{
+if ( !mbLocked )
+return;
+Scheduler::Unlock();
+}
+};
+
 #endif // INCLUDED_VCL_INC_SCHEDULERIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 3501d2c25d45..a6337

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

2017-08-04 Thread Tor Lillqvist

 include/unotools/textsearch.hxx |   28 ++
 sc/inc/address.hxx  |   14 +++
 sc/inc/queryparam.hxx   |   49 
 sc/source/core/inc/interpre.hxx |   15 
 4 files changed, 106 insertions(+)

New commits:
commit 3dd30f7ec568852ffd95932b486d0a09a2021d71
Author: Tor Lillqvist 
Date:   Fri Aug 4 13:47:39 2017 +0300

Add debug output operator<< for ParamIfsResult

Change-Id: I82cfed0d86c42feabb646301b399695ed71308ed

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 7fa41cb9a561..113cf6aa4ec6 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class ScDocument;
 class SbxVariable;
@@ -72,6 +73,20 @@ struct ParamIfsResult
 double mfMax = std::numeric_limits::lowest();
 };
 
+template
+inline std::basic_ostream & operator 
<<(std::basic_ostream & stream, const ParamIfsResult& rRes)
+{
+stream << "{" <<
+"sum=" << rRes.mfSum << "," <<
+"mem=" << rRes.mfMem << "," <<
+"count=" << rRes.mfCount << "," <<
+"min=" << rRes.mfMin << "," <<
+"max=" << rRes.mfMax << "," <<
+"}";
+
+return stream;
+}
+
 }
 
 namespace svl {
commit 1717f57705770ebbfac625945478d0e07e816965
Author: Tor Lillqvist 
Date:   Fri Aug 4 13:07:46 2017 +0300

Add debug output operator<< for ScQueryParam and its base classes

diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 16b4573c9fa6..a96375a8002e 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -26,6 +26,7 @@
 
 #include 
 #include 
+#include 
 
 class SvNumberFormatter;
 
@@ -79,6 +80,23 @@ protected:
 EntriesType m_Entries;
 };
 
+// For use in SAL_DEBUG etc. Output format not guaranteed to be stable.
+template
+inline std::basic_ostream & operator 
<<(std::basic_ostream & stream, const ScQueryParamBase& rParam)
+{
+stream << "{" <<
+"searchType=" << rParam.eSearchType <<
+",hasHeader=" << (rParam.bHasHeader?"YES":"NO") <<
+",byRow=" << (rParam.bByRow?"YES":"NO") <<
+",inplace=" << (rParam.bInplace?"YES":"NO") <<
+",caseSens=" << (rParam.bCaseSens?"YES":"NO") <<
+",duplicate=" << (rParam.bDuplicate?"YES":"NO") <<
+",rangeLookup=" << (rParam.mbRangeLookup?"YES":"NO") <<
+"}";
+
+return stream;
+}
+
 struct ScQueryParamTable
 {
 SCCOL   nCol1;
@@ -92,6 +110,21 @@ struct ScQueryParamTable
 virtual ~ScQueryParamTable();
 };
 
+// For use in SAL_DEBUG etc. Output format not guaranteed to be stable.
+template
+inline std::basic_ostream & operator 
<<(std::basic_ostream & stream, const ScQueryParamTable& rParam)
+{
+stream << "{" <<
+"col1=" << rParam.nCol1 <<
+",row1=" << rParam.nRow1 <<
+",col2=" << rParam.nCol2 <<
+",row2=" << rParam.nRow2 <<
+",tab=" << rParam.nTab <<
+"}";
+
+return stream;
+}
+
 struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public 
ScQueryParamTable
 {
 boolbDestPers;  // not saved
@@ -111,6 +144,22 @@ struct SC_DLLPUBLIC ScQueryParam : public 
ScQueryParamBase, public ScQueryParamT
 voidMoveToDest();
 };
 
+// For use in SAL_DEBUG etc. Output format not guaranteed to be stable.
+template
+inline std::basic_ostream & operator 
<<(std::basic_ostream & stream, const ScQueryParam& rParam)
+{
+stream << "{" <<
+"base=" << *(static_cast(&rParam)) <<
+",table=" << *(static_cast(&rParam)) <<
+",destPers=" << (rParam.bDestPers?"YES":"NO") <<
+",destTab=" << rParam.nDestTab <<
+",destCol=" << rParam.nDestCol <<
+",destRow=" << rParam.nDestRow <<
+"}";
+
+return stream;
+}
+
 struct ScDBQueryParamBase : public ScQueryParamBase
 {
 enum DataType { INTERNAL, MATRIX };
commit e34df1a0607f51b8e1168fdfeb8703c9e4e9dd6b
Author: Tor Lillqvist 
Date:   Fri Aug 4 13:00:41 2017 +0300

Add debug output operator<< for ScAddress

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index a13f3e9ddb62..3aab8862ecbd 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -24,6 +24,8 @@
 #include 
 
 #include 
+#include 
+
 #include "scdllapi.h"
 #include "types.hxx"
 #include 
@@ -355,6 +357,18 @@ public:
 OUString GetColRowString() const;
 };
 
+// For use in SAL_DEBUG etc. Output format not guaranteed to be stable.
+template
+inline std::basic_ostream & operator 
<<(std::basic_ostream & stream, const ScAddress& rAddress)
+{
+stream <<
+rAddress.Tab() << "!" <<
+"R" << rAddress.Row() <<
+"C" << rAddress.Col();
+
+return stream;
+}
+
 inline void ScAddress::PutInOrder( ScAddress& rAddress )
 {
 if ( rAddress.Col() < Col() )
commit bf234dc9cd0481c241bbb0f755264562ee89d568
Author: Tor Lillqvist 
Date:   Fri Aug 4 12:58:33 2017 +0300

Add debug output operator<< fo

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

2017-08-04 Thread Noel Grandin

 compilerplugins/clang/constparams.cxx |9 +
 sw/inc/HandleAnchorNodeChg.hxx|2 +-
 sw/inc/authfld.hxx|2 +-
 sw/inc/dbfld.hxx  |8 
 sw/inc/docufld.hxx|2 +-
 sw/inc/editsh.hxx |   14 +++---
 sw/inc/fesh.hxx   |4 ++--
 sw/inc/ndarr.hxx  |2 +-
 sw/inc/ndgrf.hxx  |6 +++---
 sw/source/core/edit/acorrect.cxx  |4 ++--
 sw/source/core/edit/autofmt.cxx   |8 
 sw/source/core/edit/edfcol.cxx|2 +-
 sw/source/core/edit/edfld.cxx |6 +++---
 sw/source/core/edit/edlingu.cxx   |8 
 sw/source/core/edit/edtox.cxx |2 +-
 sw/source/core/edit/edws.cxx  |2 +-
 sw/source/core/fields/authfld.cxx |2 +-
 sw/source/core/fields/cellfml.cxx |2 +-
 sw/source/core/fields/dbfld.cxx   |8 
 sw/source/core/fields/docufld.cxx |4 ++--
 sw/source/core/fields/textapi.cxx |2 +-
 sw/source/core/frmedt/fecopy.cxx  |4 ++--
 sw/source/core/frmedt/fefly1.cxx  |2 +-
 sw/source/core/frmedt/feshview.cxx|4 ++--
 sw/source/core/frmedt/tblsel.cxx  |2 +-
 sw/source/core/graphic/ndgrf.cxx  |   12 ++--
 sw/source/core/inc/flyfrm.hxx |2 +-
 sw/source/core/inc/ftnboss.hxx|4 ++--
 sw/source/core/inc/ftnfrm.hxx |2 +-
 sw/source/core/inc/textapi.hxx|4 ++--
 sw/source/core/layout/atrfrm.cxx  |2 +-
 sw/source/core/layout/dbg_lay.cxx |   12 ++--
 sw/source/core/layout/fly.cxx |2 +-
 sw/source/core/layout/ftnfrm.cxx  |6 +++---
 sw/source/core/layout/hffrm.cxx   |2 +-
 35 files changed, 84 insertions(+), 75 deletions(-)

New commits:
commit 902d87147d779c84b4ea84ef7779897d89b1fab2
Author: Noel Grandin 
Date:   Fri Aug 4 10:15:51 2017 +0200

loplugin:constparams in sw part3

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

diff --git a/compilerplugins/clang/constparams.cxx 
b/compilerplugins/clang/constparams.cxx
index 4f683317f3a8..f0f4baf761b4 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -164,6 +164,15 @@ bool ConstParams::VisitFunctionDecl(const FunctionDecl * 
functionDecl)
 || name == "GoNext"
 || name == "GoPrevious"
 || name == "lcl_SetOtherLineHeight"
+|| name == "BoxNmsToPtr"
+|| name == "PtrToBoxNms"
+|| name == "RelNmsToBoxNms"
+|| name == "RelBoxNmsToPtr"
+|| name == "BoxNmsToRelNm"
+|| name == "MakeFormula_"
+|| name == "GetFormulaBoxes"
+|| name == "HasValidBoxes_"
+|| name == "SplitMergeBoxNm_"
  // #ifdef win32
 || name == "convert_slashes"
 // UNO component entry points
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index 8261c86c16d6..576efa46890f 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -49,7 +49,7 @@ public:
 */
 SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat,
const SwFormatAnchor& _rNewAnchorFormat,
-   SwFlyFrame* _pKeepThisFlyFrame = nullptr );
+   SwFlyFrame const * _pKeepThisFlyFrame = nullptr );
 
 /** calls , if re-creation of fly frames is 
necessary.
 
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 2696ef619b26..653e43f96e6a 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -129,7 +129,7 @@ public:
 
 sal_uInt16  GetSortKeyCount() const ;
 const SwTOXSortKey* GetSortKey(sal_uInt16 nIdx) const ;
-voidSetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey 
nKeys[]);
+voidSetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey const 
nKeys[]);
 
 //initui.cxx
 static OUString GetAuthFieldName(ToxAuthorityField eType);
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 62318b162b34..b751fcc76345 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -106,7 +106,7 @@ public:
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) 
const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt16 nWhich 
) override;
 
-static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString 
&aString, sal_uInt32 nFormat,
+static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString const 
&aString, sal_uInt32 nFormat,
  double &aNumber, sal_Int32 nColumnType, SwDBField 
*pField = nullptr );
 };
 
@@ -167,7 +167,7 @@ public:
 virtual OUStringExpand() const override;
 virtual SwField

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - extras/Package_tplofficorr.mk extras/source

2017-08-04 Thread heiko tietze

 dev/null   |binary
 extras/Package_tplofficorr.mk  |2 
+-
 extras/source/templates/officorr/Modern_business_letter_sans_serif.ott |binary
 extras/source/templates/officorr/Modern_business_letter_serif.ott  |binary
 4 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98caff29c736b2a22f0efe7af1711600a25ecb41
Author: heiko tietze 
Date:   Fri Aug 4 09:37:12 2017 +0200

tdf#111331 Rename Moderate template

Files renamed, template's title property adjusted

Change-Id: Ifca9a740417c0c7563e7d97f8d08de9f69e8f7ff
Reviewed-on: https://gerrit.libreoffice.org/40758
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 8a150beab270f53943014ba9f6b5507ec6231227)
Reviewed-on: https://gerrit.libreoffice.org/40759

diff --git a/extras/Package_tplofficorr.mk b/extras/Package_tplofficorr.mk
index 15329e6fff48..dc79d8790cc1 100644
--- a/extras/Package_tplofficorr.mk
+++ b/extras/Package_tplofficorr.mk
@@ -10,7 +10,7 @@
 $(eval $(call 
gb_Package_Package,extras_tplofficorr,$(SRCDIR)/extras/source/templates/officorr))
 
 $(eval $(call 
gb_Package_add_files,extras_tplofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
-   Moderate_business_letter_sans_serif.ott \
+   Modern_business_letter_sans_serif.ott \
Modern_business_letter_serif.ott \
 ))
 
diff --git 
a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott 
b/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott
deleted file mode 100644
index 4f897cc2c8c3..
Binary files 
a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott and 
/dev/null differ
diff --git 
a/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott 
b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott
new file mode 100644
index ..f8fbc40b6517
Binary files /dev/null and 
b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott differ
diff --git a/extras/source/templates/officorr/Modern_business_letter_serif.ott 
b/extras/source/templates/officorr/Modern_business_letter_serif.ott
index 217aca4d4a17..db218f304581 100644
Binary files 
a/extras/source/templates/officorr/Modern_business_letter_serif.ott and 
b/extras/source/templates/officorr/Modern_business_letter_serif.ott differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-08-04 Thread Szymon Kłos

 sc/qa/unit/data/xlsx/column-style-autofilter.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx|   17 +
 sc/source/filter/oox/sheetdatabuffer.cxx  |   21 -
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit bca55386e187e2cb4ab277a597a420f15c6cebcf
Author: Szymon KÅos 
Date:   Wed Aug 2 14:24:56 2017 +0200

tdf#91567 Apply pattern without AutoFilter only

When AutoFilter button was placed in first row, was also
copied to other cells without formatting all over the worksheet.
Take pattern from first row without AutoFilter button.

Change-Id: Ib2eb12659bf8105e39b469b21386b3232e710007
Reviewed-on: https://gerrit.libreoffice.org/40675
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 

diff --git a/sc/qa/unit/data/xlsx/column-style-autofilter.xlsx 
b/sc/qa/unit/data/xlsx/column-style-autofilter.xlsx
new file mode 100755
index ..67b2dd479576
Binary files /dev/null and b/sc/qa/unit/data/xlsx/column-style-autofilter.xlsx 
differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 0e838a87496e..f8f6548984b5 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -213,6 +213,7 @@ public:
 void testOutlineODS();
 
 void testColumnStyleXLSX();
+void testColumnStyleAutoFilterXLSX();
 
 void testSharedFormulaHorizontalXLS();
 void testSharedFormulaWrappedRefsXLS();
@@ -338,6 +339,7 @@ public:
 CPPUNIT_TEST(testPrintRangeODS);
 CPPUNIT_TEST(testOutlineODS);
 CPPUNIT_TEST(testColumnStyleXLSX);
+CPPUNIT_TEST(testColumnStyleAutoFilterXLSX);
 CPPUNIT_TEST(testSharedFormulaHorizontalXLS);
 CPPUNIT_TEST(testSharedFormulaWrappedRefsXLS);
 CPPUNIT_TEST(testSharedFormulaBIFF5);
@@ -3285,6 +3287,21 @@ void ScFiltersTest::testColumnStyleXLSX()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testColumnStyleAutoFilterXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("column-style-autofilter.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+const ScPatternAttr* pPattern = rDoc.GetPattern(0, 10, 18);
+CPPUNIT_ASSERT(pPattern);
+
+const ScMergeFlagAttr& rAttr = static_cast(pPattern->GetItem(ATTR_MERGE_FLAG));
+CPPUNIT_ASSERT(!rAttr.HasAutoFilter());
+
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testSharedFormulaHorizontalXLS()
 {
 ScDocShellRef xDocSh = loadDoc("shared-formula/horizontal.", FORMAT_XLS);
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 585a8a1bbcf6..cdd3cf909e92 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -444,7 +444,26 @@ void SheetDataBuffer::finalizeImport()
 {
 RowStyles& rRowStyles = col->second;
 SCCOL nScCol = static_cast< SCCOL >( col->first );
-const ScPatternAttr* pDefPattern = rDoc.getDoc().GetPattern(nScCol, 0, 
getSheetIndex());
+
+// tdf#91567 Get pattern from the first row without AutoFilter
+const ScPatternAttr* pDefPattern = nullptr;
+bool bAutoFilter = true;
+SCROW nScRow = 0;
+while ( bAutoFilter && nScRow < MAXROW )
+{
+pDefPattern = rDoc.getDoc().GetPattern( nScCol, nScRow, 
getSheetIndex() );
+if ( pDefPattern )
+{
+const ScMergeFlagAttr* pAttr = static_cast( pDefPattern->GetItemSet().GetItem( ATTR_MERGE_FLAG ) );
+bAutoFilter = pAttr->HasAutoFilter();
+}
+else
+break;
+nScRow++;
+}
+if ( !pDefPattern || nScRow == MAXROW )
+pDefPattern = rDoc.getDoc().GetDefPattern();
+
 Xf::AttrList aAttrs(pDefPattern);
 for ( RowStyles::iterator rRows = rRowStyles.begin(), rRows_end = 
rRowStyles.end(); rRows != rRows_end; ++rRows )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/inc cui/source cui/uiconfig

2017-08-04 Thread Muhammet Kara

 cui/inc/strings.hrc   |2 
 cui/source/customize/SvxMenuConfigPage.cxx|  242 
 cui/source/customize/SvxToolbarConfigPage.cxx |  580 ---
 cui/source/customize/cfg.cxx  |   66 --
 cui/source/inc/SvxMenuConfigPage.hxx  |8 
 cui/source/inc/SvxToolbarConfigPage.hxx   |   11 
 cui/source/inc/cfg.hxx|   27 
 cui/uiconfig/ui/customizedialog.ui|   14 
 cui/uiconfig/ui/menuassignpage.ui |  783 ++
 9 files changed, 365 insertions(+), 1368 deletions(-)

New commits:
commit 0bf8a4f768d52e6f5233dd9b352e4485a503c834
Author: Muhammet Kara 
Date:   Fri Jul 28 17:11:28 2017 +0300

Convert UI of Customize Dialog to the new design

* Elements of the old design have been removed from both
the .ui file and the .cxx/.hxx files.

* New elements for the new design have been added to the
.ui file.

* Menu, Toolbar and Context menu tabs now resemble the new design

Change-Id: Ib602e0a4b9419d16adaa4ff6aa23b74097a3b88d
Reviewed-on: https://gerrit.libreoffice.org/40468
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 2a82447321d3..74b0bcb4f80e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -59,7 +59,7 @@
 #define RID_SVXSTR_PRODUCTNAME_TOOLBARS 
NC_("RID_SVXSTR_PRODUCTNAME_TOOLBARS", "%PRODUCTNAME %MODULENAME Toolbars")
 #define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS 
NC_("RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS", "%PRODUCTNAME %MODULENAME Context 
Menus")
 #define RID_SVXSTR_TOOLBAR  NC_("RID_SVXSTR_TOOLBAR", 
"Toolbar")
-#define RID_SVXSTR_TOOLBAR_CONTENT  
NC_("RID_SVXSTR_TOOLBAR_CONTENT", "Toolbar Content")
+//#define RID_SVXSTR_TOOLBAR_CONTENT  
NC_("RID_SVXSTR_TOOLBAR_CONTENT", "Toolbar Content")
 #define RID_SVXSTR_COMMANDS NC_("RID_SVXSTR_COMMANDS", 
"Commands")
 #define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR   
NC_("RID_SXVSTR_CONFIRM_DELETE_TOOLBAR", "There are no more commands on the 
toolbar. Do you want to delete the toolbar?")
 /* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index ec4b2866fe86..36291d5e3cf1 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -113,8 +113,12 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, 
const SfxItemSet& rSe
 m_pContentsListBox->set_vexpand(true);
 m_pContentsListBox->Show();
 
-m_pAddSubmenuButton->Enable();
-m_pAddSubmenuButton->Show();
+m_pFunctionsListBox = VclPtr::Create(m_pFunctions, 
this);
+m_pFunctionsListBox->set_grid_left_attach(0);
+m_pFunctionsListBox->set_grid_top_attach(0);
+m_pFunctionsListBox->set_hexpand(true);
+m_pFunctionsListBox->set_vexpand(true);
+m_pFunctionsListBox->Show();
 
 m_pTopLevelListBox->SetSelectHdl(
 LINK( this, SvxMenuConfigPage, SelectMenu ) );
@@ -124,43 +128,6 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, 
const SfxItemSet& rSe
 
 m_pMoveUpButton->SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );
 m_pMoveDownButton->SetClickHdl ( LINK( this, SvxConfigPage, MoveHdl) );
-
-m_pNewTopLevelButton->SetClickHdl  (
-LINK( this, SvxMenuConfigPage, NewMenuHdl ) );
-
-m_pAddCommandsButton->SetClickHdl  (
-LINK( this, SvxMenuConfigPage, AddCommandsHdl ) );
-
-m_pAddSeparatorButton->SetClickHdl  (
-LINK( this, SvxMenuConfigPage, AddSeparatorHdl ) );
-
-m_pAddSubmenuButton->SetClickHdl  (
-LINK( this, SvxMenuConfigPage, AddSubmenuHdl ) );
-
-m_pDeleteCommandButton->SetClickHdl  (
-LINK( this, SvxMenuConfigPage, DeleteCommandHdl ) );
-
-PopupMenu* pMenu = m_pModifyTopLevelButton->GetPopupMenu();
-pMenu->SetMenuFlags(
-pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
-
-m_pModifyTopLevelButton->SetSelectHdl(
-LINK( this, SvxMenuConfigPage, MenuSelectHdl ) );
-
-PopupMenu* pEntry = m_pModifyCommandButton->GetPopupMenu();
-pEntry->SetMenuFlags(
-pEntry->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries );
-
-m_pModifyCommandButton->SetSelectHdl(
-LINK( this, SvxMenuConfigPage, EntrySelectHdl ) );
-
-if ( !bIsMenuBar )
-{
-m_pTopLevel->set_label( CuiResId( RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS 
) );
-m_pNewTopLevelButton->Hide();
-pMenu->HideItem( pMenu->GetItemId( "move" ) );
-pMenu->HideItem( pMenu->GetItemId( "menuitem3" ) );
-}
 }
 
 SvxMenuConfigPage::~SvxMenuConfigPage()
@@ -199,7 +166,6 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, SelectMenuEntry, 
SvTreeListBox *, void )
 
 void SvxMenuConfigPage::UpdateButtonStates()
 {
-PopupMenu* pPo

[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk

2017-08-04 Thread Caolán McNamara

 sd/UIConfig_sdraw.mk |2 -
 sd/UIConfig_simpress.mk  |2 -
 sd/source/ui/view/DocumentRenderer.cxx   |4 +--
 sd/uiconfig/sdraw/ui/drawprinteroptions.ui   |   24 ++---
 sd/uiconfig/simpress/ui/impressprinteroptions.ui |   26 +++
 5 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 116931751d252a8284d5c76d883e766186538ed2
Author: CaolÃ¡n McNamara 
Date:   Thu Aug 3 17:49:41 2017 +0100

draw vs impress printer option pages

disambiguate contexts for impress vs draw printer options pages

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

diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 089814d6ffb8..1d2d6e9f2a1e 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/dlgsnap \
sd/uiconfig/sdraw/ui/copydlg \
sd/uiconfig/sdraw/ui/drawchardialog \
+   sd/uiconfig/sdraw/ui/drawprinteroptions \
sd/uiconfig/sdraw/ui/drawparadialog \
sd/uiconfig/sdraw/ui/drawpagedialog \
sd/uiconfig/sdraw/ui/drawprtldialog \
@@ -111,7 +112,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/insertslidesdialog \
sd/uiconfig/sdraw/ui/namedesign \
sd/uiconfig/sdraw/ui/paranumberingtab \
-   sd/uiconfig/sdraw/ui/printeroptions \
sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
sd/uiconfig/sdraw/ui/tabledesigndialog \
sd/uiconfig/sdraw/ui/vectorize \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index a6ebd013f086..6163004182b4 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/fontstylemenu \
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
+   sd/uiconfig/simpress/ui/impressprinteroptions \
sd/uiconfig/simpress/ui/insertslides \
sd/uiconfig/simpress/ui/interactiondialog \
sd/uiconfig/simpress/ui/interactionpage \
@@ -136,7 +137,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \
sd/uiconfig/simpress/ui/presentationdialog \
-   sd/uiconfig/simpress/ui/printeroptions \
sd/uiconfig/simpress/ui/prntopts \
sd/uiconfig/simpress/ui/publishingdialog \
sd/uiconfig/simpress/ui/remotedialog \
diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 363d46dc4b05..021ce8e7b689 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -367,9 +367,9 @@ namespace {
 beans::PropertyValue aOptionsUIFile;
 aOptionsUIFile.Name = "OptionsUIFile";
 if( mbImpress )
-aOptionsUIFile.Value <<= 
OUString("modules/simpress/ui/printeroptions.ui");
+aOptionsUIFile.Value <<= 
OUString("modules/simpress/ui/impressprinteroptions.ui");
 else
-aOptionsUIFile.Value <<= 
OUString("modules/sdraw/ui/printeroptions.ui");
+aOptionsUIFile.Value <<= 
OUString("modules/sdraw/ui/drawprinteroptions.ui");
 maProperties.push_back(aOptionsUIFile);
 
 SvtModuleOptions aOpt;
diff --git a/sd/uiconfig/sdraw/ui/printeroptions.ui 
b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
similarity index 93%
rename from sd/uiconfig/sdraw/ui/printeroptions.ui
rename to sd/uiconfig/sdraw/ui/drawprinteroptions.ui
index 38edf40a5c73..883ba3cbef30 100644
--- a/sd/uiconfig/sdraw/ui/printeroptions.ui
+++ b/sd/uiconfig/sdraw/ui/drawprinteroptions.ui
@@ -29,7 +29,7 @@
 6
 
   
-Page name
+Page name
 False
 True
 True
@@ -45,7 +45,7 @@
 
 
   
-Date and time
+Date and time
 False
 True
 True
@@ -67,7 +67,7 @@
   
 True
 False
-Contents
+Contents
 
   
 
@@ -100,7 +100,7 @@
 6
 
   
-Original size
+Original size
 False
 True
 True
@@ -118,7 +118,7 @@
 
 
   
-Grayscale
+Grayscale

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

2017-08-04 Thread heiko tietze

 dev/null   |binary
 extras/Package_tplofficorr.mk  |2 
+-
 extras/source/templates/officorr/Modern_business_letter_sans_serif.ott |binary
 extras/source/templates/officorr/Modern_business_letter_serif.ott  |binary
 4 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a150beab270f53943014ba9f6b5507ec6231227
Author: heiko tietze 
Date:   Fri Aug 4 09:37:12 2017 +0200

tdf#111331 Rename Moderate template

Files renamed, template's title property adjusted

Change-Id: Ifca9a740417c0c7563e7d97f8d08de9f69e8f7ff
Reviewed-on: https://gerrit.libreoffice.org/40758
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/extras/Package_tplofficorr.mk b/extras/Package_tplofficorr.mk
index 15329e6fff48..dc79d8790cc1 100644
--- a/extras/Package_tplofficorr.mk
+++ b/extras/Package_tplofficorr.mk
@@ -10,7 +10,7 @@
 $(eval $(call 
gb_Package_Package,extras_tplofficorr,$(SRCDIR)/extras/source/templates/officorr))
 
 $(eval $(call 
gb_Package_add_files,extras_tplofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
-   Moderate_business_letter_sans_serif.ott \
+   Modern_business_letter_sans_serif.ott \
Modern_business_letter_serif.ott \
 ))
 
diff --git 
a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott 
b/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott
deleted file mode 100644
index 4f897cc2c8c3..
Binary files 
a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott and 
/dev/null differ
diff --git 
a/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott 
b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott
new file mode 100644
index ..f8fbc40b6517
Binary files /dev/null and 
b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott differ
diff --git a/extras/source/templates/officorr/Modern_business_letter_serif.ott 
b/extras/source/templates/officorr/Modern_business_letter_serif.ott
index 217aca4d4a17..db218f304581 100644
Binary files 
a/extras/source/templates/officorr/Modern_business_letter_serif.ott and 
b/extras/source/templates/officorr/Modern_business_letter_serif.ott differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: "Moderate" business letter

2017-08-04 Thread Heiko Tietze

Hi Caolán,

Good point. Here is the ticket 
https://bugs.documentfoundation.org/show_bug.cgi?id=111331 and the patch 
https://gerrit.libreoffice.org/#/c/40758/.

Thanks for reporting,
Heiko

On 03.08.2017 21:04, Caolán McNamara wrote:
> We have in extras/source/templates/officorr/ a
> Modern_business_letter_serif.ott
> and a
> Moderate_business_letter_sans_serif.ott
> what is a "Moderate" business letter. I'm assuming this a typo gone
> wrong and it should be (and its internal style name also) a 
> Modern_business_letter_sans_serif.ott, right ?
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

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



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

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

2017-08-04 Thread Patrick Jaap

 drawinglayer/source/tools/emfpfont.hxx |5 ++
 drawinglayer/source/tools/emfphelperdata.cxx   |   62 +
 drawinglayer/source/tools/emfpstringformat.cxx |3 +
 drawinglayer/source/tools/emfpstringformat.hxx |   12 
 4 files changed, 82 insertions(+)

New commits:
commit 5a9e731d00de64dd906ffd4ebf77f7fc7f811f99
Author: Patrick Jaap 
Date:   Tue Aug 1 14:21:29 2017 +0200

new EMF+ Parser: Basic Text Primitives for EmfPlusRecordTypeDrawString

Implementation of basic text primitives. It supports text, textstyle (bold, 
italic, font, font size, direction, color, locale.
The positions are well-transformed.

Also a few adjustments and supplements for EMFplus font and stringformat

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

diff --git a/drawinglayer/source/tools/emfpfont.hxx 
b/drawinglayer/source/tools/emfpfont.hxx
index 6c9f73fd4455..22263faf728a 100644
--- a/drawinglayer/source/tools/emfpfont.hxx
+++ b/drawinglayer/source/tools/emfpfont.hxx
@@ -32,6 +32,11 @@ namespace emfplushelper
 OUString family;
 
 void Read(SvMemoryStream &s);
+
+bool Bold() { return fontFlags & 0x1; }
+bool Italic()   { return fontFlags & 0x2; }
+bool Underline(){ return fontFlags & 0x4; }
+bool Strikaout(){ return fontFlags & 0x8; }
 };
 }
 
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index d7919234842f..d5249b1c5d39 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -882,9 +884,69 @@ namespace emfplushelper
 
 if (flags & 0x8000)
 {
+// read the layout rectangle
 float lx, ly, lw, lh;
 
rMS.ReadFloat(lx).ReadFloat(ly).ReadFloat(lw).ReadFloat(lh);
 SAL_INFO("cppcanvas.emf", "EMF+ DrawString 
layoutRect: " << lx << "," << ly << " - " << lw << "x" << lh);
+// parse the string
+OUString text = read_uInt16s_ToOUString(rMS, 
stringLength);
+SAL_INFO("cppcanvas.emf", "EMF+ DrawString string: 
" << text);
+// get the stringFormat from the Object table
+EMFPStringFormat *stringFormat = static_cast< 
EMFPStringFormat* >(maEMFPObjects[formatId & 0xff].get());
+// get the font from the flags
+EMFPFont *font = static_cast< EMFPFont* >( 
maEMFPObjects[flags & 0xff].get() );
+if (!stringFormat || !font)
+{
+  break;
+}
+// done reading
+
+// transform to TextSimplePortionPrimitive2D
+
+const OUString emptyString;
+drawinglayer::attribute::FontAttribute 
fontAttribute(
+font->family,  
  // font family
+emptyString,   
  // (no) font style
+font->Bold() ? 8u : 1u,
  // weight: 8 = bold
+font->family.compareTo("SYMBOL") == 0, // 
symbol
+stringFormat->DirectionVertical(), 
  // vertical
+font->Italic(),
  // italic
+false, 
  // monospaced
+false, 
  // outline = false, no such thing in MS-EMFPLUS
+stringFormat->DirectionRightToLeft(),  
  // right-to-left
+false);
  // BiDiStrong
+
+LanguageTag aLanguageTag(static_cast< LanguageType 
>(stringFormat->language));
+css::lang::Locale locale = 
aLanguageTag.getLocale();
+
+basegfx::B2DHomMatrix transformMatrix = 
basegfx::tools::createScaleTranslateB2DHomMatrix(MapSize(font->emSize,font->emSize),Map(lx,ly+font->emSize));
+
+basegfx::BColor color;
+if (flags & 0x8000) // we use a color
+{
+  color = Color(0xff - (brushId >> 24), (brushId 
>> 16) & 0xff, (brushId >> 8) & 0xff, brushId & 0xff).getBColor();
+

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

2017-08-04 Thread Patrick Jaap

 drawinglayer/source/tools/emfphelperdata.cxx |   28 +++
 drawinglayer/source/tools/emfppen.cxx|4 ++-
 drawinglayer/source/tools/emfppen.hxx|2 +
 3 files changed, 29 insertions(+), 5 deletions(-)

New commits:
commit a3926e25bb0a9c79e3ea1f413b8fa83b91915758
Author: Patrick Jaap 
Date:   Tue Aug 1 16:24:01 2017 +0200

new EMF+ parser: EMFPPlusDrawPolygon: use correct pen width

the current implementation uses PolyPolygonHairlinePrimitive2D for
polygons. This patch uses a PolyPolygonStrokePrimitive2D which makes
use of the correct (transformed) pen width and some basic join and cap
attributes.

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

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index a648117982ff..d7919234842f 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -331,10 +331,30 @@ namespace emfplushelper
 
 if (pen && polygon.count())
 {
-mrTargetHolders.Current().append(
-new drawinglayer::primitive2d::PolyPolygonHairlinePrimitive2D(
-polygon,
-pen->GetColor().getBColor()));
+  // we need a line join attribute
+  basegfx::B2DLineJoin lineJoin = basegfx::B2DLineJoin::Round;
+  if (pen->penDataFlags & 0x0008) // additional line join 
information
+  {
+lineJoin = 
static_cast(EMFPPen::lcl_convertLineJoinType(pen->lineJoin));
+  }
+
+  // we need a line cap attribute
+  css::drawing::LineCap lineCap = css::drawing::LineCap_BUTT;
+  if (pen->penDataFlags & 0x0002) // additional line cap 
information
+  {
+lineCap = 
static_cast(EMFPPen::lcl_convertStrokeCap(pen->startCap));
+SAL_WARN_IF(pen->startCap != pen->endCap, "cppcanvas.emf", "emf+ 
pen uses different start and end cap");
+  }
+  // transform the pen width
+  const double transformedPenWidth = MapSize(pen->penWidth, 0).getX();
+  drawinglayer::attribute::LineAttribute 
lineAttribute(pen->GetColor().getBColor(),
+   
transformedPenWidth,
+   lineJoin,
+   lineCap);
+  mrTargetHolders.Current().append(
+  new drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D(
+  polygon,
+  lineAttribute));
 }
 }
 
diff --git a/drawinglayer/source/tools/emfppen.cxx 
b/drawinglayer/source/tools/emfppen.cxx
index 9bc66e6716af..1905b8cb6f48 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -69,6 +69,8 @@ namespace emfplushelper
 
 EMFPPen::EMFPPen()
 : EMFPBrush()
+, penDataFlags(0)
+, penUnit(0)
 , penWidth(0.0)
 , startCap(0)
 , endCap(0)
@@ -169,7 +171,7 @@ namespace emfplushelper
 
 void EMFPPen::Read(SvStream& s, EmfPlusHelperData& rR)
 {
-sal_uInt32 graphicsVersion, penType, penDataFlags, penUnit;
+sal_uInt32 graphicsVersion, penType;
 int i;
 
s.ReadUInt32(graphicsVersion).ReadUInt32(penType).ReadUInt32(penDataFlags).ReadUInt32(penUnit).ReadFloat(penWidth);
 SAL_INFO("cppcanvas.emf", "EMF+\tpen");
diff --git a/drawinglayer/source/tools/emfppen.hxx 
b/drawinglayer/source/tools/emfppen.hxx
index c338fef62029..7b8f67d41d87 100644
--- a/drawinglayer/source/tools/emfppen.hxx
+++ b/drawinglayer/source/tools/emfppen.hxx
@@ -39,6 +39,8 @@ namespace emfplushelper
 struct EMFPPen : public EMFPBrush
 {
 basegfx::B2DHomMatrix pen_transformation;   //TODO: This isn't used
+sal_uInt32 penDataFlags;
+sal_uInt32 penUnit;
 float penWidth;
 sal_Int32 startCap;
 sal_Int32 endCap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice-commits] core.git: 2 commits - bin/update

[Libreoffice-commits] core.git: Makefile.gbuild

Re: LO 80731 - Incorrect syntax does compile, MID without end bracket

Re: For what versions get source archives created?

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

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

[Libreoffice-commits] core.git: basic/source compilerplugins/clang oox/source svx/source sw/source uitest/uitest

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

Re: Experiences building LO from scratch as a "new" developer

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

Re: LO 80731 - Incorrect syntax does compile, MID without end bracket

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

Re: Experiences building LO from scratch as a "new" developer

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

New Defects reported by Coverity Scan for LibreOffice

Re: Experiences building LO from scratch as a "new" developer

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

Re: Experiences building LO from scratch as a "new" developer

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

[Libreoffice-commits] core.git: vcl/README.scheduler

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 13 commits - bin/lo-commit-stat download.lst external/expat include/oox oox/source sc/source sd/qa sd/source sw/qa sw/source writerfi

[Libreoffice-commits] core.git: include/vcl sc/qa sfx2/source vcl/inc vcl/source

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

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - extras/Package_tplofficorr.mk extras/source

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc17-revamp-customize-dialog' - cui/inc cui/source cui/uiconfig

[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk

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

Re: "Moderate" business letter

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

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

33 matches

Site Navigation

Mail list logo

Footer information