date:20160311

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

2016-03-11 Thread David Ostrovsky

 external/glew/ExternalProject_glew.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 682da4010b45cbb3268ea8b2b3da455bca413acd
Author: David Ostrovsky 
Date:   Sat Mar 12 01:01:48 2016 +0100

Fix glew on MSVC 14.0

Without explicitly specifying toolset v140, the build was
failing when only MSVC 14.0 was installed:

  The builds tools for v120 (Platform Toolset = 'v120')
  cannot be found

Change-Id: I5849821f291b705ad75db8b4c9404af8458902ba
Reviewed-on: https://gerrit.libreoffice.org/23160
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 

diff --git a/external/glew/ExternalProject_glew.mk 
b/external/glew/ExternalProject_glew.mk
index bb78dce..0d80cd0 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -17,10 +17,10 @@ ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade glew.sln,echo 
up-to-date) && \
-   msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 
140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \
,build/vc12) \
$(call gb_ExternalProject_run,build,\
-   msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release \
+   msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release $(if $(filter 
140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \
,build/vc12)
 
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Adolfo Jayme Barrientos

 sfx2/source/view/view.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 65b4d2a6185b1b98e22101c7d33ab42b3a4a4525
Author: Adolfo Jayme Barrientos 
Date:   Sat Mar 12 01:08:34 2016 -0600

Typo

Change-Id: I834c8473a6c2ad135359c45af868132bbb6960f8

diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 81718cc..23b4682 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -103,7 +103,7 @@ String STR_TARGET_DOC_NOT_CLASSIFIED
 
 String STR_DOC_CLASSIFICATION_TOO_LOW
 {
-Text [ en-US ] = "This document has a lower classificaton level than the 
clipboard." ;
+Text [ en-US ] = "This document has a lower classification level than the 
clipboard." ;
 };
 
 PushButton BT_CHECKOUT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Adolfo Jayme Barrientos

 source/text/shared/main0650.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b54536ff09619519e8d5bbd87b08b13fe027abfd
Author: Adolfo Jayme Barrientos 
Date:   Fri Mar 11 23:51:05 2016 -0600

English

Change-Id: I9b07a614becef43d07bb946d07a2efbb91794a0e

diff --git a/source/text/shared/main0650.xhp b/source/text/shared/main0650.xhp
index 413119c..df04ebc 100644
--- a/source/text/shared/main0650.xhp
+++ b/source/text/shared/main0650.xhp
@@ -37,10 +37,10 @@
 The Java platform support needs to be activated under $[officename] 
to run Java applications.
 
 
-Activate Java platform support by choosing %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Advanced.
+Enable Java platform support by choosing %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Advanced.
 
 
 Before 
you can use a JDBC driver, you need to add its class path. Choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME - Advanced, and click the 
Class Path button. After you add the path information, restart 
%PRODUCTNAME.
-Your modifications at the %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
Advanced tab page will be used even if the Java Virtual Machine (JVM, a 
virtual machine for the Java platform) already has been started. After 
modifications to the ClassPath you must restart $[officename]. The same is true 
for modifications under %PRODUCTNAME - 
PreferencesTools - 
Options - Internet - Proxy. 
Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a 
restart, they will be evaluated when you click OK.
+Your modifications at the %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
Advanced tab page will be used even if the Java Virtual Machine (JVM) 
has been started already. After any modifications to the ClassPath you must 
restart $[officename]. The same is true for modifications under %PRODUCTNAME - 
PreferencesTools - 
Options - Internet - Proxy. 
Only the boxes "HTTP Proxy" and "FTP Proxy" and their ports do not require a 
restartâthey will be evaluated when you click OK.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-03-11 Thread Adolfo Jayme Barrientos

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

New commits:
commit b5ba60e39f689d5db7868b1149271787dcb5602f
Author: Adolfo Jayme Barrientos 
Date:   Fri Mar 11 23:51:05 2016 -0600

Updated core
Project: help  b54536ff09619519e8d5bbd87b08b13fe027abfd

English

Change-Id: I9b07a614becef43d07bb946d07a2efbb91794a0e

diff --git a/helpcontent2 b/helpcontent2
index f030152..b54536f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f0301528ebc8a907be01e9435bb43b8d2b9449e0
+Subproject commit b54536ff09619519e8d5bbd87b08b13fe027abfd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fwd: Interested to work on GSoC project

2016-03-11 Thread Rosemary Sebastian

Hello everyone

I'm Rosemary, a final year student of B.Tech. in Computer Science and
Engineering.

I found the project "Saving ODF XML of Change-Tracking as a sequence of
predefined Changes" interesting as it looks similar to the projects I've
worked on in LibreOffice. So I'd like to work on it for GSoC 2016.

My contributions to LibreOffice include:

   1. Writing an export filter for the export of VBA streams to MSO
   formats; moggi was my mentor for this corehack.
   2. Implementing OOXML export and import of Impress text fields; bubli
   mentored me for this one.

My IRC nickname is roses and my email ID is rosemary.seb8 at gmail dot com

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

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

2016-03-11 Thread Jochen Nitschke

 sc/inc/address.hxx|   91 +
 sc/inc/attrib.hxx |3 
 sc/inc/rangelst.hxx   |6 
 sc/inc/rangeutl.hxx   |8 
 sc/qa/unit/copy_paste_test.cxx|4 
 sc/qa/unit/helper/qahelper.cxx|   14 
 sc/qa/unit/ucalc.cxx  |2 
 sc/qa/unit/ucalc_formula.cxx  |  164 +--
 sc/qa/unit/ucalc_pivottable.cxx   |6 
 sc/qa/unit/ucalc_sort.cxx |2 
 sc/source/core/data/bcaslot.cxx   |6 
 sc/source/core/data/conditio.cxx  |2 
 sc/source/core/data/documen5.cxx  |   12 
 sc/source/core/data/dpcache.cxx   |2 
 sc/source/core/data/formulacell.cxx   |   12 
 sc/source/core/data/validat.cxx   |4 
 sc/source/core/tool/address.cxx   |  522 
+-
 sc/source/core/tool/chartarr.cxx  |4 
 sc/source/core/tool/chgtrack.cxx  |   12 
 sc/source/core/tool/compiler.cxx  |   60 -
 sc/source/core/tool/grouparealistener.cxx |4 
 sc/source/core/tool/interpr1.cxx  |   20 
 sc/source/core/tool/rangelst.cxx  |   28 
 sc/source/core/tool/rangenam.cxx  |4 
 sc/source/core/tool/rangeutl.cxx  |   66 -
 sc/source/core/tool/reffind.cxx   |   30 
 sc/source/filter/excel/xecontent.cxx  |2 
 sc/source/filter/excel/xename.cxx |4 
 sc/source/filter/excel/xestream.cxx   |6 
 sc/source/filter/excel/xicontent.cxx  |4 
 sc/source/filter/excel/xilink.cxx |4 
 sc/source/filter/oox/worksheetbuffer.cxx  |2 
 sc/source/filter/oox/worksheethelper.cxx  |3 
 sc/source/filter/xcl97/xcl97rec.cxx   |   26 
 sc/source/filter/xml/xmlexprt.cxx |2 
 sc/source/ui/Accessibility/AccessibleCellBase.cxx |2 
 sc/source/ui/Accessibility/AccessibleDocument.cxx |2 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx  |4 
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx   |2 
 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx|4 
 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx |   12 
 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx|   12 
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx|   18 
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |6 
 sc/source/ui/app/inputhdl.cxx |   33 
 sc/source/ui/app/inputwin.cxx |8 
 sc/source/ui/collab/sendfunc.cxx  |2 
 sc/source/ui/condformat/condformatdlg.cxx |   22 
 sc/source/ui/condformat/condformatmgr.cxx |2 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx  |   10 
 sc/source/ui/dbgui/consdlg.cxx|   12 
 sc/source/ui/dbgui/dbnamdlg.cxx   |   10 
 sc/source/ui/dbgui/filtdlg.cxx|6 
 sc/source/ui/dbgui/foptmgr.cxx|   14 
 sc/source/ui/dbgui/sfiltdlg.cxx   |   22 
 sc/source/ui/dbgui/tpsort.cxx |   18 
 sc/source/ui/dbgui/validate.cxx   |2 
 sc/source/ui/dialogs/searchresults.cxx|6 
 sc/source/ui/docshell/arealink.cxx|2 
 sc/source/ui/docshell/docfunc.cxx |2 
 sc/source/ui/docshell/docsh4.cxx  |8 
 sc/source/ui/docshell/impex.cxx   |8 
 sc/source/ui/docshell/servobj.cxx |4 
 sc/source/ui/drawfunc/fuins2.cxx  |8 
 sc/source/ui/formdlg/formula.cxx  |4 
 sc/source/ui/inc/rfindlst.hxx |4 
 sc/source/ui/miscdlgs/acredlin.

Re: minutes of ESC call ...

2016-03-11 Thread David Ostrovsky

Hi,

On Fri, 2016-03-11 at 11:00 -0600, Norbert Thiebaud wrote:
> On Fri, Mar 11, 2016 at 1:29 AM, David Ostrovsky 
> wrote:
> > 
> > I've just approved this change: [1] and after confirmtaion from
> > Norbert
> > that our CI infra was extended to support MSVC 2015, I will merge
> > it.
> 
> in another related thread vmiklos pointed to a residual problem with
> 32 bits on vs2015 only setup.
> something about missing dotnet stuff it seems... I'm not sure.. but
> that is prolly something
> that need explaining/addressing before we switch...

Sorry, fixed in: [1]. I added the TODO there, and asked shm_get to drop
support for Windows 32 bit platform. After he said no, /me forgot to
test 32bit build on 32bit platform. I only tested it on 64bit platform.

Unrelated to this thread, but while setting new 32bit VM I tried

  LODE on Chocolate 

combination, and it was v. impressive. Thanks to all (mostly shm_get)
who made the setup on this platform so ... painless. I extended the
Wiki here: [2].

* [1] https://gerrit.libreoffice.org/23159
* [2] https://wiki.documentfoundation.org/Development/lode#Preparing_Wi
ndows_with_Chocolate

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

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

2016-03-11 Thread David Ostrovsky

 configure.ac |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dc519b6dea7653e4b68b45aa664e3c0b5189d682
Author: David Ostrovsky 
Date:   Sat Mar 12 00:07:28 2016 +0100

Fix .NET detection on 32bit platform

Change-Id: I5eaa098d1de6b57245aca7bba2274139e60ba402
Reviewed-on: https://gerrit.libreoffice.org/23159
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 

diff --git a/configure.ac b/configure.ac
index cd3d79a..23b6fb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5279,13 +5279,17 @@ find_dotnetsdk46()
 {
 unset frametest
 
-for ver in 4.6; do
-# TODO(davido): Do we need to take care about 32bit?
+for ver in 4.6.1 4.6; do
 reg_get_value_64 
"HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
 if test -n "$regvalue"; then
 frametest=$regvalue
 return
 fi
+reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
+if test -n "$regvalue"; then
+frametest=$regvalue
+return
+fi
 done
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Julien Nabet

 vcl/qa/complex/persistent_window_states/PersistentWindowTest.java |2 +-
 wizards/source/gimmicks/ChangeAllChars.xba|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5da0983a7ce4bc28bff495ae09a218d26281a150
Author: Julien Nabet 
Date:   Sat Mar 12 00:44:24 2016 +0100

Typo: documet->document

Change-Id: I7ec134282af33386cab001ed076fb8fa90d33608

diff --git a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java 
b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
index 2123e8a..04938f4 100644
--- a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
+++ b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
@@ -233,7 +233,7 @@ public class PersistentWindowTest
 /**
  * Load a document
  * @param xMSF A MultiServiceFactory from an office
- * @param docLoader A documet loader
+ * @param docLoader A document loader
  * @return A handle to the document
  */
 private DocumentHandle loadDocument(XMultiServiceFactory xMSF,
diff --git a/wizards/source/gimmicks/ChangeAllChars.xba 
b/wizards/source/gimmicks/ChangeAllChars.xba
index d91db00..cdcbc96 100644
--- a/wizards/source/gimmicks/ChangeAllChars.xba
+++ b/wizards/source/gimmicks/ChangeAllChars.xba
@@ -17,7 +17,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-http://openoffice.org/2000/script"; 
script:name="ChangeAllChars" script:language="StarBasic">' This macro 
replaces all characters in a writer-documet through "x" or 
"X" signs.
+http://openoffice.org/2000/script"; 
script:name="ChangeAllChars" script:language="StarBasic">' This macro 
replaces all characters in a writer-document through "x" or 
"X" signs.
 ' It works on the currently activated document.
 Private const UPPERREPLACECHAR = "X"
 Private const LOWERREPLACECHAR = "x"
@@ -89,4 +89,4 @@ Sub ReplaceStrings(oContainer as Object, sSearchString, 
sReplaceString  as Strin
oReplaceDesc.Searchstring = sSearchString
oReplaceDesc.ReplaceString = sReplaceString
oReplCount = oContainer.ReplaceAll(oReplaceDesc)
-End Sub
\ No newline at end of file
+End Sub
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Rohan Kumar

 forms/source/xforms/model.cxx |   16 
 forms/source/xforms/model.hxx |2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b430ec96e3b131734239305715e2593dc4b57af2
Author: Rohan Kumar 
Date:   Wed Mar 9 18:41:20 2016 +0530

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I removed OSL_DEBUG_LEVEL > 1 conditionals and in some
places i replaced OSL_ENSURE(..) with assert()

Change-Id: Ide7e4b633e85a699f680f47caac5bff36bf180a2
Reviewed-on: https://gerrit.libreoffice.org/23076
Tested-by: Jenkins 
Reviewed-by: BjÃ¶rn Michaelsen 

diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index c567303..9d6b89a 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -73,7 +73,7 @@ using namespace com::sun::star::xml::dom;
 using namespace xforms;
 
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 #define DBG_INVARIANT_TYPE(TYPE) class DBG_##TYPE { const TYPE* mpT; void 
check() { mpT->dbg_assertInvariant(); } public: DBG_##TYPE(const TYPE* pT) : 
mpT(pT) { check(); } ~DBG_##TYPE() { check(); } } _DBG_##TYPE(this);
 
 #define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model)
@@ -197,17 +197,17 @@ void Model::setExternalData( bool _bData )
 mbExternalData = _bData;
 }
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 void Model::dbg_assertInvariant() const
 {
-OSL_ENSURE( mpInstances != NULL, "no instances found" );
-OSL_ENSURE( mxInstances.is(), "No instance container!" );
+assert(mpInstances && "no instances found");
+assert(mxInstances.is() && "No instance container!");
 
-OSL_ENSURE( mpBindings != NULL, "no bindings element" );
-OSL_ENSURE( mxBindings.is(), "No Bindings container" );
+assert(mpBindings && "no bindings element");
+assert(mxBindings.is() && "No Bindings container");
 
-OSL_ENSURE( mpSubmissions != NULL, "no submissions element" );
-OSL_ENSURE( mxSubmissions.is(), "No Submission container" );
+assert(mpSubmissions && "no submissions element");
+assert(mxSubmissions.is() && "No Submission container");
 }
 #endif
 
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 222bb67..70e067c 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -145,7 +145,7 @@ public:
 void setExternalData( bool _bData );
 
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 void dbg_assertInvariant() const;
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

2016-03-11 Thread Caolán McNamara

 sw/source/core/view/pagepreviewlayout.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 4dbf1e6897453b998e3f5460612f871bb2eded63
Author: CaolÃ¡n McNamara 
Date:   Wed Mar 9 15:51:41 2016 +

Resolves: tdf#82781 avoid dereferencing invalid iterators

when using print preview with cursor on 2nd page which consists solely of
hidden text with show hiddle text enabled.

inner mrParentViewShell.Paint can invalidate iterators, as later
detected with the mbNewLayoutDuringPaint flag but we dereference
for the purposes of drawing the shadow before we get there.

easiest thing seems to be to just grab the bits of info we want before the
inner paint occurs.

Change-Id: I09c9b06449db440b7beba7de9e71c239ee64f6ca
(cherry picked from commit 4eb5f363ed9a3181a817f12d5ec49eede13b9c9c)
Reviewed-on: https://gerrit.libreoffice.org/23092
Tested-by: Jenkins 
Reviewed-by: BjÃ¶rn Michaelsen 

diff --git a/sw/source/core/view/pagepreviewlayout.cxx 
b/sw/source/core/view/pagepreviewlayout.cxx
index 05519c5..9994983 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1092,7 +1092,9 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect );
 if ( aPxOutRect.IsOver( aPxPaintRect) )
 {
-if ( (*aPageIter)->pPage->IsEmptyPage() )
+const SwPageFrame* pPage = (*aPageIter)->pPage;
+
+if (pPage->IsEmptyPage())
 {
 const Color aRetouche( 
mrParentViewShell.Imp()->GetRetoucheColor() );
 if( pOutputDev->GetFillColor() != aRetouche )
@@ -1120,16 +1122,20 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 }
 else
 {
+const bool bIsLeftShadowed = pPage->IsLeftShadowNeeded();
+const bool bIsRightShadowed = pPage->IsRightShadowNeeded();
+
 mrParentViewShell.maVisArea = aPageRect;
 aPxPaintRect.Intersection( aPxOutRect );
 Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect 
);
 mrParentViewShell.Paint(rRenderContext, aPaintRect);
+
 // --> OD 2007-08-15 #i80691#
 // paint page border and shadow
 {
 SwRect aPageBorderRect;
 SwPageFrame::GetBorderAndShadowBoundRect( SwRect( 
aPageRect ), &mrParentViewShell, &rRenderContext, aPageBorderRect,
-(*aPageIter)->pPage->IsLeftShadowNeeded(), 
(*aPageIter)->pPage->IsRightShadowNeeded(), true );
+bIsLeftShadowed, bIsRightShadowed, true );
 const vcl::Region aDLRegion(aPageBorderRect.SVRect());
 mrParentViewShell.DLPrePaint2(aDLRegion);
 SwPageFrame::PaintBorderAndShadow( aPageRect, 
&mrParentViewShell, true, false, true );
@@ -1144,11 +1150,10 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 break;
 }
 
-if ( (*aPageIter)->pPage->GetPhyPageNum() == mnSelectedPageNum )
+if (pPage->GetPhyPageNum() == mnSelectedPageNum)
 {
 _PaintSelectMarkAtPage(rRenderContext, *aPageIter);
 }
-
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: error in building libreoffice

2016-03-11 Thread Chris Sherlock

Or run:

make chart2.clean

Chris

> On 12 Mar 2016, at 5:40 AM, jan iversen  wrote:
> 
> Hi
> 
> This looks very much like a corrupted object file, I suspect you ran make 
> before and it terminated for some reason.
> 
> Try to run
> make clean
> and then
> make
> 
> rgds
> jan i.
> 
> 
>> On 11 Mar 2016, at 19:34, Sukant Kumar  wrote:
>> 
>> hi
>> i am trying to build libreoffice on ubuntu 15.10 
>> am getting this error .
>> how can i fix this
>> 
>> thanks
>> regards
>> sukant
>> 
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

2016-03-11 Thread Winfried Donkers

 sc/source/ui/docshell/docsh4.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 8dd5dbbb6ef27e7e5405e38761576a61f11a3b19
Author: Winfried Donkers 
Date:   Mon Feb 29 16:20:21 2016 +0100

tdf#97897 (first problem) fix for not recalculating on F9.

Set current formulacell to dirty to enforce recalculation.

Change-Id: Ie02b6a5ce7df57e6acca2fa3854cab883834af69
Reviewed-on: https://gerrit.libreoffice.org/22772
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 62b27d8..1332e29 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -98,6 +98,7 @@ using namespace ::com::sun::star;
 #include "sharedocdlg.hxx"
 #include "conditio.hxx"
 #include "sheetevents.hxx"
+#include "formulacell.hxx"
 #include 
 #include 
 
@@ -1205,9 +1206,9 @@ void ScDocShell::DoRecalc( bool bApi )
 {
 bool bDone = false;
 ScTabViewShell* pSh = GetBestViewShell();
+ScInputHandler* pHdl = ( pSh ? SC_MOD()->GetInputHdl( pSh ) : nullptr );
 if ( pSh )
 {
-ScInputHandler* pHdl = SC_MOD()->GetInputHdl(pSh);
 if ( pHdl && pHdl->IsInputMode() && pHdl->IsFormulaMode() && !bApi )
 {
 pHdl->FormulaPreview(); // Teilergebnis als QuickHelp
@@ -1222,6 +1223,13 @@ void ScDocShell::DoRecalc( bool bApi )
 if (!bDone) // sonst Dokument neu berechnen
 {
 WaitObject aWaitObj( GetActiveDialogParent() );
+if ( pHdl )
+{
+// tdf97897 set current cell to Dirty to force recalculation of 
cell
+ScFormulaCell* pFC = aDocument.GetFormulaCell( 
pHdl->GetCursorPos());
+if (pFC)
+pFC->SetDirty();
+}
 aDocument.CalcFormulaTree();
 if ( pSh )
 pSh->UpdateCharts(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/sdi sc/source svx/source

2016-03-11 Thread Dennis Francis

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |6 
 sc/inc/appoptio.hxx  |6 
 sc/sdi/scalc.sdi |2 
 sc/source/core/tool/appoptio.cxx |   47 +-
 sc/source/ui/app/scmod.cxx   |6 
 sc/source/ui/view/tabvwsha.cxx   |  115 ---
 svx/source/stbctrls/pszctrl.cxx  |   43 +++--
 7 files changed, 144 insertions(+), 81 deletions(-)

New commits:
commit 7bc97db5b972f27693161beb9182f8a5850f5551
Author: Dennis Francis 
Date:   Sat Oct 17 10:45:53 2015 +0530

tdf#42629 : Allow multiple status bar functions at a time

Change-Id: Ide9ced5ff4cedebd41a85814f74549648a896f16
Reviewed-on: https://gerrit.libreoffice.org/22060
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index e2006aa..69b3f5c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -395,6 +395,12 @@
 
   Contains other layout settings.
 
+
+  
+Selects a set of functions that are calculated for the 
selected cells, and which show the results in the status bar.
+Statusbar Functions
+  
+
 
   
   
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 8c01420..a3fc724 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -49,8 +49,8 @@ public:
 sal_uInt16* GetLRUFuncList() const  { return pLRUList;  }
 voidSetLRUFuncList( const sal_uInt16* pList,
 const sal_uInt16  nCount );
-voidSetStatusFunc( sal_uInt16 nNew ){ nStatusFunc = nNew;   }
-sal_uInt16  GetStatusFunc() const   { return nStatusFunc;   }
+voidSetStatusFunc( sal_uInt32 nNew ){ nStatusFunc = nNew;   }
+sal_uInt32  GetStatusFunc() const   { return nStatusFunc;   }
 voidSetAutoComplete( bool bNew ){ bAutoComplete = bNew; }
 boolGetAutoComplete() const { return bAutoComplete; }
 voidSetDetectiveAuto( bool bNew )   { bDetectiveAuto = bNew; }
@@ -87,7 +87,7 @@ private:
 SvxZoomType eZoomType;
 sal_uInt16  nZoom;
 boolbSynchronizeZoom;
-sal_uInt16  nStatusFunc;
+sal_uInt32  nStatusFunc;
 boolbAutoComplete;
 boolbDetectiveAuto;
 sal_uInt32  nTrackContentColor;
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 853bc79..60a4bac 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -5205,7 +5205,7 @@ SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD
 ]
 
 
-SfxUInt16Item StatusBarFunc SID_PSZ_FUNCTION
+SfxUInt32Item StatusBarFunc SID_PSZ_FUNCTION
 
 [
 AutoUpdate = FALSE,
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 3bdf429..cbc3c19 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -62,7 +62,7 @@ void ScAppOptions::SetDefaults()
 nZoom   = 100;
 eZoomType   = SvxZoomType::PERCENT;
 bSynchronizeZoom = true;
-nStatusFunc = SUBTOTAL_FUNC_SUM;
+nStatusFunc = ( 1 << SUBTOTAL_FUNC_SUM );
 bAutoComplete   = true;
 bDetectiveAuto  = true;
 
@@ -215,7 +215,8 @@ static void lcl_GetSortList( Any& rDest )
 #define SCLAYOUTOPT_ZOOMVAL 2
 #define SCLAYOUTOPT_ZOOMTYPE3
 #define SCLAYOUTOPT_SYNCZOOM4
-#define SCLAYOUTOPT_COUNT   5
+#define SCLAYOUTOPT_STATUSBARMULTI  5
+#define SCLAYOUTOPT_COUNT   6
 
 #define CFGPATH_INPUT   "Office.Calc/Input"
 
@@ -254,6 +255,16 @@ static void lcl_GetSortList( Any& rDest )
 #define SCCOMPATOPT_KEY_BINDING 0
 #define SCCOMPATOPT_COUNT   1
 
+static sal_uInt32 lcl_ConvertStatusBarFuncSetToSingle( sal_uInt32 nFuncSet )
+{
+if ( !nFuncSet )
+return 0;
+for ( sal_uInt32 nFunc = 1; nFunc < 32; ++nFunc )
+if ( nFuncSet & ( 1 << nFunc ) )
+return nFunc;
+return 0;
+}
+
 Sequence ScAppCfg::GetLayoutPropertyNames()
 {
 static const char* aPropNames[] =
@@ -262,7 +273,8 @@ Sequence ScAppCfg::GetLayoutPropertyNames()
 "Other/StatusbarFunction",  // SCLAYOUTOPT_STATUSBAR
 "Zoom/Value",   // SCLAYOUTOPT_ZOOMVAL
 "Zoom/Type",// SCLAYOUTOPT_ZOOMTYPE
-"Zoom/Synchronize"  // SCLAYOUTOPT_SYNCZOOM
+"Zoom/Synchronize", // SCLAYOUTOPT_SYNCZOOM
+"Other/StatusbarMultiFunction"  // SCLAYOUTOPT_STATUSBARMULTI
 };
 Sequence aNames(SCLAYOUTOPT_COUNT);
 OUString* pNames = aNames.getArray();
@@ -389,6 +401,8 @@ ScAppCfg::

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

2016-03-11 Thread Jan Holesovsky

 svx/source/table/tablecontroller.cxx |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 97c872d015350810fb0180ffdb10de7f039363a4
Author: Jan Holesovsky 
Date:   Fri Mar 11 20:45:02 2016 +0100

lok: Avoid dereferencing nullptr.

Change-Id: I40a53cf08e2a789299cd7a05d531b4f920653989

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 73e33df..afb4229 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -243,9 +243,17 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWindow
 return executeAction( nAction, rKEvt.GetKeyCode().IsShift(), pWindow );
 }
 
+namespace {
 
-// css::awt::XMouseClickHandler:
+Point pixelToLogic(const Point& rPoint, vcl::Window* pWindow)
+{
+if (!pWindow)
+return rPoint;
 
+return pWindow->PixelToLogic(rPoint);
+}
+
+}
 
 bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, 
vcl::Window* pWindow )
 {
@@ -266,7 +274,7 @@ bool SvxTableController::onMouseButtonDown(const 
MouseEvent& rMEvt, vcl::Window*
 if( !rMEvt.IsRight() && 
mpView->PickAnything(rMEvt,SdrMouseEventKind::BUTTONDOWN, aVEvt) == 
SDRHIT_HANDLE )
 return false;
 
-TableHitKind eHit = static_cast< SdrTableObj* 
>(mxTableObj.get())->CheckTableHit( pWindow->PixelToLogic(rMEvt.GetPosPixel()), 
maMouseDownPos.mnCol, maMouseDownPos.mnRow, 0 );
+TableHitKind eHit = static_cast< SdrTableObj* 
>(mxTableObj.get())->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), 
maMouseDownPos.mnCol, maMouseDownPos.mnRow, 0);
 
 mbLeftButtonDown = (rMEvt.GetClicks() == 1) && rMEvt.IsLeft();
 
@@ -284,11 +292,7 @@ bool SvxTableController::onMouseButtonDown(const 
MouseEvent& rMEvt, vcl::Window*
 {
 RemoveSelection();
 
-Point aPnt(rMEvt.GetPosPixel());
-if (pWindow!=nullptr)
-aPnt=pWindow->PixelToLogic(aPnt);
-
-SdrHdl* pHdl = mpView->PickHandle(aPnt);
+SdrHdl* pHdl = mpView->PickHandle(pixelToLogic(rMEvt.GetPosPixel(), 
pWindow));
 
 if( pHdl )
 {
@@ -352,7 +356,7 @@ bool SvxTableController::onMouseMove(const MouseEvent& 
rMEvt, vcl::Window* pWind
 
 SdrTableObj* pTableObj = dynamic_cast< SdrTableObj* >( mxTableObj.get() );
 CellPos aPos;
-if( mbLeftButtonDown && pTableObj && pTableObj->CheckTableHit( 
pWindow->PixelToLogic(rMEvt.GetPosPixel()), aPos.mnCol, aPos.mnRow, 0 ) != 
SDRTABLEHIT_NONE )
+if (mbLeftButtonDown && pTableObj && 
pTableObj->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), 
aPos.mnCol, aPos.mnRow, 0 ) != SDRTABLEHIT_NONE)
 {
 if(aPos != maMouseDownPos)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Jan Holesovsky

 svx/source/table/tablecontroller.cxx |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 8547c89c317dbfa3c4cbace8851c10573a7f21cd
Author: Jan Holesovsky 
Date:   Fri Mar 11 20:45:02 2016 +0100

lok: Avoid dereferencing nullptr.

Change-Id: I40a53cf08e2a789299cd7a05d531b4f920653989

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 64b40da..7a4462c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -244,9 +244,17 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWindow
 return executeAction( nAction, rKEvt.GetKeyCode().IsShift(), pWindow );
 }
 
+namespace {
 
-// ::com::sun::star::awt::XMouseClickHandler:
+Point pixelToLogic(const Point& rPoint, vcl::Window* pWindow)
+{
+if (!pWindow)
+return rPoint;
+
+return pWindow->PixelToLogic(rPoint);
+}
 
+}
 
 bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, 
vcl::Window* pWindow )
 {
@@ -267,7 +275,7 @@ bool SvxTableController::onMouseButtonDown(const 
MouseEvent& rMEvt, vcl::Window*
 if( !rMEvt.IsRight() && 
mpView->PickAnything(rMEvt,SdrMouseEventKind::BUTTONDOWN, aVEvt) == 
SDRHIT_HANDLE )
 return false;
 
-TableHitKind eHit = static_cast< SdrTableObj* 
>(mxTableObj.get())->CheckTableHit( pWindow->PixelToLogic(rMEvt.GetPosPixel()), 
maMouseDownPos.mnCol, maMouseDownPos.mnRow, 0 );
+TableHitKind eHit = static_cast< SdrTableObj* 
>(mxTableObj.get())->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), 
maMouseDownPos.mnCol, maMouseDownPos.mnRow, 0);
 
 mbLeftButtonDown = (rMEvt.GetClicks() == 1) && rMEvt.IsLeft();
 
@@ -285,11 +293,7 @@ bool SvxTableController::onMouseButtonDown(const 
MouseEvent& rMEvt, vcl::Window*
 {
 RemoveSelection();
 
-Point aPnt(rMEvt.GetPosPixel());
-if (pWindow!=NULL)
-aPnt=pWindow->PixelToLogic(aPnt);
-
-SdrHdl* pHdl = mpView->PickHandle(aPnt);
+SdrHdl* pHdl = mpView->PickHandle(pixelToLogic(rMEvt.GetPosPixel(), 
pWindow));
 
 if( pHdl )
 {
@@ -346,8 +350,6 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& 
rMEvt, vcl::Window* /
 return false;
 }
 
-
-
 bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* 
pWindow )
 {
 if( !checkTableObject() )
@@ -355,7 +357,7 @@ bool SvxTableController::onMouseMove(const MouseEvent& 
rMEvt, vcl::Window* pWind
 
 SdrTableObj* pTableObj = dynamic_cast< SdrTableObj* >( mxTableObj.get() );
 CellPos aPos;
-if( mbLeftButtonDown && pTableObj && pTableObj->CheckTableHit( 
pWindow->PixelToLogic(rMEvt.GetPosPixel()), aPos.mnCol, aPos.mnRow, 0 ) != 
SDRTABLEHIT_NONE )
+if (mbLeftButtonDown && pTableObj && 
pTableObj->CheckTableHit(pixelToLogic(rMEvt.GetPosPixel(), pWindow), 
aPos.mnCol, aPos.mnRow, 0 ) != SDRTABLEHIT_NONE)
 {
 if(aPos != maMouseDownPos)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Mayank Gupta license statement

2016-03-11 Thread Mayank Gupta

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: error in building libreoffice

2016-03-11 Thread jan iversen

Hi

This looks very much like a corrupted object file, I suspect you ran make 
before and it terminated for some reason.

Try to run
make clean
and then
make

rgds
jan i.


> On 11 Mar 2016, at 19:34, Sukant Kumar  wrote:
> 
> hi
> i am trying to build libreoffice on ubuntu 15.10 
> am getting this error .
> how can i fix this
> 
> thanks
> regards
> sukant
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Pratishta Sharma license statement

2016-03-11 Thread Pratishta Sharma

All of my past and future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-03-11 Thread Miklos Vajna

 source/text/shared/01/selectcertificate.xhp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f0301528ebc8a907be01e9435bb43b8d2b9449e0
Author: Miklos Vajna 
Date:   Fri Mar 11 18:07:00 2016 +0100

selectcertificate: add help content for the description

Change-Id: Ie93709cbebcf11866cded6958c14375028910944

diff --git a/source/text/shared/01/selectcertificate.xhp 
b/source/text/shared/01/selectcertificate.xhp
index d12d894..5d139f5 100644
--- a/source/text/shared/01/selectcertificate.xhp
+++ b/source/text/shared/01/selectcertificate.xhp
@@ -40,5 +40,8 @@
 
 View Certificate
 Opens the View Certificate dialog 
where you can examine the selected certificate.
+
+Description
+Type a purpose for the signature.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-03-11 Thread Miklos Vajna

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

New commits:
commit c86a4d6b077af0841c600e9705340aa92b81d92c
Author: Miklos Vajna 
Date:   Fri Mar 11 18:07:00 2016 +0100

Updated core
Project: help  f0301528ebc8a907be01e9435bb43b8d2b9449e0

selectcertificate: add help content for the description

Change-Id: Ie93709cbebcf11866cded6958c14375028910944

diff --git a/helpcontent2 b/helpcontent2
index c8c8643..f030152 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8c86435d40ad2ec5b0e1c5f6bdb9888445d13ab
+Subproject commit f0301528ebc8a907be01e9435bb43b8d2b9449e0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes18' - sw/source

2016-03-11 Thread László Németh

 sw/source/core/txtnode/txtedt.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 0965dc4c8e96b7bc6de49bdab7b55fef5f099e21
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Fri Mar 11 18:05:34 2016 +0100

Revert "test autocompletion word collection"

This reverts commit 6314d1eac6b0c622a6414c96d74a6dc3d5b19a33.

diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index fd912a5..5064e00 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1556,10 +1556,6 @@ SwRect SwTextFrame::SmartTagScan( SwContentNode* 
/*pActNode*/, sal_Int32 /*nActP
 return aRet;
 }
 
-#if 1
-void SwTextFrame::CollectAutoCmplWrds( SwContentNode* , sal_Int32  )
-{}
-#else
 // Wird vom CollectAutoCmplWords gerufen
 void SwTextFrame::CollectAutoCmplWrds( SwContentNode* pActNode, sal_Int32 
nActPos )
 {
@@ -1609,7 +1605,7 @@ void SwTextFrame::CollectAutoCmplWrds( SwContentNode* 
pActNode, sal_Int32 nActPo
 if (!bACWDirty)
 pNode->SetAutoCompleteWordDirty( false );
 }
-#endif
+
 /** Findet den TextFrame und sucht dessen CalcHyph */
 bool SwTextNode::Hyphenate( SwInterHyphInfo &rHyphInf )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2016-03-11 Thread Norbert Thiebaud

On Fri, Mar 11, 2016 at 1:29 AM, David Ostrovsky  wrote:
>
> I've just approved this change: [1] and after confirmtaion from Norbert
> that our CI infra was extended to support MSVC 2015, I will merge it.

in another related thread vmiklos pointed to a residual problem with
32 bits on vs2015 only setup.
something about missing dotnet stuff it seems... I'm not sure.. but
that is prolly something
that need explaining/addressing before we switch...

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

[Libreoffice-commits] core.git: Branch 'private/tml/fixwintext' - vcl/win

2016-03-11 Thread Tor Lillqvist

 vcl/win/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3cc72625da8429b342be2e827604ea65962fcd2e
Author: Tor Lillqvist 
Date:   Fri Mar 11 18:58:02 2016 +0200

Further tweak, getting much closer to correct

Change-Id: I57ada8873b24a911b9f24ca268f876193ebe25ed

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 0881521..8ae8926 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -540,7 +540,7 @@ bool WinFontInstance::AddChunkOfGlyphs(bool 
bRealGlyphIndices, int nGlyphIndex,
 return false;
 }
 
-D2D1_POINT_2F baseline = { nX, nY + aChunk.mnAscent - bounds.Top() };
+D2D1_POINT_2F baseline = { nX, nY - bounds.Top() };
 DWRITE_GLYPH_RUN glyphs = {
 pTxt->GetFontFace(),
 pTxt->GetEmHeight(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - xmlsecurity/Library_xmlsecurity.mk xmlsecurity/qa xmlsecurity/source

2016-03-11 Thread Miklos Vajna

 xmlsecurity/Library_xmlsecurity.mk |1 
 xmlsecurity/qa/unit/signing/data/bad.odt   |binary
 xmlsecurity/qa/unit/signing/data/good.odt  |binary
 xmlsecurity/qa/unit/signing/signing.cxx|   34 +
 xmlsecurity/source/helper/ooxmlsecexporter.cxx |  504 +
 xmlsecurity/source/helper/ooxmlsecexporter.hxx |   37 +
 xmlsecurity/source/helper/xsecctl.cxx  |  365 --
 7 files changed, 579 insertions(+), 362 deletions(-)

New commits:
commit 27fc89cce931039f8f585c10b8ee41023c777b5e
Author: Miklos Vajna 
Date:   Fri Mar 11 17:09:02 2016 +0100

xmlsecurity: extract OOXML export code into its own class

It was odd that import code had its own OOXMLSecParser, but export code
was buried in the controller.

Change-Id: Ie1964bf9c54a8b779981e8d72bf4810090cf960c

diff --git a/xmlsecurity/Library_xmlsecurity.mk 
b/xmlsecurity/Library_xmlsecurity.mk
index c594ec9..1997010 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\
xmlsecurity/source/helper/documentsignaturehelper \
xmlsecurity/source/helper/documentsignaturemanager \
xmlsecurity/source/helper/ooxmlsecparser \
+   xmlsecurity/source/helper/ooxmlsecexporter \
xmlsecurity/source/helper/xmlsignaturehelper2 \
xmlsecurity/source/helper/xmlsignaturehelper \
xmlsecurity/source/helper/xsecctl \
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx 
b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
new file mode 100644
index 000..d88d542
--- /dev/null
+++ b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
@@ -0,0 +1,504 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "ooxmlsecexporter.hxx"
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+using namespace com::sun::star;
+
+struct OOXMLSecExporter::Impl
+{
+const uno::Reference& m_xComponentContext;
+const uno::Reference& m_xRootStorage;
+const uno::Reference& m_xDocumentHandler;
+const SignatureInformation& m_rInformation;
+OUString m_aSignatureTimeValue;
+
+Impl(const uno::Reference& xComponentContext,
+ const uno::Reference& xRootStorage,
+ const uno::Reference& xDocumentHandler,
+ const SignatureInformation& rInformation)
+: m_xComponentContext(xComponentContext)
+, m_xRootStorage(xRootStorage)
+, m_xDocumentHandler(xDocumentHandler)
+, m_rInformation(rInformation)
+{
+}
+
+/// Should we intentionally not sign this stream?
+static bool isOOXMLBlacklist(const OUString& rStreamName);
+/// Should we intentionally not sign this relation type?
+static bool isOOXMLRelationBlacklist(const OUString& rRelationName);
+
+void writeSignedInfo();
+void writeCanonicalizationMethod();
+void writeCanonicalizationTransform();
+void writeDigestMethod();
+void writeSignatureMethod();
+void writeSignedInfoReferences();
+void writeSignatureValue();
+void writeKeyInfo();
+void writePackageObject();
+void writeManifest();
+void writeRelationshipTransform(const OUString& rURI);
+/// Writes  inside idPackageObject.
+void writePackageObjectSignatureProperties();
+/// Writes a single  inside .
+void writeManifestReference(const SignatureReferenceInformation& 
rReference);
+void writeOfficeObject();
+/// Writes .
+void writeSignatureInfo();
+void writePackageSignature();
+void writeSignedProperties();
+};
+
+bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName)
+{
+#if !HAVE_BROKEN_STATIC_INITILIZER_LIST
+static
+#endif
+const std::initializer_list vBlacklist =
+{
+OUStringLiteral("/%5BContent_Types%5D.xml"),
+OUStringLiteral("/docProps/app.xml"),
+OUStringLiteral("/docProps/core.xml"),
+// Don't attempt to sign other signatures for now.
+OUStringLiteral("/_xmlsignatures")
+};
+// Just check the prefix, as we don't care about the content type part of 
the stream name.
+return std::find_if(vBlacklist.begin(), vBlacklist.end(), [&](const 
OUStringLiteral& rLiteral)
+{
+return rStreamName.startsWith(rLiteral);
+}) != vBlacklist.end();
+}
+
+bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& 
rRelationName)
+{
+#if !HAVE_BROKEN_STATIC_INITILIZER_LIST
+static
+#endif
+const std::initializer_list vBlacklist =
+{
+
OUStringLiteral("http://schemas.openxmlformats.org/officeDocument/2

[Libreoffice-commits] core.git: Branch 'private/tml/fixwintext' - vcl/win

2016-03-11 Thread Tim Eves

 vcl/win/gdi/winlayout.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 89a274d9e8bcba123b769fe018ff58695705427b
Author: Tim Eves 
Date:   Fri Mar 11 22:49:05 2016 +0700

Fix several miscalulations in positioning glyph to be rendered into that 
Atlas

Change-Id: Ife4c6f9057389c0f96801a99ccc14eb14d75bdfe

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 134be9f..0881521 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -497,7 +497,7 @@ bool WinFontInstance::AddChunkOfGlyphs(bool 
bRealGlyphIndices, int nGlyphIndex,
 nBitmapHeight = bounds.GetHeight() + aChunk.getExtraSpace();
 
 aChunk.maLocation.resize(nCount);
-UINT nPos = 0;
+UINT nPos = aChunk.getExtraOffset();
 for (int i = 0; i < nCount; i++)
 {
 // FIXME: really I don't get why 'vertical' makes any difference [!] 
what does it mean !?
@@ -528,14 +528,9 @@ bool WinFontInstance::AddChunkOfGlyphs(bool 
bRealGlyphIndices, int nGlyphIndex,
 aDC.fill(MAKE_SALCOLOR(0xff, 0xff, 0xff));
 
 int nY = aChunk.getExtraOffset();
-int nX = nY;
-if (aChunk.mbVertical)
-nX += aGlyphAdv[0];
-else
-nX -= bounds.Left();
+int nX = aChunk.getExtraOffset();
 
-bounds.Move(-bounds.Left(), -bounds.Top());
-pTxt->BindDC(aDC.getCompatibleHDC(), bounds);
+pTxt->BindDC(aDC.getCompatibleHDC(), Rectangle(0, 0, nBitmapWidth, 
nBitmapHeight));
 auto pRT = pTxt->GetRenderTarget();
 
 ID2D1SolidColorBrush* pBrush = nullptr;
@@ -545,7 +540,7 @@ bool WinFontInstance::AddChunkOfGlyphs(bool 
bRealGlyphIndices, int nGlyphIndex,
 return false;
 }
 
-D2D1_POINT_2F baseline = { 0.0f, bounds.Bottom() - nY };
+D2D1_POINT_2F baseline = { nX, nY + aChunk.mnAscent - bounds.Top() };
 DWRITE_GLYPH_RUN glyphs = {
 pTxt->GetFontFace(),
 pTxt->GetEmHeight(),
@@ -557,7 +552,6 @@ bool WinFontInstance::AddChunkOfGlyphs(bool 
bRealGlyphIndices, int nGlyphIndex,
 0
 };
 
-
 pRT->BeginDraw();
 pRT->DrawGlyphRun(baseline, &glyphs, pBrush);
 HRESULT hr = pRT->EndDraw();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Jan Holesovsky

 loleaflet/src/core/Socket.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ca4f44099f3a58bd10a72fc650182349249e25dd
Author: Jan Holesovsky 
Date:   Fri Mar 11 17:18:26 2016 +0100

Revert "loleaflet: pass doc URI to WebSocket"

With this, no document loads.

This reverts commit 081ca0aa9f7a8af0833f5ec04f4169dcb85b4a7b.

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 3a0f61a..d1d5ad9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -9,7 +9,7 @@ L.Socket = L.Class.extend({
initialize: function (map) {
this._map = map;
try {
-   this.socket = new WebSocket(map.options.server + 
map.options.doc);
+   this.socket = new WebSocket(map.options.server);
} catch (e) {
this.fire('error', {msg: _('Socket connection error'), 
cmd: 'socket', kind: 'failed', id: 3});
return null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/tml/fixwintext'

2016-03-11 Thread Tor Lillqvist

New branch 'private/tml/fixwintext' available with the following commits:
commit d97a7ebc962c19b26e83262e097bd5c97c2a7eb3
Author: Tor Lillqvist 
Date:   Fri Mar 11 18:06:31 2016 +0200

Temporary tweak of glyph vertical positioning

Change-Id: I2a6afca473e36e240f8d2b3f7da3447be20e2294

commit e4bafd2f482d818937936c4e40be8af86b5d2b89
Author: Tor Lillqvist 
Date:   Fri Mar 11 17:25:00 2016 +0200

Mark the mnAscent in the chunk bitmap debug output

Change-Id: Ibf8077b9ffe34443858990eb699c0ed2129bd39e

commit f0b4025ca94ff0ab8a501496f8a1c9fb9f286d20
Author: Tor Lillqvist 
Date:   Fri Mar 11 15:07:50 2016 +0200

Passing a string to a std::ostringstream ctor is tricky

Change-Id: If520c98cbd4d3913b644c2137623c2b7e9c5c708

commit 1568c4a37f5863a442b255f9fe53666f49935bba
Author: Tim Eves 
Date:   Fri Mar 11 18:50:25 2016 +0700

Try calculating a chunks ascent & height from the inkboxes

Rather than using the font metrics which might not alway be correct
when glyphs inkboxes are tall than the ascent or lower than the descent.

Change-Id: I9811acafd9619c2223f3ead934d5a06aed6a7baf

commit 7bc54e59fb6afe3d59938be6ac8cbb2d346e6ec5
Author: Tim Eves 
Date:   Fri Mar 11 18:31:02 2016 +0700

Handle the non-real glyph case for AddChunkOfGlyphs

Convert UTF16 to UTF32 and turn codepoints into glyph indices with
DWrite.

Change-Id: I79c6e534e8e99416fc2c5a75c49e7c0a983954bb

commit 441cecb82d79cda21d325ebba7a6eb1ddda7598b
Author: Tor Lillqvist 
Date:   Fri Mar 11 12:55:34 2016 +0200

Use better baseline

Now glyphs show up at the right position. Not the correct glyphs, but
that is a different problem.

Change-Id: I21370d18189e761b223a4a4e78d849fb0180b1e3

commit cf69f6630ce63adc11fab387a4bc916ff4b7402c
Author: Tor Lillqvist 
Date:   Fri Mar 11 12:49:03 2016 +0200

I assume we want to initialise the rectangle with zero left/right/top/bottom

... and not using the default constructor, which sets the right and
bottom coordinates to the magic value -32767. That made the 'bound'
rectangle end up with rather amusing boundaries, like left=-32766,
top=-16, right=-32576, bottom=6.

Change-Id: I46b99b757b6a4f8129f3b2ca43b193e99a54c532

commit b1110d527b26993e03fe6e49b0daa00e89f5ab4a
Author: Tor Lillqvist 
Date:   Fri Mar 11 10:50:48 2016 +0200

Don't treat success as an error

Change-Id: I9e24d6118dad8fa3dceb0a6f80cf76af668064bd

commit 886a7afccc8a3f0533a76b19478c8defbd0a95a4
Author: Tim Eves 
Date:   Fri Mar 11 04:23:37 2016 +0700

Refactor D2DWriteTextOutRenderer and apply to rendering GlyphAtlas

Refactor some previously private methods into public ones and
reimplement parts of D2DWriteTextOutRenderer to user them. Also
apply them to rendering the OpenGL glyph atlas, in an effort to
workaround some bugs in legacy Windows text rendering APIs.

Change-Id: I99b2a18537014c81a54575573ea5468223c0829f

commit 3163bd9a12a8037eaadb5b7449523e06772f2c0f
Author: Michael Meeks 
Date:   Tue Feb 23 16:45:21 2016 +

Starting to render horizontal text apparently correctly ...

Change-Id: I6bf049bf56bc971824c9591ccd23e437b9b268b3

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

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

2016-03-11 Thread Stephan Bergmann

 desktop/source/app/app.cxx |8 +--
 desktop/source/app/dispatchwatcher.cxx |7 ---
 desktop/source/app/dispatchwatcher.hxx |7 ---
 desktop/source/app/officeipcthread.cxx |   67 +++--
 desktop/source/app/officeipcthread.hxx |   14 +++---
 5 files changed, 45 insertions(+), 58 deletions(-)

New commits:
commit 69bb5e849825e32d9fe929519813ede56ca76997
Author: Stephan Bergmann 
Date:   Fri Mar 11 16:10:21 2016 +0100

Thread safety

Change-Id: I13282ac1d6b3f1323e9056a4160301bd503ac271

diff --git a/desktop/source/app/officeipcthread.cxx 
b/desktop/source/app/officeipcthread.cxx
index 5662823..6bf4dc5 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -666,6 +666,7 @@ OfficeIPCThread::~OfficeIPCThread()
 
 void OfficeIPCThread::SetReady()
 {
+osl::MutexGuard g(GetMutex());
 if (pGlobalOfficeIPCThread.is())
 {
 pGlobalOfficeIPCThread->cReady.set();
@@ -674,7 +675,11 @@ void OfficeIPCThread::SetReady()
 
 void OfficeIPCThread::WaitForReady()
 {
-rtl::Reference< OfficeIPCThread > const & t(pGlobalOfficeIPCThread);
+rtl::Reference t;
+{
+osl::MutexGuard g(GetMutex());
+t =  pGlobalOfficeIPCThread;
+}
 if (t.is())
 {
 t->cReady.wait();
@@ -683,6 +688,7 @@ void OfficeIPCThread::WaitForReady()
 
 bool OfficeIPCThread::IsEnabled()
 {
+osl::MutexGuard g(GetMutex());
 return pGlobalOfficeIPCThread.is();
 }
 
commit 8db7c0de57d3c5129236fc6cfc37e93cfb75e49f
Author: Stephan Bergmann 
Date:   Fri Mar 11 16:08:05 2016 +0100

No need for a complicated arg to SetReady

Change-Id: Iacb900ab7de0f01a78441019d2455abacc974617

diff --git a/desktop/source/app/officeipcthread.cxx 
b/desktop/source/app/officeipcthread.cxx
index 6c94f62..5662823 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -638,7 +638,7 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
 // release mutex to avoid deadlocks
 aMutex.clear();
 
-OfficeIPCThread::SetReady(pOfficeIPCThread);
+pOfficeIPCThread->cReady.set();
 
 // exit gracefully and join
 if (join)
@@ -664,14 +664,11 @@ OfficeIPCThread::~OfficeIPCThread()
 pGlobalOfficeIPCThread.clear();
 }
 
-void OfficeIPCThread::SetReady(
-rtl::Reference< OfficeIPCThread > const & pThread)
+void OfficeIPCThread::SetReady()
 {
-rtl::Reference< OfficeIPCThread > const & t(
-pThread.is() ? pThread : pGlobalOfficeIPCThread);
-if (t.is())
+if (pGlobalOfficeIPCThread.is())
 {
-t->cReady.set();
+pGlobalOfficeIPCThread->cReady.set();
 }
 }
 
diff --git a/desktop/source/app/officeipcthread.hxx 
b/desktop/source/app/officeipcthread.hxx
index 1319d39..919ec44 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -117,9 +117,7 @@ class OfficeIPCThread : public salhelper::Thread
 static Status   EnableOfficeIPCThread();
 static void DisableOfficeIPCThread(bool join = true);
 // start dispatching events...
-static void SetReady(
-rtl::Reference< OfficeIPCThread > const & pThread =
-rtl::Reference< OfficeIPCThread >());
+static void SetReady();
 static void WaitForReady();
 static bool IsEnabled();
 
commit 34eb5546a1f8824c275337644d6db1c344e596fc
Author: Stephan Bergmann 
Date:   Fri Mar 11 15:47:18 2016 +0100

Turn static s_bInEnableRequests into an ExecuteCmdLineRequests arg

Change-Id: Idb0b252d986bc866409928f4a126f55608c6347c

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index a7d97de..3166b34 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2407,7 +2407,7 @@ void Desktop::OpenClients()
 }
 
 // Process request
-if ( OfficeIPCThread::ExecuteCmdLineRequests( aRequest ) )
+if ( OfficeIPCThread::ExecuteCmdLineRequests(aRequest, false) )
 {
 // Don't do anything if we have successfully called terminate at 
desktop:
 return;
@@ -2481,7 +2481,7 @@ void Desktop::OpenDefault()
 
 ProcessDocumentsRequest aRequest(rArgs.getCwdUrl());
 aRequest.aOpenList.push_back(aName);
-OfficeIPCThread::ExecuteCmdLineRequests( aRequest );
+OfficeIPCThread::ExecuteCmdLineRequests(aRequest, false);
 }
 
 
@@ -2604,7 +2604,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& 
rAppEvent )
 std::vector const & data(rAppEvent.GetStringsData());
 docsRequest.aOpenList.insert(
 docsRequest.aOpenList.end(), data.begin(), data.end());
-OfficeIPCThread::ExecuteCmdLineRequests(docsRequest);
+OfficeIPCThread::ExecuteCmdLineRequests(docsRequest, false);
 }
 }
 break;
@@ -2621

Re: alternatives to Firebird: sqlite [was: Firebird doesn't support MSVC 2015]

2016-03-11 Thread Anthonys Lists


On 11/03/2016 01:45, toki wrote:

On 10/03/2016 01:27, Wols Lists wrote:


On top of that, an integrity layer that enforces datatypes. This isn't part of 
standard multi-value,

What?  Back when I played with Pick, one of the selling points was that
one couldn't put the wrong type of data into a record field. Was that
feature simply a vendor provided customization?


OMG... Yes it must have been.

ED FILE RECORD
scribble scribble scribble
FI

Bingo, one record with all sorts of data all over the place with no 
validity checking whatsoever. Bear in mind that in relational, the 
schema is PREscriptive, defining what data goes where. In Pick, the 
DICTionary is DEscriptive, telling you what's supposed to go where - 
indeed it is so non-prescriptive that it's optional!


If you used one of the generators, such as &PACE or System Builder, they 
probably did use the dictionary as a schema, and would have enforced 
integrity. I want to put a layer at the WRITE level that, if enabled, 
enforces the DICTionary as a schema - it shouldn't be that hard.



I'll then need a Basic compiler.

Does it have to be BASIC?
Can't R or Python be used instead of BASIC?

###

I realize that using R means either including another scripting
language, or upgrading the existing R Language extension so that it
installs a version of R that plays nicely within LibreOffice.


One of the problems with "play nicely with Pick" is that Pick is p-code 
based, and that p-code gets embedded in the data files ... so I need 
something where I can embed the object code, as data, in the DICTionary. 
(For the relational guys, these are "calculated fields", Pick "stores a 
mini program in the column definition of the schema" which then 
calculates the value of that column.)


But that's one of the reasons for wanting to play nice with / integrate 
with StarBasic - it makes it easy to spit out a .odf from the database. 
That's one up on Crystal Reports :-)

I know Pick isn't the easiest of topics to Google for, but some links for 
reading ...

Talking about which, Given how poor the documentation for BASE is, do
you know anybody who would be willing and able to write documentation on
using PICK within LibreOffice. (FWIW, Even a developers outline on what
it should do, would be a good starting point for users.)
That's actually one of my strong points - not necessarily knowing what's 
required but I'm very good at explaining to users AT THEIR LEVEL what 
they need to know. If I can see where they're struggling, I can explain 
it to them in terms they can understand.


For example, the way I can best describe Pick (to someone who has some 
degree of database knowledge) is to say that just as the row is the 
basic unit in relational, so the RECORD is the basic unit in Pick. The 
RECORD maps to a real world object and, in relational terms, should be a 
3nf view of that object. Because that 3nf view includes foreign keys, I 
can then access other objects/RECORDs via a "directed graph" type 
mechanism, rather than a relational join. This may have pros and cons, 
but a massive pro is speed. And because you're thinking at the object 
level, it doesn't really make sense to have a relational style "record 
set". Instead, think of stepping through your 3nf objects using a cursor 
size of one.


Hopefully that'll showcase my explanational skills, and give you an idea 
as to how Pick functions, though if you've played with it I guess you've 
already got some idea :-)


Unfortunately, I don't know of any truly Free Software implementation I 
could recommend to go with LO. The only plausible candidate is OpenQM / 
ScarletDME, which is *allegedly* GPL'd. Note the stress on "allegedly" 
:-( MaVerick, which has been mentioned elsewhere, I think just ran out 
of steam (and it's Java-based - a victim of "let's rewrite everything in 
Java" imho).



And can I write a version of Pick that comes over as a bright shiny new 
bauble? I don't know, but I can damn well give it the good old college try!



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


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

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk

2016-03-11 Thread Michael Meeks

 instsetoo_native/CustomTarget_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a9095570a2430568f5c5e1c91edd6a717e099a6
Author: Michael Meeks 
Date:   Fri Mar 11 09:48:21 2016 +

User-Agent: disable reporting of languages.

Nowadays we have them all, so it is big, non-useful data.

Change-Id: Ia08b863852e6a0916f30e2ecdc14eea4fafe2ab0
Reviewed-on: https://gerrit.libreoffice.org/23143
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index e4cdd53..a8d56a3 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -143,7 +143,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ReferenceOOoMajorMinor=4.1' \
&& echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
&& echo 'UpdateURL=$(if 
$(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if 
$(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
-   && echo 'UpdateUserAgent= ($${buildid}; $${_OS}; 
$${_ARCH}; BundledLanguages=$${AllLanguages})' \
+   && echo 'UpdateUserAgent= ($${buildid}; $${_OS}; 
$${_ARCH}; )' \
&& echo 'Vendor=$(OOO_VENDOR)' \
) > $@
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Pranav Kant

 loleaflet/src/map/handler/Map.BoxZoom.js |8 
 1 file changed, 8 deletions(-)

New commits:
commit aa806f0ec3028494fa87b1fb698009d1dad46458
Author: Pranav Kant 
Date:   Fri Mar 11 11:56:46 2016 +0530

ccu#1329: This is not a map, this is libreoffice

... so by selecting and dragging the mouse we do not intend to
look closer what is there, which is an expected behavior for
maps, but doesn't fit well for us.

Change-Id: Ib7e838038fff9310e40912f251cb89c7eb0baaee

diff --git a/loleaflet/src/map/handler/Map.BoxZoom.js 
b/loleaflet/src/map/handler/Map.BoxZoom.js
index d94478b..9b4093e 100644
--- a/loleaflet/src/map/handler/Map.BoxZoom.js
+++ b/loleaflet/src/map/handler/Map.BoxZoom.js
@@ -88,14 +88,6 @@ L.Map.BoxZoom = L.Handler.extend({
this._finish();
 
if (!this._moved) { return; }
-
-   var bounds = new L.LatLngBounds(
-   this._map.containerPointToLatLng(this._startPoint),
-   this._map.containerPointToLatLng(this._point));
-
-   this._map
-   .fitBounds(bounds)
-   .fire('boxzoomend', {boxZoomBounds: bounds});
},
 
_onKeyDown: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/zip_help.sh

2016-03-11 Thread Yousuf Philips

 helpers/zip_help.sh |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit c8c86435d40ad2ec5b0e1c5f6bdb9888445d13ab
Author: Yousuf Philips 
Date:   Mon Mar 7 02:43:50 2016 +0400

Helper file to package the help so it can be viewed in help viewer

Change-Id: I419d7ac89953e969d271f1ef2d82d091cd1b079c
Reviewed-on: https://gerrit.libreoffice.org/22962
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/helpers/zip_help.sh b/helpers/zip_help.sh
new file mode 100755
index 000..9245491
--- /dev/null
+++ b/helpers/zip_help.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# This script zips the various help files and moves them into the help folder 
so they can be properly tested in the help viewer
+
+cd ../source/
+zip -r sbasic.jar text/sbasic/
+zip -r scalc.jar text/scalc/
+zip -r schart.jar text/schart/
+zip -r sdraw.jar text/sdraw/
+zip -r shared.jar text/shared/
+zip -r simpress.jar text/simpress/
+zip -r smath.jar text/smath/
+zip -r swriter.jar text/swriter/
+
+# default location of help files for libreoffice on ubuntu
+# uncomment this and change the location accordingly
+#sudo mv -f *.jar /usr/share/libreoffice/help/en-US/
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-03-11 Thread Yousuf Philips

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

New commits:
commit fb3d0279d5c565d2f89ceb0d951b6fad2206c4e9
Author: Yousuf Philips 
Date:   Mon Mar 7 02:43:50 2016 +0400

Updated core
Project: help  c8c86435d40ad2ec5b0e1c5f6bdb9888445d13ab

Helper file to package the help so it can be viewed in help viewer

Change-Id: I419d7ac89953e969d271f1ef2d82d091cd1b079c
Reviewed-on: https://gerrit.libreoffice.org/22962
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/helpcontent2 b/helpcontent2
index 581ea6a..c8c8643 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 581ea6ad44ece0d44bb062d824b3ee165bc57f20
+Subproject commit c8c86435d40ad2ec5b0e1c5f6bdb9888445d13ab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Rohan Kumar

 sot/source/sdstor/ucbstorage.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 004c233d30a432ba4e8e4c0d0052d34798850bd4
Author: Rohan Kumar 
Date:   Wed Mar 9 16:07:44 2016 +0530

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I removed OSL_DEBUG_LEVEL > 1 conditionals and replaced them with
OSL_DEBUG_LEVEL > 0 as suggested in easy hack

Change-Id: I6495bf203365356e0969a057f5238c2343931d2b
Reviewed-on: https://gerrit.libreoffice.org/23061
Tested-by: Jenkins 
Reviewed-by: BjÃ¶rn Michaelsen 

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 3b69a4b..d3b53a7 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -74,8 +74,7 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::sdbc;
 using namespace ::ucbhelper;
 
-#if OSL_DEBUG_LEVEL > 1
-#include 
+#if OSL_DEBUG_LEVEL > 0
 static int nOpenFiles=0;
 static int nOpenStreams=0;
 #endif
@@ -120,7 +119,7 @@ FileStreamWrapper_Impl::~FileStreamWrapper_Impl()
 if ( m_pSvStream )
 {
 delete m_pSvStream;
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 --nOpenFiles;
 #endif
 }
@@ -225,7 +224,7 @@ void SAL_CALL FileStreamWrapper_Impl::closeInput() throw( 
NotConnectedException,
 ::osl::MutexGuard aGuard( m_aMutex );
 checkConnected();
 DELETEZ( m_pSvStream );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 --nOpenFiles;
 #endif
 ::utl::UCBContentHelper::Kill( m_aURL );
@@ -288,7 +287,7 @@ void FileStreamWrapper_Impl::checkConnected()
 if ( !m_pSvStream )
 {
 m_pSvStream = ::utl::UcbStreamHelper::CreateStream( m_aURL, 
STREAM_STD_READ );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 ++nOpenFiles;
 #endif
 }
@@ -729,7 +728,7 @@ bool UCBStorageStream_Impl::Init()
 m_aTempURL = ::utl::TempFile().GetURL();
 
 m_pStream = ::utl::UcbStreamHelper::CreateStream( m_aTempURL, 
STREAM_STD_READWRITE, true /* bFileExists */ );
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 ++nOpenFiles;
 #endif
 
@@ -1206,7 +1205,7 @@ bool UCBStorageStream_Impl::Clear()
 
 void UCBStorageStream_Impl::Free()
 {
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 if ( m_pStream )
 {
 if ( !m_aTempURL.isEmpty() )
@@ -2253,9 +2252,9 @@ sal_Int16 UCBStorage_Impl::Commit()
 }
 else
 {
-#if OSL_DEBUG_LEVEL > 1
-fprintf ( stderr, "Files: %i\n", nOpenFiles );
-fprintf ( stderr, "Streams: %i\n", nOpenStreams );
+#if OSL_DEBUG_LEVEL > 0
+SAL_INFO("sot", "Files: " << nOpenFiles);
+SAL_INFO("sot", "Streams: " << nOpenStreams);
 #endif
 // force writing
 Any aAny;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Rohan Kumar

 cpputools/source/unoexe/unoexe.cxx |   24 +++-
 include/sal/log-areas.dox  |5 +
 2 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit 2e0c1e03e85ef6a20ca362f263c60b141741f698
Author: Rohan Kumar 
Date:   Fri Mar 11 18:25:32 2016 +0530

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I replaced OSL_DEBUG_LEVEL > 1 with OSL_DEBUG_LEVEL > 0
and made sure that it doesn't break the build

Change-Id: I9febeed949a24d7bc5afb13dedde03fd812b5b20
Reviewed-on: https://gerrit.libreoffice.org/23077
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git a/cpputools/source/unoexe/unoexe.cxx 
b/cpputools/source/unoexe/unoexe.cxx
index 806e7a1..a8ddbdf 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -109,13 +109,7 @@ static bool readOption( OUString * pValue, const sal_Char 
* pOpt,
 }
 else
 {
-#if OSL_DEBUG_LEVEL > 1
-out( "\n> identified option -" );
-out( pOpt );
-out( " = " );
-OString tmp = OUStringToOString(aArg, RTL_TEXTENCODING_ASCII_US);
-  out( tmp.getStr() );
-#endif
+SAL_INFO("cpputools.unoexe", "> identified option -" << pOpt << " 
= " << aArg);
 ++(*pnIndex);
 return true;
 }
@@ -123,13 +117,7 @@ static bool readOption( OUString * pValue, const sal_Char 
* pOpt,
   else if (aArg.indexOf(aOpt) == 1)
 {
 *pValue = aArg.copy(1 + aOpt.getLength());
-#if OSL_DEBUG_LEVEL > 1
-out( "\n> identified option -" );
-out( pOpt );
-out( " = " );
-OString tmp = OUStringToOString(aArg.copy(aOpt.getLength()), 
RTL_TEXTENCODING_ASCII_US);
-out( tmp.getStr() );
-#endif
+SAL_INFO("cpputools.unoexe", "> identified option -" << pOpt << " = " 
<< aArg);
 ++(*pnIndex);
 
 return true;
@@ -146,10 +134,7 @@ static bool readOption( bool * pbOpt, const sal_Char * 
pOpt,
 {
 ++(*pnIndex);
 *pbOpt = true;
-#if OSL_DEBUG_LEVEL > 1
-out( "\n> identified option --" );
-out( pOpt );
-#endif
+SAL_INFO("cpputools.unoexe", "> identified option --" << pOpt);
 return true;
 }
 return false;
@@ -557,9 +542,6 @@ SAL_IMPLEMENT_MAIN()
 if (xComp.is())
 xComp->dispose();
 
-#if OSL_DEBUG_LEVEL > 1
-out( "\n" );
-#endif
 return nRet;
 }
 
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 207f843..e76e948 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -100,6 +100,11 @@ certain functionality.
 @li @c cppuhelper
 @li @c cppuhelper.shlib
 
+@section cpputools
+
+@li @c cpputools
+@li @c cpputools.unoexe
+
 @section cui
 
 @li @c cui.customize
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Tor Lillqvist

 vcl/win/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67ef33f914eae7d9752cd7d354e76210f33f59f0
Author: Tor Lillqvist 
Date:   Fri Mar 11 15:07:50 2016 +0200

Passing a string to a std::ostringstream ctor is tricky

For it to do what one typically wants, also std::ios_base::ate is
needed.

Change-Id: If520c98cbd4d3913b644c2137623c2b7e9c5c708

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 31168bc..ab04e70 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -179,7 +179,7 @@ void DumpGlyphBitmap(HDC hDC)
 
 SAL_INFO("vcl.gdi.opengl", "Bitmap " << hBitmap << ": " << aBitmap.bmWidth 
<< "x" << aBitmap.bmHeight << ":");
 
-std::ostringstream sLine("\n");
+std::ostringstream sLine("\n", std::ios_base::ate);
 for (long y = 0; y < aBitmap.bmHeight; y++)
 {
 for (long x = 0; x < std::min(75l, aBitmap.bmWidth); x++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 235411c9d47ecba88e46d859ea93bcecefb0c46e
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 11 13:21:23 2016 +

gtk3: various bits means different things again

Change-Id: Iafa1e65fb0cc096513cdfe12a09fb0ef4c4d2db0

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 403280c..7591f68 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1124,6 +1124,12 @@ static GtkStyleContext* 
createStyleContext(GtkControlPart ePart, GtkStyleContext
 #   define CHECKED GTK_STATE_FLAG_ACTIVE
 #endif
 
+#if GTK_CHECK_VERSION(3,19,11)
+#   define ACTIVE_TAB GTK_STATE_FLAG_CHECKED
+#else
+#   define ACTIVE_TAB GTK_STATE_FLAG_ACTIVE
+#endif
+
 void GtkSalGraphics::PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context,
const Rectangle& rControlRectangle, 
bool bIsCheck, bool bInMenu)
 {
@@ -1345,7 +1351,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 case CTRL_TAB_ITEM:
 context = mpNotebookHeaderTabsTabStyle;
 if (nState & ControlState::SELECTED)
-flags = (GtkStateFlags) (flags | GTK_STATE_FLAG_ACTIVE);
+flags = (GtkStateFlags) (flags | ACTIVE_TAB);
 break;
 case CTRL_WINDOW_BACKGROUND:
 context = gtk_widget_get_style_context(mpWindow);
@@ -2030,7 +2036,7 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 aTextColor = getColor( text_color );
 aStyleSet.SetTabRolloverTextColor(aTextColor);
 
-gtk_style_context_set_state(pCStyle, GTK_STATE_FLAG_ACTIVE);
+gtk_style_context_set_state(pCStyle, ACTIVE_TAB);
 gtk_style_context_get_color(pCStyle, 
gtk_style_context_get_state(pCStyle), &text_color);
 aTextColor = getColor( text_color );
 aStyleSet.SetTabHighlightTextColor(aTextColor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - bean/com jurt/com odk/examples

2016-03-11 Thread Christian Lohmaier

 bean/com/sun/star/comp/beans/LocalOfficeConnection.java   |8 
++---
 bean/com/sun/star/comp/beans/OOoBean.java |   16 
+-
 jurt/com/sun/star/comp/loader/JavaLoader.java |5 
---
 jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java |2 -
 jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java|3 -
 jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java |2 -
 jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java   |2 -
 odk/examples/DevelopersGuide/Forms/DocumentHelper.java|2 -
 odk/examples/DevelopersGuide/Forms/KeyGenerator.java  |2 -
 9 files changed, 18 insertions(+), 24 deletions(-)

New commits:
commit 053103915717e41436b7a397d9cfa3ea0e3519cc
Author: Christian Lohmaier 
Date:   Fri Mar 11 03:07:49 2016 +0100

neither doxygen nor javadoc make use of  annotations

even more so when they are invalid xml.
Thus obsolete since the switch from autodoc to doxygen, see also
https://lists.freedesktop.org/archives/libreoffice/2013-June/053077.html

Change-Id: Ifc2ef7754eca70bf923a2f7e4a652a8d394c370b

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 7623ad8..5d79c21 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -923,12 +923,12 @@ public class OOoBean
 
 // @requirement FUNC.BEAN.PROG/0.5
 // @requirement API.SIM.SEAP/0.2
-/** returns the Frame
+/** returns the com::sun::star::frame::Frame
 of the bean.
 
 @return
 a Java class which implements all interfaces which the service
-Frame implements.
+com::sun::star::frame::Frame implements.
 Thus, methods can be called directly without queryInterface.
 This feature might be implemented by UNO or explicitly coded.
 
@@ -947,11 +947,11 @@ public class OOoBean
 
// @requirement FUNC.BEAN.PROG/0.5
// @requirement API.SIM.SEAP/0.2
-/** returns the  of the 
bean.
+/** returns the com::sun::star::frame::Controller of the bean.
 
 @return
 a Java class which implements all interfaces which the service
-Controller implements.
+com::sun::star::frame::Controller implements.
 Thus, methods can be called directly without queryInterface.
 This feature might be implemented by UNO or explicitly coded.
 
@@ -974,12 +974,12 @@ public class OOoBean
 // @requirement FUNC.BEAN.STOR/0.4
 // @requirement FUNC.BEAN.PRNT/0.4
 // @requirement API.SIM.SEAP/0.2
-   /** returns the 
+   /** returns the com::sun::star::document::OfficeDocument
 of the bean.
 
 @return
 a Java class which implements all interfaces which the service
-OfficeDocument
+com::sun::star::document::OfficeDocument
 implements.
 Thus, methods can be called directly without queryInterface.
 This feature might be implemented by UNO or explicitly coded.
commit 69db01422057771d462287e84352b48fc773a845
Author: Christian Lohmaier 
Date:   Fri Mar 11 01:33:14 2016 +0100

ThreadPool doesn't exist - etiher point to IThreadPool or implementation

Change-Id: I96e1607945802d06dcc01b64267117d98f9a9994

diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java 
b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
index c43bcfa..3373c92 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
@@ -22,7 +22,7 @@ package com.sun.star.lib.uno.environments.remote;
  * This class implements a java thread pool.
  *
  * @see com.sun.star.uno.UnoRuntime
- * @see com.sun.star.lib.uno.environments.remote.ThreadPool
+ * @see com.sun.star.lib.uno.environments.remote.NativeThreadPool
  * @see com.sun.star.lib.uno.environments.remote.IThreadPool
  * @see com.sun.star.lib.uno.environments.remote.Job
  * @see com.sun.star.lib.uno.environments.remote.JobQueue
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java 
b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 592bc32..57dc5fa 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -31,7 +31,7 @@ import com.sun.star.lang.DisposedException;
  * (put by putjob) into the async queue, which is only
  * known by the sync queue.
  *
- * @see com.sun.star.lib.uno.environments.remote.ThreadPool
+ * @see com.sun.star.lib.uno.environments.remote.IThreadPool
  * @see com.sun.star.lib.uno.environments.remote.Job
  * @see com.sun.star.lib.uno.environments.remote.ThreadId
  * @since   UDK1.0
commit a86734e

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

2016-03-11 Thread Stephan Bergmann

 sd/source/ui/presenter/PresenterCanvas.cxx |  101 -
 sd/source/ui/presenter/PresenterCanvas.hxx |   24 --
 sd/util/sd.component   |3 
 3 files changed, 1 insertion(+), 127 deletions(-)

New commits:
commit 54da5514c3b9a180a081e9836741e3297f71da7d
Author: Stephan Bergmann 
Date:   Fri Mar 11 13:44:53 2016 +0100

Looks like no need to instantiate PresenterCanvas via service manager

(see commit message of 86ce77b9255ab92cceb6164828c90b0b3e1ee9ed "Don't 
adertise
PresenterCanvas as com.sun.star.rendering.Canvas service"; maybe it was just
cargo cult to make it available as a service in the first place)

Change-Id: I31291a7685c89d469309754cc4630b824a276890

diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx 
b/sd/source/ui/presenter/PresenterCanvas.cxx
index 0465e20..2df5cda 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "PresenterCanvas.hxx"
-#include "facreg.hxx"
 
 #include 
 #include 
@@ -27,10 +26,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -109,19 +106,6 @@ private:
 
 //= PresenterCanvas ===
 
-PresenterCanvas::PresenterCanvas()
-: PresenterCanvasInterfaceBase(m_aMutex),
-  mxUpdateCanvas(),
-  mxSharedCanvas(),
-  mxSharedWindow(),
-  mxWindow(),
-  maOffset(),
-  mpUpdateRequester(),
-  maClipRectangle(),
-  mbOffsetUpdatePending(true)
-{
-}
-
 PresenterCanvas::PresenterCanvas (
 const Reference& rxUpdateCanvas,
 const Reference& rxUpdateWindow,
@@ -157,82 +141,6 @@ void SAL_CALL PresenterCanvas::disposing()
 mxWindow->removeWindowListener(this);
 }
 
-//- XInitialization ---
-
-void SAL_CALL PresenterCanvas::initialize (
-const Sequence& rArguments)
-throw(Exception, RuntimeException, std::exception)
-{
-if (rBHelper.bDisposed || rBHelper.bInDispose)
-ThrowIfDisposed();
-
-if (rArguments.getLength() == 5)
-{
-try
-{
-// First and second argument may be NULL.
-rArguments[0] >>= mxUpdateCanvas;
-rArguments[1] >>= mxUpdateWindow;
-
-if ( ! (rArguments[2] >>= mxSharedWindow))
-{
-throw lang::IllegalArgumentException("PresenterCanvas: invalid 
shared window",
-static_cast(this),
-1);
-}
-
-if ( ! (rArguments[3] >>= mxSharedCanvas))
-{
-throw lang::IllegalArgumentException("PresenterCanvas: invalid 
shared canvas",
-static_cast(this),
-2);
-}
-
-if ( ! (rArguments[4] >>= mxWindow))
-{
-throw lang::IllegalArgumentException("PresenterCanvas: invalid 
window",
-static_cast(this),
-3);
-}
-
-mpUpdateRequester = 
CanvasUpdateRequester::Instance(mxUpdateCanvas);
-
-mbOffsetUpdatePending = true;
-if (mxWindow.is())
-mxWindow->addWindowListener(this);
-}
-catch (RuntimeException&)
-{
-mxSharedWindow = nullptr;
-mxWindow = nullptr;
-throw;
-}
-}
-else
-{
-throw RuntimeException("PresenterCanvas: invalid number of arguments",
-static_cast(this));
-}
-}
-
-OUString PresenterCanvas::getImplementationName()
-throw (css::uno::RuntimeException, std::exception)
-{
-return OUString("com.sun.star.comp.Draw.PresenterCanvasFactory");
-}
-
-sal_Bool PresenterCanvas::supportsService(OUString const & ServiceName)
-throw (css::uno::RuntimeException, std::exception)
-{
-return cppu::supportsService(this, ServiceName);
-}
-
-css::uno::Sequence PresenterCanvas::getSupportedServiceNames()
-throw (css::uno::RuntimeException, std::exception)
-{
-return css::uno::Sequence{"com.sun.star.rendering.Canvas"};
-}
-
 //- XCanvas ---
 
 void SAL_CALL PresenterCanvas::clear()
@@ -984,13 +892,4 @@ void PresenterCustomSprite::ThrowIfDisposed()
 
 } } // end of namespace ::sd::presenter
 
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(css::uno::XComponentContext*,
- 
css::uno::Sequence const &)
-{
-return cppu::acquire(new sd::presenter::PresenterCanvas());
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx 
b/sd/source/ui/presenter/PresenterCanvas.hxx
index 6bbcdb0..2484ea9 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hx

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

2016-03-11 Thread Miklos Vajna

 sc/inc/clipoptions.hxx   |   25 +
 sc/inc/document.hxx  |5 +
 sc/source/core/data/documen2.cxx |1 +
 sc/source/core/data/documen3.cxx |7 +++
 sc/source/ui/view/cliputil.cxx   |   29 ++---
 sc/source/ui/view/viewfun3.cxx   |   12 
 6 files changed, 76 insertions(+), 3 deletions(-)

New commits:
commit e75979eaed5c417da5f33f7259f070afbaa674b8
Author: Miklos Vajna 
Date:   Fri Mar 11 13:40:59 2016 +0100

sc: handle classification during copy&paste

This is the same feature as done for sw and sd internal copy already.

Change-Id: I6b8bd1228510fb2fb65ed1c2ab5e8307c38664b2

diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index bb4fc02..c79d173 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -15,12 +15,34 @@
 #include "dpobject.hxx"
 #include "globstr.hrc"
 #include "clipparam.hxx"
+#include "clipoptions.hxx"
 #include "rangelst.hxx"
 #include "viewutil.hxx"
 #include "markdata.hxx"
 #include 
 
 #include 
+#include 
+
+namespace
+{
+
+/// Paste only if SfxClassificationHelper recommends so.
+bool lcl_checkClassification(ScDocument* pSourceDoc, ScDocument* 
pDestinationDoc)
+{
+if (!pSourceDoc || !pDestinationDoc)
+return true;
+
+ScClipOptions* pSourceOptions = pSourceDoc->GetClipOptions();
+SfxObjectShell* pDestinationShell = pDestinationDoc->GetDocumentShell();
+if (!pSourceOptions || !pDestinationShell)
+return true;
+
+SfxClassificationCheckPasteResult eResult = 
SfxClassificationHelper::CheckPaste(pSourceOptions->m_xDocumentProperties, 
pDestinationShell->getDocProperties());
+return SfxClassificationHelper::ShowPasteInfo(eResult);
+}
+
+}
 
 void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* 
pTabViewShell, bool bShowDialog )
 {
@@ -64,9 +86,10 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, 
ScTabViewShell* pTab
 // For multi-range paste, we paste values by default.
 nFlags &= ~InsertDeleteFlags::FORMULA;
 
-pTabViewShell->PasteFromClip( nFlags, pClipDoc,
-ScPasteFunc::NONE, false, false, false, INS_NONE, 
InsertDeleteFlags::NONE,
-bShowDialog );  // allow warning dialog
+if (lcl_checkClassification(pClipDoc, pThisDoc))
+pTabViewShell->PasteFromClip( nFlags, pClipDoc,
+ScPasteFunc::NONE, false, false, false, INS_NONE, 
InsertDeleteFlags::NONE,
+bShowDialog );  // allow warning dialog
 }
 }
 pTabViewShell->CellContentChanged();// => PasteFromSystem() ???
commit 9db5512084bb0df58322d755b7b1770a9779ab57
Author: Miklos Vajna 
Date:   Fri Mar 11 11:17:42 2016 +0100

sc: make metadata available in copy result

Calc had the same problem as Writer: metadata is part of the doc shell,
but the clipboard document has no doc shell. So need to store this info
in ScDocument in some way in the clipboard case.

10:45 <@moggi> vmiklos: I would most likely add a ScClipOptions similar to 
ScDocOptions and only populate it in the clip document

Change-Id: I4ad01faa55cfb6fb58213d67003c8c0f9849800d

diff --git a/sc/inc/clipoptions.hxx b/sc/inc/clipoptions.hxx
new file mode 100644
index 000..d4ccb59
--- /dev/null
+++ b/sc/inc/clipoptions.hxx
@@ -0,0 +1,25 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SC_INC_CLIPOPTIONS_HXX
+#define INCLUDED_SC_INC_CLIPOPTIONS_HXX
+
+#include 
+
+/// Stores options which are only relevant for clipboard documents.
+class SC_DLLPUBLIC ScClipOptions
+{
+public:
+/// Document properties.
+css::uno::Reference 
m_xDocumentProperties;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e486b04..7da2b4d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -117,6 +117,7 @@ class ScBroadcastAreaSlotMachine;
 class ScChangeViewSettings;
 class ScChartCollection;
 class ScChartListenerCollection;
+class ScClipOptions;
 class ScConditionalFormat;
 class ScConditionalFormatList;
 class ScDBCollection;
@@ -351,6 +352,7 @@ private:
 ScViewOptions*  pViewOptions;   // view options
 ScDocOptions*   pDocOptions;// document options
 ScExtDocOptions*pExtDocOptions; // for import etc.
+std::unique_ptr mpClipOptions;   // clipboard options
 ScConsolidateParam* pConsolidateDlgData;
 
 ScRecursionHelper*  pRecursionHelper;

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

2016-03-11 Thread Noel Grandin

 filter/source/xsltdialog/typedetectionimport.cxx |   29 ---
 filter/source/xsltdialog/typedetectionimport.hxx |   12 -
 2 files changed, 11 insertions(+), 30 deletions(-)

New commits:
commit 7f1d68a798fcde681fb01a17f0ff0fd4b2b6fb7f
Author: Noel Grandin 
Date:   Thu Mar 10 16:40:36 2016 +0200

these don't need to be fields on the class

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

diff --git a/filter/source/xsltdialog/typedetectionimport.cxx 
b/filter/source/xsltdialog/typedetectionimport.cxx
index 8c19851..0865121 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -34,19 +34,12 @@ using namespace com::sun::star::xml::sax;
 using namespace com::sun::star;
 using namespace std;
 
+static const OUString sNode( "node" );
+static const OUString sName( "oor:name" );
+static const OUString sUIName( "UIName" );
+static const OUString sData( "Data" );
 
 TypeDetectionImporter::TypeDetectionImporter()
-:   sRootNode( "oor:component-data" ),
-sNode( "node" ),
-sName( "oor:name" ),
-sProp( "prop" ),
-sValue( "value" ),
-sUIName( "UIName" ),
-sData( "Data" ),
-sFilters( "Filters" ),
-sTypes( "Types" ),
-sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ),
-sXSLTFilterService( "com.sun.star.documentconversion.XSLTFilter" )
 {
 }
 
@@ -200,10 +193,10 @@ filter_info_impl* 
TypeDetectionImporter::createFilterForNode( Node * pNode )
 if( pFilter->maFlags == 0 )
 bOk = false;
 
-if( aFilterService != sFilterAdaptorService )
+if( aFilterService != "com.sun.star.comp.Writer.XmlFilterAdaptor" )
 bOk = false;
 
-if( aAdapterService != sXSLTFilterService )
+if( aAdapterService != "com.sun.star.documentconversion.XSLTFilter" )
 bOk = false;
 
 if( pFilter->maExtension.isEmpty() )
@@ -236,7 +229,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const 
OUString& aName, const
 if( maStack.empty() )
 {
 // #109668# support legacy name as well on import
-if( aName == sRootNode || aName == "oor:node" )
+if( aName == "oor:component-data" || aName == "oor:node" )
 {
 eNewState = e_Root;
 }
@@ -247,11 +240,11 @@ void SAL_CALL TypeDetectionImporter::startElement( const 
OUString& aName, const
 {
 OUString aNodeName( xAttribs->getValueByName( sName ) );
 
-if( aNodeName == sFilters )
+if( aNodeName == "Filters" )
 {
 eNewState = e_Filters;
 }
-else if( aNodeName == sTypes )
+else if( aNodeName == "Types" )
 {
 eNewState = e_Types;
 }
@@ -268,7 +261,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const 
OUString& aName, const
 }
 else if( (maStack.top() == e_Filter) || (maStack.top() == e_Type))
 {
-if( aName == sProp )
+if( aName == "prop" )
 {
 maPropertyName = xAttribs->getValueByName( sName );
 eNewState = e_Property;
@@ -276,7 +269,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const 
OUString& aName, const
 }
 else if( maStack.top() == e_Property )
 {
-if( aName == sValue )
+if( aName == "value" )
 {
 eNewState = e_Value;
 maValue.clear();
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx 
b/filter/source/xsltdialog/typedetectionimport.hxx
index fcc668e..9d2be2d 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -97,18 +97,6 @@ private:
 OUString maValue;
 OUString maNodeName;
 OUString maPropertyName;
-
-const OUString sRootNode;
-const OUString sNode;
-const OUString sName;
-const OUString sProp;
-const OUString sValue;
-const OUString sUIName;
-const OUString sData;
-const OUString sFilters;
-const OUString sTypes;
-const OUString sFilterAdaptorService;
-const OUString sXSLTFilterService;
 };
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Takeshi Abe

 starmath/source/dialog.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e7e1d50fc0c8077be9d9603eab8ef86098c9aa24
Author: Takeshi Abe 
Date:   Fri Mar 11 19:50:59 2016 +0900

Resolves tdf#88485: Allow to select rightmost symbols in the dialog

by adjusting target area with proper offsets.

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

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 9dbf293..5e81954 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1186,6 +1186,8 @@ void SmShowSymbolSetWindow::MouseButtonDown(const 
MouseEvent& rMEvt)
 GrabFocus();
 
 Size aOutputSize(nColumns * nLen, nRows * nLen);
+aOutputSize.Width() += nXOffset;
+aOutputSize.Height() += nYOffset;
 Point aPoint(rMEvt.GetPosPixel());
 aPoint.X() -= nXOffset;
 aPoint.Y() -= nYOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Caolán McNamara

 chart2/source/controller/sidebar/ChartAreaPanel.cxx |  117 
 1 file changed, 71 insertions(+), 46 deletions(-)

New commits:
commit 9048e7f58763cf87460a25cba374741352ceb98b
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 11 12:16:18 2016 +

Resolves: tdf#98390 ChartAreaPanel throw during ctor

after a ChartSidebarModifyListener pointing to it has been created and 
added to
the model, so ChartSidebarModifyListeners exist which point to a dead
ChartAreaPanel which has never even completed its ctor

workaround this by checking that properties it querys for exist
before accessing them and triggering the IllegalProperty throw

Change-Id: I0c251360714592c78132c0867903216f3866489a

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 7dc2b76..1039214 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -387,59 +387,84 @@ void ChartAreaPanel::updateData()
 if (!xPropSet.is())
 return;
 
-css::drawing::FillStyle eFillStyle = css::drawing::FillStyle_SOLID;
-xPropSet->getPropertyValue("FillStyle") >>= eFillStyle;
-XFillStyleItem aFillStyleItem(eFillStyle);
-updateFillStyle(false, true, &aFillStyleItem);
-
-sal_uInt16 nFillTransparence = 0;
-xPropSet->getPropertyValue("FillTransparence") >>= nFillTransparence;
-SfxUInt16Item aTransparenceItem(0, nFillTransparence);
-updateFillTransparence(false, true, &aTransparenceItem);
-
-OUString aGradientName;
-xPropSet->getPropertyValue("FillGradientName") >>= aGradientName;
-XGradient xGradient = getXGradientForName(mxModel, aGradientName);
-XFillGradientItem aGradientItem(aGradientName, xGradient);
-updateFillGradient(false, true, &aGradientItem);
-
-OUString aHatchName;
-xPropSet->getPropertyValue("FillHatchName") >>= aHatchName;
-XHatch xHatch = getXHatchFromName(mxModel, aHatchName);
-XFillHatchItem aHatchItem(aHatchName, xHatch);
-updateFillHatch(false, true, &aHatchItem);
-
-OUString aBitmapName;
-xPropSet->getPropertyValue("FillBitmapName") >>= aBitmapName;
-GraphicObject xBitmap = getXBitmapFromName(mxModel, aBitmapName);
-XFillBitmapItem aBitmapItem(aBitmapName, xBitmap);
-XFillBitmapItem* pBitmapItem = nullptr;
-DrawModelWrapper* pModelWrapper = nullptr;
-try
+css::uno::Reference 
xInfo(xPropSet->getPropertySetInfo());
+if (!xInfo.is())
+return;
+
+if (xInfo->hasPropertyByName("FillStyle"))
 {
-pModelWrapper = getDrawModelWrapper(mxModel);
-if (pModelWrapper)
-{
-pBitmapItem = 
aBitmapItem.checkForUniqueItem(&pModelWrapper->getSdrModel());
-}
+css::drawing::FillStyle eFillStyle = css::drawing::FillStyle_SOLID;
+xPropSet->getPropertyValue("FillStyle") >>= eFillStyle;
+XFillStyleItem aFillStyleItem(eFillStyle);
+updateFillStyle(false, true, &aFillStyleItem);
 }
-catch (...)
+
+if (xInfo->hasPropertyByName("FillTransparence"))
+{
+sal_uInt16 nFillTransparence = 0;
+xPropSet->getPropertyValue("FillTransparence") >>= nFillTransparence;
+SfxUInt16Item aTransparenceItem(0, nFillTransparence);
+updateFillTransparence(false, true, &aTransparenceItem);
+}
+
+if (xInfo->hasPropertyByName("FillGradientName"))
+{
+   OUString aGradientName;
+   xPropSet->getPropertyValue("FillGradientName") >>= aGradientName;
+   XGradient xGradient = getXGradientForName(mxModel, aGradientName);
+   XFillGradientItem aGradientItem(aGradientName, xGradient);
+   updateFillGradient(false, true, &aGradientItem);
+}
+
+if (xInfo->hasPropertyByName("FillHatchName"))
 {
+OUString aHatchName;
+xPropSet->getPropertyValue("FillHatchName") >>= aHatchName;
+XHatch xHatch = getXHatchFromName(mxModel, aHatchName);
+XFillHatchItem aHatchItem(aHatchName, xHatch);
+updateFillHatch(false, true, &aHatchItem);
 }
-updateFillBitmap(false, true, pBitmapItem ? pBitmapItem : &aBitmapItem);
-delete pBitmapItem;
 
-OUString aFillFloatTransparenceName;
-xPropSet->getPropertyValue("FillTransparenceGradientName") >>= 
aFillFloatTransparenceName;
-XFillFloatTransparenceItem aFillFloatTransparenceItem = 
getXTransparencyGradientForName(mxModel, aFillFloatTransparenceName);
-updateFillFloatTransparence(false, true, &aFillFloatTransparenceItem);
+if (xInfo->hasPropertyByName("FillBitmapName"))
+{
+OUString aBitmapName;
+xPropSet->getPropertyValue("FillBitmapName") >>= aBitmapName;
+GraphicObject xBitmap = getXBitmapFromName(mxModel, aBitmapName);
+XFillBitmapItem aBitmapItem(aBitmapName, xBitmap);
+XFillBitmapItem* pBitmapItem = nullptr;
+DrawModelWrapper* pModelWrapper = nullptr;
+try
+{
+

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

2016-03-11 Thread Rohan Kumar

 testtools/source/performance/pseudo.cxx |2 +-
 testtools/source/performance/ubtest.cxx |3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 96e44b3b510bc97ddda6caf937d031ae6a656d58
Author: Rohan Kumar 
Date:   Wed Mar 9 17:13:25 2016 +0530

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I replaced the OSL_DEBUG_LEVEL > 1 to OSL_DEBUG_LEVEL > 0
conditionals. At some places i removed the logs containing
OSL_DEBUG_LEVEL > 1 as OSL_DEBUG_LEVEL > 0 is compiled in
production code

Change-Id: I4466e7a2025b055f89fc525d7412f10bd4d8a07f
Reviewed-on: https://gerrit.libreoffice.org/23067
Tested-by: Jenkins 
Reviewed-by: BjÃ¶rn Michaelsen 

diff --git a/testtools/source/performance/pseudo.cxx 
b/testtools/source/performance/pseudo.cxx
index a23ea01..bff6e99 100644
--- a/testtools/source/performance/pseudo.cxx
+++ b/testtools/source/performance/pseudo.cxx
@@ -84,7 +84,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_free( 
uno_ExtEnvironment * pEnv, v
 typelib_typedescription_release( (typelib_TypeDescription 
*)pThis->pTypeDescr );
 (*pThis->pPseudoMapping->release)( pThis->pPseudoMapping );
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
 *(int *)pProxy = 0xdeadbabe;
 #endif
 delete pThis;
diff --git a/testtools/source/performance/ubtest.cxx 
b/testtools/source/performance/ubtest.cxx
index f135113..abc532f 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -1161,9 +1161,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & 
rArgs )
 // dump out tables
 
 out( "\nTimes( ratio to direct in process )", stream );
-#if OSL_DEBUG_LEVEL > 1
-out ("; compiled with OSL_DEBUG_LEVEL > 1", stream );
-#endif
 out( ":", stream );
 
 sal_Int32 nPos = 60;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Rohan Kumar

 shell/source/win32/simplemail/senddoc.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a32bfdfd280b51d1bd5283243e286f056d3986dd
Author: Rohan Kumar 
Date:   Wed Mar 9 19:17:44 2016 +0530

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

I replaced OSL_DEBUG_LEVEL > 2 conditionals with OSL_DEBUG_LEVEL > 0
conditionals

Change-Id: Ibfb3a4e00da7ef6a213dcd4659c7963935cfad1f
Reviewed-on: https://gerrit.libreoffice.org/23081
Tested-by: Jenkins 
Reviewed-by: BjÃ¶rn Michaelsen 

diff --git a/shell/source/win32/simplemail/senddoc.cxx 
b/shell/source/win32/simplemail/senddoc.cxx
index ace7303..a17df21 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 0
 void dumpParameter();
 #endif
 
@@ -248,7 +248,7 @@ int main(int argc, char* argv[])
 
 initParameter(argc, argv);
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 0
 dumpParameter();
 #endif
 
@@ -300,7 +300,7 @@ int main(int argc, char* argv[])
 return ulRet;
 }
 
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 0
 void dumpParameter()
 {
 std::ostringstream oss;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source

2016-03-11 Thread Rishabh Kumar

 cui/source/customize/cfg.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6f3ac91fabe1faa664aecfc535b49ee31fcb9beb
Author: Rishabh Kumar 
Date:   Tue Aug 18 03:11:53 2015 +0530

tdf#80758:empty values in button name not respected

In case of empty values , the accelerator character is passed
as the button name which avoids extra spacing.

Change-Id: I8a82f5226e17bf8977fb6a8fd59c99a244e59309
Reviewed-on: https://gerrit.libreoffice.org/14498
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 
(cherry picked from commit b2e78fc73363d3ee43e3ee7bc90237d6d048aef7)
Reviewed-on: https://gerrit.libreoffice.org/20804
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 4f9c706..018cf39 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3403,9 +3403,12 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl, 
MenuButton *, pButton, vo
 if ( pNameDialog->Execute() == RET_OK ) {
 pNameDialog->GetName(aNewName);
 
-pEntry->SetName( aNewName );
-m_pContentsListBox->SetEntryText( pActEntry, aNewName );
+if( aNewName == "" ) //tdf#80758 - Accelerator character ("~") 
is passed as
+pEntry->SetName( "~" ); // the button name in case of 
empty values.
+else
+pEntry->SetName( aNewName );
 
+m_pContentsListBox->SetEntryText( pActEntry, aNewName );
 bNeedsApply = true;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Giuseppe Castagno

 external/curl/ExternalProject_curl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30b9c6a457de61f3c94431ecc75716f866c3379e
Author: Giuseppe Castagno 
Date:   Thu Mar 10 14:54:28 2016 +0100

tdf#98416: Explicitly disable curl hardcoded CA certificate store

Add --without-ca-bundle --without-ca-path options to curl configure
in Linux, to explicitly disable the hardcoded curl CA certificate
store.

If the store is not disabled, curl configure will try to find
one suitable for the Linux distro on which it's being built, leading
to possible problems when building on a Linux distro type while
targeting another Linux distro type (e.g. building on Red Hat
derivative targeting Debian derivative).

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

diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index e31f5d6..9dd4a07 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -51,6 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-librtmp --disable-ldaps --disable-tftp 
--disable-pop3 \
--disable-imap --disable-smtp --disable-manual 
--without-metalink \
--without-nghttp2 \
+   $(if $(filter LINUX,$(OS)),--without-ca-bundle 
--without-ca-path) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jurt/test

2016-03-11 Thread Stephan Bergmann

 jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java |   10 
+-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b2d53cc003d070181d80af92d1568de1bdcfe73b
Author: Stephan Bergmann 
Date:   Fri Mar 11 11:50:50 2016 +0100

typo

Change-Id: I8ae443a69aab715a59f347a2de5a36b458a934f5

diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java 
b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
index e753c65..e63be6f 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
@@ -37,7 +37,7 @@ class TestWorkAt implements TestIWorkAt {
 private Thread _sync_thread;
 private Thread _async_thread;
 
-private boolean _passedAync = true;
+private boolean _passedAsync = true;
 boolean _notified = false;
 
 public synchronized void syncCall() throws Throwable {
@@ -47,12 +47,12 @@ class TestWorkAt implements TestIWorkAt {
 // defer the check until passedAsyncTest and assert here
 assertEquals(MESSAGES, _async_counter);
 if(_async_counter != MESSAGES)
-_passedAync = false;
+_passedAsync = false;
 
 if(_sync_thread == null)
 _sync_thread = Thread.currentThread();
 
-if(DEBUG) System.err.println("syncCall:" + _sync_counter + " " + 
_passedAync + " " + Thread.currentThread());
+if(DEBUG) System.err.println("syncCall:" + _sync_counter + " " + 
_passedAsync + " " + Thread.currentThread());
 }
 
 public synchronized void asyncCall() throws Throwable {
@@ -81,7 +81,7 @@ class TestWorkAt implements TestIWorkAt {
 
 public synchronized boolean passedAsyncTest() {
 assertEquals(MESSAGES, _sync_counter);
-assertTrue(_passedAync);
-return  _passedAync && (_sync_counter == MESSAGES);
+assertTrue(_passedAsync);
+return  _passedAsync && (_sync_counter == MESSAGES);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jurt/test

2016-03-11 Thread Stephan Bergmann

 jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit feb480d78021541a264701ea811a5002accc
Author: Stephan Bergmann 
Date:   Fri Mar 11 11:49:35 2016 +0100

Synchronize all access to _sync_counter, _passedAync

Change-Id: I34e9b3fb9481af30ddda8cde45ccbb27819fc452

diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java 
b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
index 6c4a472..e753c65 100644
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
+++ b/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
@@ -79,7 +79,7 @@ class TestWorkAt implements TestIWorkAt {
 _notified = true;
 }
 
-public boolean passedAsyncTest() {
+public synchronized boolean passedAsyncTest() {
 assertEquals(MESSAGES, _sync_counter);
 assertTrue(_passedAync);
 return  _passedAync && (_sync_counter == MESSAGES);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Stephan Bergmann

 sd/util/sd.component |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 86ce77b9255ab92cceb6164828c90b0b3e1ee9ed
Author: Stephan Bergmann 
Date:   Fri Mar 11 11:36:03 2016 +0100

Don't adertise PresenterCanvas as com.sun.star.rendering.Canvas service

Window::ImplGetCanvas (vcl/source/window/window.cxx) tries to obtain such a
Canvas service (passing in 6 initialization arguments), and the 
CanvasFactory in
canvas/source/factory/cf_service.cxx apparently goes through the 
implementations
advertised to implement that service, looking for the best match.  At least 
for
Linux-rpm_deb-x86_64@70-TDF-dbg tinderbox, it somehow manages to pick the
PresenterCanvas (instead of one of the more obvious choices among the 
variants
in canvas/soruce/{cairo,directx,vcl}), but which only epects 5 
initialization
arguments, so CppunitTest_cppcanvas_emfplus fails with a "PresenterCanvas:
invalid number of arguments" exception. (And the choice of the 
PresenterCanvas
looks more than dubious anyway.)

Normally, instances of PresenterCanvas appear to be created "directly" from
PresenterHelper::createSharedCanvas 
(sd/source/ui/presenter/PresenterHelper.cxx)
so it shouldn't hurt to no longer adertise this implementation as providing 
the
Canvas service---and it might not even be necessary to make it available 
via the
service manager at all.

Change-Id: Ie76bfc87fec51b6d5361930204e55ef9cb80370e

diff --git a/sd/util/sd.component b/sd/util/sd.component
index a3e531a..74b66bc 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -33,7 +33,6 @@
   
   
-
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Miklos Vajna

 cppu/source/typelib/typelib.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 6d42dc0e7ce90c0996a28d8ee084baa183c90457
Author: Miklos Vajna 
Date:   Fri Mar 11 11:27:10 2016 +0100

cppu: SAL_WARN_IF() -> SAL_INFO_IF() where it was dbglevel=2-specific before

As these fire already during the build.

Change-Id: I750ea04be317fffb8bc321a2b7b4da0447789c8f

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 55ee766..e84e5ce 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -307,17 +307,17 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
 pWeakMap = nullptr;
 }
 #if OSL_DEBUG_LEVEL > 0
-SAL_WARN_IF( nTypeDescriptionCount, "cppu.typelib", "nTypeDescriptionCount 
is not zero" );
-SAL_WARN_IF( nCompoundTypeDescriptionCount, "cppu.typelib", 
"nCompoundTypeDescriptionCount is not zero" );
-SAL_WARN_IF( nIndirectTypeDescriptionCount, "cppu.typelib", 
"nIndirectTypeDescriptionCount is not zero" );
-SAL_WARN_IF( nEnumTypeDescriptionCount, "cppu.typelib", 
"nEnumTypeDescriptionCount is not zero" );
-SAL_WARN_IF( nInterfaceMethodTypeDescriptionCount, "cppu.typelib", 
"nInterfaceMethodTypeDescriptionCount is not zero" );
-SAL_WARN_IF( nInterfaceAttributeTypeDescriptionCount, "cppu.typelib", 
"nInterfaceAttributeTypeDescriptionCount is not zero" );
-SAL_WARN_IF( nInterfaceTypeDescriptionCount, "cppu.typelib", 
"nInterfaceTypeDescriptionCount is not zero" );
-SAL_WARN_IF( nTypeDescriptionReferenceCount, "cppu.typelib", 
"nTypeDescriptionReferenceCount is not zero" );
+SAL_INFO_IF( nTypeDescriptionCount, "cppu.typelib", "nTypeDescriptionCount 
is not zero" );
+SAL_INFO_IF( nCompoundTypeDescriptionCount, "cppu.typelib", 
"nCompoundTypeDescriptionCount is not zero" );
+SAL_INFO_IF( nIndirectTypeDescriptionCount, "cppu.typelib", 
"nIndirectTypeDescriptionCount is not zero" );
+SAL_INFO_IF( nEnumTypeDescriptionCount, "cppu.typelib", 
"nEnumTypeDescriptionCount is not zero" );
+SAL_INFO_IF( nInterfaceMethodTypeDescriptionCount, "cppu.typelib", 
"nInterfaceMethodTypeDescriptionCount is not zero" );
+SAL_INFO_IF( nInterfaceAttributeTypeDescriptionCount, "cppu.typelib", 
"nInterfaceAttributeTypeDescriptionCount is not zero" );
+SAL_INFO_IF( nInterfaceTypeDescriptionCount, "cppu.typelib", 
"nInterfaceTypeDescriptionCount is not zero" );
+SAL_INFO_IF( nTypeDescriptionReferenceCount, "cppu.typelib", 
"nTypeDescriptionReferenceCount is not zero" );
 #endif
 
-SAL_WARN_IF( pCallbacks && !pCallbacks->empty(), "cppu.typelib", 
"pCallbacks is not NULL or empty" );
+SAL_INFO_IF( pCallbacks && !pCallbacks->empty(), "cppu.typelib", 
"pCallbacks is not NULL or empty" );
 delete pCallbacks;
 pCallbacks = nullptr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Caolán McNamara

 lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp |binary
 lotuswordpro/source/filter/lwplayout.cxx|5 +++--
 lotuswordpro/source/filter/lwplayout.hxx|   16 +---
 3 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit bcecf9b13b7eee0e7c60a6827a310f8b38d13f69
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 11 10:38:46 2016 +

tweat ExtMargins with same recurse protection as Margins

Change-Id: I24640971ea6ca89878043966293492a991f01008

diff --git a/lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp 
b/lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp
new file mode 100644
index 000..ffc7a44
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/recurse-1.lwp 
differ
diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 17eb43d..e5c8c1d 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -78,6 +78,7 @@ LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr, 
LwpSvStream* pStrm)
 , m_bGettingHasProtection(false)
 , m_bGettingIsProtected(false)
 , m_bGettingMarginsValue(false)
+, m_bGettingExtMarginsValue(false)
 , m_nAttributes(0)
 , m_nAttributes2(0)
 , m_nAttributes3(0)
@@ -750,7 +751,7 @@ double LwpMiddleLayout::MarginsValue(const sal_uInt8 
&nWhichSide)
  * @param:
  * @return:
 */
-double LwpMiddleLayout::GetExtMarginsValue(const sal_uInt8 &nWhichSide)
+double LwpMiddleLayout::ExtMarginsValue(const sal_uInt8 &nWhichSide)
 {
 double fValue = 0;
 if(m_nOverrideFlag & OVER_MARGINS)
@@ -768,7 +769,7 @@ double LwpMiddleLayout::GetExtMarginsValue(const sal_uInt8 
&nWhichSide)
 fValue = pStyle->GetExtMarginsValue(nWhichSide);
 return fValue;
 }
-return LwpVirtualLayout::GetExtMarginsValue(nWhichSide);
+return LwpVirtualLayout::ExtMarginsValue(nWhichSide);
 }
 /**
  * @descr:  Get the LwpBorderStuff object according to m_LayBorderStuff id.
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 0456cfa..991dfac 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -99,7 +99,6 @@ public:
 inline virtual sal_uInt16 GetNumCols(){return 1;}
 virtual double GetColWidth(sal_uInt16 nIndex);
 virtual double GetColGap(sal_uInt16 nIndex);
-virtual double GetExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 
0;}
 virtual bool IsAutoGrow(){ return false;}
 virtual bool IsAutoGrowUp(){ return false;}
 virtual bool IsAutoGrowDown(){ return false;}
@@ -154,6 +153,15 @@ public:
 m_bGettingMarginsValue = false;
 return fRet;
 }
+double GetExtMarginsValue(const sal_uInt8& nWhichSide)
+{
+if (m_bGettingExtMarginsValue)
+throw std::runtime_error("recursion in layout");
+m_bGettingExtMarginsValue = true;
+auto fRet = ExtMarginsValue(nWhichSide);
+m_bGettingExtMarginsValue = false;
+return fRet;
+}
 OUString GetStyleName(){ return m_StyleName;}
 bool IsComplex();
 virtual bool IsAnchorPage(){ return false;}
@@ -207,6 +215,7 @@ protected:
 virtual bool HonorProtection();
 virtual bool IsProtected();
 virtual double MarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
+virtual double ExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;}
 virtual bool MarginsSameAsParent();
 protected:
 bool m_bGettingHonorProtection;
@@ -214,6 +223,7 @@ protected:
 bool m_bGettingHasProtection;
 bool m_bGettingIsProtected;
 bool m_bGettingMarginsValue;
+bool m_bGettingExtMarginsValue;
 sal_uInt32 m_nAttributes;
 sal_uInt32 m_nAttributes2;
 sal_uInt32 m_nAttributes3;
@@ -323,8 +333,6 @@ class LwpMiddleLayout : public LwpVirtualLayout
 public:
 LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm );
 virtual ~LwpMiddleLayout();
-virtual double MarginsValue(const sal_uInt8& nWhichSide) override;
-virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) override;
 LwpLayoutGeometry* GetGeometry()
 {
 if (m_bGettingGeometry)
@@ -379,6 +387,8 @@ public:
 protected:
 void Read() override;
 virtual bool MarginsSameAsParent() override;
+virtual double MarginsValue(const sal_uInt8& nWhichSide) override;
+virtual double ExtMarginsValue(const sal_uInt8& nWhichSide) override;
 private:
 LwpObjectID m_BasedOnStyle;
 LwpLayoutGeometry* Geometry();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Caolán McNamara

 include/comphelper/attributelist.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 849e78756b33ff5307311349b8b1fc4bcc85d0e4
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 11 10:07:19 2016 +

include memory

Change-Id: If91042b2a72b0dd70cc630e1140f602ac1b823d2

diff --git a/include/comphelper/attributelist.hxx 
b/include/comphelper/attributelist.hxx
index 9a6f535..1fa83ae 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 namespace comphelper
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Stephan Bergmann

 include/comphelper/attributelist.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 28fb13b473012369ef5037e4d1b094dcc29dccb1
Author: Stephan Bergmann 
Date:   Fri Mar 11 11:07:49 2016 +0100

Missing include

Change-Id: Ia99c17d90f66860bcd9ef6bb1732437e425a4a04

diff --git a/include/comphelper/attributelist.hxx 
b/include/comphelper/attributelist.hxx
index 1fa83ae..fa616ab 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 #define INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 
+#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: include/comphelper

2016-03-11 Thread Stephan Bergmann

 include/comphelper/attributelist.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6aa5bdc371d0feab085e46b5dc58b1c56369cef1
Author: Stephan Bergmann 
Date:   Fri Mar 11 11:09:22 2016 +0100

...and now it got included twice

Change-Id: I5cb7eda5a8dc1bddd3e76e1d3aae94f264d609d9

diff --git a/include/comphelper/attributelist.hxx 
b/include/comphelper/attributelist.hxx
index fa616ab..0836e9c 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace comphelper
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Xisco Fauli

 svgio/source/svgreader/svgstyleattributes.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1868a62a32cff30e3ba214cbd03917d2c6518073
Author: Xisco Fauli 
Date:   Thu Mar 10 20:01:44 2016 +0100

tdf#47446: SVGIO: Take markers' parents into account too

Change-Id: I41b7228ab5980581ab5e1c8c4d4d466da6045086
Reviewed-on: https://gerrit.libreoffice.org/23124
Tested-by: Jenkins 
Reviewed-by: Xisco FaulÃ 

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index f344610..b60d84b 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1954,8 +1954,20 @@ namespace svgio
 
 const basegfx::BColor* SvgStyleAttributes::getFill() const
 {
-if(mbIsClipPathContent || ((SVGTokenMarker == mrOwner.getType()) 
&& !maFill.isSet()))
+if(mbIsClipPathContent)
+{
+static basegfx::BColor aBlack(0.0, 0.0, 0.0);
+return &aBlack;
+}
+else if((SVGTokenMarker == mrOwner.getType()) && !maFill.isSet())
 {
+const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
+
+if(pSvgStyleAttributes)
+{
+return pSvgStyleAttributes->getFill();
+}
+
 static basegfx::BColor aBlack(0.0, 0.0, 0.0);
 return &aBlack;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Jan Iversen

 l10ntools/inc/gLang.hxx |   36 ---
 l10ntools/source/gConv.cxx  |5 
 l10ntools/source/gLang.cxx  |  464 ++--
 l10ntools/source/gLexPo.l   |   12 -
 l10ntools/source/gLexSrc.l  |   13 -
 l10ntools/source/gLexTree.l |   13 -
 l10ntools/source/gLexUlf.l  |   13 -
 l10ntools/source/gLexXcs.l  |   13 -
 l10ntools/source/gLexXcu.l  |   13 -
 l10ntools/source/gLexXhp.l  |   13 -
 l10ntools/source/gLexXrm.l  |   13 -
 11 files changed, 468 insertions(+), 140 deletions(-)

New commits:
commit 00badb6fb53aa28f4184aaecd8455dcd5267c5f8
Author: Jan Iversen 
Date:   Fri Mar 11 10:39:47 2016 +0100

update genLang (l10ntools)

Upgrade gLang to LO standard
Compilation of genLang module is disabled for now
activate manually by adding to Module_l10ntools.mk

Change-Id: Ib82cae6a013d10d158ec5faa81ace512c0096a39

diff --git a/l10ntools/inc/gLang.hxx b/l10ntools/inc/gLang.hxx
index be1422b..ed35538 100644
--- a/l10ntools/inc/gLang.hxx
+++ b/l10ntools/inc/gLang.hxx
@@ -113,7 +113,7 @@ class convert_gen
 ~convert_gen();
 
 // do extract/merge
-bool execute(const bool bMerge);
+bool execute(const bool bMerge, const bool bKid);
 
 // ONLY po should implement these functions
 void startSave(const std::string& sLanguage,
@@ -127,38 +127,4 @@ class convert_gen
 static bool checkAccess(std::string& sFile);
 static bool createDir(std::string& sDir, std::string& sFile);
 };
-
-
-
-/   C L A S S   D E F I N I T I O N   /
-class handler
-{
-  public:
-handler();
-~handler();
-
-void checkCommandLine(int argc, char *argv[]);
-void run();
-
-  private:
-enum {DO_CONVERT, DO_CONVERT_POT, DO_EXTRACT, DO_EXTRACT_KID, DO_MERGE} 
meWorkMode;
-l10nMem  mcMemory;
-std::string  msModuleName;
-std::string  msPoOutDir;
-std::string  msPoDir;
-std::string  msSourceDir;
-std::string  msTargetDir;
-bool mbForceSave;
-std::vector mvSourceFiles;
-std::vector mvLanguages;
-
-void runConvert(bool bPot);
-void runExtract(bool bKid);
-void runMerge();
-
-void showUsage(std::string& sErr);
-void showManual();
-void loadL10MEM(bool onlyTemplates);
-void readFileWithSources();
-};
 #endif
diff --git a/l10ntools/source/gConv.cxx b/l10ntools/source/gConv.cxx
index 15b5625..ff16706 100644
--- a/l10ntools/source/gConv.cxx
+++ b/l10ntools/source/gConv.cxx
@@ -103,10 +103,13 @@ convert_gen::~convert_gen()
 
 
 /**   I M P L E M E N T A T I O N   **/
-bool convert_gen::execute(const bool bMerge)
+bool convert_gen::execute(const bool bMerge, const bool bKid)
 {
   convert_gen_impl::mcImpl->mbMergeMode  = bMerge;
 
+  if (bKid)
+  throw l10nMem::showError("not implemented");
+
   // and load file
   if (!convert_gen_impl::mcImpl->prepareFile())
 return false;
diff --git a/l10ntools/source/gLang.cxx b/l10ntools/source/gLang.cxx
index 9a3105a..696d861 100644
--- a/l10ntools/source/gLang.cxx
+++ b/l10ntools/source/gLang.cxx
@@ -16,33 +16,463 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #include "gLang.hxx"
+#include 
+
+
+
+class handler
+{
+public:
+handler()  {};
+~handler() {};
+
+void showRunTimeError(std::string sErr);
+void showUsage(std::stringsErr);
+void checkCommandLine(int argc, char *argv[]);
+void run();
+
+private:
+bool mbForceSave;
+bool mbDebug;
+bool mbVerbose;
+bool mbSave;
+enum {DO_CONVERT, DO_EXTRACT, DO_MERGE_KID, DO_MERGE} meWorkMode;
+std::string  msTargetDir;
+std::string  msPoDir;
+std::string  msPotDir;
+std::vector mvSourceFiles;
+std::vector mvLanguages;
+l10nMem  mcMemory;
+
+void showManual();
+void loadL10MEM(bool onlyTemplates);
+void runConvert();
+void runExtract();
+void runMerge(bool bKid);
+};
+
+
+
+void handler::showRunTimeError(std::string sErr)
+{
+std::cerr << "runtime error: "
+  << (sErr.size() ? sErr : "No description")
+  << std::endl;
+exit(-1);
+}
+
+
+
+void handler::showUsage(std::string sErr)
+{
+if (sErr.size())
+std::cerr << "commandline error: " << sErr << std::endl;
+
+std::cout << "syntax oveview, use \"genLang help\" for full description\n"
+ "   genLang  \n"
+ "is one of\n"
+ "  convert   convert old pot/po files to new format\n"
+ "  extract   extract pot templates from sources\n"
+ "  help  show manual\n"
+ "  merge merge po files back

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

2016-03-11 Thread Caolán McNamara

 comphelper/source/xml/attributelist.cxx |   18 +++---
 include/comphelper/attributelist.hxx|   10 --
 2 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 66fee51115a2174bde47c3af01a7d1fdcf1ef602
Author: CaolÃ¡n McNamara 
Date:   Fri Mar 11 09:45:39 2016 +

Resolves: tdf#98418 AttributeList must support XCloneable

regression from

commit 8998768a34751d35403678a81464a26835b2230e
Date:   Sat Feb 6 18:38:32 2016 +0100

Change-Id: I217fb66621505b77b6102954c07ef513e2d4b25e

diff --git a/comphelper/source/xml/attributelist.cxx 
b/comphelper/source/xml/attributelist.cxx
index f196b48..cefede8 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -100,15 +100,20 @@ OUString SAL_CALL AttributeList::getValueByName(const 
OUString& sName) throw( cs
 return OUString();
 }
 
-
 AttributeList::AttributeList()
+: m_pImpl(new AttributeList_Impl)
+{
+}
+
+AttributeList::AttributeList(const AttributeList &r)
+: cppu::WeakImplHelper()
+, m_pImpl(new AttributeList_Impl)
 {
-m_pImpl = new AttributeList_Impl;
+*m_pImpl = *(r.m_pImpl);
 }
 
 AttributeList::~AttributeList()
 {
-delete m_pImpl;
 }
 
 void AttributeList::AddAttribute(const OUString &sName,
@@ -122,6 +127,13 @@ void AttributeList::Clear()
 m_pImpl->vecAttribute.clear();
 }
 
+css::uno::Reference< css::util::XCloneable > AttributeList::createClone() 
throw (css::uno::RuntimeException, std::exception)
+
+{
+AttributeList *p = new AttributeList( *this );
+return css::uno::Reference< css::util::XCloneable > ( 
static_cast(p) );
+}
+
 } // namespace comphelper
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/attributelist.hxx 
b/include/comphelper/attributelist.hxx
index 18aaa50..9a6f535 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 #define INCLUDED_COMPHELPER_ATTRIBUTELIST_HXX
 
+#include 
 #include 
 #include 
 #include 
@@ -31,11 +32,13 @@ namespace comphelper
 struct AttributeList_Impl;
 
 class COMPHELPER_DLLPUBLIC AttributeList :
-public ::cppu::WeakImplHelper
+public ::cppu::WeakImplHelper
 {
-AttributeList_Impl *m_pImpl;
+std::unique_ptr m_pImpl;
 public:
 AttributeList();
+AttributeList(const AttributeList &r);
+
 virtual ~AttributeList();
 
 // methods that are not contained in any interface
@@ -56,6 +59,9 @@ public:
 virtual OUString SAL_CALL getValueByName(const OUString& aName)
 throw( css::uno::RuntimeException, std::exception ) override;
 
+// css::util::XCloneable
+virtual css::uno::Reference< XCloneable > SAL_CALL
+createClone()   throw(css::uno::RuntimeException, std::exception) 
override;
 };
 
 } // namespace comphelper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice Online Chinese support issues

2016-03-11 Thread Michael Meeks

Hi Xipeng Song,

On Thu, 2016-03-10 at 10:29 +0800, xipeng wrote:
> I suspect that the browser may support IME, just after switching
> Chinese input do not know how to obtain the return of the unicode
> code.

Sure - exactly; so - we need a way of injection not just key-codes into
the text - but full UTF-8 / unicode strings as produced by the IME. In
gtk+ language that's an IM commit - and the internal event is
SALEVENT_EXTTEXTINPUT - almost certainly we would want to simulate that
internally. Wrt. the IME popup windows, and so on I'd hope we can
overlay that in the browser at the cursor point.

> I imagine "Map.Keyboard.js" is the implementation of the event for
> the English/Western char input. 

Right.

> We hope our efforts can bring some convenience to people's lives.

Sure - thanks for digging into this.

If you can get the javascript side to work nicely for you (with the IME
pieces) and give us a clean UTF-8 string - I'd be happy to implement the
"commit" piece on the protocol / server side.

Does that make sense ?

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

Fix tdf#98416: explicitly disable hardcoded curl CA certificate store

2016-03-11 Thread Giuseppe Castagno


Hi all,

This gerrit:


is a proposed fix for tdf#98416


In curl doc about ssl store, here:


the relevant quote:
"
...

--with-ca-bundle=FILE: use the specified file as CA certificate store. 
CA certificates need to be concatenated in PEM format into this file.


--with-ca-path=PATH: use the specified path as CA certificate store. CA 
certificates need to be stored as individual PEM files in this 
directory. You may need to run c_rehash after adding files there.


If neither of the two options is specified, configure will try to 
auto-detect a setting. It's also possible to explicitly not hardcode any 
default store but rely on the built in default the crypto library may 
provide instead. You can achieve that by passing both 
--without-ca-bundle and --without-ca-path to the configure script.


...
"
Hence the need to explicitly disable the hardcoded store, the comment in 
the gerrit patch should be explicative.


IIRC in LO, curl relies on nss for the CA certificate store, not on curl 
own store.


--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2016-03-11 Thread Stephan Bergmann

 sal/osl/unx/nlsupport.cxx |   36 
 1 file changed, 20 insertions(+), 16 deletions(-)

New commits:
commit 8e94196776e902330c39257f276f995612d9a0f7
Author: Stephan Bergmann 
Date:   Fri Mar 11 10:31:54 2016 +0100

Better fix for -Werror=shadow

Change-Id: I2dff3eeef6e9d2bcf089f054475c164c8c641941

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 92a2828..b7e86c1 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -40,19 +40,23 @@
 
 #include 
 
-typedef struct {
+namespace {
+
+struct Pair {
 const char  *key;
 const rtl_TextEncoding   value;
-} pair;
+};
+
+}
 
 /*
  compare function for binary search
  */
 
 static int
-pair_compare (const char *key, const pair *pair_)
+pair_compare (const char *key, const Pair *pair)
 {
-int result = rtl_str_compareIgnoreAsciiCase( key, pair_->key );
+int result = rtl_str_compareIgnoreAsciiCase( key, pair->key );
 return result;
 }
 
@@ -60,8 +64,8 @@ pair_compare (const char *key, const pair *pair_)
  binary search on encoding tables
  */
 
-static const pair*
-pair_search (const char *key, const pair *base, unsigned int member )
+static const Pair*
+pair_search (const char *key, const Pair *base, unsigned int member )
 {
 unsigned int lower = 0;
 unsigned int upper = member;
@@ -254,7 +258,7 @@ static rtl_Locale * parse_locale( const char * locale )
  *LC_ALL=$i locale -k code_set_name
  *  done
  */
-static const pair nl_language_list[] = {
+static const Pair nl_language_list[] = {
 { "5601",   RTL_TEXTENCODING_EUC_KR }, /* ko_KR.EUC */
 { "646",RTL_TEXTENCODING_ISO_8859_1 }, /* fake: ASCII_US */
 { "ANSI-1251",  RTL_TEXTENCODING_MS_1251}, /* ru_RU.ANSI1251 */
@@ -291,7 +295,7 @@ static const pair nl_language_list[] = {
 
 #elif defined(LINUX)
 
-static const pair nl_language_list[] = {
+static const Pair nl_language_list[] = {
 { "ANSI_X3.110-1983",   RTL_TEXTENCODING_DONTKNOW   },  /* 
ISO-IR-99 NAPLPS */
 { "ANSI_X3.4-1968", RTL_TEXTENCODING_ISO_8859_1 },  /* fake: 
ASCII_US */
 { "ASMO_449",   RTL_TEXTENCODING_DONTKNOW },/* 
ISO_9036 ARABIC7 */
@@ -473,7 +477,7 @@ static const pair nl_language_list[] = {
 
 #elif defined(FREEBSD) || defined(DRAGONFLY)
 
-static const pair nl_language_list[] = {
+static const Pair nl_language_list[] = {
 { "ASCII", RTL_TEXTENCODING_ASCII_US   }, /* US-ASCII */
 { "BIG5",  RTL_TEXTENCODING_BIG5   }, /* China - 
Traditional Chinese */
 { "CP1251",RTL_TEXTENCODING_MS_1251}, /* MS-CYRL */
@@ -497,7 +501,7 @@ static const pair nl_language_list[] = {
 
 #elif defined(NETBSD)
 
-static const pair nl_language_list[] = {
+static const Pair nl_language_list[] = {
 { "ASCII", RTL_TEXTENCODING_ASCII_US   }, /* US-ASCII */
 { "BIG5",  RTL_TEXTENCODING_BIG5   }, /* China - 
Traditional Chinese */
 { "Big5",  RTL_TEXTENCODING_BIG5   }, /* China - 
Traditional Chinese */
@@ -532,7 +536,7 @@ static const pair nl_language_list[] = {
 
 #elif defined(OPENBSD)
 
-static const pair nl_language_list[] = {
+static const Pair nl_language_list[] = {
 { "ASCII", RTL_TEXTENCODING_ASCII_US   }, /* US-ASCII */
 { "BIG5",  RTL_TEXTENCODING_BIG5   }, /* China - 
Traditional Chinese */
 { "CP1251",RTL_TEXTENCODING_MS_1251}, /* MS-CYRL */
@@ -564,7 +568,7 @@ static pthread_mutex_t aLocalMutex = 
PTHREAD_MUTEX_INITIALIZER;
 
 rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
 {
-const pair *language=nullptr;
+const Pair *language=nullptr;
 
 char  locale_buf[64] = "";
 char  codeset_buf[64];
@@ -683,7 +687,7 @@ int imp_setProcessLocale( rtl_Locale * pLocale )
  * from the ISO language codes.
  */
 
-static const pair full_locale_list[] = {
+static const Pair full_locale_list[] = {
 { "ja_JP.eucJP",  RTL_TEXTENCODING_EUC_JP  },
 { "ja_JP.EUC",RTL_TEXTENCODING_EUC_JP  },
 { "ko_KR.EUC",RTL_TEXTENCODING_EUC_KR  },
@@ -691,7 +695,7 @@ static const pair full_locale_list[] = {
 { "zh_TW.EUC",RTL_TEXTENCODING_EUC_TW  }
 };
 
-static const pair locale_extension_list[] = {
+static const Pair locale_extension_list[] = {
 { "big5", RTL_TEXTENCODING_BIG5},
 { "big5hk",   RTL_TEXTENCODING_BIG5_HKSCS  },
 { "gb18030",  RTL_TEXTENCODING_GB_18030},
@@ -720,7 +724,7 @@ static const pair locale_extension_list[] = {
 { "utf-8",RTL_TEXTENCODING_UTF8}
 };
 
-static const pair iso_language_list[] = {
+static const Pai

Mayank Gupta license statement

2016-03-11 Thread Mayank Gupta

Hi!

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

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

[Libreoffice-commits] core.git: chart2/source comphelper/source forms/source framework/source l10ntools/source sw/source tools/source

2016-03-11 Thread Wastack

 chart2/source/model/template/PieChartType.cxx |2 +-
 comphelper/source/property/propertystatecontainer.cxx |2 +-
 forms/source/richtext/clipboarddispatcher.cxx |2 +-
 forms/source/richtext/parametrizedattributedispatcher.cxx |2 +-
 forms/source/richtext/richtextimplcontrol.cxx |2 +-
 framework/source/uielement/statusbaritem.cxx  |2 +-
 framework/source/uifactory/addonstoolbarfactory.cxx   |2 +-
 l10ntools/source/propmerge.cxx|6 +++---
 sw/source/core/crsr/crbm.cxx  |4 ++--
 tools/source/misc/cpuid.cxx   |4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit ce549d2a09ad9884a7e598162cf0ca6b6bc3150c
Author: Wastack 
Date:   Fri Mar 11 01:07:08 2016 +0100

tdf#97966: Remove 'static' keywords

Change-Id: Iced527f48afa828cc9acf5b6461674a2706cbcd7
Reviewed-on: https://gerrit.libreoffice.org/23135
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/chart2/source/model/template/PieChartType.cxx 
b/chart2/source/model/template/PieChartType.cxx
index f036ebc..b95d083 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -46,7 +46,7 @@ enum
 PROP_PIECHARTTYPE_3DRELATIVEHEIGHT
 };
 
-static void lcl_AddPropertiesToVector(
+void lcl_AddPropertiesToVector(
 ::std::vector< Property > & rOutProperties )
 {
 rOutProperties.push_back(
diff --git a/comphelper/source/property/propertystatecontainer.cxx 
b/comphelper/source/property/propertystatecontainer.cxx
index 01cfe36..b315a66 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -31,7 +31,7 @@ namespace comphelper
 
 namespace
 {
-static OUString lcl_getUnknownPropertyErrorMessage( const OUString& 
_rPropertyName )
+OUString lcl_getUnknownPropertyErrorMessage( const OUString& 
_rPropertyName )
 {
 // TODO: perhaps it's time to think about resources in the 
comphelper module?
 // Would be nice to have localized exception strings (a simply 
resource file containing
diff --git a/forms/source/richtext/clipboarddispatcher.cxx 
b/forms/source/richtext/clipboarddispatcher.cxx
index 09cbdbc..00d5ade 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -38,7 +38,7 @@ namespace frm
 
 namespace
 {
-static URL createClipboardURL( OClipboardDispatcher::ClipboardFunc 
_eFunc )
+URL createClipboardURL( OClipboardDispatcher::ClipboardFunc _eFunc )
 {
 URL aURL;
 switch ( _eFunc )
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx 
b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 47fe59a..607cba9 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -53,7 +53,7 @@ namespace frm
 
 namespace
 {
-static SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
+SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
 {
 switch ( _nSlotId )
 {
diff --git a/forms/source/richtext/richtextimplcontrol.cxx 
b/forms/source/richtext/richtextimplcontrol.cxx
index 24c5b04..6bb6849 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -543,7 +543,7 @@ namespace frm
 
 namespace
 {
-static void lcl_inflate( Rectangle& _rRect, long _nInflateX, long 
_nInflateY )
+void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
 {
 _rRect.Left() -= _nInflateX;
 _rRect.Right() += _nInflateX;
diff --git a/framework/source/uielement/statusbaritem.cxx 
b/framework/source/uielement/statusbaritem.cxx
index c33bd04..a69baac 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -33,7 +33,7 @@ namespace framework
 
 namespace
 {
-static sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
+sal_uInt16 impl_convertItemBitsToItemStyle( sal_Int16 nItemBits )
 {
 sal_uInt16 nStyle( 0 );
 
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx 
b/framework/source/uifactory/addonstoolbarfactory.cxx
index c1356d5..2003669 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -98,7 +98,7 @@ AddonsToolBarFactory::~AddonsToolBarFactory()
 {
 }
 
-static bool IsCorrectContext( const OUString& rModuleIdentifier, const 
OUString& aContextList )
+bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString& 
aContextList )
 {
 if ( aContextList.isEmpty() )
 return true;
diff --g

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

2016-03-11 Thread Wastack

 compilerplugins/clang/cstylecast.cxx   |2 +-
 compilerplugins/clang/fpcomparison.cxx |4 ++--
 compilerplugins/clang/mergeclasses.cxx |8 
 compilerplugins/clang/staticmethods.cxx|2 +-
 compilerplugins/clang/store/removevirtuals.cxx |4 ++--
 compilerplugins/clang/store/unnecessaryvirtual.cxx |2 +-
 compilerplugins/clang/unusedfieldsremove.cxx   |4 ++--
 compilerplugins/clang/unusedmethodsremove.cxx  |4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 9a13cff64783a7de3dce7d484c150605bd42a4d6
Author: Wastack 
Date:   Fri Mar 11 01:00:27 2016 +0100

tdf#97966: Remove 'static' keywords

Change-Id: Id991cead4f01830eafd9cf8dd63b519ef07c9451
Reviewed-on: https://gerrit.libreoffice.org/23134
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/cstylecast.cxx 
b/compilerplugins/clang/cstylecast.cxx
index ce4b8b6..e33e905 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -110,7 +110,7 @@ private:
 bool externCFunction;
 };
 
-static const char * recommendedFix(clang::CastKind ck) {
+const char * recommendedFix(clang::CastKind ck) {
 switch(ck) {
 case CK_IntegralToPointer: return "reinterpret_cast";
 case CK_PointerToIntegral: return "reinterpret_cast";
diff --git a/compilerplugins/clang/fpcomparison.cxx 
b/compilerplugins/clang/fpcomparison.cxx
index 8d20b8c..491eb80 100644
--- a/compilerplugins/clang/fpcomparison.cxx
+++ b/compilerplugins/clang/fpcomparison.cxx
@@ -40,7 +40,7 @@ private:
 EState meState = EState::None;
 };
 
-static const std::set whitelist {
+const std::set whitelist {
 "rtl::math::approxEqual",
 "(anonymous namespace)::doubleToString",
 "(anonymous namespace)::stringToDouble",
@@ -95,7 +95,7 @@ bool FpComparison::ignore(FunctionDecl* function)
 return false;
 }
 
-static bool isZeroConstant(ASTContext& context, const Expr* expr)
+bool isZeroConstant(ASTContext& context, const Expr* expr)
 {
 if (!expr->getType()->isFloatingType()) {
 return false;
diff --git a/compilerplugins/clang/mergeclasses.cxx 
b/compilerplugins/clang/mergeclasses.cxx
index 72e4f32..6fcee44 100644
--- a/compilerplugins/clang/mergeclasses.cxx
+++ b/compilerplugins/clang/mergeclasses.cxx
@@ -79,11 +79,11 @@ public:
 bool VisitCallExpr(const CallExpr* decl);
 };
 
-static bool startsWith(const std::string& rStr, const char* pSubStr) {
+bool startsWith(const std::string& rStr, const char* pSubStr) {
 return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
 }
 
-static void addToInstantiatedSet(const std::string& s)
+void addToInstantiatedSet(const std::string& s)
 {
 // ignore stuff in the standard library, and UNO stuff we can't touch.
 if (startsWith(s, "rtl::") || startsWith(s, "sal::") || startsWith(s, 
"com::sun::")
@@ -161,12 +161,12 @@ bool MergeClasses::VisitFunctionDecl(const FunctionDecl* 
decl)
 return true;
 }
 
-static bool startswith(const std::string& s, const std::string& prefix)
+bool startswith(const std::string& s, const std::string& prefix)
 {
 return s.rfind(prefix,0) == 0;
 }
 
-static bool endswith(const std::string& s, const std::string& suffix)
+bool endswith(const std::string& s, const std::string& suffix)
 {
 return s.rfind(suffix) == (s.size()-suffix.size());
 }
diff --git a/compilerplugins/clang/staticmethods.cxx 
b/compilerplugins/clang/staticmethods.cxx
index d4edb1a..43e0f73 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -67,7 +67,7 @@ std::string StaticMethods::getFilename(SourceLocation loc)
 return compiler.getSourceManager().getFilename(spellingLocation);
 }
 
-static bool startsWith(const std::string& rStr, const char* pSubStr) {
+bool startsWith(const std::string& rStr, const char* pSubStr) {
 return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
 }
 
diff --git a/compilerplugins/clang/store/removevirtuals.cxx 
b/compilerplugins/clang/store/removevirtuals.cxx
index 86f4477..da204d3 100644
--- a/compilerplugins/clang/store/removevirtuals.cxx
+++ b/compilerplugins/clang/store/removevirtuals.cxx
@@ -44,7 +44,7 @@ private:
 char* mmappedData;
 };
 
-static size_t getFilesize(const char* filename)
+size_t getFilesize(const char* filename)
 {
 struct stat st;
 stat(filename, &st);
@@ -71,7 +71,7 @@ RemoveVirtuals::~RemoveVirtuals()
 close(mmapFD);
 }
 
-static std::string niceName(const CXXMethodDecl* functionDecl)
+std::string niceName(const CXXMethodDecl* functionDecl)
 {
 std::string s =
functionDecl->getParent()->getQualifiedNameAsString() + "::"
diff --git a/compilerplugins/clang/store/unnecessaryvirtual.cxx 
b/compilerplugins/clang/store/unnecessaryvirtual.cxx
index a5682ce..463fc23 100644
--- a/compilerplugins/clang/store/unnecessaryvirtual.cxx
+++ b/compilerplugins/clang/store

[Libreoffice-commits] core.git: connectivity/source dbaccess/source extensions/source filter/source sdext/source writerperfect/qa

2016-03-11 Thread Wastack

 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |4 ++--
 dbaccess/source/core/dataaccess/documentevents.cxx |2 +-
 extensions/source/resource/ResourceIndexAccess.cxx |2 +-
 filter/source/msfilter/util.cxx|6 +++---
 sdext/source/pdfimport/sax/saxattrlist.cxx |2 +-
 sdext/source/pdfimport/services.cxx|   12 ++--
 writerperfect/qa/unit/DirectoryStreamTest.cxx  |2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 018c6adf85097d07a0b0fbce3d7155ca5a369ae1
Author: Wastack 
Date:   Fri Mar 11 00:49:47 2016 +0100

tdf#97966: Remove 'static' keywords

Change-Id: I0d9837a7ccecd606e0d43b53f8b920547b0d0bcd
Reviewed-on: https://gerrit.libreoffice.org/23132
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 24492f1..d3410ba 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::mozilla;
 namespace
 {
 
-static OUString lcl_getUserDataDirectory()
+OUString lcl_getUserDataDirectory()
 {
 ::osl::Security   aSecurity;
 OUString   aConfigPath;
@@ -90,7 +90,7 @@ namespace
 };
 
 
-static OUString lcl_guessProfileRoot( MozillaProductType _product )
+OUString lcl_guessProfileRoot( MozillaProductType _product )
 {
 size_t productIndex = _product - 1;
 
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx 
b/dbaccess/source/core/dataaccess/documentevents.cxx
index 3d00576..37d364d 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -73,7 +73,7 @@ namespace dbaccess
 
 namespace
 {
-static const DocumentEventData* lcl_getDocumentEventData()
+const DocumentEventData* lcl_getDocumentEventData()
 {
 static const DocumentEventData s_aData[] = {
 { "OnCreate",   true  },
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx 
b/extensions/source/resource/ResourceIndexAccess.cxx
index 63bfee9..5141b20 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::container;
 
 namespace
 {
-static std::shared_ptr GetResMgr(Sequence const& rArgs)
+std::shared_ptr GetResMgr(Sequence const& rArgs)
 {
 if(rArgs.getLength()!=1)
 return std::shared_ptr();
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index 6874111..89ab37a 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -1231,7 +1231,7 @@ namespace
 // Scheme means pattern of chromatic values.
 // [2,2,1] -> red and green are approximately equal and blue is the dominant 
color (e.g. blue)
 // [1,1,1] -> all chromatic values are approximately equal (e.g. white, gray, 
black)
-static void CalculateScheme(const BitmapColor& rBitmapColor, std::vector 
&vScheme, sal_uInt16 nVariance)
+void CalculateScheme(const BitmapColor& rBitmapColor, std::vector 
&vScheme, sal_uInt16 nVariance)
 {
 vScheme.resize(3,1);
 if( rBitmapColor.GetRed() < rBitmapColor.GetGreen() + nVariance )
@@ -1248,7 +1248,7 @@ static void CalculateScheme(const BitmapColor& 
rBitmapColor, std::vector &v
 ++vScheme[2];
 }
 
-static bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const 
BitmapColor& rBitmapColor2, sal_uInt16 nVariance)
+bool HasSimilarScheme(const BitmapColor& rBitmapColor1, const BitmapColor& 
rBitmapColor2, sal_uInt16 nVariance)
 {
 std::vector vScheme1, vScheme2;
 CalculateScheme(rBitmapColor1, vScheme1, nVariance);
@@ -1262,7 +1262,7 @@ static bool HasSimilarScheme(const BitmapColor& 
rBitmapColor1, const BitmapColor
 }
 
 // Find the best match in the color palette using scheme of the input color
-static sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const 
BitmapColor& rBitmapColor)
+sal_uInt16 GetBestIndex(const BitmapPalette& rPalette, const BitmapColor& 
rBitmapColor)
 {
 sal_uInt16 nReturn = 0;
 sal_uInt16 nLastErr = SAL_MAX_UINT16;
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx 
b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 87d804b..6fa5db9 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -48,7 +48,7 @@ SaxAttrList::~SaxAttrList()
 }
 
 namespace {
-static OUString getCDATAString()
+OUString getCDATAString()
 {
 return OUString( "CDATA" );
 }
diff --git a/sdext/source/pdfimport/services.cxx 
b/sdext/source/pdfimport/services.cxx
index 834964f..52916d2 100644
--- a/sdext/source/pd

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

2016-03-11 Thread Wastack

 svx/source/form/fmPropBrw.cxx  |2 +-
 svx/source/unodraw/recoveryui.cxx  |6 +++---
 vcl/source/app/brand.cxx   |4 ++--
 xmloff/source/transform/XMLFilterRegistration.cxx  |2 +-
 xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx |2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 7a0b8decb7d81fefced39ee04368dd0112e8ac28
Author: Wastack 
Date:   Fri Mar 11 00:43:10 2016 +0100

tdf#97966: Remove 'static' keywords

Change-Id: Id70f9e55fb4ad7d3a501399b055208ea10369c82
Reviewed-on: https://gerrit.libreoffice.org/23131
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index aff1df1..af7487d 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -491,7 +491,7 @@ IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*, 
void )
 
 namespace
 {
-static bool lcl_shouldEnableHelpSection( const Reference< 
XComponentContext >& _rxContext )
+bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& 
_rxContext )
 {
 ::utl::OConfigurationTreeRoot aConfiguration(
 ::utl::OConfigurationTreeRoot::createWithComponentContext(
diff --git a/svx/source/unodraw/recoveryui.cxx 
b/svx/source/unodraw/recoveryui.cxx
index 7f436f9..ef3701b 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -176,7 +176,7 @@ css::uno::Any SAL_CALL 
RecoveryUI::dispatchWithReturnValue(const css::util::URL&
 }
 
 
-static OUString GetCrashConfigDir()
+OUString GetCrashConfigDir()
 {
 
 #if defined(_WIN32)
@@ -202,14 +202,14 @@ static OUString GetCrashConfigDir()
 #endif
 
 
-static OUString GetUnsentURL()
+OUString GetUnsentURL()
 {
 OUString aURL = GetCrashConfigDir() + "/" LCKFILE;
 return aURL;
 }
 
 
-static bool delete_pending_crash()
+bool delete_pending_crash()
 {
 OUStringaUnsentURL = GetUnsentURL();
 return ( FileBase::E_None == File::remove( aUnsentURL ) );
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 5a7bd2d..236ddea 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -29,7 +29,7 @@
 #include 
 
 namespace {
-static bool loadPng( const OUString & rPath, BitmapEx &rBitmap)
+bool loadPng( const OUString & rPath, BitmapEx &rBitmap)
 {
 INetURLObject aObj( rPath );
 SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
@@ -41,7 +41,7 @@ namespace {
 else
 return false;
 }
-static bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, 
BitmapEx& rBitmap )
+bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, 
BitmapEx& rBitmap )
 {
 return loadPng( rBaseDir + "/" LIBO_ETC_FOLDER + rName, rBitmap);
 }
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx 
b/xmloff/source/transform/XMLFilterRegistration.cxx
index e87ea6a..4b7ce03 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -43,7 +43,7 @@ namespace
 CreateInstance  createInstance;
 };
 
-static const ServiceDescriptor* getServiceDescriptors()
+const ServiceDescriptor* getServiceDescriptors()
 {
 static const ServiceDescriptor aDescriptors[] =
 {
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index 1815770..50dcade 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -64,7 +64,7 @@ sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( 
::com::sun::star::uno::R
 
 namespace {
 // Helper functions from nss/lib/certdb/genname.c
-static int GetNamesLength(CERTGeneralName *names)
+int GetNamesLength(CERTGeneralName *names)
 {
 int  length = 0;
 CERTGeneralName  *first;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Wastack

 vcl/source/control/imgctrl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b91fb8465cdaaff077b9f5c2a73cfc873350126f
Author: Wastack 
Date:   Fri Mar 11 00:39:12 2016 +0100

tdf#97966: Remove 'static' keywords

Change-Id: I67e6076d65b90fb386ab439c5716820a6322af38
Reviewed-on: https://gerrit.libreoffice.org/23130
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index a41f3f4..60d7b79 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -47,7 +47,7 @@ void ImageControl::Resize()
 
 namespace
 {
-static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& 
_rBitmapSize )
+Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& 
_rBitmapSize )
 {
 const Size aPaintSize = _rPaintRect.GetSize();
 
@@ -58,7 +58,7 @@ namespace
 return Size( long( _rBitmapSize.Width() * nRatioMin ), long( 
_rBitmapSize.Height() * nRatioMin ) );
 }
 
-static Point lcl_centerWithin( const Rectangle& _rArea, const Size& 
_rObjectSize )
+Point lcl_centerWithin( const Rectangle& _rArea, const Size& _rObjectSize )
 {
 Point aPos( _rArea.TopLeft() );
 aPos.X() += ( _rArea.GetWidth() - _rObjectSize.Width() ) / 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-11 Thread Wastack

 vcl/source/control/quickselectionengine.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 951917e73cc5d52453830daa47fd30b5fd834bc0
Author: Wastack 
Date:   Fri Mar 11 00:37:08 2016 +0100

tdf#97966: Remove 'static' keywords

Change-Id: I0a3f17d43917d05734980329231ef6e7cadfd58a
Reviewed-on: https://gerrit.libreoffice.org/23129
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/vcl/source/control/quickselectionengine.cxx 
b/vcl/source/control/quickselectionengine.cxx
index e8d4075..fc7e789 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -56,7 +56,7 @@ namespace vcl
 
 namespace
 {
-static void lcl_reset( QuickSelectionEngine_Data& _data )
+void lcl_reset( QuickSelectionEngine_Data& _data )
 {
 _data.sCurrentSearchString.clear();
 _data.aSingleSearchChar.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Firebird doesn't support MSVC 2015

2016-03-11 Thread Miklos Vajna

Hi David,

On Wed, Mar 02, 2016 at 07:37:40PM +0100, David Ostrovsky  
wrote:
> > The wiki states that 32-bit >build is broken, that sounds like a
> >blocker as well. (Or is it just >that the wiki is outdated?
> >configure.ac:5277 suggests it's up to date.)
> 
> Yes, wiki was outdated, should be fixed now. Thanks for noticing.

Hmm, I've set up a 32bit VM with VS2015 only (no VS2013). Currently
configure fails at find_dotnetsdk46(), which isn't too surprising, since
even you added a TODO, saying the current code only works on 64bit. :-)

It would be really nice if this would be addressed before VS2013 support
is dropped. I'm mentioning this here, as my concern is that you only
test 64bit and CI only tests VS2013+VS2015, not VS2015 only.

Thanks,

Miklos

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

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

2016-03-11 Thread Wastack

 cppuhelper/source/exc_thrower.cxx   |4 ++--
 tubes/qa/test_manager.cxx   |2 +-
 ucb/source/ucp/expand/ucpexpand.cxx |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 83452dd0836fe0da96095a322231d837fc31934b
Author: Wastack 
Date:   Fri Mar 11 00:54:07 2016 +0100

tdf#97966 redundant static keywords removed 6

Change-Id: Iaf034f3b2282a973f6503edea41cb3184543fb11
Reviewed-on: https://gerrit.libreoffice.org/23133
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/cppuhelper/source/exc_thrower.cxx 
b/cppuhelper/source/exc_thrower.cxx
index 26838d6..7d3e24b 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -67,12 +67,12 @@ extern "C"
 {
 
 
-static void SAL_CALL ExceptionThrower_acquire_release_nop(
+void SAL_CALL ExceptionThrower_acquire_release_nop(
 SAL_UNUSED_PARAMETER uno_Interface * )
 {}
 
 
-static void SAL_CALL ExceptionThrower_dispatch(
+void SAL_CALL ExceptionThrower_dispatch(
 uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType,
 void * pReturn, void * pArgs [], uno_Any ** ppException )
 {
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index 5abe193..a5c1397 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -64,7 +64,7 @@ class TestCollaboration : public Collaboration
 virtual void StartCollaboration( TeleConference* ) {}
 };
 
-static gboolean timed_out( void * )
+gboolean timed_out( void * )
 {
 CPPUNIT_ASSERT_MESSAGE( "Test took longer than ten seconds!", false);
 
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx 
b/ucb/source/ucp/expand/ucpexpand.cxx
index 9fa5b4d..49673d6 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -115,7 +115,7 @@ void ExpandContentProviderImpl::disposing()
 }
 
 
-static uno::Reference< uno::XInterface > SAL_CALL create(
+uno::Reference< uno::XInterface > SAL_CALL create(
 uno::Reference< uno::XComponentContext > const & xComponentContext )
 {
 return static_cast< ::cppu::OWeakObject * >(
@@ -123,13 +123,13 @@ static uno::Reference< uno::XInterface > SAL_CALL create(
 }
 
 
-static OUString SAL_CALL implName()
+OUString SAL_CALL implName()
 {
 return OUString("com.sun.star.comp.ucb.ExpandContentProvider");
 }
 
 
-static uno::Sequence< OUString > SAL_CALL supportedServices()
+uno::Sequence< OUString > SAL_CALL supportedServices()
 {
 OUString names [] = {
 OUString("com.sun.star.ucb.ExpandContentProvider"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

2016-03-11 Thread Lionel Elie Mamane

On Fri, Mar 11, 2016 at 08:29:43AM +0100, David Ostrovsky wrote:
> On Fri, 2016-03-11 at 07:57 +0100, Lionel Elie Mamane wrote:
>> On Fri, Mar 11, 2016 at 07:30:54AM +0100, David Ostrovsky wrote:
>>> On Fri, 2016-03-11 at 06:45 +0100, Lionel Elie Mamane wrote:
 On Thu, Mar 10, 2016 at 07:28:58PM +0100, David Ostrovsky wrote:
> On Thu Mar 10 16:40:50 UTC 2016, Michael Meeks wrote:

>>+ decision needed: (Norbert)
>>+ effort to support VS 2015
>>+ not eager to turn it off.
>> AI:=> regret; disable for now for CI (Norbert)

> (...) the FB devs rejected support for the new toolchain
> (C++14/C++17) for the next 10 years (at least) because they need
> the compatibility with WinXP (see the thread from their ML I
> mentioned in my previous mail).

> [...]

 then AFAICS we don't have a problem.

>>> I see it differently. Just in case, we dropped MSVC 2013 and the
>>> LAST_VERSION_WITHIN_A_REASONABLE_TIMEFRAME = 10 years,

>> No, more like 1 year.

>>> 1/ How is LO 6,7,8,9,10, ... going to be released, after support
>>> for MSVC 2013 was discontinued on master?

>> ?

> How is the next LibreOffice release (5.2?) supposed to be built
> after this change was merged, when FB cannot be built on MSVC 2015
> toolchain?

We are not there yet. Obviously, if we need to switch to MSVC2015 for
5.2 and not 5.3 and FB is not fixed by then, then, yes, without FB.

Now that I look at the planning, that's indeed a two-month timeframe
(until the feature freeze). 

> And other releases during this 1 year (too optimistic assumption for
> me, but still)?

We are not talking of the same period. I was saying that if FB
intends, in the future on an ongoing basis, to be compatible with the
latest MSVC release within one year, then that will probably be
acceptable to us. I WILL ASK THEM WHAT THEIR INTENTIONS ARE. Until we
have their opinion, WE HAVE NO BASE TO DISCUSS ON.

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

Proposal for using std::unique_ptr to signal transfer of ownership

2016-03-11 Thread Markus Mohrhard

Hey,

so while looking through some of the current calc memory leaks I noticed
that at least some of them are related to our poor API and I noticed that
quite a few of the problems can easily be avoided with better API design.

For now I would like to propose that we try to use std::unique_ptr in two
places to show ownership of data. A method that returns an object for which
ownership transfers to the caller we should return the object wrapped in a
std::unique_ptr. The same should be done for a method taking ownership of a
pointer.

I hope that these are not really controversial and I'm aware that they are
not yet useful for all the old code but we need to start somewhere. Also if
there is some agreement on this there are some simple easy hacks that can
be done to move at least a bit of our code into this direction (e.g. the
horrible SfxItemPool::Clone method that results in quite a few of my leaks.)

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

[Libreoffice-commits] core.git: 3 commits - writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/qa writerfilter/source xmlsecurity/qa xmlsecurity/source

2016-03-11 Thread Miklos Vajna

 writerfilter/Library_writerfilter.mk|1 
 writerfilter/inc/dmapper/DomainMapperFactory.hxx|6 
 writerfilter/qa/cppunittests/misc/misc.cxx  |   40 +--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |5 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx   |4 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |4 
 xmlsecurity/qa/create-certs/create-certs.sh |3 
 xmlsecurity/source/framework/buffernode.cxx |   96 ---
 xmlsecurity/source/framework/buffernode.hxx |4 
 xmlsecurity/source/framework/decryptorimpl.cxx  |   33 --
 xmlsecurity/source/framework/decryptorimpl.hxx  |4 
 xmlsecurity/source/framework/elementcollector.cxx   |   41 ---
 xmlsecurity/source/framework/elementcollector.hxx   |4 
 xmlsecurity/source/framework/elementmark.cxx|7 
 xmlsecurity/source/framework/elementmark.hxx|4 
 xmlsecurity/source/framework/encryptionengine.cxx   |   27 --
 xmlsecurity/source/framework/encryptionengine.hxx   |4 
 xmlsecurity/source/framework/encryptorimpl.cxx  |   30 --
 xmlsecurity/source/framework/encryptorimpl.hxx  |4 
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx |   85 --
 xmlsecurity/source/framework/saxeventkeeperimpl.hxx |4 
 xmlsecurity/source/framework/securityengine.hxx |4 
 xmlsecurity/source/framework/signaturecreatorimpl.cxx   |   40 ---
 xmlsecurity/source/framework/signaturecreatorimpl.hxx   |4 
 xmlsecurity/source/framework/signatureengine.cxx|   33 --
 xmlsecurity/source/framework/signatureengine.hxx|4 
 xmlsecurity/source/framework/signatureverifierimpl.cxx  |   33 --
 xmlsecurity/source/framework/signatureverifierimpl.hxx  |4 
 xmlsecurity/source/helper/xsecctl.cxx   |  129 
--
 xmlsecurity/source/helper/xsecctl.hxx   |4 
 xmlsecurity/source/helper/xsecparser.hxx|4 
 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx |4 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |   86 --
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx |4 
 xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx  |   13 -
 xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx  |4 
 36 files changed, 32 insertions(+), 748 deletions(-)

New commits:
commit 0fea7b00e26d9e5ee9ae995d484540adadf85fda
Author: Miklos Vajna 
Date:   Fri Mar 11 09:11:13 2016 +0100

xmlsecurity: add missing CSP switch to certificate generator script

Without this the generated .p12 test file can't be used for SHA2 signing
on Windows, as xmlsec.git's README points out.

Change-Id: Ib97a337eca3b92dde5e0ccadee7420c492a8971c

diff --git a/xmlsecurity/qa/create-certs/create-certs.sh 
b/xmlsecurity/qa/create-certs/create-certs.sh
index cc2d317..30ae73d 100755
--- a/xmlsecurity/qa/create-certs/create-certs.sh
+++ b/xmlsecurity/qa/create-certs/create-certs.sh
@@ -150,7 +150,8 @@ do
 -inkey intermediate/private/example-xmlsecurity-${i}.key.pem \
 -passin env:SSLPASS \
 -in intermediate/certs/example-xmlsecurity-${i}.cert.pem \
--certfile intermediate/certs/ca-chain.cert.pem
+-certfile intermediate/certs/ca-chain.cert.pem \
+-CSP "Microsoft Enhanced RSA and AES Cryptographic Provider"
 done
 
 echo
commit eb63915f0ab18cd7225a573bcb9a5121c7d6b0f1
Author: Miklos Vajna 
Date:   Fri Mar 11 09:09:41 2016 +0100

xmlsecurity: clean up no longer relevant email addresses

Change-Id: I224a0914bd3506b4e2ce057c53838ec78187b060

diff --git a/xmlsecurity/source/framework/buffernode.cxx 
b/xmlsecurity/source/framework/buffernode.cxx
index f68b28b..462a98c 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -60,10 +60,6 @@ bool BufferNode::isECOfBeforeModifyIncluded(sal_Int32 
nIgnoredSecurityId) const
  *
  *   RESULT
  *  bExist - true if a match found, false otherwise
- *
- *   AUTHOR
- *  Michael Mi
- *  Email: michael...@sun.com
  
**/
 {
 bool rc = false;
@@ -104,10 +100,6 @@ void BufferNode::setReceivedAll()
  *
  *   RESULT
  *  empty
- *
- *   AUTHOR
- *  Michael Mi
- *  Email: michael...@sun.com
  
**/
 {
 m_bAllReceived = true;
@@ -132,10 +124,6 @@ void BufferNode::addElementCollector(const 
ElementCollector* pElementCollector)
  *
  *   RESULT
  *  empty
- *
- *   AUTHOR
- *  Michael Mi
- *  Email: mic

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

2016-03-11 Thread Stephan Bergmann

 desktop/source/app/dispatchwatcher.cxx |   19 ---
 desktop/source/app/dispatchwatcher.hxx |2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit 5d59315809eae08f2340864dd18f667ce2b24198
Author: Stephan Bergmann 
Date:   Thu Mar 10 16:38:36 2016 +0100

There's only a single DispatchWatcher, no need for a static mutex member

Change-Id: I410d07210bd80379fd2de1b8d76843794fa5f660

diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index 3ba4e15..35864f1 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 using namespace ::osl;
@@ -170,16 +169,6 @@ OUString impl_GuessFilter( const OUString& rUrlOut, const 
OUString& rDocService
 
 }
 
-namespace
-{
-class theWatcherMutex : public rtl::Static {};
-}
-
-Mutex& DispatchWatcher::GetMutex()
-{
-return theWatcherMutex::get();
-}
-
 DispatchWatcher::DispatchWatcher()
 : m_nRequestCount(0)
 {
@@ -317,7 +306,7 @@ bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatchRequ
 if( xDispatcher.is() )
 {
 {
-::osl::ClearableMutexGuard aGuard( GetMutex() );
+::osl::ClearableMutexGuard aGuard(m_mutex);
 // Remember request so we can find it in statusChanged!
 m_aRequestContainer.emplace(aURL.Complete, 1);
 m_nRequestCount++;
@@ -698,7 +687,7 @@ bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatchRequ
 xDisp->dispatchWithNotification( aDispatches[n].aURL, aArgs, 
this );
 else
 {
-::osl::ClearableMutexGuard aGuard( GetMutex() );
+::osl::ClearableMutexGuard aGuard(m_mutex);
 m_nRequestCount--;
 aGuard.clear();
 xDispatch->dispatch( aDispatches[n].aURL, aArgs );
@@ -706,7 +695,7 @@ bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatchRequ
 }
 }
 
-::osl::ClearableMutexGuard aGuard( GetMutex() );
+::osl::ClearableMutexGuard aGuard(m_mutex);
 bool bEmpty = (m_nRequestCount == 0);
 aGuard.clear();
 
@@ -738,7 +727,7 @@ void SAL_CALL DispatchWatcher::disposing( const 
css::lang::EventObject& )
 
 void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) 
throw( RuntimeException, std::exception )
 {
-osl::ClearableMutexGuard aGuard( GetMutex() );
+osl::ClearableMutexGuard aGuard(m_mutex);
 sal_Int16 nCount = --m_nRequestCount;
 aGuard.clear();
 OfficeIPCThread::RequestsCompleted();
diff --git a/desktop/source/app/dispatchwatcher.hxx 
b/desktop/source/app/dispatchwatcher.hxx
index 13c5b25..a71c54b 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -85,7 +85,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< 
css::frame::XDispatchResu
 bool executeDispatchRequests( const DispatchList& aDispatches, bool 
bNoTerminate = false );
 
 private:
-static ::osl::Mutex&GetMutex();
+osl::Mutex m_mutex;
 
 std::unordered_map
 m_aRequestContainer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

75 matches

Mail list logo