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

[Miklos Vajna]

 o3tl/qa/test-sorted_vector.cxx |  112 -
 1 file changed, 56 insertions(+), 56 deletions(-)

New commits:
commit 59fe25a4240b6b456456779b63694de18827d6f7
Author: Miklos Vajna 
Date:   Thu Jun 2 08:04:17 2016 +0200

CppunitTest_o3tl_tests: fix loplugin:cppunitassertequals warnings in ...

... sorted_vector

Change-Id: Ie6c5f0e187228e2cf7769c62c86ff3cba80ab6ce
Reviewed-on: https://gerrit.libreoffice.org/25804
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 2253ced..471ca7e 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -45,27 +45,27 @@ public:
 CPPUNIT_ASSERT( aVec.insert(p1).second );
 CPPUNIT_ASSERT( !aVec.insert(p3).second );
 
-CPPUNIT_ASSERT( aVec.size() == 2 );
+CPPUNIT_ASSERT_EQUAL( static_cast(2), aVec.size() );
 
-CPPUNIT_ASSERT( aVec[0] == p1 );
-CPPUNIT_ASSERT( aVec[1] == p3 );
+CPPUNIT_ASSERT_EQUAL( p1, aVec[0] );
+CPPUNIT_ASSERT_EQUAL( p3, aVec[1] );
 
-CPPUNIT_ASSERT( *aVec.begin() == p1 );
-CPPUNIT_ASSERT( *(aVec.end()-1) == p3 );
+CPPUNIT_ASSERT_EQUAL( p1, *aVec.begin() );
+CPPUNIT_ASSERT_EQUAL( p3, *(aVec.end()-1) );
 
-CPPUNIT_ASSERT( aVec.front() == p1 );
-CPPUNIT_ASSERT( aVec.back() == p3 );
+CPPUNIT_ASSERT_EQUAL( p1, aVec.front() );
+CPPUNIT_ASSERT_EQUAL( p3, aVec.back() );
 
 CPPUNIT_ASSERT( aVec.find(p1) != aVec.end() );
-CPPUNIT_ASSERT( aVec.find(p1) - aVec.begin() == 0 );
+CPPUNIT_ASSERT_EQUAL( static_cast(0), aVec.find(p1) - 
aVec.begin() );
 CPPUNIT_ASSERT( aVec.find(p3) != aVec.end() );
-CPPUNIT_ASSERT( aVec.find(p3) - aVec.begin() == 1 );
-CPPUNIT_ASSERT( aVec.find(p2) == aVec.end() );
-CPPUNIT_ASSERT( aVec.find(p4) == aVec.end() );
+CPPUNIT_ASSERT_EQUAL( static_cast(1), aVec.find(p3) - 
aVec.begin() );
+CPPUNIT_ASSERT( bool(aVec.find(p2) == aVec.end()) );
+CPPUNIT_ASSERT( bool(aVec.find(p4) == aVec.end()) );
 
-CPPUNIT_ASSERT( aVec.erase(p1) == 1 );
-CPPUNIT_ASSERT( aVec.size() == 1 );
-CPPUNIT_ASSERT( aVec.erase(p2) == 0 );
+CPPUNIT_ASSERT_EQUAL( static_cast(1), aVec.erase(p1) );
+CPPUNIT_ASSERT_EQUAL( static_cast(1), aVec.size() );
+CPPUNIT_ASSERT_EQUAL( static_cast(0), aVec.erase(p2) );
 
 aVec.DeleteAndDestroyAll();
 delete p1;
@@ -85,22 +85,22 @@ public:
 aVec.insert(p2);
 aVec.insert(p3);
 
-CPPUNIT_ASSERT( aVec.erase(p1) == 1 );
-CPPUNIT_ASSERT( aVec.size() == 2 );
+CPPUNIT_ASSERT_EQUAL( static_cast(1), aVec.erase(p1) );
+CPPUNIT_ASSERT_EQUAL( static_cast(2), aVec.size() );
 
 aVec.erase(1);
-CPPUNIT_ASSERT( aVec.size() == 1 );
+CPPUNIT_ASSERT_EQUAL( static_cast(1), aVec.size() );
 
-CPPUNIT_ASSERT( aVec.erase(p4) == 0 );
+CPPUNIT_ASSERT_EQUAL( static_cast(0), aVec.erase(p4) );
 
 aVec.clear();
-CPPUNIT_ASSERT( aVec.size() == 0 );
+CPPUNIT_ASSERT_EQUAL( static_cast(0), aVec.size() );
 
 aVec.insert(p1);
 aVec.insert(p2);
 aVec.insert(p3);
 aVec.DeleteAndDestroyAll();
-CPPUNIT_ASSERT( aVec.size() == 0 );
+CPPUNIT_ASSERT_EQUAL( static_cast(0), aVec.size() );
 delete p4;
 }
 
@@ -118,7 +118,7 @@ public:
 o3tl::sorted_vector > aVec2;
 aVec2.insert( aVec1 );
 
-CPPUNIT_ASSERT( aVec2.size() == 3 );
+CPPUNIT_ASSERT_EQUAL( static_cast(3), aVec2.size() );
 delete p1;
 delete p2;
 delete p3;
@@ -136,8 +136,8 @@ public:
 aVec.insert(p2);
 aVec.insert(p3);
 
-CPPUNIT_ASSERT( aVec.lower_bound(p1) == aVec.begin() );
-CPPUNIT_ASSERT( aVec.lower_bound(p4) == aVec.end() );
+CPPUNIT_ASSERT( bool(aVec.lower_bound(p1) == aVec.begin()) );
+CPPUNIT_ASSERT( bool(aVec.lower_bound(p4) == aVec.end()) );
 delete p1;
 delete p2;
 delete p3;
@@ -160,29 +160,29 @@ public:
 CPPUNIT_ASSERT( aVec.insert(p1).second );
 CPPUNIT_ASSERT( !aVec.insert(p3).second );
 
-CPPUNIT_ASSERT( aVec.size() == 2 );
+CPPUNIT_ASSERT_EQUAL( static_cast(2), aVec.size() );
 
-CPPUNIT_ASSERT( aVec[0] == p1 );
-CPPUNIT_ASSERT( aVec[1] == p3 );
+CPPUNIT_ASSERT_EQUAL( p1, aVec[0] );
+CPPUNIT_ASSERT_EQUAL( p3, aVec[1] );
 
 CPPUNIT_ASSERT( aVec.insert(p2_2).second );
 CPPUNIT_ASSERT( aVec.insert(p2_3).second );
 CPPUNIT_ASSERT( !aVec.insert(p2_2).second );
 CPPUNIT_ASSERT( aVec.insert(p2_4).second );
-CPPUNIT_ASSERT( aVec.size() == 5 );
+CPPUNIT_ASSERT_EQUAL( static_cast(5), aVec.size() );
 
-CPPUNIT_ASSERT( *aVec.begin() == p1 );
-CPPUNIT_ASSERT( *(aVec.e

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

[László Németh]

 sw/source/core/doc/DocumentStateManager.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1d776d6db31c741afc810056fceef6d98029e90e
Author: László Németh 
Date:   Thu Jun 2 09:11:17 2016 +0200

Revert "sw::DocumentStateManager::SetModified: don't call the OLE link 
unconditionally"

This reverts commit 5e8bc55b676116d55c3458cd799bdf4e3aebab44.

diff --git a/sw/source/core/doc/DocumentStateManager.cxx 
b/sw/source/core/doc/DocumentStateManager.cxx
index 575a010..ec6286a 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -40,10 +40,9 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc 
) :
 void DocumentStateManager::SetModified()
 {
 m_rDoc.GetDocumentLayoutManager().ClearSwLayouterEntries();
-bool bOldModified = mbModified;
 mbModified = true;
 m_rDoc.GetDocumentStatisticsManager().GetDocStat().bModified = true;
-if( !bOldModified && m_rDoc.GetOle2Link().IsSet() )
+if( m_rDoc.GetOle2Link().IsSet() )
 {
 mbInCallModified = true;
 m_rDoc.GetOle2Link().Call( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 jurt/com/sun/star/lib/uno/environments/remote/Job.java  |2 
 jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java |   58 
 2 files changed, 24 insertions(+), 36 deletions(-)

New commits:
commit 3e4fad756a451eca546eb4b2cf481172c523c71a
Author: Noel Grandin 
Date:   Wed Jun 1 15:15:02 2016 +0200

Use ArrayList for JobQueue

and make various internals of the class privatey

(This is not an ABI change, as package
com.sun.star.lib.uno.environments.remote is not considered part of the
stable URE interface; it is not included in the documentation at
.)

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

diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java 
b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
index 9dc2052..f65 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -41,8 +41,6 @@ import com.sun.star.uno.XCurrentContext;
  * @since   UDK1.0
  */
 public class Job {
-protected Job _next;
-
 protected IReceiver _iReceiver;
 protected Message  _iMessage;
   Object_disposeId;
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 a4dc753..131f2b5 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -19,6 +19,8 @@
 
 package com.sun.star.lib.uno.environments.remote;
 
+import java.util.ArrayList;
+
 import com.sun.star.lang.DisposedException;
 
 /**
@@ -27,7 +29,7 @@ import com.sun.star.lang.DisposedException;
  * For every jobs thread id exists a job queue which is registered
  * at the ThreadPool.
  *
- * A JobQueue is splitted in a sync job queue and an async job queue.
+ * A JobQueue is split into a sync job queue and an async job queue.
  * The sync job queue is the registered queue, it delegates async jobs
  * (put by putjob) into the async queue, which is only
  * known by the sync queue.
@@ -43,25 +45,24 @@ public class JobQueue {
  */
 private static final boolean DEBUG = false;
 
-protected Job _head; // the head of the job list
-protected Job _tail; // the tail of the job list
+final ArrayList jobList = new ArrayList();
 
-protected ThreadId  _threadId;   // the thread id of the queue
-protected int   _ref_count = 0;  // the stack deepness
-protected boolean   _createThread;   // create a worker thread, if needed
-protected boolean   _createThread_now;   // create a worker thread, if 
needed
-protected Thread_worker_thread;  // the thread that does the jobs
+private ThreadId  _threadId;   // the thread id of the queue
+protected int _ref_count = 0;  // the stack deepness
+private boolean   _createThread;   // create a worker thread, if needed
+private boolean   _createThread_now;   // create a worker thread, if needed
+private Thread_worker_thread;  // the thread that does the jobs
 
-protected Object_disposeId; // the active dispose id
-protected Object_doDispose = null;
-protected Throwable _throwable;
+private Object_disposeId; // the active dispose id
+private Object_doDispose = null;
+private Throwable _throwable;
 
-protected JobQueue  _async_jobQueue; // chaining job queues for asyncs
+JobQueue  _async_jobQueue; // chaining job queues for asyncs
 protected JobQueue  _sync_jobQueue;  // chaining job queues for syncs
 
-protected boolean _active = false;
+private boolean _active = false;
 
-protected JavaThreadPoolFactory _javaThreadPoolFactory;
+private JavaThreadPoolFactory _javaThreadPoolFactory;
 
 /**
  * A thread for dispatching jobs.
@@ -88,7 +89,7 @@ public class JobQueue {
 try {
   enter(2000, _disposeId);
 } catch(Throwable throwable) {
-if(_head != null || _active) { // there was a job in progress, 
so give a stack
+if(!jobList.isEmpty() || _active) { // there was a job in 
progress, so give a stack
 System.err.println(getClass().getName() + " - exception 
occurred:" + throwable);
 throwable.printStackTrace(System.err);
 }
@@ -186,13 +187,13 @@ public class JobQueue {
  * @return a job or null if timed out.
  */
 private Job removeJob(int waitTime) {
-if(DEBUG) System.err.println("# " + getClass().getName() + 
".removeJob:" + _head + " " + _threadId);
+if(DEBUG) System.err.println("# " + getClass().getName() + 
".removeJob:" + jobList + " " + _threadId);
 
 Job job = null;
 

converting Calc functions to jump functions

[Winfried Donkers]

Hi Eike,

I started converting the new Calc functions IFS and SWITCH to jump functions.
So far, the general part has been done.

I experience a problem where the functions IFS and SWITCH differ from the other 
jump functions (IF, CHOOSE, IFERROR, IFNA).
The other jump functions do 1 evaluation (of the first argument) and then jump 
to an argument that is to be the output.
The new jump functions need to evaluate at least 2 arguments.
And that is where I get stuck.

The first argument is on the stack, i.e. GetStackType() returns a type and 
ScInterpreter::sp is 1.
When I jump to the next argument to be evaluated, with aCode.Jump( pJump[ nIdx 
], pJump[ pJump[ 0 ] ] ), ScInterpreter::sp is 0 afterwards.
How do I get the argument I jumped to (that part works) on the stack to be 
evaluated?

I hope you can shed some light on this jump mechanism.

Winfried

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

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

[Jochen Nitschke]

 chart2/source/controller/dialogs/tp_ChartType.cxx |3 +--
 chart2/source/inc/macros.hxx  |2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ef3585340eb440fd9269de8a5f0f729642f67514
Author: Jochen Nitschke 
Date:   Wed Jun 1 09:21:47 2016 +0200

remove ENABLE_GL3D_BARCHART define

enabled since commit dfb2ab0cee2ba04ce8816580447e7db8160ffac4

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

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index b5682d5..5b75da8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -754,11 +754,10 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
 m_aChartTypeDialogControllerList.push_back(new 
StockChartDialogController() );
 }
 m_aChartTypeDialogControllerList.push_back(new 
CombiColumnLineChartDialogController() );
-#if ENABLE_GL3D_BARCHART
+
 SvtMiscOptions aOpts;
 if ( aOpts.IsExperimentalMode() )
 m_aChartTypeDialogControllerList.push_back(new 
GL3DBarChartDialogController());
-#endif
 
 ::std::vector< ChartTypeDialogController* >::const_iterator   aIter = 
m_aChartTypeDialogControllerList.begin();
 const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = 
m_aChartTypeDialogControllerList.end();
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 2319afe..daf66c4 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -30,8 +30,6 @@
 typeid( ex ).name() << ", Message: " << \
 ex.Message )
 
-#define ENABLE_GL3D_BARCHART 1
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

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

New commits:
commit 85a013ac3fcb8da33babd1f8d11dfa9016cc1547
Author: Jochen Nitschke 
Date:   Wed Jun 1 10:57:28 2016 +0200

remove wrong comment

comment is there since initial commit 
cd3b0741a8f509f20c5b6deaa32f2158b315939d

but HIDESELECT is handled in svtools/source/brwbox/brwbox1.cxx
and used in chart2 and dbaccess

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

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index dcaa244..132a550 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -64,7 +64,7 @@ enum class BrowserMode
 HLINES   = 0x10,
 VLINES   = 0x20,
 
-HIDESELECT   = 0x000100, // old => don't use!
+HIDESELECT   = 0x000100,
 HIDECURSOR   = 0x000200,
 
 NO_HSCROLL   = 0x000400,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 chart2/source/controller/dialogs/DataBrowser.cxx|   37 +---
 chart2/source/controller/main/ChartTransferable.cxx |6 +--
 chart2/source/tools/RangeHighlighter.cxx|   14 +++
 chart2/source/view/charttypes/Splines.cxx   |6 +--
 chart2/source/view/inc/GL3DRenderer.hxx |   12 +++---
 chart2/source/view/main/GL3DRenderer.cxx|8 ++--
 6 files changed, 38 insertions(+), 45 deletions(-)

New commits:
commit 4ca9e855389176bd913c60840b516cb122273b81
Author: Jochen Nitschke 
Date:   Wed Jun 1 10:57:28 2016 +0200

replace simple macros in chart2

with static constantants or a named value (enum)

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

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 2767d01..e1b8e94 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -52,25 +52,6 @@
 #include 
 #include 
 
-/*  BrowserMode::COLUMNSELECTION :  single cells may be selected rather than 
only
-   entire rows
-BROWSER_(H|V)LINES :   show horizontal or vertical grid-lines
-
-BROWSER_AUTO_(H|V)SCROLL : scroll automated horizontally or vertically when
-   cursor is moved beyond the edge of the dialog
-BrowserMode::HIDESELECT :   Do not mark the current row with selection 
color
-   (usually blue)
-
- */
-#define BROWSER_STANDARD_FLAGS  \
-BrowserMode::COLUMNSELECTION | \
-BrowserMode::HLINES | BrowserMode::VLINES | \
-BrowserMode::AUTO_HSCROLL | BrowserMode::AUTO_VSCROLL | \
-BrowserMode::HIDESELECT
-
-// BrowserMode::HIDECURSOR would prevent flickering in edit fields, but 
navigating
-// with shift up/down, and entering non-editable cells would be problematic,
-// e.g.  the first cell, or when being in read-only mode
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
@@ -79,6 +60,22 @@ using namespace ::svt;
 
 namespace
 {
+/*  BrowserMode::COLUMNSELECTION : single cells may be selected rather than 
only
+   entire rows
+BrowserMode::(H|V)LINES : show horizontal or vertical grid-lines
+BrowserMode::AUTO_(H|V)SCROLL : scroll automated horizontally or 
vertically when
+cursor is moved beyond the edge of the 
dialog
+BrowserMode::HIDESELECT : Do not mark the current row with selection color
+  (usually blue)
+  ! BrowserMode::HIDECURSOR would prevent flickering in edit fields, but 
navigating
+with shift up/down, and entering non-editable cells would be 
problematic,
+e.g.  the first cell, or when being in read-only mode
+*/
+const BrowserMode BrowserStdFlags = BrowserMode::COLUMNSELECTION |
+BrowserMode::HLINES | BrowserMode::VLINES |
+BrowserMode::AUTO_HSCROLL | 
BrowserMode::AUTO_VSCROLL |
+BrowserMode::HIDESELECT;
+
 sal_Int32 lcl_getRowInData( long nRow )
 {
 return static_cast< sal_Int32 >( nRow );
@@ -440,7 +437,7 @@ sal_Int32 lcl_getColumnInDataOrHeader(
 } // anonymous namespace
 
 DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool 
bLiveUpdate ) :
-::svt::EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | 
EditBrowseBoxFlags::HANDLE_COLUMN_TEXT, nStyle, BROWSER_STANDARD_FLAGS ),
+::svt::EditBrowseBox( pParent, EditBrowseBoxFlags::SMART_TAB_TRAVEL | 
EditBrowseBoxFlags::HANDLE_COLUMN_TEXT, nStyle, BrowserStdFlags ),
 m_nSeekRow( 0 ),
 m_bIsReadOnly( false ),
 m_bIsDirty( false ),
diff --git a/chart2/source/controller/main/ChartTransferable.cxx 
b/chart2/source/controller/main/ChartTransferable.cxx
index 5888620..206b7ad 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -32,8 +32,6 @@
 #include 
 #include 
 
-#define CHARTTRANSFER_OBJECTTYPE_DRAWMODEL  SotClipboardFormatId::STRING
-
 using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
@@ -83,7 +81,7 @@ bool ChartTransferable::GetData( const 
css::datatransfer::DataFlavor& rFlavor, c
 {
 if ( nFormat == SotClipboardFormatId::DRAWING )
 {
-bResult = SetObject( m_pMarkedObjModel, 
CHARTTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor );
+bResult = SetObject( m_pMarkedObjModel, 
SotClipboardFormatId::STRING, rFlavor );
 }
 else if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
 {
@@ -108,7 +106,7 @@ bool ChartTransferable::WriteObject( 
tools::SvRef& rxOStm, voi
 bool bRet = false;
 switch ( nUserObjectId )
 {
-case CHARTTRANSFER

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

[krishna keshav]

 vcl/win/gdi/winlayout.cxx |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit c0843884a0929ae4e5ad30e2410d8a8f6dfb1670
Author: krishna keshav 
Date:   Mon May 30 02:17:22 2016 +0530

tdf#96099 Reduce number of typedefs used for trivial container types

Removed "typedef" for std::unordered_map in 
vcl/win/gdi/winlayout.cxx

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

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 7133a7c..76900a5 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -50,8 +50,6 @@
 #include 
 #include 
 
-typedef std::unordered_map IntMap;
-
 // Graphite headers
 #include 
 #if ENABLE_GRAPHITE
@@ -233,10 +231,10 @@ public:
 }
 
 private:
-IntMap  maWidthMap;
-mutable int mnMinKashidaWidth;
-mutable int mnMinKashidaGlyph;
-boolmbGLyphySetupCalled;
+std::unordered_mapmaWidthMap;
+mutable int mnMinKashidaWidth;
+mutable int mnMinKashidaGlyph;
+boolmbGLyphySetupCalled;
 };
 
 GLuint WinFontInstance::mnGLyphyProgram = 0;
@@ -345,7 +343,7 @@ inline void WinFontInstance::CacheGlyphWidth( int 
nCharCode, int nCharWidth )
 
 inline int WinFontInstance::GetCachedGlyphWidth( int nCharCode ) const
 {
-IntMap::const_iterator it = maWidthMap.find( nCharCode );
+auto it = maWidthMap.find( nCharCode );
 if( it == maWidthMap.end() )
 return -1;
 return it->second;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rishabh Kumar]

 cui/source/inc/cuitabarea.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa8759400ef4adda2fe5570a9343960529786f39
Author: Rishabh Kumar 
Date:   Thu Jun 2 00:28:00 2016 +0530

tdf#100121 : Assertion failed in Area fill of a text box inside a chart

Replace MetricField by NumericField

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

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 9655799..22e2651 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -390,7 +390,7 @@ private:
 VclPtrm_pLbColorTo;
 VclPtrm_pMtrColorTo;
 VclPtr m_pLbGradients;
-VclPtrm_pMtrIncrement;
+VclPtr   m_pMtrIncrement;
 VclPtr m_pSliderIncrement;
 VclPtrm_pCtlPreview;
 VclPtr m_pBtnAdd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Coding style using shared_ptr

[Stephan Bergmann]

On 06/01/2016 09:33 AM, Aptitude Testing Team wrote:

We have an inconsistency with the coding style in our shared_ptr typedefs

cd core/include; grep -R "typedef std::shared_ptr"

Shows (for "std::shared_ptr") we have "FooPtr" or "FooRef" or "PFoo"

Should we standardise this?

FooPtr is my preference.


...and std::shared_ptr is mine.  (That is, most of the time I find 
such trivial typedefs to be more of a distraction ("what's that FooPtr 
thing? a plain *, some std smart ptr, or maybe an rtl::Reference? lets 
look it up") than a help.  I think we even have an EasyHack to get rid 
of them.)

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

Re: Coding style using shared_ptr

[Tor Lillqvist]

most of the time I find such trivial typedefs to be more of a distraction


I agree. The EasyHack is
https://bugs.documentfoundation.org/show_bug.cgi?id=96099

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

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

[Tomaž Vajngerl]

 vcl/opengl/combinedFragmentShader.glsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7aae883b90850af3f3a0aaada5704682f77c3d02
Author: Tomaž Vajngerl 
Date:   Thu Jun 2 17:48:03 2016 +0900

tdf#100187 fix division by zero in comboFragmentShader

When feather is 0.0 (used when anti-aliasing is disabled) then
we get a "division by zero" situation. As per OpenGL secs. the
shader should not fail in this situation however the result is
undetermined. Most GPUs handled this correctly but on some the
lines didn't draw at all. This should fix this issue.

Change-Id: I56ca2f10c393491807321969c72085ef7690d16a

diff --git a/vcl/opengl/combinedFragmentShader.glsl 
b/vcl/opengl/combinedFragmentShader.glsl
index c44e75c..8d73d08 100644
--- a/vcl/opengl/combinedFragmentShader.glsl
+++ b/vcl/opengl/combinedFragmentShader.glsl
@@ -29,7 +29,7 @@ void main()
 
 // Calculate the multiplier so we can transform the 0->1 fade factor
 // to take feather and line width into account.
-float multiplied = 1.0 / (1.0 - (start / end));
+float multiplied = start == end ? 1.0 : 1.0 / (1.0 - (start / end));
 
 float dist = (1.0 - abs(fade_factor)) * multiplied;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source include/vcl offapi/com sc/source sd/source svtools/source svx/source sw/source xmloff/source

[Noel Grandin]

 avmedia/source/macavf/framegrabber.mm |4 
 avmedia/source/macavf/manager.mm  |4 
 include/vcl/opengl/OpenGLContext.hxx  |2 
 offapi/com/sun/star/i18n/XCharacterClassification.idl |2 
 sc/source/ui/view/viewdata.cxx|2 
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |4 
 sd/source/ui/unoidl/DrawController.cxx|4 
 svtools/source/control/accessibleruler.cxx|5 -
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |2 
 sw/source/core/unocore/unostyle.cxx   |2 
 xmloff/source/style/PageMasterImportContext.cxx   |6 -
 xmloff/source/style/prstylei.cxx  |   66 +++---
 12 files changed, 51 insertions(+), 52 deletions(-)

New commits:
commit a21d34941c01622a479523d9eb2ab4086ff14ca0
Author: Noel Grandin 
Date:   Thu Jun 2 08:35:30 2016 +0200

drop some more RTL_CONSTASCII_USTRINGPARAM

Change-Id: I528b0ecb5282178d8e727471beb126cb7d3f2eb4

diff --git a/avmedia/source/macavf/framegrabber.mm 
b/avmedia/source/macavf/framegrabber.mm
index 2cbe8cb..15c70a7 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -108,14 +108,14 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
FrameGrabber::grabFrame( double fMe
 ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
 throw (uno::RuntimeException)
 {
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& 
ServiceName )
 throw (uno::RuntimeException)
 {
-return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( 
AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME ) );
+return ServiceName.equalsAsciiL( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME );
 }
 
 
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 3e413a3..5ba5006 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -56,14 +56,14 @@ uno::Reference< media::XPlayer > SAL_CALL 
Manager::createPlayer( const ::rtl::OU
 ::rtl::OUString SAL_CALL Manager::getImplementationName(  )
 throw (uno::RuntimeException)
 {
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ) );
+return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME );
 }
 
 
 sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName 
)
 throw (uno::RuntimeException)
 {
-return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( 
AVMEDIA_MACAVF_MANAGER_SERVICENAME ) );
+return ServiceName.equalsAsciiL( AVMEDIA_MACAVF_MANAGER_SERVICENAME );
 }
 
 
diff --git a/include/vcl/opengl/OpenGLContext.hxx 
b/include/vcl/opengl/OpenGLContext.hxx
index 6863467..dbe0ec6 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -145,7 +145,7 @@ private:
 
 protected:
 bool InitGLEW();
-void InitGLEWDebugging();
+static void InitGLEWDebugging();
 static void InitChildWindow(SystemChildWindow *pChildWindow);
 static void BuffersSwapped();
 virtual GLWindow& getModifiableOpenGLWindow() = 0;
diff --git a/offapi/com/sun/star/i18n/XCharacterClassification.idl 
b/offapi/com/sun/star/i18n/XCharacterClassification.idl
index 9540f7c..1bc8c7c 100644
--- a/offapi/com/sun/star/i18n/XCharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/XCharacterClassification.idl
@@ -245,7 +245,7 @@ published interface XCharacterClassification : 
com::sun::star::uno::XInterface
 // Continuing characters may be any alphanumeric or underscore.
 sal_Int32 nContFlags = nStartFlags;
 // Additionally, continuing characters may contain a blank.
-OUString aContChars( RTL_CONSTASCII_USTRINGPARAM(" ") );
+OUString aContChars( " " );
 // Parse predefined (must be an IDENTNAME) token.
 ParseResult rRes = xCC->parsePredefinedToken( 
KParseType::IDENTNAME, rName, 0, aLocale,
 nStartFlags, aEmptyString, nContFlags, aContChars );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 85dbb46..aa0d3a5 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2708,7 +2708,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence 
& rSe
 pSettings[SC_SHEETTABS].Value <<= pOptions->GetOption( 
VOPT_TABCONTROLS );
 pSettings[SC_OUTLSYMB].Name = SC_UNO_OUTLSYMB;
 pSettings[SC_OUTLSYMB].Value <<= pOptions->GetOption( 
VOPT_OUTLINER );
-pSettings[SC_VALUE_HIGHLIGHTING].Name = rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VALUEHIGH ) );
+pSettings[SC_VA

[Libreoffice-commits] core.git: Branch 'feature/fixes22' -

[László Németh]

 0 files changed

New commits:
commit b0260681b7435f275fc58a6a6d6ff37eb26af5be
Author: László Németh 
Date:   Thu Jun 2 11:12:52 2016 +0200

empty commit (repeat)

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/opengl

[Tomaž Vajngerl]

 vcl/opengl/combinedFragmentShader.glsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5888dd3e521184637cbe70757262eaf83e20387c
Author: Tomaž Vajngerl 
Date:   Thu Jun 2 17:48:03 2016 +0900

tdf#100187 fix division by zero in comboFragmentShader

When feather is 0.0 (used when anti-aliasing is disabled) then
we get a "division by zero" situation. As per OpenGL secs. the
shader should not fail in this situation however the result is
undetermined. Most GPUs handled this correctly but on some the
lines didn't draw at all. This should fix this issue.

Change-Id: I56ca2f10c393491807321969c72085ef7690d16a
(cherry picked from commit 7aae883b90850af3f3a0aaada5704682f77c3d02)
Reviewed-on: https://gerrit.libreoffice.org/25809
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/combinedFragmentShader.glsl 
b/vcl/opengl/combinedFragmentShader.glsl
index c44e75c..8d73d08 100644
--- a/vcl/opengl/combinedFragmentShader.glsl
+++ b/vcl/opengl/combinedFragmentShader.glsl
@@ -29,7 +29,7 @@ void main()
 
 // Calculate the multiplier so we can transform the 0->1 fade factor
 // to take feather and line width into account.
-float multiplied = 1.0 / (1.0 - (start / end));
+float multiplied = start == end ? 1.0 : 1.0 / (1.0 - (start / end));
 
 float dist = (1.0 - abs(fade_factor)) * multiplied;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/firebird/Connection.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 09224f23168786fbe28641a87cbffddcbed6e31b
Author: Lionel Elie Mamane 
Date:   Thu Jun 2 11:52:42 2016 +0200

don't detach from database if we are not attached

this leads to a cascade of uncaught/unexpected exception and thus abort in 
debug build

Change-Id: If417d2fd2037379e3006f98bc046713729ea4648

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 4f82570..979c677 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -773,9 +773,12 @@ void Connection::disposing()
 isc_rollback_transaction(status, &m_aTransactionHandle);
 }
 
-if (isc_detach_database(status, &m_aDBHandle))
+if (m_aDBHandle != 0)
 {
-evaluateStatusVector(status, "isc_detach_database", *this);
+if (isc_detach_database(status, &m_aDBHandle))
+{
+evaluateStatusVector(status, "isc_detach_database", *this);
+}
 }
 // TODO: write to storage again?
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

New branch 'feature/fixes23' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 i18npool/source/localedata/data/tr_TR.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eee5256e6649c5ccbd26f30b53351c808f6c56e4
Author: Muhammet Kara 
Date:   Thu Jun 2 10:07:23 2016 +0300

tdf#63272 Fix location of percent sign for Turkish

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

diff --git a/i18npool/source/localedata/data/tr_TR.xml 
b/i18npool/source/localedata/data/tr_TR.xml
index 823dbc9..04b840a 100644
--- a/i18npool/source/localedata/data/tr_TR.xml
+++ b/i18npool/source/localedata/data/tr_TR.xml
@@ -85,10 +85,10 @@
   ##0,00E+00
 
 
-  0%
+  %0
 
 
-  0,00%
+  %0,00
 
 
   [$₺-41F]#.##0;-[$₺-41F]#.##0
___
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' - svgio/source

[Sam Tygier]

 svgio/source/svgreader/svgcharacternode.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e687739eb4849014f7f2657e94d8ab67e4d74625
Author: Sam Tygier 
Date:   Sun May 22 19:51:53 2016 +0100

tdf#4 Avoid invalid access by reusing getFontFamily() result

getFontFamily() can give a different result on the second call so in
order to protect against access to an invalid element of the vector
the result must be reused.

Change-Id: Iec7d58537263cb5c8a7c2ea95761dd929d659e01
Reviewed-on: https://gerrit.libreoffice.org/25704
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 
Reviewed-on: https://gerrit.libreoffice.org/25796
Reviewed-by: Mark Page 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index 855beaa..8951c31 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -238,9 +238,10 @@ namespace svgio
 if(nLength)
 {
 // prepare FontAttribute
-OUString aFontFamily = 
rSvgStyleAttributes.getFontFamily().empty() ?
+const SvgStringVector& rFontFamilyVector = 
rSvgStyleAttributes.getFontFamily();
+OUString aFontFamily = rFontFamilyVector.empty() ?
 OUString("Times New Roman") :
-rSvgStyleAttributes.getFontFamily()[0];
+rFontFamilyVector[0];
 
 // #i122324# if the FontFamily name ends on ' embedded' it is 
probably a re-import
 // of a SVG export with font embedding. Remove this to make 
font matching work. This
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig extensions/source extensions/uiconfig sc/source sc/uiconfig

[Muhammet Kara]

 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx |2 
 chart2/uiconfig/ui/tp_3D_SceneGeometry.ui|   37 ---
 cui/source/tabpages/paragrph.cxx |6 -
 cui/source/tabpages/paragrph.hrc |1 
 cui/source/tabpages/paragrph.src |4 -
 cui/uiconfig/ui/textflowpage.ui  |   26 +--
 extensions/source/dbpilots/groupboxwiz.cxx   |1 
 extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui |8 ++
 sc/source/ui/dbgui/scuiasciiopt.cxx  |3 
 sc/uiconfig/scalc/ui/textimportcsv.ui|   15 ++--
 10 files changed, 53 insertions(+), 50 deletions(-)

New commits:
commit 3498fd9fe905c2021fe1298769c8e2025c2d6f39
Author: Muhammet Kara 
Date:   Wed Jun 1 14:25:03 2016 +0300

Remove SetAccessibleRelationLabeledBy calls tdf#87026

And make proper changes in the related .ui files

Change-Id: Iea998b6de25831c08950a8afa725713288113bfa
Reviewed-on: https://gerrit.libreoffice.org/25807
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx 
b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 93f17f3..ae6bfa5 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -143,8 +143,6 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( 
vcl::Window* pWindow
 {
 m_pCbxRightAngledAxes->Enable(false);
 }
-m_pMFPerspective->SetAccessibleName(m_pCbxPerspective->GetText());
-m_pMFPerspective->SetAccessibleRelationLabeledBy(m_pCbxPerspective);
 }
 
 ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage()
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui 
b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index d492804..f89fc13 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -1,6 +1,7 @@
 
+
 
-  
+  
   
 100
 1
@@ -32,55 +33,48 @@
 0
 0
 2
-1
   
 
 
   
 True
 False
-0
 _X rotation
 True
 MTR_FLD_X_ROTATION:0degrees
+0
   
   
 0
 1
-1
-1
   
 
 
   
 True
 False
-0
 _Y rotation
 True
 MTR_FLD_Y_ROTATION:0degrees
+0
   
   
 0
 2
-1
-1
   
 
 
   
 True
 False
-0
 _Z rotation
 True
 MTR_FLD_Z_ROTATION:0degrees
+0
   
   
 0
 3
-1
-1
   
 
 
@@ -92,12 +86,13 @@
 True
 0
 True
+
+  
+
   
   
 0
 4
-1
-1
   
 
 
@@ -106,12 +101,18 @@
 False
 •
 adjustmentPERSPECTIVE
+
+  
+
+
+  
+Perspective
+  
+
   
   
 1
 4
-1
-1
   
 
 
@@ -126,8 +127,6 @@
   
 1
 3
-1
-1
   
 
 
@@ -140,8 +139,6 @@
   
 1
 2
-1
-1
   
 
 
@@ -154,8 +151,6 @@
   
 1
 1
-1
-1
   
 
   
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4b9e7da..295a39a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1902,12 +1902,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( 
vcl::Window* pParent, const SfxI
 get(m_pWidowRowNo,"spinWidow");
 get(m_pWidowRowLabel,"labelWidow");
 
-m_pApplyCollBox->SetAccessibleRelationLabeledBy(m_pApplyCollBtn);
-m_pApplyCollBox->SetAccessibleName(CUI_RES(STR_PAGE_STYLE));
-
-m_pOrphanRowNo->SetAccessibleRelationLabeledBy(m_pOrphanBox);
-m_pWidowRowNo->SetAccessibleRelationLabeledBy(m_pWidowBox);
-
 // this page needs ExchangeSupport
 SetExchangeSupport();
 
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 31694ed..b59f213 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -22,7 +22,6 @@
 // StandardTabPage --
 
 #define STR_EXAMPLE 5010
-#define STR_PAGE_STYLE  5011
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index c246134..8c57940 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -26,9 +26,5 @@ String STR_EXAMPLE
 {
 Text [ en-US ] 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/opengl

[Tomaž Vajngerl]

 vcl/opengl/combinedFragmentShader.glsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be4aea73266f4aadf561b4b3943206d361a46ebd
Author: Tomaž Vajngerl 
Date:   Thu Jun 2 17:48:03 2016 +0900

tdf#100187 fix division by zero in comboFragmentShader

When feather is 0.0 (used when anti-aliasing is disabled) then
we get a "division by zero" situation. As per OpenGL secs. the
shader should not fail in this situation however the result is
undetermined. Most GPUs handled this correctly but on some the
lines didn't draw at all. This should fix this issue.

(cherry picked from commit 7aae883b90850af3f3a0aaada5704682f77c3d02)

Change-Id: I56ca2f10c393491807321969c72085ef7690d16a
Reviewed-on: https://gerrit.libreoffice.org/25810
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/opengl/combinedFragmentShader.glsl 
b/vcl/opengl/combinedFragmentShader.glsl
index c44e75c..8d73d08 100644
--- a/vcl/opengl/combinedFragmentShader.glsl
+++ b/vcl/opengl/combinedFragmentShader.glsl
@@ -29,7 +29,7 @@ void main()
 
 // Calculate the multiplier so we can transform the 0->1 fade factor
 // to take feather and line width into account.
-float multiplied = 1.0 / (1.0 - (start / end));
+float multiplied = start == end ? 1.0 : 1.0 / (1.0 - (start / end));
 
 float dist = (1.0 - abs(fade_factor)) * multiplied;
 
___
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' - i18npool/source

[Eike Rathke]

 i18npool/source/localedata/data/cs_CZ.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 91768f3f8314a3570146a28e041fdb1aef3b9df0
Author: Eike Rathke 
Date:   Wed Jun 1 14:49:37 2016 +0200

tdf#63272 [cs-CZ] percentage format with no-break space

(cherry picked from commit c5c2181a14c6ca9ed47729e6d8dbda2cc3552221)

Change-Id: I53968fb15b6e0d6e1ab5cedb7a9b6c4ffae8e534
Reviewed-on: https://gerrit.libreoffice.org/25777
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/i18npool/source/localedata/data/cs_CZ.xml 
b/i18npool/source/localedata/data/cs_CZ.xml
index 4179081..a67a9f5 100644
--- a/i18npool/source/localedata/data/cs_CZ.xml
+++ b/i18npool/source/localedata/data/cs_CZ.xml
@@ -185,10 +185,10 @@
   # ##0,-- [$Kč-405];[RED]-# ##0,-- [$Kč-405]
 
 
-  0%
+  0" "%
 
 
-  0,00%
+  0,00" "%
 
 
   0,00E+000
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svgio/source

[Xisco Fauli]

 svgio/source/svgreader/svgstyleattributes.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 897f9e6eff9f0f0a40b6abb5f6a93d7ebcc7fad5
Author: Xisco Fauli 
Date:   Tue May 31 00:37:20 2016 +0200

SVGIO: Add support for "inherit" in font-family

Change-Id: I180ab3b119af124d2d1113df055986168d39d30d
Reviewed-on: https://gerrit.libreoffice.org/25694
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 
(cherry picked from commit 5d613f920510a5a16ddb50c1577d8c29f1a8e069)
Reviewed-on: https://gerrit.libreoffice.org/25729
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index ff4a185..8be96e6 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2334,7 +2334,7 @@ namespace svgio
 
 const SvgStringVector& SvgStyleAttributes::getFontFamily() const
 {
-if(!maFontFamily.empty())
+if(!maFontFamily.empty() && !maFontFamily[0].startsWith("inherit"))
 {
 return maFontFamily;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svgio/source

[Sam Tygier]

 svgio/source/svgreader/svgcharacternode.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 08c8d094390c7ccedde7d9c04c503a62ed907ae2
Author: Sam Tygier 
Date:   Sun May 22 19:51:53 2016 +0100

tdf#4 Avoid invalid access by reusing getFontFamily() result

getFontFamily() can give a different result on the second call so in
order to protect against access to an invalid element of the vector
the result must be reused.

Change-Id: Iec7d58537263cb5c8a7c2ea95761dd929d659e01
Reviewed-on: https://gerrit.libreoffice.org/25704
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 
Reviewed-on: https://gerrit.libreoffice.org/25795
Reviewed-by: Mark Page 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index 29fd256..da61a07 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -236,9 +236,10 @@ namespace svgio
 if(nLength)
 {
 // prepare FontAttribute
-OUString aFontFamily = 
rSvgStyleAttributes.getFontFamily().empty() ?
+const SvgStringVector& rFontFamilyVector = 
rSvgStyleAttributes.getFontFamily();
+OUString aFontFamily = rFontFamilyVector.empty() ?
 OUString("Times New Roman") :
-rSvgStyleAttributes.getFontFamily()[0];
+rFontFamilyVector[0];
 
 // #i122324# if the FontFamily name ends on ' embedded' it is 
probably a re-import
 // of a SVG export with font embedding. Remove this to make 
font matching work. This
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit f52bbd2bab18c45c687ee466d1caa57a4d515785
Author: Caolán McNamara 
Date:   Thu Jun 2 11:42:46 2016 +0100

fix debugging build

Change-Id: Idb1b1d50260a969446ac1385f93163bea6cf6b04

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 3503017..72cb1d6 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -316,7 +316,7 @@ void OpenGLContext::InitGLEWDebugging()
 }
 
 // Test hooks for inserting tracing messages into the stream
-VCL_GL_INFO("LibreOffice GLContext initialized: " << this);
+VCL_GL_INFO("LibreOffice GLContext initialized");
 #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-2' - svl/source

[Laurent Balland-Poirier]

 svl/source/numbers/zformat.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 1744120145648a891b58af8c85af7585f38696f6
Author: Laurent Balland-Poirier 
Date:   Sun May 29 16:48:38 2016 +0200

tdf#100122 Correctly treat fraction without integer part

If there is no integer part (with format such as ?/?):
- sStr should be skiped
- SFrac should be completed with the right number of ?,
  j==0 must also be treated in ImpNumberFill

Change-Id: I57448eb3b0c68e10779d7fa565379e2604f7f63b
Reviewed-on: https://gerrit.libreoffice.org/25612
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit a3471916370c53c6627ba4010489f539c174bdf9)
Reviewed-on: https://gerrit.libreoffice.org/25803
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 38efb37..9f987f5 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2694,16 +2694,14 @@ bool SvNumberformat::ImpGetFractionOutput(double 
fNumber,
 else
 {
 bRes |= ImpNumberFill(sFrac, fNumber, k, j, nIx, 
NF_SYMBOLTYPE_FRACBLANK);
+bCont = false;  // there is no main number?
 if (rInfo.nTypeArray[j] == NF_SYMBOLTYPE_FRACBLANK)
 {
 sFrac.insert(0, rInfo.sStrArray[j]);
 if ( j )
 {
 j--;
-}
-else
-{
-bCont = false;
+bCont = true;  // Yes, there is a main number
 }
 }
 }
@@ -4294,6 +4292,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 short eSymbolType )// type of stop 
condition
 {
 bool bRes = false;
+bool bStop = false;
 const ImpSvNumberformatInfo& rInfo = NumFor[nIx].Info();
 // no normal thousands separators if number divided by thousands
 bool bDoThousands = (rInfo.nThousand == 0);
@@ -4301,7 +4300,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 
 k = sBuff.getLength(); // behind last digit
 
-while (j > 0 && (nType = rInfo.nTypeArray[j]) != eSymbolType ) // Backwards
+while (!bStop && (nType = rInfo.nTypeArray[j]) != eSymbolType ) // 
Backwards
 {
 switch ( nType )
 {
@@ -4376,7 +4375,10 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& 
sBuff, // number string
 sBuff.insert(k, rInfo.sStrArray[j]);
 break;
 } // of switch
-j--; // Next String
+if ( j )
+j--; // Next String
+else
+bStop = true;
 } // of while
 return bRes;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - officecfg/registry

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |   64 
--
 1 file changed, 56 insertions(+), 8 deletions(-)

New commits:
commit 1b4ce1cf3be51900b43d913df205c1325862e739
Author: Yousuf Philips 
Date:   Fri May 20 22:24:31 2016 +0400

tdf#98290 New Mac shortcut for fullscreen for all apps

Change-Id: Iacb8cd21e2323dff575da130ea9ec4fd98096a88
Reviewed-on: https://gerrit.libreoffice.org/25722
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 4112084..ec657ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1322,7 +1322,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -2314,7 +2320,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -3201,7 +3213,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -3695,7 +3713,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -4468,7 +4492,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -5229,7 +5259,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -6008,7 +6044,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
@@ -6793,7 +6835,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:FullScreen
+.uno:FullScreen
+  
+
+
+  
+I10N SHORTCUTS - NO 
TRANSLATE
+.uno:FullScreen
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - configmgr/qa officecfg/registry sw/uiconfig

[Yousuf Philips]

 configmgr/qa/unit/test.cxx   |2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   25 

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   11 ++
 sw/uiconfig/swriter/menubar/menubar.xml  |   52 
+-
 4 files changed, 63 insertions(+), 27 deletions(-)

New commits:
commit 08bb0cf5872c24533312994976969e734d33bcef
Author: Yousuf Philips 
Date:   Thu Apr 14 16:02:37 2016 +0400

tdf#91781 A round of minor tweaks to Writer's menus

Change-Id: I0c37f9e0349af0cd9dc41c500543da7532fb9198
Reviewed-on: https://gerrit.libreoffice.org/23976
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 198cba6e9af2d8a2d8d201a8b26d9a835744c659)
Reviewed-on: https://gerrit.libreoffice.org/25726
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index d22adad..9f9c203 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -283,7 +283,7 @@ void Test::testSetSetMemberName()
 ".uno:FontworkShapeType",
 "Label") >>=
 s);
-CPPUNIT_ASSERT( s == "Fontwork Gallery..." );
+CPPUNIT_ASSERT( s == "Fontwork Style" );
 }
 
 void Test::testInsertSetMember() {
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f1f25a2..01fa906 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -58,7 +58,10 @@
   
   
 
-  Fontwork Gallery...
+  Fontwork Style
+
+
+  Fontwork...
 
 
   9
@@ -400,7 +403,7 @@
   
   
 
-  "Prohibited" Symbol
+  Prohibited
 
 
   1
@@ -2414,7 +2417,10 @@
   
   
 
-  Rotate case (Title Case, UPPERCASE, 
lowercase)
+  Cycle Case (Title Case, UPPERCASE, 
lowercase)
+
+
+  Cycle Case
 
   
   
@@ -3253,6 +3259,14 @@
   1
 
   
+  
+
+  ~Link
+
+
+  1
+
+  
   
 
   Footnote and Endno~te
@@ -4726,7 +4740,10 @@
   
   
 
-  Clip Art ~Gallery
+  Media ~Gallery
+
+
+  ~Gallery
 
 
   9
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 5cc9ca7..1a5d1c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -267,6 +267,17 @@
   1
 
   
+  
+
+  ~Track Changes
+
+
+  1
+
+
+  .uno:ShowTrackedChanges
+
+  
   
 
   Go t~o Page
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 78526e2..309a486 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -71,8 +71,8 @@
   
   
   
-  
   
+  
   
   
 
@@ -87,6 +87,7 @@
   
   
   
+  
   
   
 
@@ -104,13 +105,16 @@
   
 
   
-  
   
   
   
-  
-  
   
+  
+  
+  
+  
+  
+  
   
   
   
@@ -168,6 +172,7 @@
 
   
   
+  
   
   
   
@@ -213,7 +218,6 @@
   
 
   
-  
   
 
   
@@ -242,6 +246,7 @@
   
 
   
+  
   
   
   
@@ -254,9 +259,13 @@
   
   
   
-  
-  
-  
+  
+
+  
+  
+  
+
+  
   
   
   
@@ -353,19 +362,16 @@
   
   
   
+  
   
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -417,6 +423,7 @@
 
   
   
+  
   
   
   
@@ -697,11 +704,12 @@
   
   
 
-  
   
+  
+  
   
-  
   
+  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.free

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |   23 ++
 sc/UIConfig_scalc.mk |1 
 sc/uiconfig/scalc/toolbar/singlemode.xml |   88 
++
 3 files changed, 112 insertions(+)

New commits:
commit 66a3295a0b87617e912eacb4e1bec390385fee38
Author: Yousuf Philips 
Date:   Thu Apr 14 18:12:11 2016 +0400

tdf#92218 Implement Calc single toolbar mode toolbar

Change-Id: Ie261b71000c37f18efe0658bbf239c9639a5fcf3
Reviewed-on: https://gerrit.libreoffice.org/24088
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit da27c5d58948a782f25338320f9c57cfe542986e)
Reviewed-on: https://gerrit.libreoffice.org/25725
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 0485e53..d41335a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -694,6 +694,29 @@
   true
 
   
+  
+
+  0,0
+
+
+  true
+
+
+  0
+
+
+  Standard (Single Mode)
+
+
+  false
+
+
+  false
+
+
+  false
+
+  
 
   
 
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 21bb7e1..7ab8cd4 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/scalc,\
sc/uiconfig/scalc/toolbar/mediaobjectbar \
sc/uiconfig/scalc/toolbar/moreformcontrols \
sc/uiconfig/scalc/toolbar/previewbar \
+   sc/uiconfig/scalc/toolbar/singlemode \
sc/uiconfig/scalc/toolbar/standardbar \
sc/uiconfig/scalc/toolbar/starshapes \
sc/uiconfig/scalc/toolbar/symbolshapes \
diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml 
b/sc/uiconfig/scalc/toolbar/singlemode.xml
new file mode 100644
index 000..fff6ef8
--- /dev/null
+++ b/sc/uiconfig/scalc/toolbar/singlemode.xml
@@ -0,0 +1,88 @@
+
+
+
+http://openoffice.org/2001/toolbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf77349.rtf   |3 +++
 sw/qa/extras/rtfimport/rtfimport.cxx   |7 +++
 writerfilter/source/dmapper/DomainMapper.cxx   |7 +++
 writerfilter/source/dmapper/DomainMapper.hxx   |3 +++
 writerfilter/source/dmapper/GraphicHelpers.cxx |   24 
 writerfilter/source/dmapper/GraphicHelpers.hxx |   11 +++
 writerfilter/source/dmapper/GraphicImport.cxx  |   11 ++-
 7 files changed, 61 insertions(+), 5 deletions(-)

New commits:
commit 5823d676e99f7536fca2cee774e2f8d80588
Author: Miklos Vajna 
Date:   Tue May 31 09:11:52 2016 +0200

tdf#77349 RTF import: automatically generate names for images if needed

The DOC/ODT import can call SwDoc::SetAllUniqueFlyNames() at the end of
the process to assign unique names to fly frames which lack a name.

Add a similar (but much simpler) feature to the domain mapper to avoid
empty image names in the DOCX/RTF import result, so it's easier to click
on the items in Writer's navigator.

(cherry picked from commit 526ed1f7dbd9150734edcb03727d49e1b1306f56)

Change-Id: I432fc741f8d75d735e1dfe88daba50ba0797042d
Reviewed-on: https://gerrit.libreoffice.org/25812
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/rtfimport/data/tdf77349.rtf 
b/sw/qa/extras/rtfimport/data/tdf77349.rtf
new file mode 100644
index 000..1451b36
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf77349.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+{\pict \pngblip \picw-64 \pich-1061137057 \picwgoal0 \pichgoal0 
47494638396110001000d5ffffc0c0c0555f00aafcfcfcf6f6f6eaeaeae6e6e6e4e4e4e3e3e3c2c2c2c1c1c1bcbcbcb5b5b5b3b3b3b0b0b0adadada5a5a5a2a2a2a1a1a19f9f9f9494948a8a8a888686867b7b7b6c6c6c5c5c5c4e4e4e4b4b4b4747474646463d3d3d3c3c3c2e2e2e2525251b1b1b1818181010100909090606060303030021f9040102002c1000100684408170482c0a06c8a4728924389f506833b281302a8e6b164b18103024c52111504cca67332102e0042e9a40d9319f8300a343c1200f54e47f7e2a1e0b0a7d0d728a010d838400261a7c0d94947784252700127e9d159f6c8411140019080ea7a9a85f842122281612b1b3b25d6b1f29291d0fbbbdbc5d5e51c34e4cc64a46c94341003b}
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2af36e6..390079c 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2619,6 +2619,13 @@ DECLARE_RTFIMPORT_TEST(testTdf74795, "tdf74795.rtf")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(xCell, "LeftBorderDistance"));
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf77349, "tdf77349.rtf")
+{
+uno::Reference xImage(getShape(1), uno::UNO_QUERY);
+// This was empty: imported image wasn't named automatically.
+CPPUNIT_ASSERT_EQUAL(OUString("Image1"), xImage->getName());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5eb24e9..b7403ea 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3605,6 +3605,13 @@ GraphicZOrderHelper* DomainMapper::graphicZOrderHelper()
 return zOrderHelper.get();
 }
 
+GraphicNamingHelper& DomainMapper::GetGraphicNamingHelper()
+{
+if (m_pGraphicNamingHelper.get() == nullptr)
+m_pGraphicNamingHelper.reset(new GraphicNamingHelper());
+return *m_pGraphicNamingHelper;
+}
+
 uno::Reference DomainMapper::PopPendingShape()
 {
 return m_pImpl->PopPendingShape();
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx 
b/writerfilter/source/dmapper/DomainMapper.hxx
index fee11b1..2abaf123 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -62,6 +62,7 @@ class DomainMapper_Impl;
 class ListsManager;
 class StyleSheetTable;
 class GraphicZOrderHelper;
+class GraphicNamingHelper;
 
 // different context types require different sprm handling (e.g. names)
 enum SprmType
@@ -107,6 +108,7 @@ public:
 OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, 
bool bAlwaysCreate );
 std::shared_ptr< StyleSheetTable > GetStyleSheetTable( );
 GraphicZOrderHelper* graphicZOrderHelper();
+GraphicNamingHelper& GetGraphicNamingHelper();
 
 /// Return the first from the pending (not inserted to the document) 
shapes, if there are any.
 css::uno::Reference PopPendingShape();
@@ -169,6 +171,7 @@ private:
 static sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
 bool mbIsSplitPara;
 std::unique_ptr< GraphicZOrderHelper > zOrderHelper;
+std::unique_ptr m_pGraphicNamingHelper;
 };
 
 } // namespace dmapper
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/d

[Libreoffice-commits] core.git: filter/source idl/source sc/source starmath/source sw/source

[Takeshi Abe]

 filter/source/msfilter/msdffimp.cxx  |2 +-
 idl/source/cmptools/lex.cxx  |2 +-
 idl/source/prj/command.cxx   |2 +-
 sc/source/filter/excel/excimp8.cxx   |2 +-
 starmath/source/eqnolefilehdr.cxx|2 +-
 starmath/source/mathtype.cxx |2 +-
 sw/source/filter/basflt/iodetect.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx  |2 +-
 sw/source/filter/ww8/ww8par4.cxx |6 +++---
 9 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 53bc54209388f608521de48e289226188c138cec
Author: Takeshi Abe 
Date:   Thu Jun 2 14:30:41 2016 +0900

STREAM_STD_READ already includes StreamMode::NOCREATE

Change-Id: Ib8c81056619a383cedc828b945c1802ff1ce42ca
Reviewed-on: https://gerrit.libreoffice.org/25802
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 9753f6e..996fa28 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7113,7 +7113,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
 // TODO/LATER: should the caller be notified if the 
aspect changes in future?
 
 tools::SvRef xObjInfoSrc = 
xObjStg->OpenSotStream(
-"\3ObjInfo", STREAM_STD_READ | 
StreamMode::NOCREATE );
+"\3ObjInfo", STREAM_STD_READ );
 if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
 {
 sal_uInt8 nByte = 0;
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 6084489..56d696a 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -84,7 +84,7 @@ void SvTokenStream::InitCtor()
 }
 
 SvTokenStream::SvTokenStream( const OUString & rFileName )
-: pInStream( new SvFileStream( rFileName, STREAM_STD_READ | 
StreamMode::NOCREATE ) )
+: pInStream( new SvFileStream( rFileName, STREAM_STD_READ ) )
 , aFileName( rFileName )
 {
 InitCtor();
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 66ab61c..fb5e9d7 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -144,7 +144,7 @@ static bool ResponseFile( StringList * pList, int argc, 
char ** argv )
 {
 if( '@' == **(argv +i) )
 { // when @, then response file
-SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), 
STREAM_STD_READ | StreamMode::NOCREATE );
+SvFileStream aStm( OUString::createFromAscii((*(argv +i)) +1), 
STREAM_STD_READ );
 if( aStm.GetError() != SVSTREAM_OK )
 return false;
 
diff --git a/sc/source/filter/excel/excimp8.cxx 
b/sc/source/filter/excel/excimp8.cxx
index 71551f4..91f9d80 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -374,7 +374,7 @@ void ImportExcel8::ReadBasic()
 rFilterOpt.IsLoadExcelBasicExecutable() )
 {
 // see if we have the XCB stream
-tools::SvRef xXCB = xRootStrg->OpenSotStream( 
"XCB", STREAM_STD_READ | StreamMode::NOCREATE  );
+tools::SvRef xXCB = xRootStrg->OpenSotStream( 
"XCB", STREAM_STD_READ );
 if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() )
 {
 ScCTBWrapper wrapper;
diff --git a/starmath/source/eqnolefilehdr.cxx 
b/starmath/source/eqnolefilehdr.cxx
index 63e9d09..0465149 100644
--- a/starmath/source/eqnolefilehdr.cxx
+++ b/starmath/source/eqnolefilehdr.cxx
@@ -31,7 +31,7 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 
&nVersion )
 
 tools::SvRef xSrc = pStor->OpenSotStream(
 "Equation Native",
-STREAM_STD_READ | StreamMode::NOCREATE);
+STREAM_STD_READ);
 if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError()))
 return bSuccess;
 SotStorageStream *pS = &xSrc;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index d18ef63..dd61e26 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -557,7 +557,7 @@ bool MathType::Parse(SotStorage *pStor)
 {
 tools::SvRef xSrc = pStor->OpenSotStream(
 "Equation Native",
-STREAM_STD_READ | StreamMode::NOCREATE);
+STREAM_STD_READ);
 if ( (!xSrc.Is()) || (SVSTREAM_OK != xSrc->GetError()))
 return false;
 pS = &xSrc;
diff --git a/sw/source/filter/basflt/iodetect.cxx 
b/sw/source/filter/basflt/iodetect.cxx
index 2ac92f7..8de8f0d 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -127,7 +127,7 @@ bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const 
SfxFilter& rFilter)
 {
 tools::SvRef xRef =
 rStg.OpenSotStream("WordDocument",
-STREAM_STD_READ | StreamMode::NOCREATE );
+S

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

[Szymon Kłos]

 sw/source/ui/misc/glossary.cxx|7 +++
 sw/source/uibase/inc/glossary.hxx |2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 7961a61efa8ed97a98d06dd2c08bd686faba8384
Author: Szymon Kłos 
Date:   Wed Jun 1 16:03:29 2016 +0200

Invalidate the AutoText Dialog after selection

Changes:
- added invalidate call after entry selection and expand

Behaviour before patch (Linux):
1. Open Writer
2. Open AutoText Dialog: Tools > AutoText
3. Expand/select entry

Insert button is still disabled / entry is not expanded.
To force repaint you had to use mouse scroll.

Change-Id: I814db71dea02273998f675c3b140d554f2e109ba
Reviewed-on: https://gerrit.libreoffice.org/25783
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 16b8357..e477c6a 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -316,6 +316,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, GrpSelect, SvTreeListBox *, 
pBox, void )
 aReq.AppendItem(SfxStringItem(FN_SET_ACT_GLOSSARY, sTemp));
 aReq.Done();
 }
+Invalidate(InvalidateFlags::Update);
 }
 
 void SwGlossaryDlg::Apply()
@@ -1014,6 +1015,12 @@ TriState SwGlTreeListBox::NotifyCopyingOrMoving(
 return TRISTATE_FALSE; // otherwise the entry is being set automatically
 }
 
+void SwGlTreeListBox::ExpandedHdl()
+{
+Invalidate(InvalidateFlags::Update);
+SvTreeListBox::ExpandedHdl();
+}
+
 OUString SwGlossaryDlg::GetCurrGrpName() const
 {
 SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected();
diff --git a/sw/source/uibase/inc/glossary.hxx 
b/sw/source/uibase/inc/glossary.hxx
index ccc9759..2cd8d7b 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -80,6 +80,8 @@ public:
 virtual void RequestHelp( const HelpEvent& rHEvt ) override;
 virtual Size GetOptimalSize() const override;
 void Clear();
+
+virtual void ExpandedHdl() override;
 };
 
 class SwOneExampleFrame;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 avmedia/source/macavf/framegrabber.mm |4 +---
 avmedia/source/macavf/manager.mm  |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 913d85c6a7f6b2d1c39a56c06947b3913c3b219a
Author: Caolán McNamara 
Date:   Thu Jun 2 12:12:15 2016 +0100

a stab at fixing the macosx build

Change-Id: Id50077d03c80819312ed55326d33108e24fd4e30

diff --git a/avmedia/source/macavf/framegrabber.mm 
b/avmedia/source/macavf/framegrabber.mm
index 15c70a7..c6b8596 100644
--- a/avmedia/source/macavf/framegrabber.mm
+++ b/avmedia/source/macavf/framegrabber.mm
@@ -111,14 +111,12 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
FrameGrabber::grabFrame( double fMe
 return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME );
 }
 
-
 sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& 
ServiceName )
 throw (uno::RuntimeException)
 {
-return ServiceName.equalsAsciiL( AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME );
+return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME;
 }
 
-
 uno::Sequence< ::rtl::OUString > SAL_CALL 
FrameGrabber::getSupportedServiceNames(  )
 throw (uno::RuntimeException)
 {
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 5ba5006..06fa6ba 100644
--- a/avmedia/source/macavf/manager.mm
+++ b/avmedia/source/macavf/manager.mm
@@ -63,7 +63,7 @@ uno::Reference< media::XPlayer > SAL_CALL 
Manager::createPlayer( const ::rtl::OU
 sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName 
)
 throw (uno::RuntimeException)
 {
-return ServiceName.equalsAsciiL( AVMEDIA_MACAVF_MANAGER_SERVICENAME );
+return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 vcl/opengl/opengl_blacklist_windows.xml |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2cf09f0dcfa4b24a6c3c5560aa82b72a95a7b41b
Author: Tor Lillqvist 
Date:   Thu Jun 2 13:42:11 2016 +0300

tdf#99919: Blacklist that specific vendor, version, and device combination

Change-Id: I12b45b499bdf2041d6b50fa85e30612916462b3e

diff --git a/vcl/opengl/opengl_blacklist_windows.xml 
b/vcl/opengl/opengl_blacklist_windows.xml
index f00d909..88a958e 100644
--- a/vcl/opengl/opengl_blacklist_windows.xml
+++ b/vcl/opengl/opengl_blacklist_windows.xml
@@ -24,6 +24,10 @@
 
 
 
+
+
+
+
  
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/opengl

[Tor Lillqvist]

 vcl/opengl/opengl_blacklist_windows.xml |4 
 1 file changed, 4 insertions(+)

New commits:
commit ff6bb3fbbf98df16b73460c74e428379fb216c8f
Author: Tor Lillqvist 
Date:   Thu Jun 2 13:42:11 2016 +0300

tdf#99919: Blacklist that specific vendor, version, and device combination

Change-Id: I12b45b499bdf2041d6b50fa85e30612916462b3e
(cherry picked from commit 2cf09f0dcfa4b24a6c3c5560aa82b72a95a7b41b)
Reviewed-on: https://gerrit.libreoffice.org/25818
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/opengl_blacklist_windows.xml 
b/vcl/opengl/opengl_blacklist_windows.xml
index f00d909..88a958e 100644
--- a/vcl/opengl/opengl_blacklist_windows.xml
+++ b/vcl/opengl/opengl_blacklist_windows.xml
@@ -24,6 +24,10 @@
 
 
 
+
+
+
+
  
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 configure.ac |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit c58cd511ab6c280a72ed725dbca653d3b1274f2a
Author: Christian Lohmaier 
Date:   Thu Jun 2 13:37:02 2016 +0200

allow use of android ndk 11.1.x

Change-Id: I1ae9419383c56a026d05d6adf4adf81dc981f56a

diff --git a/configure.ac b/configure.ac
index db1b0ae..8bdee1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,15 +349,21 @@ if test -n "$with_android_ndk"; then
 # Set up a lot of pre-canned defaults
 
 if test ! -f $ANDROID_NDK_HOME/RELEASE.TXT; then
-AC_MSG_ERROR([Unrecognized Android NDK. Missing RELEASE.TXT file in 
$ANDROID_NDK_HOME.])
+if test ! -f $ANDROID_NDK_HOME/source.properties; then
+AC_MSG_ERROR([Unrecognized Android NDK. Missing RELEASE.TXT or 
source.properties file in $ANDROID_NDK_HOME.])
+fi
+ANDROID_NDK_VERSION=`sed -n -e 's/Pkg.Revision = //p' 
$ANDROID_NDK_HOME/source.properties`
+else
+ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
 fi
-ANDROID_NDK_VERSION=`cut -f1 -d' ' <$ANDROID_NDK_HOME/RELEASE.TXT`
 
 case $ANDROID_NDK_VERSION in
 r9*|r10*)
 ;;
+11.1.*)
+;;
 *)
-AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9* 
and r10* versions are supported])
+AC_MSG_ERROR([Unsupported NDK version $ANDROID_NDK_VERSION, only r9*, 
r10* and 11.1.* versions are supported])
 ;;
 esac
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Jenkins external download md5sum mismatch

[Lionel Elie Mamane]

Hi,

http://ci.libreoffice.org/job/lo_gerrit_master/16453/Gerrit=Gerrit,Platform=Linux/console
http://ci.libreoffice.org/job/lo_gerrit_master/16453/Gerrit=Gerrit,Platform=MacOSX/console

This are build logs of https://gerrit.libreoffice.org/25673/

On both platforms, it successfully downloads the tarball, but then
complains of an md5sum mismatch. However, I get the right md5sum:

$ wget
http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2
--2016-06-02 13:50:35--  
http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70, 
2001:67c:2178:7::70
Connecting to dev-www.libreoffice.org 
(dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 9552809 (9,1M) [application/x-bzip]
Saving to: ‘Firebird-3.0.0.32483-0.tar.bz2’

Firebird-3.0.0.32483-0.tar.bz 
100%[==>]   9,11M1,67MB/sin 
10s

2016-06-02 13:50:45 (909 KB/s) - ‘Firebird-3.0.0.32483-0.tar.bz2’ saved 
[9552809/9552809]

$ md5sum Firebird-3.0.0.32483-0.tar.bz2
821260b61dafc22899d1464d4e91ee6a  Firebird-3.0.0.32483-0.tar.bz2

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

[Libreoffice-commits] core.git: external/owncloud-android-lib

[Christian Lohmaier]

 external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adf7df9c021bd0291eb80d1f9e6596d5b9b090c8
Author: Christian Lohmaier 
Date:   Thu Jun 2 14:03:43 2016 +0200

use android app's target-sdk (22) also for owncloud lib

maybe should be set via configure, to keep them in-sync

Change-Id: I3747992bb2bbdd88f3668418280bbafc8c998a02

diff --git 
a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk 
b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
index 679981b..c6d539c 100644
--- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
+++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
@@ -18,7 +18,7 @@ $(call 
gb_ExternalProject_get_state_target,owncloud_android_lib,build) :
$(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
-   -Dsdk.dir=$(ANDROID_SDK_HOME) \
+   -Dsdk.dir=$(ANDROID_SDK_HOME) -Dtarget=android-22 \
release \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Jenkins external download md5sum mismatch

[Markus Mohrhard]

Hey Lionel,

On Thu, Jun 2, 2016 at 1:53 PM, Lionel Elie Mamane  wrote:

> Hi,
>
>
> http://ci.libreoffice.org/job/lo_gerrit_master/16453/Gerrit=Gerrit,Platform=Linux/console
>
> http://ci.libreoffice.org/job/lo_gerrit_master/16453/Gerrit=Gerrit,Platform=MacOSX/console
>
> This are build logs of https://gerrit.libreoffice.org/25673/
>
> On both platforms, it successfully downloads the tarball, but then
> complains of an md5sum mismatch. However, I get the right md5sum:
>
> $ wget
> http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2
> --2016-06-02 13:50:35--
> http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2
> Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)...
> 195.135.221.70, 2001:67c:2178:7::70
> Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|
> 195.135.221.70|:80... connected.
> HTTP request sent, awaiting response... 200 OK
> Length: 9552809 (9,1M) [application/x-bzip]
> Saving to: ‘Firebird-3.0.0.32483-0.tar.bz2’
>
> Firebird-3.0.0.32483-0.tar.bz
> 100%[==>]   9,11M1,67MB/s
>   in 10s
>
> 2016-06-02 13:50:45 (909 KB/s) - ‘Firebird-3.0.0.32483-0.tar.bz2’ saved
> [9552809/9552809]
>
> $ md5sum Firebird-3.0.0.32483-0.tar.bz2
> 821260b61dafc22899d1464d4e91ee6a  Firebird-3.0.0.32483-0.tar.bz2
>
> --
>
>
The problem is the trailing space as can be seen in the command.

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

Re: Jenkins external download md5sum mismatch

[Lionel Elie Mamane]

On Thu, Jun 02, 2016 at 02:08:57PM +0200, Markus Mohrhard wrote:
> On Thu, Jun 2, 2016 at 1:53 PM, Lionel Elie Mamane  wrote:

>> http://ci.libreoffice.org/job/lo_gerrit_master/16453/Gerrit=Gerrit,Platform=Linux/console
>>
>> http://ci.libreoffice.org/job/lo_gerrit_master/16453/Gerrit=Gerrit,Platform=MacOSX/console
>>
>> This are build logs of https://gerrit.libreoffice.org/25673/

>> On both platforms, it successfully downloads the tarball, but then
>> complains of an md5sum mismatch. However, I get the right md5sum:

> The problem is the trailing space as can be seen in the command.

Ah yeah, thanks.

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

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

[Tor Lillqvist]

 vcl/opengl/win/blocklist_parser.cxx |8 ++--
 vcl/qa/cppunit/blocklistparsertest.cxx  |7 ++-
 vcl/qa/cppunit/test_blocklist_parse.xml |6 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 44e89fa6151434be24dca38c32b8cb952455f372
Author: Tor Lillqvist 
Date:   Thu Jun 2 15:21:39 2016 +0300

Accept also hex vendor id in hex in opengl_blacklist_windows.xml

(And not just names from the hardcoded list.) Surely we want it to be
possible to add a blacklist entry for a hitherto unhandled vendor to
the file at a user site without having to modify the parsing code and
rebuilding LO.

Change-Id: I01ca45cb91df06e1634a565b3e469fb85fe4e116

diff --git a/vcl/opengl/win/blocklist_parser.cxx 
b/vcl/opengl/win/blocklist_parser.cxx
index 7c4a526..eb140a1 100644
--- a/vcl/opengl/win/blocklist_parser.cxx
+++ b/vcl/opengl/win/blocklist_parser.cxx
@@ -131,8 +131,12 @@ OUString getVendor(const OString& rString)
 {
 return "0x1414";
 }
-
-throw InvalidFileException();
+else
+{
+// Allow having simply the hex number as such there, too. After all, 
it's hex numbers that
+// are output to opengl_device.log.
+return OStringToOUString(rString, RTL_TEXTENCODING_UTF8);
+}
 }
 
 uint64_t getVersion(const OString& rString)
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx 
b/vcl/qa/cppunit/blocklistparsertest.cxx
index 93817fd..ddad53b 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -40,7 +40,7 @@ void BlocklistParserTest::testParse()
 aBlocklistParser.parse();
 
 size_t const n = aDriveInfos.size();
-CPPUNIT_ASSERT_EQUAL(static_cast(20), n);
+CPPUNIT_ASSERT_EQUAL(static_cast(22), n);
 
 size_t i = 0;
 
@@ -81,6 +81,11 @@ void BlocklistParserTest::testParse()
 
 aDriveInfo = aDriveInfos[i++];
 CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted);
+CPPUNIT_ASSERT_EQUAL(OUString("0xcafe"), aDriveInfo.maAdapterVendor);
+CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_NOT_EQUAL, 
aDriveInfo.meComparisonOp);
+
+aDriveInfo = aDriveInfos[i++];
+CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted);
 
CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorAll), 
aDriveInfo.maAdapterVendor);
 
CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_BETWEEN_EXCLUSIVE, 
aDriveInfo.meComparisonOp);
 
diff --git a/vcl/qa/cppunit/test_blocklist_parse.xml 
b/vcl/qa/cppunit/test_blocklist_parse.xml
index 6564668..72ba405 100755
--- a/vcl/qa/cppunit/test_blocklist_parse.xml
+++ b/vcl/qa/cppunit/test_blocklist_parse.xml
@@ -27,6 +27,9 @@
 
 
 
+
+
+
 
 
 
@@ -59,6 +62,9 @@
 
 
 
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Update to Firebird 3.0

[Bunth Tamás]

I am going to work on the following issues:

- Build Firebird 3 on Mac OS and Windows systems too. For that, I may need
some help.

- Adding tommath as external dependency if its necessary.

- I got an error while creating a new database and I'm going to examine it:





*firebird_sdbc error:*Unable to complete network request to host
"localhost".*Failed to establish a connection.caused
by'isc_create_database'*



On 30 May 2016 at 19:13, Bunth Tamás  wrote:

> Hello,
>
> I submitted my first changes, you can find it here:
>
> https://gerrit.libreoffice.org/#/c/25673/
>
> It's not ready yet, but it builds successfully for me on Linux.
>
> Regards:
> Tamás Bunth
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

GSoC Week 1 : Area Fill

[Rishabh Kumar]

Hi,

I am working on the Area Fill dialog as my GSoC project. The first task of
the project is to move out the individual Fill style controls from the Area
tab of the dialog and move them to their respective tabs.


Tasks completed :

1. Refactored out transparency tab code from the Area tab code :
https://gerrit.libreoffice.org/#/c/24368/
2. Moved gradient controls from the Area tab to the Gradient tab :
https://gerrit.libreoffice.org/#/c/24910/
3. Moved Hatch controls from the Area tab to the Hatch tab :
https://gerrit.libreoffice.org/#/c/25147/
4. Made HexColorControl class global :
https://gerrit.libreoffice.org/#/c/25665/ (To be reused in Color Tab)


Work in progress:

1. Color Tab ( https://gerrit.libreoffice.org/#/c/25538/ ) : Awaiting UI
approval. Discussion on whether to remove the CMYK color representation
from the Color Tab
2. Refactoring the Bitmap code to create a new fill style - pattern


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

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

[Caolán McNamara]

 extensions/source/abpilot/fieldmappingimpl.cxx |2 +-
 svx/source/tbxctrls/colorwindow.hxx|1 -
 svx/source/tbxctrls/tbcontrl.cxx   |   17 -
 vcl/source/window/brdwin.cxx   |6 +++---
 vcl/source/window/floatwin.cxx |3 +--
 5 files changed, 5 insertions(+), 24 deletions(-)

New commits:
commit ede822998331d75f1a17d86d609cb732d880accd
Author: Caolán McNamara 
Date:   Thu Jun 2 12:51:10 2016 +0100

DataAccess.xcs says xs:short not xs:int for this type

noticed when examing tdf#96251

Change-Id: Iec8748ad323bcb59e8e1f6b4135b4a3b313a6e44

diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx 
b/extensions/source/abpilot/fieldmappingimpl.cxx
index 921a126..a4f1c53 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -293,7 +293,7 @@ namespace abp
 
 aAddressBookSettings.setNodeValue( OUString( "DataSourceName" ), 
makeAny( _rDataSourceName ) );
 aAddressBookSettings.setNodeValue( OUString( "Command" ), makeAny( 
_rTableName ) );
-aAddressBookSettings.setNodeValue( OUString( "CommandType" ), 
makeAny( (sal_Int32)CommandType::TABLE ) );
+aAddressBookSettings.setNodeValue( OUString( "CommandType" ), 
makeAny( (sal_Int16)CommandType::TABLE ) );
 
 // commit the changes done
 aAddressBookSettings.commit();
commit 9f68bd964d7aacd52ce601b96909a964547af600
Author: Caolán McNamara 
Date:   Thu Jun 2 12:28:18 2016 +0100

these overrides just call only their parent version

looks like the sort of simplfication that could be automated

Change-Id: I29ce13fe1b98e99be096e44239b971f6971c5f98

diff --git a/svx/source/tbxctrls/colorwindow.hxx 
b/svx/source/tbxctrls/colorwindow.hxx
index c18834f..c2ffb56 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -61,7 +61,6 @@ private:
 
 protected:
 virtual voidResize() override;
-virtual boolClose() override;
 
 public:
 SvxColorWindow_Impl( const OUString& rCommand,
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 49da834..b0c2596 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -258,7 +258,6 @@ private:
 
 protected:
 virtual voidResize() override;
-virtual boolClose() override;
 virtual voidGetFocus() override;
 
 public:
@@ -283,7 +282,6 @@ private:
 
 protected:
 virtual voidResize() override;
-virtual boolClose() override;
 virtual voidGetFocus() override;
 public:
 SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, 
vcl::Window* pParentWindow );
@@ -1458,11 +1456,6 @@ void SvxColorWindow_Impl::StartSelection()
 mpColorSet->StartSelection();
 }
 
-bool SvxColorWindow_Impl::Close()
-{
-return SfxPopupWindow::Close();
-}
-
 void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, 
const SfxPoolItem* pState )
 {
 if ( nSID == SID_COLOR_TABLE )
@@ -1850,11 +1843,6 @@ void SvxFrameWindow_Impl::StartSelection()
 aFrameSet->StartSelection();
 }
 
-bool SvxFrameWindow_Impl::Close()
-{
-return SfxPopupWindow::Close();
-}
-
 static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
 {
 return SvxBorderLine::threeDMediumColor( aMain );
@@ -2030,11 +2018,6 @@ void SvxLineWindow_Impl::Resize()
 m_aLineStyleLb->Resize();
 }
 
-bool SvxLineWindow_Impl::Close()
-{
-return SfxPopupWindow::Close();
-}
-
 void SvxLineWindow_Impl::GetFocus()
 {
 if ( m_aLineStyleLb )
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 28583f5..dd8a8ae 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -957,9 +957,9 @@ bool ImplStdBorderWindowView::Tracking( const 
TrackingEvent& rTEvt )
 {
 // dispatch to correct window type (why is Close() not 
virtual ??? )
 // TODO: make Close() virtual
-VclPtr pWin = 
pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
-SystemWindow  *pSysWin  = dynamic_cast(pWin.get());
-DockingWindow *pDockWin = 
dynamic_cast(pWin.get());
+vcl::Window *pWin = 
pBorderWindow->ImplGetClientWindow()->ImplGetWindow();
+SystemWindow  *pSysWin  = dynamic_cast(pWin);
+DockingWindow *pDockWin = 
dynamic_cast(pWin);
 if ( pSysWin )
 pSysWin->Close();
 else if ( pDockWin )
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index d130466..82283c9 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -569,7 +569,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const 
vcl::Window* pWindow )
 
 IMPL_LINK_NOARG_TYPED(Floa

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

9 new defect(s) introduced to LibreOffice found with Coverity Scan.
5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

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


** CID 1362486:  Null pointer dereferences  (FORWARD_NULL)
/dbaccess/source/ui/dlg/dbwiz.cxx: 92 in 
dbaui::ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window *, SfxItemSet *, const 
com::sun::star::uno::Reference &, const 
com::sun::star::uno::Any &)()



*** CID 1362486:  Null pointer dereferences  (FORWARD_NULL)
/dbaccess/source/ui/dlg/dbwiz.cxx: 92 in 
dbaui::ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window *, SfxItemSet *, const 
com::sun::star::uno::Reference &, const 
com::sun::star::uno::Any &)()
86 m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
87 m_pNextPage->SetHelpId(HID_DBWIZ_NEXT);
88 m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
89 m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
90 // no local resources needed anymore
91 
>>> CID 1362486:  Null pointer dereferences  (FORWARD_NULL)
>>> Assigning: "pCollectionItem" = "dynamic_cast 
>>> (_pItems->GetItem(5, true))".
92 const DbuTypeCollectionItem* pCollectionItem = dynamic_cast( _pItems->GetItem(DSID_TYPECOLLECTION) );
93 m_pCollection = pCollectionItem->getCollection();
94 
95 ActivatePage();
96 setTitleBase(ModuleRes(STR_DATABASE_TYPE_CHANGE));
97 }

** CID 1362485:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1362485:  Null pointer dereferences  (FORWARD_NULL)
/starmath/qa/cppunit/test_nodetotextvisitors.cxx: 613 in 
::Test::testUnaryInMixedNumberAsNumerator()()
607 
608 SmCursor aCursor(pTree, xDocShRef);
609 ScopedVclPtrInstance< VirtualDevice > pOutputDevice;
610 
611 // move forward (more than) enough places to be at the end
612 for (size_t i = 0; i < 3; ++i)
>>> CID 1362485:  Null pointer dereferences  (FORWARD_NULL)
>>> "Move" dereferences null "aCursor.mpPosition".
613 aCursor.Move(pOutputDevice, MoveRight);
614 
615 // Select the whole Unary Horizontal Node
616 aCursor.Move(pOutputDevice, MoveLeft, false);
617 aCursor.Move(pOutputDevice, MoveLeft, false);
618 

** CID 1362484:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/doc/tblafmt.cxx: 698 in 
SwTableAutoFormat::GetBoxFormat(unsigned char)()



*** CID 1362484:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/core/doc/tblafmt.cxx: 698 in 
SwTableAutoFormat::GetBoxFormat(unsigned char)()
692 
693 SwBoxAutoFormat& SwTableAutoFormat::GetBoxFormat( sal_uInt8 nPos )
694 {
695 SAL_WARN_IF(!(nPos < 16), "sw.core", "GetBoxFormat wrong area");
696 
697 SwBoxAutoFormat* pFormat = aBoxAutoFormat[ nPos ];
>>> CID 1362484:  Null pointer dereferences  (FORWARD_NULL)
>>> Comparing "pFormat" to null implies that "pFormat" might be null.
698 if( !pFormat )
699 {
700 // If default doesn't exist yet:
701 if( !pDfltBoxAutoFormat )
702 pDfltBoxAutoFormat = new SwBoxAutoFormat();
703 *pFormat = *pDfltBoxAutoFormat;

** CID 1362483:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1362483:  Null pointer dereferences  (FORWARD_NULL)
/starmath/qa/cppunit/test_cursor.cxx: 102 in 
::Test::testCopySelectPaste()()
96 
97 SmCursor aCursor(xTree.get(), xDocShRef);
98 ScopedVclPtrInstance pOutputDevice;
99 
100 // go to the right end
101 for (int i=0;i<5;i++)
>>> CID 1362483:  Null pointer dereferences  (FORWARD_NULL)
>>> "Move" dereferences null "aCursor.mpPosition".
102 aCursor.Move(pOutputDevice, MoveRight);
103 // select "b + c" and then copy
104 aCursor.Move(pOutputDevice, MoveLeft, false);
105 aCursor.Move(pOutputDevice, MoveLeft, false);
106 aCursor.Move(pOutputDevice, MoveLeft, false);
107 aCursor.Copy();

** CID 1362482:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1362482:  Null pointer dereferences  (FORWARD_NULL)
/starmath/qa/cppunit/test_cursor.cxx: 152 in 
::Test::testCutSelectPaste()()
146 
147 SmCursor aCursor(xTree.get(), xDocShRef);
148 ScopedVclPtrInstance pOutputDevice;
149 
150 // go to the right 

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

[Caolán McNamara]

 sd/source/ui/sidebar/SlideBackground.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e5d8dc12fcf64fbbefadefbe863c772dc9134d38
Author: Caolán McNamara 
Date:   Thu Jun 2 14:11:30 2016 +0100

Resolves: tdf#100191 crash: switch to Display Mode: Notes via toolbar

Change-Id: I65f5f68433940fa0b50ad951fbb96085178a42d9

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 73da0e7..28e9bd9 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -349,7 +349,8 @@ void SlideBackground::populateMasterSlideDropdown()
 
 void SlideBackground::updateMasterSlideSelection()
 {
-SdPage* pPage = mrBase.GetMainViewShell().get()->getCurrentPage();
+ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
+SdPage* pPage = pMainViewShell ? pMainViewShell->getCurrentPage() : 
nullptr;
 if (pPage != nullptr && pPage->TRG_HasMasterPage())
 {
 SdrPage& rMasterPage (pPage->TRG_GetMasterPage());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Caolán McNamara]

 sd/source/ui/sidebar/SlideBackground.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit db5498031c033bef32ba0714279db9ecfb7b860a
Author: Caolán McNamara 
Date:   Thu Jun 2 14:11:30 2016 +0100

Resolves: tdf#100191 crash: switch to Display Mode: Notes via toolbar

Change-Id: I65f5f68433940fa0b50ad951fbb96085178a42d9
(cherry picked from commit e5d8dc12fcf64fbbefadefbe863c772dc9134d38)

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 2a616f5..f6c7d89 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -350,7 +350,8 @@ void SlideBackground::populateMasterSlideDropdown()
 
 void SlideBackground::updateMasterSlideSelection()
 {
-SdPage* pPage = mrBase.GetMainViewShell().get()->getCurrentPage();
+ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
+SdPage* pPage = pMainViewShell ? pMainViewShell->getCurrentPage() : 
nullptr;
 if (pPage != nullptr && pPage->TRG_HasMasterPage())
 {
 SdrPage& rMasterPage (pPage->TRG_GetMasterPage());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/o3tl/any.hxx  |  264 ++
 xmloff/source/core/unoatrcn.cxx   |   10 
 xmloff/source/draw/XMLImageMapExport.cxx  |3 
 xmloff/source/draw/animationexport.cxx|   66 ++---
 xmloff/source/draw/shapeexport.cxx|   13 -
 xmloff/source/draw/ximpcustomshape.cxx|   21 -
 xmloff/source/style/XMLPageExport.cxx |3 
 xmloff/source/style/prstylei.cxx  |5 
 xmloff/source/style/styleexp.cxx  |9 
 xmloff/source/style/xmlbahdl.cxx  |3 
 xmloff/source/style/xmlnume.cxx   |6 
 xmloff/source/style/xmlnumi.cxx   |3 
 xmloff/source/style/xmlstyle.cxx  |2 
 xmloff/source/text/XMLIndexMarkExport.cxx |5 
 xmloff/source/text/XMLLineNumberingExport.cxx |9 
 xmloff/source/text/XMLRedlineExport.cxx   |   23 +
 xmloff/source/text/XMLSectionExport.cxx   |   31 +-
 xmloff/source/text/XMLTextColumnsExport.cxx   |7 
 xmloff/source/text/XMLTextHeaderFooterContext.cxx |7 
 xmloff/source/text/XMLTextMasterPageContext.cxx   |3 
 xmloff/source/text/txtexppr.cxx   |9 
 xmloff/source/text/txtflde.cxx|5 
 xmloff/source/text/txtftne.cxx|6 
 xmloff/source/text/txtimppr.cxx   |5 
 xmloff/source/text/txtparae.cxx   |   45 ++-
 xmloff/source/text/txtprhdl.cxx   |   15 -
 xmloff/source/text/txtstyli.cxx   |4 
 27 files changed, 437 insertions(+), 145 deletions(-)

New commits:
commit 0d7c5823124696f80583ac2a5f0e28f329f6f786
Author: Stephan Bergmann 
Date:   Thu Jun 2 15:06:06 2016 +0200

New o3tl::try/doGet to obtain value from Any

...in an attempt to reduce usage of type-unsafe

  void const * css::uno::Any::getValue()

These new functions are often more convenient to use than the existing 
">>=" and
Any::get.  Note how they are careful to provide a pointer directly into 
the
given Any, instead of creating temporaries.

As an example, replaced most calls of getValue across xmloff:

* Cases that first check for a specific type (via getValueType etc.) and 
then
  call getValue can instead call tryGet.  (But beware that tryGet supports 
some
  conversions, which a check for a specific type may have missed---either
  intentionally or by accident.  Also beware the somewhat common idiom of
  checking for TypeClass_ENUM and then using getValue to obtain a sal_Int32;
  this cannot be replaced with a call to tryGet.)

* Cases that seem confident that the Any is of the correct type when calling
  getValue (but apparently are confident due to some higher-layer protocol, 
as
  the surrounding code does not do any checking via getValueType or 
similar) can
  instead call doGet.  It throws an exception if it turns out the confidence
  wasn't warranted.  (Many of the existing calls that directly dereferenced 
the
  return value of getValue as sal_Bool look suspicious, in that the author 
might
  have thought the given code would also cover a VOID Any---which 
technically it
  even would have happened to do.  If any RuntimeExceptions thrown from 
these
  doGet calls start to crop up, these changes need to be revisited.  Some 
may
  even be rewritten as uses of ">>=".  But at least "make check" did not 
show
  any such problems.  Also note that casting the value obtained from 
getValue to
  any css::uno::Reference with X being anything but the base
  css::uno::XInterface was always prone to producing a bad pointer, in case 
the
  interface actually stored in the Any derived from X via multiple 
inheritance.)

* Should there ever be cases where an Any is known to be of the requested 
type,
  some additional forceGet could be introduced (which would assert instead 
of
  throwing an exception).

Change-Id: I2d8739e86314eff73abfcafe01d806f5bc5c34db

diff --git a/include/o3tl/any.hxx b/include/o3tl/any.hxx
new file mode 100644
index 000..268ae20
--- /dev/null
+++ b/include/o3tl/any.hxx
@@ -0,0 +1,264 @@
+/* -*- 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_O3TL_ANY_HXX
+#define INCLUDED_O3TL_ANY_HXX
+
+#include 
+
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+// Some functionality related to css::uno::Any that would ideally be part of
+// , but (for now) cannot be for some reason.
+
+namespace com { namespace

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

[Michael Stahl]

 vcl/source/filter/igif/gifread.cxx |2 
 vcl/source/filter/sgvmain.cxx  |  352 ++---
 vcl/source/filter/sgvmain.hxx  |1 
 3 files changed, 217 insertions(+), 138 deletions(-)

New commits:
commit f6ed2305abb0289ad51605ceeaee607a0bc8d7bd
Author: Michael Stahl 
Date:   Thu Jun 2 14:11:40 2016 +0200

vcl: GIF import: don't use __LP64__ to check for a 64-bit system

__LP64__ is not defined in MSVC AMD64 builds, since it doesn't have
64-bit longs.  This caused the vcl_filters_test to fail because loading
the file for which that check is a work-around succeeded.

Change-Id: I4df48d4b196a1d08e9bd5ef61b64ec63501037c9

diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index aac672f..f008b1b 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -172,7 +172,7 @@ void GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
 {
 const Size aSize( nWidth, nHeight );
 
-#ifdef __LP64__
+#if SAL_TYPES_SIZEOFPOINTER == 8
 // Don't bother allocating a bitmap of a size that would fail on a
 // 32-bit system. We have at least one unit tests that is expected
 // to fail (loading a 65535*65535 size GIF
commit e144eeb1ca868e93f5a69ca14a12b036def45980
Author: Michael Stahl 
Date:   Thu Jun 2 13:31:41 2016 +0200

vcl: remove pointless check

This would have been more useful if it checked one of the other types
that use inheritance. It would also be more useful if it actually did
something to report the issue instead of silently reporting success.

Change-Id: I684146244d4eec15669b499e40214b8ede70741f

diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 73a3b0d..bdae296 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -914,10 +914,6 @@ bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, 
GDIMetaFile& rMtf )
 
 bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, const INetURLObject& 
_aIniPath )
 {
-#if OSL_DEBUG_LEVEL > 1 // check record size. New compiler possibly aligns 
different!
-if (sizeof(ObjTextType)!=ObjTextTypeSize)  return false;
-#endif
-
 sal_uLong   nFileStart;// offset of SgfHeaders. In general 0.
 SgfHeader   aHead;
 SgfEntryaEntr;
commit af8509fa194e6747c82a9df9a1c465be82a32637
Author: Michael Stahl 
Date:   Thu Jun 2 12:54:36 2016 +0200

vcl: fix "sgv" import filter on 64-bit MSVC

This filter reads entire structs at a time from the SvStream, including
structs that are derived from other structs.  This happens to work fine
with GCC by chance, but MSVC AMD64 by default aligns structs to 8 bytes,
and that means if sizeof(super-stuct) = 20 then 4 bytes of padding are
inserted and that ruins the import.

This causes vcl_filters_test to go into an infinite loop reading
SaveAsPicture.sgv.

Fix this by reading each member of the structs separately, which also
means that the filter doesn't need to byte-swap every member on
big-endian platforms since SvStream methods already do that.

Change-Id: I237725dbcde5232006728179e645776fcb79cac3

diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 18e2d2c..73a3b0d 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -35,52 +35,6 @@
 p.x=OSL_SWAPWORD(p.x); \
 p.y=OSL_SWAPWORD(p.y); }
 
-#define SWAPPAGE(p) { \
-p.Next   =OSL_SWAPDWORD (p.Next   );   \
-p.nList  =OSL_SWAPDWORD (p.nList  );   \
-p.ListEnd=OSL_SWAPDWORD (p.ListEnd);   \
-p.Paper.Size.x=OSL_SWAPWORD(p.Paper.Size.x); \
-p.Paper.Size.y=OSL_SWAPWORD(p.Paper.Size.y); \
-p.Paper.RandL =OSL_SWAPWORD(p.Paper.RandL ); \
-p.Paper.RandR =OSL_SWAPWORD(p.Paper.RandR ); \
-p.Paper.RandO =OSL_SWAPWORD(p.Paper.RandO ); \
-p.Paper.RandU =OSL_SWAPWORD(p.Paper.RandU ); \
-SWAPPOINT(p.U);   \
-sal_uInt16 iTemp; \
-for (iTemp=0;iTemp<20;iTemp++) {  \
-rPage.HlpLnH[iTemp]=OSL_SWAPWORD(rPage.HlpLnH[iTemp]);   \
-rPage.HlpLnV[iTemp]=OSL_SWAPWORD(rPage.HlpLnV[iTemp]);  }}
-
-#define SWAPOBJK(o) { \
-o.Last=OSL_SWAPDWORD (o.Last); \
-o.Next=OSL_SWAPDWORD (o.Next); \
-o.MemSize =OSL_SWAPWORD(o.MemSize ); \
-SWAPPOINT(o.ObjMin);  \
-SWAPPOINT(o.ObjMax);  }
-
-#define SWAPLINE(l) { \
-l.LMSize=OSL_SWAPWORD(l.LMSize); \
-l.LDicke=OSL_SWAPWORD(l.LDicke); }
-
-#define SWAPAREA(a) {   \
-a.FDummy2=OSL_SWAPWORD(a.FDummy2); \
-a.FMuster=OSL_SWAPWORD(a.FMuster); }
-
-#define SWAPTEXT(t) {   \
-SWAPLINE(t.L);  \
-SWAPAREA(t.F);  \
-t.FontLo =OSL_SWAPWORD(t.FontLo ); \
-t.Fon

[Libreoffice-commits] core.git: Branch 'feature/fixes23' -

[László Németh]

 0 files changed

New commits:
commit 1d8dfbe0eb67214872ccd1bc8c921cf378acd2c6
Author: László Németh 
Date:   Thu Jun 2 15:43:58 2016 +0200

empty commit  (repeat)

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

Re: Update to Firebird 3.0

[Bunth Tamás]

If I understand correctly, this error:





*firebird_sdbc error:*Unable to complete network request to host
"localhost".*Failed to establish a connection.caused
by'isc_create_database'*

Is because of the issue Lionel posted on gerrit:
"You need to make sure that firebird looks for libEngine12.so where it is
installed, and not in /usr/local/firebird/plugins/"

Am I right?
As I see, Firebird tries to use some remote access instead of local
connection ( Remote provider instead of Engine12 ?). If it is so, it may be
sensible to have a firebird.conf file in the installation directory, where
we can set up that only the "Engine12" provider should be used.

To change the path of libEngine12 I may need to write a patch to change it
somewhere in workdir/UnpackedTarball/firebird/gen/Release/.



On 2 June 2016 at 14:36, Bunth Tamás  wrote:

> I am going to work on the following issues:
>
> - Build Firebird 3 on Mac OS and Windows systems too. For that, I may need
> some help.
>
> - Adding tommath as external dependency if its necessary.
>
> - I got an error while creating a new database and I'm going to examine it:
>
>
>
>
>
> *firebird_sdbc error:*Unable to complete network request to host
> "localhost".*Failed to establish a connection.caused
> by'isc_create_database'*
>
>
>
> On 30 May 2016 at 19:13, Bunth Tamás  wrote:
>
>> Hello,
>>
>> I submitted my first changes, you can find it here:
>>
>> https://gerrit.libreoffice.org/#/c/25673/
>>
>> It's not ready yet, but it builds successfully for me on Linux.
>>
>> Regards:
>> Tamás Bunth
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 dbaccess/source/ui/dlg/dbwiz.cxx |4 +-
 starmath/source/cursor.cxx   |   75 ---
 sw/source/core/doc/tblafmt.cxx   |2 -
 3 files changed, 42 insertions(+), 39 deletions(-)

New commits:
commit 31038459b576b5ef53c3ccadb1e2aee0e61d20ff
Author: Caolán McNamara 
Date:   Thu Jun 2 15:22:05 2016 +0100

coverity#1362478 Explicit null dereferenced

and

coverity#1362479, coverity#1362480, coverity#1362481,
coverity#1362482, coverity#1362483, coverity#1362485

Change-Id: Ia3a32b69bcbe5ac3e7cc50dacfa02e8bf1aab787

diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 617e100..3baf5e1 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -16,53 +16,56 @@
 
 void SmCursor::Move(OutputDevice* pDev, SmMovementDirection direction, bool 
bMoveAnchor){
 SmCaretPosGraphEntry* NewPos = nullptr;
-switch(direction){
+switch(direction)
+{
 case MoveLeft:
-{
-NewPos = mpPosition->Left;
+if (mpPosition)
+NewPos = mpPosition->Left;
 OSL_ENSURE(NewPos, "NewPos shouldn't be NULL here!");
-}break;
+break;
 case MoveRight:
-{
-NewPos = mpPosition->Right;
+if (mpPosition)
+NewPos = mpPosition->Right;
 OSL_ENSURE(NewPos, "NewPos shouldn't be NULL here!");
-}break;
+break;
 case MoveUp:
 //Implementation is practically identical to MoveDown, except for 
a single if statement
 //so I've implemented them together and added a direction == 
MoveDown to the if statements.
 case MoveDown:
-{
-SmCaretLine from_line = SmCaretPos2LineVisitor(pDev, 
mpPosition->CaretPos).GetResult(),
-best_line,  //Best approximated line found so far
-curr_line;  //Current line
-long dbp_sq = 0;//Distance squared to best line
-for(auto &pEntry : *mpGraph)
+if (mpPosition)
 {
-//Reject it if it's the current position
-if(pEntry->CaretPos == mpPosition->CaretPos) continue;
-//Compute caret line
-curr_line = SmCaretPos2LineVisitor(pDev, 
pEntry->CaretPos).GetResult();
-//Reject anything above if we're moving down
-if(curr_line.GetTop() <= from_line.GetTop() && direction == 
MoveDown) continue;
-//Reject anything below if we're moving up
-if(curr_line.GetTop() + curr_line.GetHeight() >= 
from_line.GetTop() + from_line.GetHeight()
-&& direction == MoveUp) continue;
-//Compare if it to what we have, if we have anything yet
-if(NewPos){
-//Compute distance to current line squared, multiplied 
with a horizontal factor
-long dp_sq = curr_line.SquaredDistanceX(from_line) * 
HORIZONTICAL_DISTANCE_FACTOR +
- curr_line.SquaredDistanceY(from_line);
-//Discard current line if best line is closer
-if(dbp_sq <= dp_sq) continue;
+SmCaretLine from_line = SmCaretPos2LineVisitor(pDev, 
mpPosition->CaretPos).GetResult(),
+best_line,  //Best approximated line found so far
+curr_line;  //Current line
+long dbp_sq = 0;//Distance squared to best line
+for(auto &pEntry : *mpGraph)
+{
+//Reject it if it's the current position
+if(pEntry->CaretPos == mpPosition->CaretPos) continue;
+//Compute caret line
+curr_line = SmCaretPos2LineVisitor(pDev, 
pEntry->CaretPos).GetResult();
+//Reject anything above if we're moving down
+if(curr_line.GetTop() <= from_line.GetTop() && direction 
== MoveDown) continue;
+//Reject anything below if we're moving up
+if(curr_line.GetTop() + curr_line.GetHeight() >= 
from_line.GetTop() + from_line.GetHeight()
+&& direction == MoveUp) continue;
+//Compare if it to what we have, if we have anything yet
+if(NewPos){
+//Compute distance to current line squared, multiplied 
with a horizontal factor
+long dp_sq = curr_line.SquaredDistanceX(from_line) * 
HORIZONTICAL_DISTANCE_FACTOR +
+ curr_line.SquaredDistanceY(from_line);
+//Discard current line if best line is closer
+if(dbp_sq <= dp_sq) continue;
+}
+//Take current line as the best
+best_line = curr_line;
+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - desktop/source

[Markus Mohrhard]

 desktop/source/app/crashreport.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 70500b1bd76200b5339686bbc28f12fdbe898e98
Author: Markus Mohrhard 
Date:   Mon May 30 05:51:36 2016 +0200

use the existing url to path function also in the ini file part

Change-Id: Ia92261a63cfe1d51f68f312a27d5ba4b42719c47
Reviewed-on: https://gerrit.libreoffice.org/25647
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 4405180546bce4b4237f1a23c0bc5bcc5d7bb3a7)
Reviewed-on: https://gerrit.libreoffice.org/25819

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index b1866f5..c50c2e9 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -68,11 +68,9 @@ OUString getCrashUserProfileDirectory()
 rtl::Bootstrap::expandMacros(url);
 osl::Directory::create(url);
 
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
-return url.copy(7);
-#elif defined WNT
-return url.copy(8);
-#endif
+OUString aProfilePath;
+osl::FileBase::getSystemPathFromFileURL(url, aProfilePath);
+return aProfilePath;
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Update to Firebird 3.0

[Lionel Elie Mamane]

On Thu, Jun 02, 2016 at 04:20:46PM +0200, Bunth Tamás wrote:
> If I understand correctly, this error:

> *firebird_sdbc error:*Unable to complete network request to host
> "localhost".*Failed to establish a connection.caused
> by'isc_create_database'*

> Is because of the issue Lionel posted on gerrit:
> "You need to make sure that firebird looks for libEngine12.so where it is
> installed, and not in /usr/local/firebird/plugins/"

> Am I right?

Yes, that's correct. With the new Thunderbird 3.0 architecture, the
client library has three "providers"

 - remote
 - engine12
 - localhost

In the default configuration, they are tried in that order. "remote"
and "localhost" are built-in in the fbclient shared library, and
"engine12" is in a separate plug-in shared library which firebird
dlopen()s.

"remote" is for connecting (TCP, named pipe, ...) to a firebird server
(whose hostname is given in the database specification
e.g. host:/path/to/db or inet://host/path/to/db)

engine12 is "access the file directly in-process" (database
specification is /path/to/db)

localhost is a special case of remote that connects to localhost when
given a filename as database specification.

What happens is that in the current state of your patch, firebird
looks for libEngine12.so in /usr/local/lib/firebird/plugins (or
something like that), and it is not found. So it tries with remote
(which decides not to handle the filename we give it), tries to load
engine12 (fails) then tries localhost which tries to connect to
localhost. That's why the error message looks like that.

> As I see, Firebird tries to use some remote access instead of local
> connection ( Remote provider instead of Engine12 ?).

Basically yes, but see above.

> it is so, it may be sensible to have a firebird.conf file in the
> installation directory, where we can set up that only the "Engine12"
> provider should be used.

That is true for embedded database; however we can also (not
implemented yet, but let's not close that door) use our internal
firebird driver to connect to a remote firebird server. So I'd
recommend not to have that in a firebird.conf that is "always" active
within LibreOffice.

> To change the path of libEngine12 I may need to write a patch to
> change it somewhere in workdir/UnpackedTarball/firebird/gen/Release/.

Try this: firebird should dlopen("libEngine12.so") without any path. I
think it will work. If not, passing the right --prefix to firebird's
./configure or something like that. Or patching the code to hardcode
it :)

> On 2 June 2016 at 14:36, Bunth Tamás  wrote:
> 
> > I am going to work on the following issues:
> >
> > - Build Firebird 3 on Mac OS and Windows systems too. For that, I may need
> > some help.
> >
> > - Adding tommath as external dependency if its necessary.
> >
> > - I got an error while creating a new database and I'm going to examine it:
> >
> >
> >
> >
> >
> > *firebird_sdbc error:*Unable to complete network request to host
> > "localhost".*Failed to establish a connection.caused
> > by'isc_create_database'*
> >
> >
> >
> > On 30 May 2016 at 19:13, Bunth Tamás  wrote:
> >
> >> Hello,
> >>
> >> I submitted my first changes, you can find it here:
> >>
> >> https://gerrit.libreoffice.org/#/c/25673/
> >>
> >> It's not ready yet, but it builds successfully for me on Linux.
> >>
> >> Regards:
> >> Tamás Bunth
> >>
> >
> >

> ___
> 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

minutes of ESC call ...

[Michael Meeks]

* Present:
   + Olivier, Jan I, Caolan, Michael S, Sophie, Bjoern, Christian,
 Miklos, Norbert, Thorsten, David, Kendy, Eike, Bubli, Stephan
 
* Completed Action Items:
   + Akshay Deep - chase mentor wrt. access (Thorsten)
 [ account setup, Norbert sorted gerrit out (Kendy) ]
+ encourage GSOC students to public IRC / dev-list posting (Thorsten)
 [ all blogs aggregated, and weekly reports to the list ]
 
* Pending Action Items:
+ investigate a chron job that queries & auto-merges (Norbert)
 + if +2 by author and +1 by jenkins -> auto-push
 [ Miklos pointed Norbert at something very similar ]
+ connect to David Ostrovsky to fuse gerrit with vm173 (Olivier)
 [ changing the XML specification, it needs improvement ]
+ tweak UI and get LiveConnect API key / build case for board (Christian)
+ attempt to re-build a recent gstreamer 1.0 / core spec file
  on our CentOS6 base (tdf#94508) (Christian)
 
* Release Engineering update (Cloph)
+ 5.2 Beta update
+ built & published, next week the 2nd beta.
+ 2nd Beta enables the breakpad crash/reporting feature
+ win64 indexing / symbol extraction took a while
+ 10 hours for 64bit vs. 10mins for 32bit.
+ build the extraction utility yourself if you
  build the indexer
+ 5.1.4 RC1 update
+ tagged Wed. morning, Mac builds still need up-loading
+ then can announce; all queued patches are in.
+ Android & iOS Remote
+ up-loaded the impress / Android remote to the Play store
   + changed it to a public beta
   + will publish a URL to sign-up for that.
   + if you were a previous tester, you can get it now.
+ building the Android Viewer right now;
   + will test & up-load soon.
 
* Documentation (Olivier)
+ working on translating the Getting Started manuals
+ continuing to analyse the XML of the help-content
+ was done in 2005; needs improvement.
+ defining new tags to get some improvements for a
  richer experience.
+ examples of tags ? (Kendy)
+ want to remove some things.
+ can map 1:1 between several tags & pure HTML (Olivier)
+ can we add SVG graphics, MathML equations, things
  that give a better experience for the help user.
+ agreed - lots needs removing.
+ book from Frank Peters with XML definition (Olivier)
+ building a Wiki to describe this too.
+ structure of XML is in the DTD (Kendy)
+ we know all the tags that are there.
+ but good to have a readable description of this
+ useful to have a stripped down version for end-users to edit 
(Olivier)
 
* GSoC 2016 (Thorsten)
+ lots of good things happening, in blogs etc.
+ positive answers: every showed up.
+ deadline next - end of June (23rd?) for mid-term.
+ BZ issue for each GSoC project ? (JanI)
   + Reasons
  + One place to add comments, see Regina mail
  How should she report the problems ?
  + GSoC project as the BZ issue get mentioned in release notes
  + Easy to identify a gerrit patch as GSoC
  Can't identify them as GSOC
  + Easier to make Blog posts referering BZ
  Planning to do a series of blog-posts over the summer.
  going through the git logs - is hard; referencing bugs
   + Objections
  + Mentioned in release notes - built into the wiki page.
 + when are bug lists published ? (Michael)
 + when build is announced (Cloph)
+ for minor point releases.
+ not added to main release notes, just to RC release notes.
https://wiki.documentfoundation.org/ReleasePlan/5.1 → 

https://wiki.documentfoundation.org/Releases/5.1.4/RC1#List_of_fixed_bugs for 
example
  + try to explain to users - 1 bug, has 1 fix (Miklos)
 + concerned wrt. 100 commit issues.
  + issues wrt. identifying GSOC students ?
  + could we have GSOC in the commit summary ? (Eike)
 + a topic in the commit ?
AI:  + encourage GSOC students to use GSOC in the commit summary (Thorsten/JanI)
 
* UX Update (Kendy)
+ not in the call personally; from minutes
+ Heiko identified some easy-hacks that need code-ptrs.
+ if bored, want to provide code-pointers for easy-hackers
+ discussion on GSOC work
+ discussion on new Gallery content & pre-defined shapes.
+ discussion about CMYK color selection (Bubli)
+ the default space to use.
 
* Crashtest update (Caolan)
+ 73 import failure, 1 export failure, 9 coverity
+ spike on import crashers; needs investigating
 
* Munich hack-fest update (Bubli)
+ Jmux, Bubli, new LHM hackers, Mike Saunders too.
+ Lots of great food, and 

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

[Eike Rathke]

 i18npool/source/localedata/LocaleNode.cxx  |4 +
 i18npool/source/localedata/data/ar_DZ.xml  |8 +-
 i18npool/source/localedata/data/ar_EG.xml  |8 +-
 i18npool/source/localedata/data/ar_OM.xml  |2 
 i18npool/source/localedata/data/bo_CN.xml  |   16 ++---
 i18npool/source/localedata/data/bo_IN.xml  |   16 ++---
 i18npool/source/localedata/data/cu_RU.xml  |2 
 i18npool/source/localedata/data/dz_BT.xml  |   28 -
 i18npool/source/localedata/data/en_US.xml  |   28 -
 i18npool/source/localedata/data/he_IL.xml  |6 +-
 i18npool/source/localedata/data/hr_HR.xml  |8 +-
 i18npool/source/localedata/data/ja_JP.xml  |8 +-
 i18npool/source/localedata/data/km_KH.xml  |   16 ++---
 i18npool/source/localedata/data/ko_KR.xml  |   84 ++---
 i18npool/source/localedata/data/lo_LA.xml  |2 
 i18npool/source/localedata/data/locale.dtd |6 +-
 i18npool/source/localedata/data/lt_LT.xml  |   12 ++--
 i18npool/source/localedata/data/my_MM.xml  |   48 
 i18npool/source/localedata/data/pl_PL.xml  |2 
 i18npool/source/localedata/data/pt_PT.xml  |   28 -
 i18npool/source/localedata/data/th_TH.xml  |   74 -
 i18npool/source/localedata/data/tr_TR.xml  |8 +-
 i18npool/source/localedata/data/zh_CN.xml  |   18 +++---
 i18npool/source/localedata/data/zh_HK.xml  |   16 ++---
 i18npool/source/localedata/data/zh_MO.xml  |   18 +++---
 i18npool/source/localedata/data/zh_SG.xml  |   18 +++---
 i18npool/source/localedata/data/zh_TW.xml  |   62 ++---
 27 files changed, 275 insertions(+), 271 deletions(-)

New commits:
commit a92eddbddee76fdcd9f98464fee26865692940e9
Author: Eike Rathke 
Date:   Thu Jun 2 17:20:21 2016 +0200

[PATCH] up the free usage formatindex start from 50 to 60

In preparation of adding some builtin format codes, actually already
NF_FRACTION_3 and NF_FRACTION_4 needed that.

Change-Id: I734a1ef5e6405aceaace7d44e8901a6183dc2a64

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 840a072..690bfeb 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -709,6 +709,10 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 
 aFormatIndex = currNodeAttr.getValueByName("formatindex");
 sal_Int16 formatindex = (sal_Int16)aFormatIndex.toInt32();
+// Ensure the new reserved range is not used anymore, free usage start
+// was up'ed from 50 to 60.
+if (50 <= formatindex && formatindex < 60)
+incErrorInt( "Error: Reserved formatindex=\"%d\" in FormatElement, 
free usage starts at 60.\n", formatindex);
 if (!aFormatIndexSet.insert( formatindex).second)
 incErrorInt( "Error: Duplicated formatindex=\"%d\" in 
FormatElement.\n", formatindex);
 of.writeIntParameter("Formatindex", formatCount, formatindex);
diff --git a/i18npool/source/localedata/data/ar_DZ.xml 
b/i18npool/source/localedata/data/ar_DZ.xml
index 3116c84..16362ce 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -195,16 +195,16 @@
 
   [NatNum1][~hijri]AM/PMHH:MM /MM/D
 
-
+
   AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]/MM/DD
 
-
+
   [NatNum1]General
 
   
diff --git a/i18npool/source/localedata/data/ar_EG.xml 
b/i18npool/source/localedata/data/ar_EG.xml
index 0d0ea2f..4dfe9be 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -195,16 +195,16 @@
 
   [NatNum1][~hijri]AM/PMHH:MM /MM/D
 
-
+
   AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]/MM/DD
 
-
+
   [NatNum1]General
 
   
diff --git a/i18npool/source/localedata/data/ar_OM.xml 
b/i18npool/source/localedata/data/ar_OM.xml
index 99c9574..51a9ece 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/ar_OM.xml
@@ -195,7 +195,7 @@
 
   DD/MM/ HH:MM:SS AM/PM
 
-
+
   [NatNum1]General
 
   
diff --git a/i18npool/source/localedata/data/bo_CN.xml 
b/i18npool/source/localedata/data/bo_CN.xml
index 3e7d794..ba01d81 100644
--- a/i18npool/source/localedata/data/bo_CN.xml
+++ b/i18npool/source/localedata/data/bo_CN.xml
@@ -164,19 +164,19 @@
 
   [NatNum1]#,###.00
 
-
+
   0
 
-
+
   0.00
 
-
+
   #,##0
 
-
+
   #,##0.00
 
-
+
   #,###.00
 
 
@@ -205,10 +205,10 @@
 
   [NatNum1]0.00%
 
-
+
   0%
 
-
+
   0.00%
 
 
@@ -217,7 +217,7 @@
 
   0.00E+00
 
-
+
   [NatNum1]0.00E+00
 
 
diff --git a/i18npool/

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - i18npool/source

[Eike Rathke]

 i18npool/source/localedata/LocaleNode.cxx  |4 +
 i18npool/source/localedata/data/ar_DZ.xml  |8 +-
 i18npool/source/localedata/data/ar_EG.xml  |8 +-
 i18npool/source/localedata/data/ar_OM.xml  |2 
 i18npool/source/localedata/data/bo_CN.xml  |   16 ++---
 i18npool/source/localedata/data/bo_IN.xml  |   16 ++---
 i18npool/source/localedata/data/cu_RU.xml  |2 
 i18npool/source/localedata/data/dz_BT.xml  |   28 -
 i18npool/source/localedata/data/en_US.xml  |   28 -
 i18npool/source/localedata/data/he_IL.xml  |6 +-
 i18npool/source/localedata/data/hr_HR.xml  |8 +-
 i18npool/source/localedata/data/ja_JP.xml  |8 +-
 i18npool/source/localedata/data/km_KH.xml  |   16 ++---
 i18npool/source/localedata/data/ko_KR.xml  |   84 ++---
 i18npool/source/localedata/data/lo_LA.xml  |2 
 i18npool/source/localedata/data/locale.dtd |6 +-
 i18npool/source/localedata/data/lt_LT.xml  |   12 ++--
 i18npool/source/localedata/data/my_MM.xml  |   48 
 i18npool/source/localedata/data/pl_PL.xml  |2 
 i18npool/source/localedata/data/pt_PT.xml  |   28 -
 i18npool/source/localedata/data/th_TH.xml  |   74 -
 i18npool/source/localedata/data/tr_TR.xml  |8 +-
 i18npool/source/localedata/data/zh_CN.xml  |   18 +++---
 i18npool/source/localedata/data/zh_HK.xml  |   16 ++---
 i18npool/source/localedata/data/zh_MO.xml  |   18 +++---
 i18npool/source/localedata/data/zh_SG.xml  |   18 +++---
 i18npool/source/localedata/data/zh_TW.xml  |   62 ++---
 27 files changed, 275 insertions(+), 271 deletions(-)

New commits:
commit 87d5f08b5cdb19973f24b2eecbed5a1010a2dd8a
Author: Eike Rathke 
Date:   Thu Jun 2 17:20:21 2016 +0200

up the free usage formatindex start from 50 to 60

In preparation of adding some builtin format codes, actually already
NF_FRACTION_3 and NF_FRACTION_4 needed that.

(cherry picked from commit a92eddbddee76fdcd9f98464fee26865692940e9)

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

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 840a072..690bfeb 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -709,6 +709,10 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 
 aFormatIndex = currNodeAttr.getValueByName("formatindex");
 sal_Int16 formatindex = (sal_Int16)aFormatIndex.toInt32();
+// Ensure the new reserved range is not used anymore, free usage start
+// was up'ed from 50 to 60.
+if (50 <= formatindex && formatindex < 60)
+incErrorInt( "Error: Reserved formatindex=\"%d\" in FormatElement, 
free usage starts at 60.\n", formatindex);
 if (!aFormatIndexSet.insert( formatindex).second)
 incErrorInt( "Error: Duplicated formatindex=\"%d\" in 
FormatElement.\n", formatindex);
 of.writeIntParameter("Formatindex", formatCount, formatindex);
diff --git a/i18npool/source/localedata/data/ar_DZ.xml 
b/i18npool/source/localedata/data/ar_DZ.xml
index 3116c84..16362ce 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -195,16 +195,16 @@
 
   [NatNum1][~hijri]AM/PMHH:MM /MM/D
 
-
+
   AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]/MM/DD
 
-
+
   [NatNum1]General
 
   
diff --git a/i18npool/source/localedata/data/ar_EG.xml 
b/i18npool/source/localedata/data/ar_EG.xml
index 0d0ea2f..4dfe9be 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -195,16 +195,16 @@
 
   [NatNum1][~hijri]AM/PMHH:MM /MM/D
 
-
+
   AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]AM/PMHH:MM /MM/D
 
-
+
   [NatNum1]/MM/DD
 
-
+
   [NatNum1]General
 
   
diff --git a/i18npool/source/localedata/data/ar_OM.xml 
b/i18npool/source/localedata/data/ar_OM.xml
index 99c9574..51a9ece 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/ar_OM.xml
@@ -195,7 +195,7 @@
 
   DD/MM/ HH:MM:SS AM/PM
 
-
+
   [NatNum1]General
 
   
diff --git a/i18npool/source/localedata/data/bo_CN.xml 
b/i18npool/source/localedata/data/bo_CN.xml
index 3e7d794..ba01d81 100644
--- a/i18npool/source/localedata/data/bo_CN.xml
+++ b/i18npool/source/localedata/data/bo_CN.xml
@@ -164,19 +164,19 @@
 
   [NatNum1]#,###.00
 
-
+
   0
 
-
+
   0.00
 
-
+
   #,##0
 
-
+
   #,##0.00
 
-
+
   #,###.00
 
 
@@ -205,10 +205,10 @@
 
   [NatNum1]0.00%
 
- 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - i18npool/source

[Muhammet Kara]

 i18npool/source/localedata/data/tr_TR.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e7992e916fe014670ccb8cc9242bfd7913ac98b
Author: Muhammet Kara 
Date:   Thu Jun 2 10:07:23 2016 +0300

tdf#63272 Fix location of percent sign for Turkish

Change-Id: I6f2d1c2c947e01a686fdb7a7f175dd7541924afa
Reviewed-on: https://gerrit.libreoffice.org/25805
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit eee5256e6649c5ccbd26f30b53351c808f6c56e4)
Reviewed-on: https://gerrit.libreoffice.org/25813

diff --git a/i18npool/source/localedata/data/tr_TR.xml 
b/i18npool/source/localedata/data/tr_TR.xml
index bbc0113..a1b9ba9 100644
--- a/i18npool/source/localedata/data/tr_TR.xml
+++ b/i18npool/source/localedata/data/tr_TR.xml
@@ -85,10 +85,10 @@
   ##0,00E+00
 
 
-  0%
+  %0
 
 
-  0,00%
+  %0,00
 
 
   [$₺-41F]#.##0;-[$₺-41F]#.##0
___
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' - i18npool/source

[Muhammet Kara]

 i18npool/source/localedata/data/tr_TR.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa406b4195460a8f7fc235c6de76834910f8d44e
Author: Muhammet Kara 
Date:   Thu Jun 2 10:07:23 2016 +0300

tdf#63272 Fix location of percent sign for Turkish

Change-Id: I6f2d1c2c947e01a686fdb7a7f175dd7541924afa
Reviewed-on: https://gerrit.libreoffice.org/25805
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit eee5256e6649c5ccbd26f30b53351c808f6c56e4)
Reviewed-on: https://gerrit.libreoffice.org/25814

diff --git a/i18npool/source/localedata/data/tr_TR.xml 
b/i18npool/source/localedata/data/tr_TR.xml
index 823dbc9..04b840a 100644
--- a/i18npool/source/localedata/data/tr_TR.xml
+++ b/i18npool/source/localedata/data/tr_TR.xml
@@ -85,10 +85,10 @@
   ##0,00E+00
 
 
-  0%
+  %0
 
 
-  0,00%
+  %0,00
 
 
   [$₺-41F]#.##0;-[$₺-41F]#.##0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rishabh Kumar]

 cui/source/tabpages/tphatch.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9f5bb8cddd28be2c45ac5bdf438d4996337f6380
Author: Rishabh Kumar 
Date:   Wed Jun 1 20:53:32 2016 +0530

Import custom Hatch background color

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

diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 78e5fa8..3b0afef 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -240,6 +240,12 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet 
)
 if(aBckItem.GetValue())
 aColor = aColorItem.GetColorValue();
 m_pLbBackgroundColor->SelectEntry(aColor);
+if( m_pLbBackgroundColor->GetSelectEntryCount() == 0 )
+{
+m_pLbBackgroundColor->InsertEntry( aColor , OUString() );
+m_pLbBackgroundColor->SelectEntry( aColor );
+}
+
 m_rXFSet.Put( aBckItem );
 m_rXFSet.Put( aColorItem );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[krishna keshav]

 sw/source/core/view/viewpg.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 66c41718f91dcca9c487742e9313c657ede4ce3f
Author: krishna keshav 
Date:   Sun May 29 12:22:58 2016 +0530

tdf#90834 Turn in-line version control history comments

cleanup in core/sw/source/core/view/viewpg.cxx

Change-Id: Ie0f406db111b4418e92245a9e998e6ff99eb75fe
Reviewed-on: https://gerrit.libreoffice.org/25596
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 9f5b788..32057c0 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -45,7 +45,6 @@
 
 using namespace ::com::sun::star;
 
-// OD 12.12.2002 #103492#
 SwPagePreviewLayout* SwViewShell::PagePreviewLayout()
 {
 return Imp()->PagePreviewLayout();
@@ -56,10 +55,7 @@ void SwViewShell::ShowPreviewSelection( sal_uInt16 nSelPage )
 Imp()->InvalidateAccessiblePreviewSelection( nSelPage );
 }
 
-/** adjust view options for page preview
-
-OD 09.01.2003 #i6467#
-*/
+// adjust view options for page preview
 void SwViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions)
 {
 if ( !IsPreview() )
@@ -74,7 +70,7 @@ void SwViewShell::AdjustOptionsForPagePreview(SwPrintData 
const& rPrintOptions)
 }
 
 /// print brochure
-// OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling
+// consider empty pages on calculation of the scaling
 // for a page to be printed.
 void SwViewShell::PrintProspect(
 OutputDevice *pOutDev,
@@ -122,7 +118,7 @@ void SwViewShell::PrintProspect(
 pNxtPage = sw_getPage(*aShell.GetLayout(), rPagesToPrint.second);
 }
 
-// OD 05.05.2003 #i14016# - consider empty pages on calculation
+// consider empty pages on calculation
 // of page size, used for calculation of scaling.
 Size aSttPageSize;
 if ( pStPage )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 configure.ac |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit b91d9e2d9138b2eb09629d0a2d7e63869f5b9f1b
Author: Christian Lohmaier 
Date:   Thu Jun 2 18:14:39 2016 +0200

android: gnu-libstdc++ dir is versioned in ndk-bundle

even with only one toolchain, so test whether path exists without
version, otherwise just stick it in.

Change-Id: I58c7f9e9582efdccb446e1bcf161d2c9e913a3af

diff --git a/configure.ac b/configure.ac
index 8bdee1d..442a816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -443,16 +443,14 @@ if test -n "$with_android_ndk"; then
 
 # This stays empty if there is just one version of the toolchain in the NDK
 ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=
-case "`echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*/prebuilt/*/bin`" 
in
-*/bin\ */bin*)
-# Trailing slash intentional and necessary, compare to how this is used
+if test ! -d "$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs" ; then
+# nope, won't work if empty...
+# as is the case when using the ndk-bundle as installed with android 
studio
+
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/"
 if test -n "$ANDROID_USING_CLANG"; then
 ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR=4.8/
-else
-
ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/"
 fi
-;;
-esac
+fi
 
 ANDROID_API_LEVEL=15
 if test $host_cpu = arm; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[jan iversen]

> * Commit Access
>+ cleanup of stale? committers (Norbert)
>  + ran a script to find people with no commit >1 yr.
> + or should we let them stay around.
>  + some project revoked after 0.5 years (Miklos)
> + frugalware.
>  + do we have any problem with leaving them ? (Stephan)
> + no; but don't want to ever be (Norbert)
>  + concern wrt. removing committers (JanI)
> + openhub counts actual commits (Norbert)
>  + generate a mail if they arrive (JanI)
>  + social aspect concern (Michael)
> + if we can get people active again by poking (Bjoern)
>+ can be helpful.
> + otherwise leave open & put a watch on commits (Bjoern)
>+ just look at these carefully.
>+ and welcome them back.
>  + concern wrt. the work, some people move on (Norbert)
> + do we want to keep them open forever.
> + we have a bunch of ex. GSOC never seen again ?
>+ silently remove those we think are unlikely to come back
>+ concern wrt. creating lots of rules
>+ notify removing them.
>  + for sure - commit rights to random projects (Kendy)
> + not feel comfortable committing now.
> + if not for three years - through gerrit.
>=> leave up to JanI

Based on the above discussion, my intention is:

- To extend my nightly statistic script, to check new commits (probably 
restricted to our code repo).
- For every commit If the delta between the last commit from the author and 
this commit is more than 1Year, the script will notify me.
- I will write a "happy to see you again" mail, with copy the dev list, so the 
author hopefully starts to be an active part of the community again.

- We already have scripting in place, to mail authors who have not contributed 
for > 3 months. (see "20(20) to be emailed" in the stats.

- Before revoking anybodys commit right please notify me in advance, so I can 
write a nice email to them as a last poke before executing the revoke.

Suggestions and comments are welcome.
rgds
jan I




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

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

[Eike Rathke]

 svx/source/items/numfmtsh.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5c24711c6517943d22a978112dc74fa4184dc5f7
Author: Eike Rathke 
Date:   Thu Jun 2 19:14:09 2016 +0200

actually list additional builtin formats NF_FRACTION_3, NF_FRACTION_4

Scanning only a subset span is ugly anyway, just hack that in now.

Change-Id: I5a5f7a64f3b49e2f590130072a2a48c2b5af21b7

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index d86e1f2..d4d6649 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -604,7 +604,9 @@ void SvxNumberFormatShell::FillEListWithStd_Impl( 
std::vector& rList,
  break;
 case CAT_FRACTION   :eOffsetStart=NF_FRACTION_START;
  eOffsetEnd=NF_FRACTION_END;
- break;
+ nSelPos = FillEListWithFormats_Impl( 
rList, nSelPos, eOffsetStart, eOffsetEnd);
+ nSelPos = FillEListWithFormats_Impl( 
rList, nSelPos, NF_FRACTION_3, NF_FRACTION_4);
+ return;
 case CAT_BOOLEAN:eOffsetStart=NF_BOOLEAN;
  eOffsetEnd=NF_BOOLEAN;
  break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[Michael Meeks]

On Thu, 2016-06-02 at 18:46 +0200, jan iversen wrote:
> - For every commit If the delta between the last commit from the
> author and this commit is more than 1Year, the script will notify me.
...
> - I will write a "happy to see you again" mail, with copy the dev
> list, so the author hopefully starts to be an active part of the
> community again.

Sounds wonderful to me =)

Thanks Jan,

Michael.

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

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

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

[Eike Rathke]

 include/svl/zforlist.hxx|   17 +++--
 svl/source/numbers/zforlist.cxx |   24 
 svx/source/items/numfmtsh.cxx   |2 ++
 3 files changed, 37 insertions(+), 6 deletions(-)

New commits:
commit e7418e96cee263a0a74027335d7f5a119bb43ce2
Author: Eike Rathke 
Date:   Thu Jun 2 20:14:16 2016 +0200

add NF_DATETIME_ISO_MMDD_HHMMSS -MM-DD HH:MM:SS builtin format code

Change-Id: I4fe6ef01a4c7fb795e4499e54aa55ebaaa0d433d

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 50e7ea3..d87641e4 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -74,6 +74,7 @@ namespace com { namespace sun { namespace star {
 
 Do NOT insert any new values!
 The values here correspond with those in 
offapi/com/sun/star/i18n/NumberFormatIndex.idl
+You may append values though.
  */
 enum NfIndexTableOffset
 {
@@ -131,6 +132,7 @@ enum NfIndexTableOffset
 NF_DATE_DIN_MMDD,   // 10-08DIN
 NF_DATE_DIN_YYMMDD, // 97-10-08 DIN
 NF_DATE_DIN_MMDD,   // 1997-10-08   DIN
+NF_DATE_ISO_MMDD = NF_DATE_DIN_MMDD, // 1997-10-08  
ISO clarify with name
 NF_DATE_SYS_MMYY,   // 10.97
 NF_DATE_SYS_DDMMM,  // 08.Oct
 NF_DATE_,   // October
@@ -156,15 +158,26 @@ enum NfIndexTableOffset
 NF_BOOLEAN, // BOOLEAN
 NF_TEXT,// @
 
-NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,// old number of predefined 
entries, locale data additions start after this
+NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,// == 50, old number of predefined 
entries, i18npool locale data additions start after this
 
 // From here on are values of new built-in formats that are not in the
 // original NumberFormatIndex.idl
 
+// XXX Values appended here must also get a corresponding entry in
+// svl/source/numbers/zforlist.cxx indexTable[] in the same order.
+
+// XXX The dialog's number format shell assumes start/end spans
+// (NF_..._START and NF_..._END above) to fill its categories with builtin
+// formats, make new formats known to svx/source/items/numfmtsh.cxx
+// SvxNumberFormatShell::FillEListWithStd_Impl(), otherwise they will not
+// be be listed at all. Yes that is ugly.
+
 NF_FRACTION_3 = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,// # ?/4
 NF_FRACTION_4,  // # ?/100
 
-NF_INDEX_TABLE_ENTRIES
+NF_DATETIME_ISO_MMDD_HHMMSS,// 1997-10-08 01:23:45  
ISO (with blank instead of T)
+
+NF_INDEX_TABLE_ENTRIES  // == 53, reserved up to 59 to not 
use in i18npool locale data.
 };
 
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 91037ff..df13480 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -91,6 +91,7 @@ using namespace ::std;
  * (old currency) is recognized as a date (#53155#). */
 #define UNKNOWN_SUBSTITUTE  LANGUAGE_ENGLISH_US
 
+// Same order as in include/svl/zforlist.hxx enum NfIndexTableOffset
 static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
 ZF_STANDARD, // NF_NUMBER_STANDARD
 ZF_STANDARD + 1, // NF_NUMBER_INT
@@ -143,7 +144,8 @@ static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] 
= {
 ZF_STANDARD_LOGICAL, // NF_BOOLEAN
 ZF_STANDARD_TEXT, // NF_TEXT
 ZF_STANDARD_FRACTION + 2, // NF_FRACTION_3
-ZF_STANDARD_FRACTION + 3 // NF_FRACTION_4
+ZF_STANDARD_FRACTION + 3, // NF_FRACTION_4
+ZF_STANDARD_DATETIME + 2 // NF_DATETIME_ISO_MMDD_HHMMSS
 };
 
 /**
@@ -2495,7 +2497,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 
CLOffset, bool bNoAdditio
 ImpInsertFormat( aFormatSeq[nIdx],
  CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD /* 
NF_DATE_DIN_YYMMDD */ );
 
-// -MM-DD   DIN/EN
+// -MM-DD   DIN/EN/ISO
 nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_MMDD );
 ImpInsertFormat( aFormatSeq[nIdx],
  CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD /* 
NF_DATE_DIN_MMDD */ );
@@ -2555,6 +2557,22 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 
CLOffset, bool bNoAdditio
 ImpInsertFormat( aFormatSeq[nIdx],
  CLOffset + ZF_STANDARD_DATETIME+1 /* 
NF_DATETIME_SYS_DDMM_HHMMSS */ );
 
+const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords();
+i18n::NumberFormatCode aSingleFormatCode;
+OUStringBuffer aBuf;
+aSingleFormatCode.Usage = i18n::KNumberFormatUsage::DATE_TIME;
+
+// -MM-DD HH:MM:SS   ISO
+aBuf.append( rKeyword[NF_KEY_]).append('-').
+append( rKeyword[NF_KEY_MM]).append('-').
+append( rKeyword[NF_KEY_DD]).append(' ').
+append( rKeyword[N

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

[Eike Rathke]

 svl/source/numbers/zforlist.cxx |   43 ++--
 1 file changed, 24 insertions(+), 19 deletions(-)

New commits:
commit 020d395b59b4c631491ded910c0405584ef46e1c
Author: Eike Rathke 
Date:   Thu Jun 2 20:40:46 2016 +0200

preserve ISO date+time format when editing such values

Change-Id: I6dcbe6c9aeff87d735303713f328c84203f76b60

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index df13480..0747e0c 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1420,24 +1420,29 @@ sal_uInt32 SvNumberFormatter::GetEditFormat( double 
fNumber, sal_uInt32 nFIndex,
 {
 // #61619# always edit using 4-digit year
 case css::util::NumberFormat::DATE :
-if (rtl::math::approxFloor( fNumber) != fNumber)
-nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
-// fdo#34977 preserve time when editing even if only date was
-// displayed.
-/* FIXME: in case an ISO 8601 format was used, editing should
- * also use such. Unfortunately we have no builtin combined
- * date+time ISO format defined. Needs also locale data work.
- * */
-else
 {
 // Preserve ISO 8601 format.
-if (nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
-nFIndex == GetFormatIndex( NF_DATE_DIN_YYMMDD, eLang) ||
-nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
-(pFormat && pFormat->IsIso8601( 0 )))
-nKey = GetFormatIndex( NF_DATE_DIN_MMDD, eLang);
+bool bIsoDate =
+nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
+nFIndex == GetFormatIndex( NF_DATE_DIN_YYMMDD, eLang) ||
+nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
+(pFormat && pFormat->IsIso8601( 0 ));
+if (rtl::math::approxFloor( fNumber) != fNumber)
+{
+// fdo#34977 preserve time when editing even if only date was
+// displayed.
+if (bIsoDate)
+nKey = GetFormatIndex( NF_DATETIME_ISO_MMDD_HHMMSS, 
eLang);
+else
+nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, 
eLang );
+}
 else
-nKey = GetFormatIndex( NF_DATE_SYS_DDMM, eLang );
+{
+if (bIsoDate)
+nKey = GetFormatIndex( NF_DATE_ISO_MMDD, eLang);
+else
+nKey = GetFormatIndex( NF_DATE_SYS_DDMM, eLang );
+}
 }
 break;
 case css::util::NumberFormat::TIME :
@@ -1458,10 +1463,10 @@ sal_uInt32 SvNumberFormatter::GetEditFormat( double 
fNumber, sal_uInt32 nFIndex,
 nKey = GetStandardFormat( fNumber, nFIndex, eType, eLang );
 break;
 case css::util::NumberFormat::DATETIME :
-nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
-/* FIXME: in case an ISO 8601 format was used, editing should
- * also use such. Unfortunately we have no builtin combined
- * date+time ISO format defined. Needs also locale data work. */
+if (nFIndex == GetFormatIndex( NF_DATETIME_ISO_MMDD_HHMMSS, eLang) 
|| (pFormat && pFormat->IsIso8601( 0 )))
+nKey = GetFormatIndex( NF_DATETIME_ISO_MMDD_HHMMSS, eLang );
+else
+nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
 break;
 default:
 nKey = GetStandardFormat( fNumber, nFIndex, eType, eLang );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 sc/source/ui/docshell/impex.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 432b27ec73940738bb0b4f9d3d749c70a2525700
Author: Pranav Kant 
Date:   Fri Jun 3 00:46:48 2016 +0530

sc: Don't export in case of invalid range

For example, copying an empty column or row range, and then
pasting as unformatted text exports all the newline characters
inspite of the fact that this is an invalid data range.

The problem becomes worse when someone tries to copy an entire
column which implies exporting MAXROW times newline characters.

Change-Id: Ie0a09890e2d0cd5f44d89d520959248e65365ad7

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 10400253..038a53d 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1600,7 +1600,8 @@ bool ScImportExport::Doc2Text( SvStream& rStrm )
 SCTAB nEndTab = aRange.aEnd.Tab();
 
 if (!pDoc->GetClipParam().isMultiRange() && nStartTab == nEndTab)
-pDoc->ShrinkToDataArea( nStartTab, nStartCol, nStartRow, nEndCol, 
nEndRow );
+if (!pDoc->ShrinkToDataArea( nStartTab, nStartCol, nStartRow, nEndCol, 
nEndRow ))
+return false;
 
 OUString aCellStr;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Problem with increase maximum height of the footer

[Bartosz Kosiorek]

Hello.

I would like to implement, increasing maximum footnote height, to resolve
issue:
https://bugs.documentfoundation.org/show_bug.cgi?id=73977

The footnote height could be set manually and with custom height.
Both are limited in theory by page height, but in practice there is some
magic number which limite footnote height

I found that most of the UI is implemented there:
https://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/misc/pgfnote.cxx#n355

But there is nothing about maximum value, except:
 lMaxHeight *= 8;
 lMaxHeight /= 10;

 // set maximum values
 HeightModify(*m_pMaxHeightEdit);

Unfortunately it is only changes maximum UI values which could be set via
Format->Page...->Footnote...->Maximum footnote height.
It it not changing a maximum height of footnote at all.

In
https://cgit.freedesktop.org/libreoffice/core/tree/sw/source/core/layout/pagechg.cxx#n173
If Height is set to 0 (for automatic footnote height mode), then height is
set to LONG_MAX


SetMaxFootnoteHeight( pPgDsc->GetFootnoteInfo().GetHeight() ?

 pPgDsc->GetFootnoteInfo().GetHeight() : LONG_MAX );


Is that mean that the limitiation of footnote height is set by
LONG_MAX (SwTwips ) type ?

I would like to resolve that issue, but currently I have stuck.
Does anyone knows some more details about that?

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

[Libreoffice-commits] core.git: helpcontent2

[Stanislav Horacek]

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

New commits:
commit e70cdaba2e2fd7f186d5bd670d249cf3b9f16038
Author: Stanislav Horacek 
Date:   Sun May 8 20:59:21 2016 +0200

Updated core
Project: help  17405f4ca6d12814f5abc0f97028745308edca9a

tdf#99637 add expert configuration property for number of undo steps

Change-Id: I6ea67b95d3cc535166adbb0459a25b335f96d544
Reviewed-on: https://gerrit.libreoffice.org/24774
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index d2dbd0d..17405f4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2dbd0dacb5c653680ed94d6a2ebabd52e300a0a
+Subproject commit 17405f4ca6d12814f5abc0f97028745308edca9a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stanislav Horacek]

 source/text/shared/01/0201.xhp   |2 +-
 source/text/shared/optionen/01011000.xhp |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 17405f4ca6d12814f5abc0f97028745308edca9a
Author: Stanislav Horacek 
Date:   Sun May 8 20:59:21 2016 +0200

tdf#99637 add expert configuration property for number of undo steps

Change-Id: I6ea67b95d3cc535166adbb0459a25b335f96d544
Reviewed-on: https://gerrit.libreoffice.org/24774
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/0201.xhp 
b/source/text/shared/01/0201.xhp
index 52de0d7..bffdcda 100644
--- a/source/text/shared/01/0201.xhp
+++ b/source/text/shared/01/0201.xhp
@@ -44,7 +44,7 @@
 
   
 
-To change 
the number of commands that you can undo, choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Memory, and enter a 
new value in the number of steps box.
+To change the number 
of commands that you can undo, go to the Expert configuration and 
set a new value of the property /org.openoffice.Office.Common/Undo 
Steps.
 Some commands (for example, editing Styles) cannot be 
undone.
 You can cancel the Undo command by choosing Edit - Redo.
 About the Undo command in database tables
diff --git a/source/text/shared/optionen/01011000.xhp 
b/source/text/shared/optionen/01011000.xhp
index f093ef1..e529076 100644
--- a/source/text/shared/optionen/01011000.xhp
+++ b/source/text/shared/optionen/01011000.xhp
@@ -34,6 +34,7 @@
 graphics; cache
 cache for graphics
 Quickstarter
+undoing; number of steps
 
 
 Memory
@@ -57,5 +58,7 @@
 Load $[officename] during system start-up 
 Enable systray 
Quickstarter
 Mark this check box 
if you want $[officename] to enable quickstart. This option is available if the 
Quickstart module has been installed.UFI: had to remove 
explanation because on Windows it is at start-up, while on Unix it is a 
user-systray feature only. Cannot have switches inside AHID 
text.
+Number 
of undo steps
+The number of 
steps which can be undone can be changed in the Expert configuration by 
setting the property /org.openoffice.Office.Common/Undo 
Steps.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-5-2' - source/text

[Stanislav Horacek]

 source/text/shared/01/0201.xhp   |2 +-
 source/text/shared/optionen/01011000.xhp |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3c62f984f3f6fcdbf9f27fc62f5fac7a6aa0734a
Author: Stanislav Horacek 
Date:   Sun May 8 20:59:21 2016 +0200

tdf#99637 add expert configuration property for number of undo steps

Change-Id: I6ea67b95d3cc535166adbb0459a25b335f96d544
Reviewed-on: https://gerrit.libreoffice.org/24774
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit 17405f4ca6d12814f5abc0f97028745308edca9a)
Reviewed-on: https://gerrit.libreoffice.org/25841

diff --git a/source/text/shared/01/0201.xhp 
b/source/text/shared/01/0201.xhp
index 52de0d7..bffdcda 100644
--- a/source/text/shared/01/0201.xhp
+++ b/source/text/shared/01/0201.xhp
@@ -44,7 +44,7 @@
 
   
 
-To change 
the number of commands that you can undo, choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - Memory, and enter a 
new value in the number of steps box.
+To change the number 
of commands that you can undo, go to the Expert configuration and 
set a new value of the property /org.openoffice.Office.Common/Undo 
Steps.
 Some commands (for example, editing Styles) cannot be 
undone.
 You can cancel the Undo command by choosing Edit - Redo.
 About the Undo command in database tables
diff --git a/source/text/shared/optionen/01011000.xhp 
b/source/text/shared/optionen/01011000.xhp
index f093ef1..e529076 100644
--- a/source/text/shared/optionen/01011000.xhp
+++ b/source/text/shared/optionen/01011000.xhp
@@ -34,6 +34,7 @@
 graphics; cache
 cache for graphics
 Quickstarter
+undoing; number of steps
 
 
 Memory
@@ -57,5 +58,7 @@
 Load $[officename] during system start-up 
 Enable systray 
Quickstarter
 Mark this check box 
if you want $[officename] to enable quickstart. This option is available if the 
Quickstart module has been installed.UFI: had to remove 
explanation because on Windows it is at start-up, while on Unix it is a 
user-systray feature only. Cannot have switches inside AHID 
text.
+Number 
of undo steps
+The number of 
steps which can be undone can be changed in the Expert configuration by 
setting the property /org.openoffice.Office.Common/Undo 
Steps.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - helpcontent2

[Stanislav Horacek]

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

New commits:
commit 72d639a0d69685f7116cbc05d609734ab8803369
Author: Stanislav Horacek 
Date:   Sun May 8 20:59:21 2016 +0200

Updated core
Project: help  3c62f984f3f6fcdbf9f27fc62f5fac7a6aa0734a

tdf#99637 add expert configuration property for number of undo steps

Change-Id: I6ea67b95d3cc535166adbb0459a25b335f96d544
Reviewed-on: https://gerrit.libreoffice.org/24774
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit 17405f4ca6d12814f5abc0f97028745308edca9a)
Reviewed-on: https://gerrit.libreoffice.org/25841

diff --git a/helpcontent2 b/helpcontent2
index 2bc5ebd..3c62f98 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2bc5ebd2fd08a5b7f456efa5054db7caefef2156
+Subproject commit 3c62f984f3f6fcdbf9f27fc62f5fac7a6aa0734a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 compilerplugins/clang/unusedfields.cxx  |2 +-
 compilerplugins/clang/unusedmethods.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2712fc0869e5ba3b7a1da41e0ce72431d3b0deee
Author: Stephan Bergmann 
Date:   Thu Jun 2 23:46:46 2016 +0200

I assume these special plugins were not intended to be enabled 
unconditionally

...with fa135fd0e05fc4ba784b4349d65f2e5ed26c0f55 "remove unused SID 
constants
and associated code"

Change-Id: I51b2a9e3c8ce13401818bca0c40167a4364212f1

diff --git a/compilerplugins/clang/unusedfields.cxx 
b/compilerplugins/clang/unusedfields.cxx
index 7191577..a370cb3 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -297,7 +297,7 @@ bool UnusedFields::VisitDeclRefExpr( const DeclRefExpr* 
declRefExpr )
 return true;
 }
 
-loplugin::Plugin::Registration< UnusedFields > X("unusedfields", true);
+loplugin::Plugin::Registration< UnusedFields > X("unusedfields", false);
 
 }
 
diff --git a/compilerplugins/clang/unusedmethods.cxx 
b/compilerplugins/clang/unusedmethods.cxx
index 9b3e9e8..aa645fb 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -378,7 +378,7 @@ bool UnusedMethods::VisitDeclRefExpr( const DeclRefExpr* 
declRefExpr )
 return true;
 }
 
-loplugin::Plugin::Registration< UnusedMethods > X("unusedmethods", true);
+loplugin::Plugin::Registration< UnusedMethods > X("unusedmethods", false);
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svx/source

[Eike Rathke]

 svx/source/items/numfmtsh.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b5f511b69a1b7ea6ecd9ba21c266be022a3f1e86
Author: Eike Rathke 
Date:   Thu Jun 2 19:14:09 2016 +0200

actually list additional builtin formats NF_FRACTION_3, NF_FRACTION_4

Scanning only a subset span is ugly anyway, just hack that in now.

Change-Id: I5a5f7a64f3b49e2f590130072a2a48c2b5af21b7
(cherry picked from commit 5c24711c6517943d22a978112dc74fa4184dc5f7)
Reviewed-on: https://gerrit.libreoffice.org/25837
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index d86e1f2..d4d6649 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -604,7 +604,9 @@ void SvxNumberFormatShell::FillEListWithStd_Impl( 
std::vector& rList,
  break;
 case CAT_FRACTION   :eOffsetStart=NF_FRACTION_START;
  eOffsetEnd=NF_FRACTION_END;
- break;
+ nSelPos = FillEListWithFormats_Impl( 
rList, nSelPos, eOffsetStart, eOffsetEnd);
+ nSelPos = FillEListWithFormats_Impl( 
rList, nSelPos, NF_FRACTION_3, NF_FRACTION_4);
+ return;
 case CAT_BOOLEAN:eOffsetStart=NF_BOOLEAN;
  eOffsetEnd=NF_BOOLEAN;
  break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Quality Laser Safety Glasses Supply与您共享了相册。

[Quality Laser Safety Glasses Supply]

Use the world’s lastest technology,
Reach a higher more Protection level,
With a better more Transmittance !

Dear Sir/Madam,

It’s glad to write to you.

We are on laser safety products for more than 8 years.

Our major product including laser protective glasses, IPL safety goggle,  
laser protection window etc., Now we have about 50% Mainland China market,  
and 50% Oversea market in Europe and U.S.A. We provide OEM and customized  
service according to customer’s application.


Below is some our hot sales for your reference --

YHP laser protective glasses
Protect wavelength: 800 - 1100nm
Transmittacne: 60%

DTY laser protective glasses
Protect wavelength: 800 - 1700nm
Transmittacne: 40%

GTY laser protective glasses
Protect wavelength: 532&1064nm
Transmittance: 40%

IPL protective glasses
Protect wavelength: 200 - 1400nm
Transmittance: 10%

The above is just a corner of us, please feel free to let us know the kinds  
of lasers you use, and our specialist will give you a most suitable  
recommendation !


Thank you,

Hui WANG

https://picasaweb.google.com/lh/sredir?uname=107557447153062976312&target=ALBUM&id=6277804371110758577&authkey=Gv1sRgCMjNvvv08Z2ECQ&invite=CPTF5KkF&feat=email
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/platform/windows.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6b3b352b06d92ef20194b9a992a521af2ef07b48
Author: Norbert Thiebaud 
Date:   Thu Jun 2 14:02:30 2016 -0500

try to avoid 'by-design' solar-mutex deadlock during ci

Change-Id: I9e1d79613adf6184f76c2e07aca0b78a9329838f
Reviewed-on: https://gerrit.libreoffice.org/25839
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index a2e621d..ebd2a3c 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -8,6 +8,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+# to block heavy exception handling that try to acquire the solarmutex
+export LO_LEAN_EXCEPTION=1
+
 # to avoid flashing windows during tests
 export VCL_HIDE_WINDOWS=1
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/svl svl/source svx/source

[Eike Rathke]

 include/svl/zforlist.hxx|   17 +++--
 svl/source/numbers/zforlist.cxx |   24 
 svx/source/items/numfmtsh.cxx   |2 ++
 3 files changed, 37 insertions(+), 6 deletions(-)

New commits:
commit cb0649d7e3afca26d4c792c6b8f08d30e66351cc
Author: Eike Rathke 
Date:   Thu Jun 2 20:14:16 2016 +0200

add NF_DATETIME_ISO_MMDD_HHMMSS -MM-DD HH:MM:SS builtin format code

Change-Id: I4fe6ef01a4c7fb795e4499e54aa55ebaaa0d433d
(cherry picked from commit e7418e96cee263a0a74027335d7f5a119bb43ce2)
Reviewed-on: https://gerrit.libreoffice.org/25842
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index a18354f..7244022 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -74,6 +74,7 @@ namespace com { namespace sun { namespace star {
 
 Do NOT insert any new values!
 The values here correspond with those in 
offapi/com/sun/star/i18n/NumberFormatIndex.idl
+You may append values though.
  */
 enum NfIndexTableOffset
 {
@@ -131,6 +132,7 @@ enum NfIndexTableOffset
 NF_DATE_DIN_MMDD,   // 10-08DIN
 NF_DATE_DIN_YYMMDD, // 97-10-08 DIN
 NF_DATE_DIN_MMDD,   // 1997-10-08   DIN
+NF_DATE_ISO_MMDD = NF_DATE_DIN_MMDD, // 1997-10-08  
ISO clarify with name
 NF_DATE_SYS_MMYY,   // 10.97
 NF_DATE_SYS_DDMMM,  // 08.Oct
 NF_DATE_,   // October
@@ -156,15 +158,26 @@ enum NfIndexTableOffset
 NF_BOOLEAN, // BOOLEAN
 NF_TEXT,// @
 
-NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,// old number of predefined 
entries, locale data additions start after this
+NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,// == 50, old number of predefined 
entries, i18npool locale data additions start after this
 
 // From here on are values of new built-in formats that are not in the
 // original NumberFormatIndex.idl
 
+// XXX Values appended here must also get a corresponding entry in
+// svl/source/numbers/zforlist.cxx indexTable[] in the same order.
+
+// XXX The dialog's number format shell assumes start/end spans
+// (NF_..._START and NF_..._END above) to fill its categories with builtin
+// formats, make new formats known to svx/source/items/numfmtsh.cxx
+// SvxNumberFormatShell::FillEListWithStd_Impl(), otherwise they will not
+// be be listed at all. Yes that is ugly.
+
 NF_FRACTION_3 = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,// # ?/4
 NF_FRACTION_4,  // # ?/100
 
-NF_INDEX_TABLE_ENTRIES
+NF_DATETIME_ISO_MMDD_HHMMSS,// 1997-10-08 01:23:45  
ISO (with blank instead of T)
+
+NF_INDEX_TABLE_ENTRIES  // == 53, reserved up to 59 to not 
use in i18npool locale data.
 };
 
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 91037ff..df13480 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -91,6 +91,7 @@ using namespace ::std;
  * (old currency) is recognized as a date (#53155#). */
 #define UNKNOWN_SUBSTITUTE  LANGUAGE_ENGLISH_US
 
+// Same order as in include/svl/zforlist.hxx enum NfIndexTableOffset
 static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
 ZF_STANDARD, // NF_NUMBER_STANDARD
 ZF_STANDARD + 1, // NF_NUMBER_INT
@@ -143,7 +144,8 @@ static sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] 
= {
 ZF_STANDARD_LOGICAL, // NF_BOOLEAN
 ZF_STANDARD_TEXT, // NF_TEXT
 ZF_STANDARD_FRACTION + 2, // NF_FRACTION_3
-ZF_STANDARD_FRACTION + 3 // NF_FRACTION_4
+ZF_STANDARD_FRACTION + 3, // NF_FRACTION_4
+ZF_STANDARD_DATETIME + 2 // NF_DATETIME_ISO_MMDD_HHMMSS
 };
 
 /**
@@ -2495,7 +2497,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 
CLOffset, bool bNoAdditio
 ImpInsertFormat( aFormatSeq[nIdx],
  CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD /* 
NF_DATE_DIN_YYMMDD */ );
 
-// -MM-DD   DIN/EN
+// -MM-DD   DIN/EN/ISO
 nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_MMDD );
 ImpInsertFormat( aFormatSeq[nIdx],
  CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD /* 
NF_DATE_DIN_MMDD */ );
@@ -2555,6 +2557,22 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 
CLOffset, bool bNoAdditio
 ImpInsertFormat( aFormatSeq[nIdx],
  CLOffset + ZF_STANDARD_DATETIME+1 /* 
NF_DATETIME_SYS_DDMM_HHMMSS */ );
 
+const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords();
+i18n::NumberFormatCode aSingleFormatCode;
+OUStringBuffer aBuf;
+aSingleFormatCode.Usage = i18n::KNumberFormatUsage::DATE_TIME;
+
+// -MM-DD HH:MM:SS   ISO
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svl/source

[Eike Rathke]

 svl/source/numbers/zforlist.cxx |   43 ++--
 1 file changed, 24 insertions(+), 19 deletions(-)

New commits:
commit b6230835b927e0053687fae6026fa3603600f321
Author: Eike Rathke 
Date:   Thu Jun 2 20:40:46 2016 +0200

preserve ISO date+time format when editing such values

Change-Id: I6dcbe6c9aeff87d735303713f328c84203f76b60
(cherry picked from commit 020d395b59b4c631491ded910c0405584ef46e1c)
Reviewed-on: https://gerrit.libreoffice.org/25843
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index df13480..0747e0c 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1420,24 +1420,29 @@ sal_uInt32 SvNumberFormatter::GetEditFormat( double 
fNumber, sal_uInt32 nFIndex,
 {
 // #61619# always edit using 4-digit year
 case css::util::NumberFormat::DATE :
-if (rtl::math::approxFloor( fNumber) != fNumber)
-nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
-// fdo#34977 preserve time when editing even if only date was
-// displayed.
-/* FIXME: in case an ISO 8601 format was used, editing should
- * also use such. Unfortunately we have no builtin combined
- * date+time ISO format defined. Needs also locale data work.
- * */
-else
 {
 // Preserve ISO 8601 format.
-if (nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
-nFIndex == GetFormatIndex( NF_DATE_DIN_YYMMDD, eLang) ||
-nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
-(pFormat && pFormat->IsIso8601( 0 )))
-nKey = GetFormatIndex( NF_DATE_DIN_MMDD, eLang);
+bool bIsoDate =
+nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
+nFIndex == GetFormatIndex( NF_DATE_DIN_YYMMDD, eLang) ||
+nFIndex == GetFormatIndex( NF_DATE_DIN_MMDD, eLang) ||
+(pFormat && pFormat->IsIso8601( 0 ));
+if (rtl::math::approxFloor( fNumber) != fNumber)
+{
+// fdo#34977 preserve time when editing even if only date was
+// displayed.
+if (bIsoDate)
+nKey = GetFormatIndex( NF_DATETIME_ISO_MMDD_HHMMSS, 
eLang);
+else
+nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, 
eLang );
+}
 else
-nKey = GetFormatIndex( NF_DATE_SYS_DDMM, eLang );
+{
+if (bIsoDate)
+nKey = GetFormatIndex( NF_DATE_ISO_MMDD, eLang);
+else
+nKey = GetFormatIndex( NF_DATE_SYS_DDMM, eLang );
+}
 }
 break;
 case css::util::NumberFormat::TIME :
@@ -1458,10 +1463,10 @@ sal_uInt32 SvNumberFormatter::GetEditFormat( double 
fNumber, sal_uInt32 nFIndex,
 nKey = GetStandardFormat( fNumber, nFIndex, eType, eLang );
 break;
 case css::util::NumberFormat::DATETIME :
-nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
-/* FIXME: in case an ISO 8601 format was used, editing should
- * also use such. Unfortunately we have no builtin combined
- * date+time ISO format defined. Needs also locale data work. */
+if (nFIndex == GetFormatIndex( NF_DATETIME_ISO_MMDD_HHMMSS, eLang) 
|| (pFormat && pFormat->IsIso8601( 0 )))
+nKey = GetFormatIndex( NF_DATETIME_ISO_MMDD_HHMMSS, eLang );
+else
+nKey = GetFormatIndex( NF_DATETIME_SYS_DDMM_HHMMSS, eLang );
 break;
 default:
 nKey = GetStandardFormat( fNumber, nFIndex, eType, eLang );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/inc/osx/a11yfocustracker.hxx |4 +++-
 vcl/osx/a11yfocustracker.cxx |2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 64e83932264f0d708e4ce2dce9b36a933afd2fbf
Author: Stephan Bergmann 
Date:   Fri Jun 3 07:32:06 2016 +0200

loplugin:refcounting

Change-Id: Ia7bd500728e122f1f4c7ff4c020cc067e72613ca

diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index bd7a520..b8872f3 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -41,6 +41,8 @@ class AquaA11yFocusTracker : public rtl::Static< 
AquaA11yFocusTracker, AquaA11yF
 public:
 AquaA11yFocusTracker();
 
+~AquaA11yFocusTracker();
+
 css::uno::Reference< css::accessibility::XAccessible > const & 
getFocusedObject() { return m_xFocusedObject; };
 
 // sets the currently focus object and notifies the FocusEventListener (if 
any)
@@ -89,7 +91,7 @@ private:
 Link m_aWindowEventLink;
 
 // the UNO XAccessibilityEventListener for Documents and other non VCL 
objects
-const css::uno::Reference< DocumentFocusListener > 
m_xDocumentFocusListener;
+const rtl::Reference< DocumentFocusListener > m_xDocumentFocusListener;
 };
 
 #endif // INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index 6f9441d..1389ae3 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -96,6 +96,8 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() :
 window_got_focus(Application::GetFocusWindow());
 }
 
+AquaA11yFocusTracker::~AquaA11yFocusTracker() {}
+
 void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& 
xAccessible)
 {
 if( xAccessible != m_xFocusedObject )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michal Kubecek]

 configure.ac |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit e5d48f12faec6027bf79411cb69111d90f4e4129
Author: Michal Kubecek 
Date:   Thu Jun 2 08:12:37 2016 +0200

configure.ac: allow build with Firebird 3.0

Relax the checks in configure.ac to allow building against recently
released Firebird 3.0. In this version, libfbclient is also used to
access local database files (embedded server mode) rather than
separate libfbembed.

Change-Id: Id498cbca22409f95ee299a6165cc765efa25eca7
Reviewed-on: https://gerrit.libreoffice.org/25845
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/configure.ac b/configure.ac
index 442a816..0c4b677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8657,8 +8657,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then
 AC_PATH_PROG(FIREBIRDCONFIG, [fb_config])
 if test -z "$FIREBIRDCONFIG"; then
 AC_MSG_NOTICE([No fb_config -- using pkg-config])
-PKG_CHECK_MODULES(FIREBIRD, fbembed)
-FIREBIRD_VERSION=`pkg-config --modversion fbembed`
+PKG_CHECK_MODULES([FIREBIRD], [fbclient >= 3], 
[FIREBIRD_PKGNAME=fbclient], [
+PKG_CHECK_MODULES([FIREBIRD], [fbembed], 
[FIREBIRD_PKGNAME=fbembed])
+])
+FIREBIRD_VERSION=`pkg-config --modversion "$FIREBIRD_PKGNAME"`
 else
 AC_MSG_NOTICE([fb_config found])
 FIREBIRD_VERSION=`$FIREBIRDCONFIG --version`
@@ -8673,19 +8675,20 @@ if test "$enable_firebird_sdbc" = "yes" ; then
 if test -n "${FIREBIRD_VERSION}"; then
 FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
 FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
-if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; 
then
+if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5" -o \
+"$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; 
then
 AC_MSG_RESULT([OK])
 else
-AC_MSG_ERROR([Ensure firebird 2.5.x is installed])
+AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed])
 fi
 else
 __save_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}"
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include 
-#if defined(FB_API_VER) && FB_API_VER == 25
+#if defined(FB_API_VER) && (FB_API_VER == 25 || FB_API_VER == 30)
 #else
 #error "Wrong Firebird API version"
-#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x is 
installed]))
+#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is 
installed]))
 CFLAGS="${__save_CFLAGS}"
 fi
 ENABLE_FIREBIRD_SDBC="TRUE"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/inc/osx/a11yfocustracker.hxx |6 +-
 vcl/osx/a11yfactory.mm   |2 +-
 vcl/osx/a11yfocuslistener.cxx|2 +-
 vcl/osx/a11ylistener.cxx |2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 1ac1b375ee3e6359d1519ac94f3ad9e69009859c
Author: Stephan Bergmann 
Date:   Fri Jun 3 07:50:46 2016 +0200

Follow-up fix (odd missing ~TheAquaA11yFocusTracker error)

Change-Id: I18501185f52ab4e90d16313cba299b7501106db3

diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index b8872f3..9852b51 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -35,7 +35,7 @@ class ToolBox;
 class DocumentFocusListener;
 
 
-class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, 
AquaA11yFocusTracker>
+class AquaA11yFocusTracker
 {
 
 public:
@@ -94,6 +94,10 @@ private:
 const rtl::Reference< DocumentFocusListener > m_xDocumentFocusListener;
 };
 
+struct TheAquaA11yFocusTracker:
+rtl::Static
+{};
+
 #endif // INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm
index 79ddf64..e9ce490 100644
--- a/vcl/osx/a11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -59,7 +59,7 @@ static bool enabled = false;
 mdAllWrapper = [ [ [ NSMutableDictionary alloc ] init ] retain ];
 // initialize keyboard focus tracker
 rtl::Reference< AquaA11yFocusListener > listener( 
AquaA11yFocusListener::get() );
-AquaA11yFocusTracker::get().setFocusListener(listener.get());
+TheAquaA11yFocusTracker::get().setFocusListener(listener.get());
 enabled = true;  
 }
 return mdAllWrapper;
diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx
index ea593f2..da4e410 100644
--- a/vcl/osx/a11yfocuslistener.cxx
+++ b/vcl/osx/a11yfocuslistener.cxx
@@ -42,7 +42,7 @@ AquaA11yFocusListener::AquaA11yFocusListener() : 
m_focusedObject(nil)
 id AquaA11yFocusListener::getFocusedUIElement()
 {
 if ( nil == m_focusedObject ) {
-Reference< XAccessible > xAccessible( 
AquaA11yFocusTracker::get().getFocusedObject() );
+Reference< XAccessible > xAccessible( 
TheAquaA11yFocusTracker::get().getFocusedObject() );
 try {
 if( xAccessible.is() ) {
 Reference< XAccessibleContext > 
xContext(xAccessible->getAccessibleContext());
diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index aeefaf6..1d56c1f 100644
--- a/vcl/osx/a11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -80,7 +80,7 @@ AquaA11yEventListener::notifyEvent( const 
AccessibleEventObject& aEvent ) throw(
 if( m_role != AccessibleRole::LIST ) {
 Reference< XAccessible > xAccessible;
 if( aEvent.NewValue >>= xAccessible )
-AquaA11yFocusTracker::get().setFocusedObject( xAccessible 
);
+TheAquaA11yFocusTracker::get().setFocusedObject( 
xAccessible );
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 framework/source/fwe/dispatch/interaction.cxx |   12 ++--
 include/framework/interaction.hxx |3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 25d46298c0a84b351d06fa78d48f2019cb845d4d
Author: Xisco Fauli 
Date:   Sun May 29 21:24:33 2016 +0200

tdf#89329: use unique_ptr for pImpl in interaction

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

diff --git a/framework/source/fwe/dispatch/interaction.cxx 
b/framework/source/fwe/dispatch/interaction.cxx
index 6fc5c69..cf4f27c 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -156,14 +156,14 @@ css::uno::Sequence< css::uno::Reference< 
css::task::XInteractionContinuation > >
 }
 
 RequestFilterSelect::RequestFilterSelect( const OUString& sURL )
+: pImpl( new RequestFilterSelect_Impl( sURL ))
 {
-pImp = new RequestFilterSelect_Impl( sURL );
-pImp->acquire();
+pImpl->acquire();
 }
 
 RequestFilterSelect::~RequestFilterSelect()
 {
-pImp->release();
+pImpl->release();
 }
 
 // return abort state of interaction
@@ -171,7 +171,7 @@ RequestFilterSelect::~RequestFilterSelect()
 
 bool RequestFilterSelect::isAbort() const
 {
-return pImp->isAbort();
+return pImpl->isAbort();
 }
 
 // return user selected filter
@@ -179,12 +179,12 @@ bool RequestFilterSelect::isAbort() const
 
 OUString RequestFilterSelect::getFilter() const
 {
-return pImp->getFilter();
+return pImpl->getFilter();
 }
 
 uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest()
 {
-return uno::Reference < task::XInteractionRequest > (pImp);
+return uno::Reference < task::XInteractionRequest > (pImpl.get());
 }
 
 class InteractionRequest_Impl : public ::cppu::WeakImplHelper< 
css::task::XInteractionRequest >
diff --git a/include/framework/interaction.hxx 
b/include/framework/interaction.hxx
index a57b3ed..f7793d3 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace framework{
 
@@ -60,7 +61,7 @@ namespace framework{
 class RequestFilterSelect_Impl;
 class FWE_DLLPUBLIC RequestFilterSelect
 {
-RequestFilterSelect_Impl* pImp;
+std::unique_ptr pImpl;
 
 public:
 RequestFilterSelect( const OUString& sURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 comphelper/source/container/embeddedobjectcontainer.cxx |7 +++
 include/comphelper/embeddedobjectcontainer.hxx  |3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e88107c0552a2165d3e3e8137ebbd80d97b5570e
Author: Xisco Fauli 
Date:   Wed Jun 1 01:25:41 2016 +0200

tdf#89329: use unique_ptr for pImpl in embeddedobjectcontainer

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

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 65d41aa..8207e5a 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -96,8 +96,8 @@ const uno::Reference < embed::XStorage >& 
EmbedImpl::GetReplacements()
 }
 
 EmbeddedObjectContainer::EmbeddedObjectContainer()
+: pImpl(new EmbedImpl)
 {
-pImpl = new EmbedImpl;
 pImpl->mxStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
 pImpl->mbOwnsStorage = true;
 pImpl->mbUserAllowsLinkUpdate = true;
@@ -105,8 +105,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer()
 }
 
 EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < 
embed::XStorage >& rStor )
+: pImpl(new EmbedImpl)
 {
-pImpl = new EmbedImpl;
 pImpl->mxStorage = rStor;
 pImpl->mbOwnsStorage = false;
 pImpl->mbUserAllowsLinkUpdate = true;
@@ -114,8 +114,8 @@ EmbeddedObjectContainer::EmbeddedObjectContainer( const 
uno::Reference < embed::
 }
 
 EmbeddedObjectContainer::EmbeddedObjectContainer( const uno::Reference < 
embed::XStorage >& rStor, const uno::Reference < uno::XInterface >& xModel )
+: pImpl(new EmbedImpl)
 {
-pImpl = new EmbedImpl;
 pImpl->mxStorage = rStor;
 pImpl->mbOwnsStorage = false;
 pImpl->mbUserAllowsLinkUpdate = true;
@@ -191,7 +191,6 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer()
 pImpl->mxStorage->dispose();
 
 delete pImpl->mpTempObjectContainer;
-delete pImpl;
 }
 
 void EmbeddedObjectContainer::CloseEmbeddedObjects()
diff --git a/include/comphelper/embeddedobjectcontainer.hxx 
b/include/comphelper/embeddedobjectcontainer.hxx
index a54aa2a..70a583c 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -30,6 +30,7 @@
 #include 
 
 #include 
+#include 
 
 namespace comphelper
 {
@@ -52,7 +53,7 @@ namespace comphelper
 struct EmbedImpl;
 class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer
 {
-EmbedImpl*  pImpl;
+std::unique_ptr  pImpl;
 
 css::uno::Reference < css::embed::XEmbeddedObject > Get_Impl( const 
OUString&,
 const css::uno::Reference < css::embed::XEmbeddedObject >& xCopy,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/vcl sw/source vcl/source vcl/unx xmloff/source

[Noel Grandin]

 include/vcl/embeddedfontshelper.hxx  |2 +-
 include/vcl/helper.hxx   |9 ++---
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 vcl/source/gdi/embeddedfontshelper.cxx   |6 +++---
 vcl/unx/generic/fontmanager/fontcache.cxx|2 +-
 vcl/unx/generic/fontmanager/helper.cxx   |   18 +-
 xmloff/source/style/XMLFontAutoStylePool.cxx |2 +-
 7 files changed, 22 insertions(+), 19 deletions(-)

New commits:
commit dfad705d5f0c05cbebb4155d69212b35c58a22c0
Author: Noel Grandin 
Date:   Wed Jun 1 11:58:20 2016 +0200

Convert whichOfficePath to scoped enum

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

diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx
index 34271ca..dcdcd92 100644
--- a/include/vcl/helper.hxx
+++ b/include/vcl/helper.hxx
@@ -31,7 +31,9 @@
 // forwards
 namespace osl { class File; }
 
-namespace psp {
+namespace psp
+{
+
 typedef int fontID;
 
 void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const 
char* pSubDir );
@@ -49,10 +51,11 @@ void VCL_DLLPUBLIC normPath( OString& rPath );
 // rOrgPath will be subject to normPath
 void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase 
);
 
-enum whichOfficePath { InstallationRootPath, UserPath, ConfigPath };
+enum class whichOfficePath { InstallationRootPath, UserPath, ConfigPath };
 // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
 // seems to be a bug in gcc, now we return an object instead of a reference
-OUString VCL_DLLPUBLIC getOfficePath( enum whichOfficePath ePath );
+OUString VCL_DLLPUBLIC getOfficePath( whichOfficePath ePath );
+
 } // namespace
 
 
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx 
b/vcl/unx/generic/fontmanager/fontcache.cxx
index 25526d8..a4a1550 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -50,7 +50,7 @@ using namespace utl;
 FontCache::FontCache()
 {
 m_bDoFlush = false;
-m_aCacheFile = getOfficePath( UserPath );
+m_aCacheFile = getOfficePath( whichOfficePath::UserPath );
 if( !m_aCacheFile.isEmpty() )
 {
 m_aCacheFile += "/user/psprint/pspfontcache";
diff --git a/vcl/unx/generic/fontmanager/helper.cxx 
b/vcl/unx/generic/fontmanager/helper.cxx
index a8c35b8..8b7c2ed 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -37,7 +37,7 @@ using ::rtl::Bootstrap;
 
 namespace psp {
 
-OUString getOfficePath( enum whichOfficePath ePath )
+OUString getOfficePath( whichOfficePath ePath )
 {
 static OUString aInstallationRootPath;
 static OUString aUserPath;
@@ -87,9 +87,9 @@ OUString getOfficePath( enum whichOfficePath ePath )
 
 switch( ePath )
 {
-case ConfigPath: return aConfigPath;
-case InstallationRootPath: return aInstallationRootPath;
-case UserPath: return aUserPath;
+case whichOfficePath::ConfigPath: return aConfigPath;
+case whichOfficePath::InstallationRootPath: return 
aInstallationRootPath;
+case whichOfficePath::UserPath: return aUserPath;
 }
 return aEmpty;
 }
@@ -116,7 +116,7 @@ void psp::getPrinterPathList( std::list< OUString >& 
rPathList, const char* pSub
 OUStringBuffer aPathBuffer( 256 );
 
 // append net path
-aPathBuffer.append( getOfficePath( psp::InstallationRootPath ) );
+aPathBuffer.append( getOfficePath( whichOfficePath::InstallationRootPath ) 
);
 if( !aPathBuffer.isEmpty() )
 {
 aPathBuffer.append( "/" LIBO_SHARE_FOLDER "/psprint" );
@@ -128,7 +128,7 @@ void psp::getPrinterPathList( std::list< OUString >& 
rPathList, const char* pSub
 rPathList.push_back( aPathBuffer.makeStringAndClear() );
 }
 // append user path
-aPathBuffer.append( getOfficePath( psp::UserPath ) );
+aPathBuffer.append( getOfficePath( whichOfficePath::UserPath ) );
 if( !aPathBuffer.isEmpty() )
 {
 aPathBuffer.append( "/user/psprint" );
@@ -193,9 +193,9 @@ OUString psp::getFontPath()
 {
 OUStringBuffer aPathBuffer( 512 );
 
-OUString aConfigPath( getOfficePath( psp::ConfigPath ) );
-OUString aInstallationRootPath( getOfficePath( 
psp::InstallationRootPath ) );
-OUString aUserPath( getOfficePath( psp::UserPath ) );
+OUString aConfigPath( getOfficePath( whichOfficePath::ConfigPath ) );
+OUString aInstallationRootPath( getOfficePath( 
whichOfficePath::InstallationRootPath ) );
+OUString aUserPath( getOfficePath( whichOfficePath::UserPath ) );
 if( !aConfigPath.isEmpty() )
 {
 // #i53530# Path from CustomDataUrl will completely
commit db4e8806aace921ca1348c1bc0949a7e554f34ac
Author: Noel Grandin 
Date:   Tue May 31 13:58:24 2016 +0200

Convert FontRights to scoped enum

C

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

[Noel Grandin]

 include/svx/lathe3d.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a6593e7fd3660b806864911c219903608c0c5b59
Author: Noel Grandin 
Date:   Wed Jun 1 19:43:14 2016 +0200

Drop unused enum LATHE_PART

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

diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 1899949..39c28f6 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -36,8 +36,6 @@
 class SVX_DLLPUBLIC E3dLatheObj : public E3dCompoundObject
 {
 private:
-// Part codes for Wireframe generation: standard oder cover surface
-enum { LATHE_PART_STD = 1, LATHE_PART_COVER = 2 };
 basegfx::B2DPolyPolygon maPolyPoly2D;
 
  protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/vcl/print.hxx  |   14 +++---
 vcl/inc/printdlg.hxx   |4 ++--
 vcl/inc/svids.hrc  |5 -
 vcl/source/gdi/print3.cxx  |   10 +-
 vcl/source/window/printdlg.cxx |   24 
 5 files changed, 22 insertions(+), 35 deletions(-)

New commits:
commit 5157caf48ac28829afa141dbf8302b2e574a7a12
Author: Noel Grandin 
Date:   Wed Jun 1 12:24:02 2016 +0200

Convert NupOrderType to scoped enum

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

diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index ff2f7b2..4481b75 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -391,17 +391,17 @@ namespace vcl
 {
 class ImplPrinterControllerData;
 
+enum class NupOrderType
+{
+LRTB, TBLR, TBRL, RLTB
+};
+
 class VCL_DLLPUBLIC PrinterController
 {
 ImplPrinterControllerData*  mpImplData;
 protected:
 PrinterController( const 
VclPtr& );
 public:
-enum NupOrderType
-{
-LRTB, TBLR, TBRL, RLTB
-};
-
 struct MultiPageSetup
 {
 // all metrics in 100th mm
@@ -416,7 +416,7 @@ public:
 longnHorizontalSpacing;
 longnVerticalSpacing;
 boolbDrawBorder;
-PrinterController::NupOrderType nOrder;
+NupOrderTypenOrder;
 
 MultiPageSetup()
  : nRows( 1 ), nColumns( 1 ), nRepeat( 1 ), aPaperSize( 21000, 
29700 )
@@ -424,7 +424,7 @@ public:
  , nRightMargin( 0 ), nBottomMargin( 0 )
  , nHorizontalSpacing( 0 ), nVerticalSpacing( 0 )
  , bDrawBorder( false )
- , nOrder( LRTB ) {}
+ , nOrder( NupOrderType::LRTB ) {}
 };
 
 struct PageSize
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index be76411..cf1dea2 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -74,7 +74,7 @@ namespace vcl
 
 class ShowNupOrderWindow : public vcl::Window
 {
-int mnOrderMode;
+NupOrderType mnOrderMode;
 int mnRows;
 int mnColumns;
 void ImplInitSettings();
@@ -85,7 +85,7 @@ namespace vcl
 
 virtual void Paint( vcl::RenderContext& rRenderContext, const 
Rectangle& ) override;
 
-void setValues( int i_nOrderMode, int i_nColumns, int i_nRows )
+void setValues( NupOrderType i_nOrderMode, int i_nColumns, int 
i_nRows )
 {
 mnOrderMode = i_nOrderMode;
 mnRows = i_nRows;
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index e23fdc5..7c81ecc 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -68,11 +68,6 @@
 #define SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT   1
 #define SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE  2
 
-#define SV_PRINT_PRT_NUP_ORDER_LRTB 0
-#define SV_PRINT_PRT_NUP_ORDER_TBLR 1
-#define SV_PRINT_PRT_NUP_ORDER_TBRL 2
-#define SV_PRINT_PRT_NUP_ORDER_RLTB 3
-
 #define SV_PRINT_NATIVE_STRINGS  2050
 
 #define SV_HELPTEXT_CLOSE   1
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index f2e73c62..8b17c70 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -433,7 +433,7 @@ bool 
Printer::PreparePrintJob(std::shared_ptr xController,
 if( nValue >= 0 )
 aMPS.nVerticalSpacing = nValue;
 aMPS.bDrawBorder = xController->getBoolProperty( "NUpDrawBorder", 
aMPS.bDrawBorder );
-aMPS.nOrder = 
static_cast(xController->getIntProperty( 
"NUpSubPageOrder", aMPS.nOrder ));
+aMPS.nOrder = static_cast(xController->getIntProperty( 
"NUpSubPageOrder", (sal_Int32)aMPS.nOrder ));
 aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( 
xController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
 css::beans::PropertyValue* pPgSizeVal = xController->getValue( 
OUString( "NUpPaperSize" ) );
 css::awt::Size aSizeVal;
@@ -1143,19 +1143,19 @@ PrinterController::PageSize 
PrinterController::getFilteredPageFile( int i_nFilte
 long nCellX = 0, nCellY = 0;
 switch( rMPS.nOrder )
 {
-case PrinterController::LRTB:
+case NupOrderType::LRTB:
 nCellX = (nSubPage % rMPS.nColumns);
 nCellY = (nSubPage / rMPS.nColumns);
 break;
-case PrinterController::TBLR:
+case NupOrderType::TBLR:
 nCellX = (nSubPage / rMPS.nRows);
 nCellY = (nSubPage % rMPS.nRows);
 break;
-case PrinterContro

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

[Xisco Fauli]

 include/svl/imageitm.hxx  |3 ++-
 svl/source/items/imageitm.cxx |   35 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit d0879b721d8c429248f9da7ce02c6c71327e2954
Author: Xisco Fauli 
Date:   Sun May 29 21:08:19 2016 +0200

tdf#89329: use unique_ptr for pImpl in imageitm

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

diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index bfe972e..d19c8be 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -22,11 +22,12 @@
 
 #include 
 #include 
+#include 
 
 struct SfxImageItem_Impl;
 class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item
 {
-SfxImageItem_Impl*  pImp;
+std::unique_ptr  pImpl;
 public:
 static SfxPoolItem* CreateDefault();
 SfxImageItem( sal_uInt16 nWhich = 0 );
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 9d07db3..4b2e31c 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -35,22 +35,21 @@ struct SfxImageItem_Impl
 
 
 SfxImageItem::SfxImageItem( sal_uInt16 which )
-: SfxInt16Item( which, 0 )
+: SfxInt16Item( which, 0 ),
+  pImpl( new SfxImageItem_Impl)
 {
-pImp = new SfxImageItem_Impl;
-pImp->nAngle = 0;
-pImp->bMirrored = false;
+pImpl->nAngle = 0;
+pImpl->bMirrored = false;
 }
 
 SfxImageItem::SfxImageItem( const SfxImageItem& rItem )
-: SfxInt16Item( rItem )
+: SfxInt16Item( rItem ),
+  pImpl( new SfxImageItem_Impl( *(rItem.pImpl.get()) ) )
 {
-pImp = new SfxImageItem_Impl( *(rItem.pImp) );
 }
 
 SfxImageItem::~SfxImageItem()
 {
-delete pImp;
 }
 
 
@@ -63,16 +62,16 @@ SfxPoolItem* SfxImageItem::Clone( SfxItemPool* ) const
 bool SfxImageItem::operator==( const SfxPoolItem& rItem ) const
 {
 return (static_cast(rItem).GetValue() == GetValue()) 
&&
-   (*pImp == *static_cast(rItem).pImp);
+   (*pImpl == *static_cast(rItem).pImpl);
 }
 
 bool SfxImageItem::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const
 {
 css::uno::Sequence< css::uno::Any > aSeq( 4 );
 aSeq[0] = css::uno::makeAny( GetValue() );
-aSeq[1] = css::uno::makeAny( pImp->nAngle );
-aSeq[2] = css::uno::makeAny( pImp->bMirrored );
-aSeq[3] = css::uno::makeAny( OUString( pImp->aURL ));
+aSeq[1] = css::uno::makeAny( pImpl->nAngle );
+aSeq[2] = css::uno::makeAny( pImpl->bMirrored );
+aSeq[3] = css::uno::makeAny( OUString( pImpl->aURL ));
 
 rVal = css::uno::makeAny( aSeq );
 return true;
@@ -87,10 +86,10 @@ bool SfxImageItem::PutValue( const css::uno::Any& rVal, 
sal_uInt8 )
 OUString aURL;
 if ( aSeq[0] >>= nVal )
 SetValue( nVal );
-aSeq[1] >>= pImp->nAngle;
-aSeq[2] >>= pImp->bMirrored;
+aSeq[1] >>= pImpl->nAngle;
+aSeq[2] >>= pImpl->bMirrored;
 if ( aSeq[3] >>= aURL )
-pImp->aURL = aURL;
+pImpl->aURL = aURL;
 return true;
 }
 
@@ -99,22 +98,22 @@ bool SfxImageItem::PutValue( const css::uno::Any& rVal, 
sal_uInt8 )
 
 void SfxImageItem::SetRotation( long nValue )
 {
-pImp->nAngle = nValue;
+pImpl->nAngle = nValue;
 }
 
 long SfxImageItem::GetRotation() const
 {
-return pImp->nAngle;
+return pImpl->nAngle;
 }
 
 void SfxImageItem::SetMirrored( bool bSet )
 {
-pImp->bMirrored = bSet;
+pImpl->bMirrored = bSet;
 }
 
 bool SfxImageItem::IsMirrored() const
 {
-return pImp->bMirrored;
+return pImpl->bMirrored;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig include/svx sd/source sd/uiconfig svx/AllLangResTarget_svx.mk svx/Library_svxcore.mk svx/source

[Katarina Behrens]

 cui/AllLangResTarget_cui.mk   |1 
 cui/source/inc/cuires.hrc |2 
 cui/source/inc/page.hxx   |3 
 cui/source/tabpages/page.cxx  |   45 +-
 cui/source/tabpages/page.h|   69 ---
 cui/source/tabpages/page.src  |   99 --
 cui/uiconfig/ui/pageformatpage.ui |2 
 include/svx/dialogs.hrc   |4 
 include/svx/papersizelistbox.hxx  |   44 +
 sd/source/ui/sidebar/SlideBackground.cxx  |   64 --
 sd/source/ui/sidebar/SlideBackground.hxx  |4 
 sd/uiconfig/simpress/ui/sidebarslidebackground.ui |   35 ---
 svx/AllLangResTarget_svx.mk   |1 
 svx/Library_svxcore.mk|1 
 svx/source/dialog/page.h  |   69 +++
 svx/source/dialog/page.src|   99 ++
 svx/source/dialog/papersizelistbox.cxx|   81 ++
 17 files changed, 314 insertions(+), 309 deletions(-)

New commits:
commit 9196de99ed4dff2c1f8708bfd68da9b6424ae53b
Author: Katarina Behrens 
Date:   Sat May 28 08:11:28 2016 +0200

Move page size listbox from cui to svx

make it a custom widget so it is accessible e.g. to sidebar panels

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

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 8d5ece0..7cb854c 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/options/treeopt.src \
 cui/source/tabpages/border.src \
 cui/source/tabpages/frmdirlbox.src \
-cui/source/tabpages/page.src \
 cui/source/tabpages/paragrph.src \
 cui/source/tabpages/strings.src \
 ))
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index f0a8ccd..103f74f 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -38,8 +38,6 @@
 //  RID_CUI_GALLERY_END (RID_SVX_START + 410)
 
 // used in "tabpages"
-#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
-#define RID_SVXSTRARY_PAPERSIZE_DRAW(RID_SVX_START + 143)
 #define RID_SVXSTR_READ_DATA_ERROR  (RID_SVX_START + 230)
 #define RID_SVXSTR_TABLE_PRESET_NONE(RID_SVX_START + 969)
 #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   (RID_SVX_START + 970)
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index d2ec71b..67cd991 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -76,7 +77,7 @@ class SvxPageDescPage : public SfxTabPage
 static const sal_uInt16 pRanges[];
 private:
 // paper format
-VclPtr m_pPaperSizeBox;
+VclPtrm_pPaperSizeBox;
 
 VclPtr m_pPaperWidthEdit;
 VclPtr m_pPaperHeightEdit;
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 1b72b7e..9391687 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -47,7 +47,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -557,29 +556,8 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), 
SFX_MAPUNIT_100TH_MM );
 m_pPaperSizeBox->Clear();
 
-sal_Int32 nActPos = LISTBOX_ENTRY_NOTFOUND;
-sal_uInt16 nAryId = RID_SVXSTRARY_PAPERSIZE_STD;
-
-if ( ePaperStart != PAPER_A3 )
-nAryId = RID_SVXSTRARY_PAPERSIZE_DRAW;
-ResStringArray aPaperAry( CUI_RES( nAryId ) );
-sal_uInt32 nCnt = aPaperAry.Count();
-
-sal_Int32 nUserPos = LISTBOX_ENTRY_NOTFOUND;
-for ( sal_uInt32 i = 0; i < nCnt; ++i )
-{
-OUString aStr = aPaperAry.GetString(i);
-Paper eSize = (Paper)aPaperAry.GetValue(i);
-sal_Int32 nPos = m_pPaperSizeBox->InsertEntry( aStr );
-m_pPaperSizeBox->SetEntryData( nPos, 
reinterpret_cast((sal_uLong)eSize) );
-
-if ( eSize == ePaper )
-nActPos = nPos;
-if( eSize == PAPER_USER )
-nUserPos = nPos;
-}
-// preselect current paper format - #115915#: ePaper might not be in 
aPaperSizeBox so use PAPER_USER instead
-m_pPaperSizeBox->SelectEntryPos( nActPos != LISTBOX_ENTRY_NOTFOUND ? 
nActPos : nUserPos );
+m_pPaperSizeBox->FillPaperSizeEntries( ( ePaperStart == PAPER_A3 ) ? 
PaperSizeStd : PaperSizeDraw );
+m_pPaperSizeBox->SetSelection( ePaper );
 
 // application specific
 
@@ -975,8 +953,8 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, 
Control&, void)
 
 IMPL_LINK_TYPED( SvxPageDescPage, Pap

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

[Xisco Fauli]

 comphelper/source/misc/accimplaccess.cxx |3 +--
 include/comphelper/accimplaccess.hxx |3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2d2971090b31776719e83d811c17a01aaf5222c7
Author: Xisco Fauli 
Date:   Wed Jun 1 01:21:36 2016 +0200

tdf#89329: use unique_ptr for pImpl in accimplaccess

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

diff --git a/comphelper/source/misc/accimplaccess.cxx 
b/comphelper/source/misc/accimplaccess.cxx
index 76ed77c..1c4096f 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 
 
 namespace comphelper
@@ -49,8 +50,6 @@ namespace comphelper
 
 OAccessibleImplementationAccess::~OAccessibleImplementationAccess( )
 {
-delete m_pImpl;
-m_pImpl = nullptr;
 }
 
 
diff --git a/include/comphelper/accimplaccess.hxx 
b/include/comphelper/accimplaccess.hxx
index ab960dd..5c048da 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star { namespace accessibility {
 class XAccessible;
@@ -62,7 +63,7 @@ namespace comphelper
 class COMPHELPER_DLLPUBLIC OAccessibleImplementationAccess : public 
OAccImpl_Base
 {
 private:
-OAccImpl_Impl*  m_pImpl;
+std::unique_ptr  m_pImpl;
 
 protected:
 /// retrieves the parent previously set via 
setAccessibleParent
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 framework/source/fwe/dispatch/interaction.cxx |9 ++---
 include/framework/interaction.hxx |4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 69a3080ae9d1439bd325f55d6c799952b02536e0
Author: Stephan Bergmann 
Date:   Fri Jun 3 08:58:14 2016 +0200

loplugin:refcounting (RequestFilterSelect_Impl derives from XInterface)

Change-Id: Iabf9b94626b599b4fe799523b3523e18df5203c5

diff --git a/framework/source/fwe/dispatch/interaction.cxx 
b/framework/source/fwe/dispatch/interaction.cxx
index cf4f27c..a9b36bb 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -157,14 +157,9 @@ css::uno::Sequence< css::uno::Reference< 
css::task::XInteractionContinuation > >
 
 RequestFilterSelect::RequestFilterSelect( const OUString& sURL )
 : pImpl( new RequestFilterSelect_Impl( sURL ))
-{
-pImpl->acquire();
-}
+{}
 
-RequestFilterSelect::~RequestFilterSelect()
-{
-pImpl->release();
-}
+RequestFilterSelect::~RequestFilterSelect() {}
 
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified 
then!
diff --git a/include/framework/interaction.hxx 
b/include/framework/interaction.hxx
index f7793d3..6858a04 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -30,11 +30,11 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 
 namespace framework{
 
@@ -61,7 +61,7 @@ namespace framework{
 class RequestFilterSelect_Impl;
 class FWE_DLLPUBLIC RequestFilterSelect
 {
-std::unique_ptr pImpl;
+rtl::Reference pImpl;
 
 public:
 RequestFilterSelect( const OUString& sURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits